Syncing for icon updates.

Also, various polish and the immunity editor is here.