fixing name icon handling