Reordered the tab strip and also centralised the icon definitions.