Renamed and reorganised icons, and created coloured versions