Added icon support 2