Reorder the icons to be OCD and all that