diff --git a/modules/modes/add_note.js b/modules/modes/add_note.js
index b257663cd..430c70a26 100644
--- a/modules/modes/add_note.js
+++ b/modules/modes/add_note.js
@@ -10,8 +10,7 @@ export function modeAddNote(context) {
     var mode = {
         id: 'add-note',
         button: 'note',
-        title: t('modes.add_note.title'),
-        description: t('modes.add_note.description'),
+        description: t.html('modes.add_note.description'),
         key: t('modes.add_note.key')
     };
 
diff --git a/modules/ui/field.js b/modules/ui/field.js
index a6bb07766..b8a23d4c9 100644
--- a/modules/ui/field.js
+++ b/modules/ui/field.js
@@ -30,7 +30,7 @@ export function uiField(context, presetField, entityIDs, options) {
 
     var _locked = false;
     var _lockedTip = uiTooltip()
-        .title(t('inspector.lock.suggestion', { label: field.label }))
+        .title(t.html('inspector.lock.suggestion', { label: field.label }))
         .placement('bottom');
 
 
diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js
index 13d7688a5..567d86f5c 100644
--- a/modules/ui/fields/localized.js
+++ b/modules/ui/fields/localized.js
@@ -52,7 +52,7 @@ export function uiFieldLocalized(field, context) {
     var _selection = d3_select(null);
     var _multilingual = [];
     var _buttonTip = uiTooltip()
-        .title(t('translate.translate'))
+        .title(t.html('translate.translate'))
         .placement('left');
     var _wikiTitles;
     var _entityIDs = [];
diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js
index 2388b0987..c1a94b394 100644
--- a/modules/ui/geolocate.js
+++ b/modules/ui/geolocate.js
@@ -88,7 +88,7 @@ export function uiGeolocate(context) {
             .call(svgIcon('#iD-icon-geolocate', 'light'))
             .call(uiTooltip()
                 .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
-                .title(t('geolocate.title'))
+                .title(t.html('geolocate.title'))
                 .keys([t('geolocate.key')])
             );
 
diff --git a/modules/ui/init.js b/modules/ui/init.js
index 0d7824d97..589e44482 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -304,14 +304,14 @@ export function uiInit(context) {
             .attr('target', '_blank')
             .attr('href', 'https://github.com/openstreetmap/iD/issues')
             .call(svgIcon('#iD-icon-bug', 'light'))
-            .call(uiTooltip().title(t('report_a_bug')).placement('top'));
+            .call(uiTooltip().title(t.html('report_a_bug')).placement('top'));
 
         issueLinks
             .append('a')
             .attr('target', '_blank')
             .attr('href', 'https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating')
             .call(svgIcon('#iD-icon-translate', 'light'))
-            .call(uiTooltip().title(t('help_translate')).placement('top'));
+            .call(uiTooltip().title(t.html('help_translate')).placement('top'));
 
         aboutList
             .append('li')
diff --git a/modules/ui/issues_info.js b/modules/ui/issues_info.js
index ed3c680ff..ff086d49f 100644
--- a/modules/ui/issues_info.js
+++ b/modules/ui/issues_info.js
@@ -62,7 +62,7 @@ export function uiIssuesInfo(context) {
 
                 var tooltipBehavior = uiTooltip()
                     .placement('top')
-                    .title(t(d.descriptionID));
+                    .title(t.html(d.descriptionID));
 
                 chipSelection
                     .call(tooltipBehavior)
diff --git a/modules/ui/panes/background.js b/modules/ui/panes/background.js
index 798ebe95e..9d2e65505 100644
--- a/modules/ui/panes/background.js
+++ b/modules/ui/panes/background.js
@@ -12,7 +12,7 @@ export function uiPaneBackground(context) {
     var backgroundPane = uiPane('background', context)
         .key(t('background.key'))
         .label(t.html('background.title'))
-        .description(t('background.description'))
+        .description(t.html('background.description'))
         .iconName('iD-icon-layers')
         .sections([
             uiSectionBackgroundList(context),
diff --git a/modules/ui/panes/help.js b/modules/ui/panes/help.js
index f9cf41ad0..8704e7471 100644
--- a/modules/ui/panes/help.js
+++ b/modules/ui/panes/help.js
@@ -259,7 +259,7 @@ export function uiPaneHelp(context) {
     var helpPane = uiPane('help', context)
         .key(t('help.key'))
         .label(t.html('help.title'))
-        .description(t('help.title'))
+        .description(t.html('help.title'))
         .iconName('iD-icon-help');
 
     helpPane.renderContent = function(content) {
@@ -354,7 +354,7 @@ export function uiPaneHelp(context) {
             .append('li')
             .attr('class', 'shortcuts')
             .call(uiTooltip()
-                .title(t('shortcuts.tooltip'))
+                .title(t.html('shortcuts.tooltip'))
                 .keys(['?'])
                 .placement('top')
             )
diff --git a/modules/ui/panes/issues.js b/modules/ui/panes/issues.js
index fd99d3004..b2e5a1acf 100644
--- a/modules/ui/panes/issues.js
+++ b/modules/ui/panes/issues.js
@@ -12,7 +12,7 @@ export function uiPaneIssues(context) {
     var issuesPane = uiPane('issues', context)
         .key(t('issues.key'))
         .label(t.html('issues.title'))
-        .description(t('issues.title'))
+        .description(t.html('issues.title'))
         .iconName('iD-icon-alert')
         .sections([
             uiSectionValidationOptions(context),
diff --git a/modules/ui/panes/map_data.js b/modules/ui/panes/map_data.js
index 0ac176971..d46d8f1df 100644
--- a/modules/ui/panes/map_data.js
+++ b/modules/ui/panes/map_data.js
@@ -12,7 +12,7 @@ export function uiPaneMapData(context) {
     var mapDataPane = uiPane('map-data', context)
         .key(t('map_data.key'))
         .label(t.html('map_data.title'))
-        .description(t('map_data.description'))
+        .description(t.html('map_data.description'))
         .iconName('iD-icon-data')
         .sections([
             uiSectionDataLayers(context),
diff --git a/modules/ui/panes/preferences.js b/modules/ui/panes/preferences.js
index 21e07c3e3..6d7d84356 100644
--- a/modules/ui/panes/preferences.js
+++ b/modules/ui/panes/preferences.js
@@ -8,7 +8,7 @@ export function uiPanePreferences(context) {
   let preferencesPane = uiPane('preferences', context)
     .key(t('preferences.key'))
     .label(t.html('preferences.title'))
-    .description(t('preferences.description'))
+    .description(t.html('preferences.description'))
     .iconName('fas-user-cog')
     .sections([
         uiSectionPrivacy(context)
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index bc6a619d2..9ca315fba 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -465,7 +465,7 @@ export function uiPresetList(context) {
                 var tooltipIdSuffix = isAutoHidden ? 'zoom' : 'manual';
                 var tooltipObj = { features: t('feature.' + hiddenPresetFeaturesId + '.description') };
                 d3_select(this).call(uiTooltip()
-                    .title(t('inspector.hidden_preset.' + tooltipIdSuffix, tooltipObj))
+                    .title(t.html('inspector.hidden_preset.' + tooltipIdSuffix, tooltipObj))
                     .placement(index < 2 ? 'bottom' : 'top')
                 );
             }
diff --git a/modules/ui/sections/background_list.js b/modules/ui/sections/background_list.js
index 998020920..0ccb264ae 100644
--- a/modules/ui/sections/background_list.js
+++ b/modules/ui/sections/background_list.js
@@ -56,7 +56,7 @@ export function uiSectionBackgroundList(context) {
             .attr('class', 'minimap-toggle-item')
             .append('label')
             .call(uiTooltip()
-                .title(t('background.minimap.tooltip'))
+                .title(t.html('background.minimap.tooltip'))
                 .keys([t('background.minimap.key')])
                 .placement('top')
             );
@@ -79,7 +79,7 @@ export function uiSectionBackgroundList(context) {
             .attr('class', 'background-panel-toggle-item')
             .append('label')
             .call(uiTooltip()
-                .title(t('background.panel.tooltip'))
+                .title(t.html('background.panel.tooltip'))
                 .keys([uiCmd('⌘⇧' + t('info_panels.background.key'))])
                 .placement('top')
             );
@@ -101,7 +101,7 @@ export function uiSectionBackgroundList(context) {
             .attr('class', 'location-panel-toggle-item')
             .append('label')
             .call(uiTooltip()
-                .title(t('background.location_panel.tooltip'))
+                .title(t.html('background.location_panel.tooltip'))
                 .keys([uiCmd('⌘⇧' + t('info_panels.location.key'))])
                 .placement('top')
             );
@@ -205,7 +205,7 @@ export function uiSectionBackgroundList(context) {
             .append('button')
             .attr('class', 'layer-browse')
             .call(uiTooltip()
-                .title(t('settings.custom_background.tooltip'))
+                .title(t.html('settings.custom_background.tooltip'))
                 .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
             )
             .on('click', editCustom)
@@ -215,7 +215,7 @@ export function uiSectionBackgroundList(context) {
             .append('div')
             .attr('class', 'best')
             .call(uiTooltip()
-                .title(t('background.best_imagery'))
+                .title(t.html('background.best_imagery'))
                 .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
             )
             .append('span')
diff --git a/modules/ui/sections/data_layers.js b/modules/ui/sections/data_layers.js
index d4b2e2705..8086adf56 100644
--- a/modules/ui/sections/data_layers.js
+++ b/modules/ui/sections/data_layers.js
@@ -96,14 +96,14 @@ export function uiSectionDataLayers(context) {
                 if (d.id === 'osm') {
                     d3_select(this)
                         .call(uiTooltip()
-                            .title(t('map_data.layers.' + d.id + '.tooltip'))
+                            .title(t.html('map_data.layers.' + d.id + '.tooltip'))
                             .keys([uiCmd('⌥' + t('area_fill.wireframe.key'))])
                             .placement('bottom')
                         );
                 } else {
                     d3_select(this)
                         .call(uiTooltip()
-                            .title(t('map_data.layers.' + d.id + '.tooltip'))
+                            .title(t.html('map_data.layers.' + d.id + '.tooltip'))
                             .placement('bottom')
                         );
                 }
@@ -155,7 +155,7 @@ export function uiSectionDataLayers(context) {
             .each(function(d) {
                 d3_select(this)
                     .call(uiTooltip()
-                        .title(t('map_data.layers.' + d.id + '.tooltip'))
+                        .title(t.html('map_data.layers.' + d.id + '.tooltip'))
                         .placement('bottom')
                     );
             });
@@ -314,7 +314,7 @@ export function uiSectionDataLayers(context) {
         var labelEnter = liEnter
             .append('label')
             .call(uiTooltip()
-                .title(t('map_data.layers.custom.tooltip'))
+                .title(t.html('map_data.layers.custom.tooltip'))
                 .placement('top')
             );
 
@@ -331,7 +331,7 @@ export function uiSectionDataLayers(context) {
             .append('button')
             .attr('class', 'open-data-options')
             .call(uiTooltip()
-                .title(t('settings.custom_data.tooltip'))
+                .title(t.html('settings.custom_data.tooltip'))
                 .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
             )
             .on('click', editCustom)
@@ -341,7 +341,7 @@ export function uiSectionDataLayers(context) {
             .append('button')
             .attr('class', 'zoom-to-data')
             .call(uiTooltip()
-                .title(t('map_data.layers.custom.zoom'))
+                .title(t.html('map_data.layers.custom.zoom'))
                 .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
             )
             .on('click', function() {
@@ -399,7 +399,7 @@ export function uiSectionDataLayers(context) {
             .attr('class', 'history-panel-toggle-item')
             .append('label')
             .call(uiTooltip()
-                .title(t('map_data.history_panel.tooltip'))
+                .title(t.html('map_data.history_panel.tooltip'))
                 .keys([uiCmd('⌘⇧' + t('info_panels.history.key'))])
                 .placement('top')
             );
@@ -421,7 +421,7 @@ export function uiSectionDataLayers(context) {
             .attr('class', 'measurement-panel-toggle-item')
             .append('label')
             .call(uiTooltip()
-                .title(t('map_data.measurement_panel.tooltip'))
+                .title(t.html('map_data.measurement_panel.tooltip'))
                 .keys([uiCmd('⌘⇧' + t('info_panels.measurement.key'))])
                 .placement('top')
             );
diff --git a/modules/ui/sections/feature_type.js b/modules/ui/sections/feature_type.js
index 4fefce066..6a88519c3 100644
--- a/modules/ui/sections/feature_type.js
+++ b/modules/ui/sections/feature_type.js
@@ -42,7 +42,7 @@ export function uiSectionFeatureType(context) {
             .append('button')
             .attr('class', 'preset-list-button preset-reset')
             .call(uiTooltip()
-                .title(t('inspector.back_tooltip'))
+                .title(t.html('inspector.back_tooltip'))
                 .placement('bottom')
             );
 
diff --git a/modules/ui/sections/photo_overlays.js b/modules/ui/sections/photo_overlays.js
index eb55e59c4..7af6527c6 100644
--- a/modules/ui/sections/photo_overlays.js
+++ b/modules/ui/sections/photo_overlays.js
@@ -74,7 +74,7 @@ export function uiSectionPhotoOverlays(context) {
                 else titleID = d.id.replace(/-/g, '_') + '.tooltip';
                 d3_select(this)
                     .call(uiTooltip()
-                        .title(t(titleID))
+                        .title(t.html(titleID))
                         .placement('top')
                     );
             });
@@ -137,7 +137,7 @@ export function uiSectionPhotoOverlays(context) {
             .each(function(d) {
                 d3_select(this)
                     .call(uiTooltip()
-                        .title(t('photo_overlays.photo_type.' + d + '.tooltip'))
+                        .title(t.html('photo_overlays.photo_type.' + d + '.tooltip'))
                         .placement('top')
                     );
             });
diff --git a/modules/ui/sections/privacy.js b/modules/ui/sections/privacy.js
index 6c4f1831b..453de3b5f 100644
--- a/modules/ui/sections/privacy.js
+++ b/modules/ui/sections/privacy.js
@@ -29,7 +29,7 @@ export function uiSectionPrivacy(context) {
         .attr('class', 'privacy-third-party-icons-item')
         .append('label')
         .call(uiTooltip()
-          .title(t('preferences.privacy.third_party_icons.tooltip'))
+          .title(t.html('preferences.privacy.third_party_icons.tooltip'))
           .placement('bottom')
         );
 
diff --git a/modules/ui/sections/raw_membership_editor.js b/modules/ui/sections/raw_membership_editor.js
index 9d27c0664..87c7a94a4 100644
--- a/modules/ui/sections/raw_membership_editor.js
+++ b/modules/ui/sections/raw_membership_editor.js
@@ -134,7 +134,11 @@ export function uiSectionRawMembershipEditor(context) {
 
 
     function fetchNearbyRelations(q, callback) {
-        var newRelation = { relation: null, value: t('inspector.new_relation') };
+        var newRelation = {
+            relation: null,
+            value: t('inspector.new_relation'),
+            display: t.html('inspector.new_relation')
+        };
 
         var entityID = _entityIDs[0];
 
@@ -378,7 +382,7 @@ export function uiSectionRawMembershipEditor(context) {
         addRelationButton
             .call(svgIcon('#iD-icon-plus', 'light'));
         addRelationButton
-            .call(uiTooltip().title(t('inspector.add_to_relation')).placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'));
+            .call(uiTooltip().title(t.html('inspector.add_to_relation')).placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'));
 
         addRowEnter
             .append('div')
diff --git a/modules/ui/tools/modes.js b/modules/ui/tools/modes.js
index 2177e7193..07249d75e 100644
--- a/modules/ui/tools/modes.js
+++ b/modules/ui/tools/modes.js
@@ -23,23 +23,23 @@ export function uiToolOldDrawModes(context) {
 
     var modes = [
         modeAddPoint(context, {
-            title: t('modes.add_point.title'),
+            title: t.html('modes.add_point.title'),
             button: 'point',
-            description: t('modes.add_point.description'),
+            description: t.html('modes.add_point.description'),
             preset: presetManager.item('point'),
             key: '1'
         }),
         modeAddLine(context, {
-            title: t('modes.add_line.title'),
+            title: t.html('modes.add_line.title'),
             button: 'line',
-            description: t('modes.add_line.description'),
+            description: t.html('modes.add_line.description'),
             preset: presetManager.item('line'),
             key: '2'
         }),
         modeAddArea(context, {
-            title: t('modes.add_area.title'),
+            title: t.html('modes.add_area.title'),
             button: 'area',
-            description: t('modes.add_area.description'),
+            description: t.html('modes.add_area.description'),
             preset: presetManager.item('area'),
             key: '3'
         })
diff --git a/modules/ui/tools/save.js b/modules/ui/tools/save.js
index a4bb169c7..de3fa22fa 100644
--- a/modules/ui/tools/save.js
+++ b/modules/ui/tools/save.js
@@ -58,7 +58,7 @@ export function uiToolSave(context) {
 
         if (tooltipBehavior) {
             tooltipBehavior
-                .title(t(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
+                .title(t.html(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
                 .keys([key]);
         }
 
@@ -76,7 +76,7 @@ export function uiToolSave(context) {
     tool.render = function(selection) {
         tooltipBehavior = uiTooltip()
             .placement('bottom')
-            .title(t('save.no_changes'))
+            .title(t.html('save.no_changes'))
             .keys([key])
             .scrollContainer(context.container().select('.top-toolbar'));
 
diff --git a/modules/ui/tools/sidebar_toggle.js b/modules/ui/tools/sidebar_toggle.js
index 58d5cac5d..bd0759699 100644
--- a/modules/ui/tools/sidebar_toggle.js
+++ b/modules/ui/tools/sidebar_toggle.js
@@ -18,7 +18,7 @@ export function uiToolSidebarToggle(context) {
             })
             .call(uiTooltip()
                 .placement('bottom')
-                .title(t('sidebar.tooltip'))
+                .title(t.html('sidebar.tooltip'))
                 .keys([t('sidebar.key')])
                 .scrollContainer(context.container().select('.top-toolbar'))
             )
diff --git a/modules/ui/tools/undo_redo.js b/modules/ui/tools/undo_redo.js
index 4c4d2dbb7..b5c4a4eb1 100644
--- a/modules/ui/tools/undo_redo.js
+++ b/modules/ui/tools/undo_redo.js
@@ -51,8 +51,8 @@ export function uiToolUndoRedo(context) {
             .placement('bottom')
             .title(function (d) {
                 return d.annotation() ?
-                    t(d.id + '.tooltip', { action: d.annotation() }) :
-                    t(d.id + '.nothing');
+                    t.html(d.id + '.tooltip', { action: d.annotation() }) :
+                    t.html(d.id + '.nothing');
             })
             .keys(function(d) {
                 return [d.cmd];
diff --git a/modules/ui/version.js b/modules/ui/version.js
index 4809656b8..ba909632b 100644
--- a/modules/ui/version.js
+++ b/modules/ui/version.js
@@ -44,7 +44,7 @@ export function uiVersion(context) {
                 .attr('href', 'https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#whats-new')
                 .call(svgIcon('#maki-gift-11'))
                 .call(uiTooltip()
-                    .title(t('version.whats_new', { version: currVersion }))
+                    .title(t.html('version.whats_new', { version: currVersion }))
                     .placement('top')
                 );
         }
diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js
index 10b783b91..f754f9b6b 100644
--- a/modules/ui/zoom.js
+++ b/modules/ui/zoom.js
@@ -15,22 +15,22 @@ export function uiZoom(context) {
     var zooms = [{
         id: 'zoom-in',
         icon: 'iD-icon-plus',
-        title: t('zoom.in'),
+        title: t.html('zoom.in'),
         action: zoomIn,
         disabled: function() {
             return !context.map().canZoomIn();
         },
-        disabledTitle: t('zoom.disabled.in'),
+        disabledTitle: t.html('zoom.disabled.in'),
         key: '+'
     }, {
         id: 'zoom-out',
         icon: 'iD-icon-minus',
-        title: t('zoom.out'),
+        title: t.html('zoom.out'),
         action: zoomOut,
         disabled: function() {
             return !context.map().canZoomOut();
         },
-        disabledTitle: t('zoom.disabled.out'),
+        disabledTitle: t.html('zoom.disabled.out'),
         key: '-'
     }];
 
diff --git a/modules/ui/zoom_to_selection.js b/modules/ui/zoom_to_selection.js
index 9bd10b410..d65421bcf 100644
--- a/modules/ui/zoom_to_selection.js
+++ b/modules/ui/zoom_to_selection.js
@@ -44,9 +44,9 @@ export function uiZoomToSelection(context) {
             .placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
             .title(function() {
                 if (isDisabled()) {
-                    return t('inspector.zoom_to.no_selection');
+                    return t.html('inspector.zoom_to.no_selection');
                 }
-                return t('inspector.zoom_to.title');
+                return t.html('inspector.zoom_to.title');
             })
             .keys([t('inspector.zoom_to.key')]);