#23 Renamed icons to match component "KIND" attr