updated icon handling