added icon handling