Added icon handling.