fix icon handling