Sort icons correctly for 2.2
Reduce duplicate icons