refreshed icons
more cleanup