Introduce new icon set. Change categories so we can access type.