update icons and some cleanup