Fewer borders for localized names

Reduces visual clutter and fixes #1695