Icon and menu item rearrangement