New icons
Renamed some classes