Added special icon handling