Moved icons to global/icons, incidental changes.