Adding new kinds and removing old ones

Adding IconLabel and CountableIconItem
Removing IconItem and CountableItem