Changed icons, more renaming