clean up and fix icons