clean up Icon code