More icon cleanup.