Reorganize icons and images