2.3 icon cleanup