Icon clean up