Oops, part 2: I shouldn't remove an icon that is still in use. Also convert some...