cleanup
new icons
more cleanup