fixing name icon handling again