various, including rearrangement of icons
icon alignment and stubbed about