diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index 5c44db3b1..4205e04a4 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -125,7 +125,7 @@ import 'emby-button';
         html += `<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ${readOnlyAttribute} label="${globalize.translate(labelKey)}"/>`;
         html += '</div>';
         if (!readOnlyAttribute) {
-            html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('ButtonRefresh')}"><span class="material-icons search"></span></button>`;
+            html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('Refresh')}"><span class="material-icons search"></span></button>`;
         }
         html += '</div>';
         if (!readOnlyAttribute) {
diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index e751ce56c..1b9bf0037 100644
--- a/src/components/displaySettings/displaySettings.template.html
+++ b/src/components/displaySettings/displaySettings.template.html
@@ -170,7 +170,7 @@
     <div class="checkboxContainer checkboxContainer-withDescription fldThemeSong hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkThemeSong" />
-            <span>${EnableThemeSongs}</span>
+            <span>${ThemeSongs}</span>
         </label>
         <div class="fieldDescription checkboxFieldDescription">${EnableThemeSongsHelp}</div>
     </div>
@@ -178,7 +178,7 @@
     <div class="checkboxContainer checkboxContainer-withDescription fldThemeVideo hide">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkThemeVideo" />
-            <span>${EnableThemeVideos}</span>
+            <span>${ThemeVideos}</span>
         </label>
         <div class="fieldDescription checkboxFieldDescription">${EnableThemeVideosHelp}</div>
     </div>
diff --git a/src/components/homeScreenSettings/homeScreenSettings.template.html b/src/components/homeScreenSettings/homeScreenSettings.template.html
index 19f79ea5d..615598a1a 100644
--- a/src/components/homeScreenSettings/homeScreenSettings.template.html
+++ b/src/components/homeScreenSettings/homeScreenSettings.template.html
@@ -1,6 +1,6 @@
 <form style="margin:0 auto;">
     <div class="verticalSection verticalSection-extrabottompadding">
-        <h2 class="sectionTitle">${HeaderHome}</h2>
+        <h2 class="sectionTitle">${Home}</h2>
 
         <div class="selectContainer hide selectTVHomeScreenContainer">
             <select is="emby-select" class="selectTVHomeScreen" label="${LabelTVHomeScreen}">
diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html
index bc8ce5968..c2ec8942e 100644
--- a/src/components/itemMediaInfo/itemMediaInfo.template.html
+++ b/src/components/itemMediaInfo/itemMediaInfo.template.html
@@ -2,7 +2,7 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <span class="material-icons arrow_back"></span>
     </button>
-    <h3 class="formDialogHeaderTitle">${HeaderMediaInfo}</h3>
+    <h3 class="formDialogHeaderTitle">${MoreMediaInfo}</h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index 92cebc9da..3aa57f243 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -88,7 +88,7 @@
 <div class="checkboxContainer checkboxContainer-withDescription hide chkImportMissingEpisodesContainer advanced">
     <label>
         <input is="emby-checkbox" type="checkbox" id="chkImportMissingEpisodes" />
-        <span>${LabelDisplayMissingEpisodesWithinSeasons}</span>
+        <span>${DisplayMissingEpisodesWithinSeasons}</span>
     </label>
     <div class="fieldDescription checkboxFieldDescription">${ImportMissingEpisodesHelp}</div>
 </div>
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 6048c918c..3216241e7 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -66,7 +66,7 @@ function showSubtitleMenu(context, player, button, item) {
     });
     menuItems.unshift({
         id: -1,
-        name: globalize.translate('ButtonOff'),
+        name: globalize.translate('Off'),
         selected: currentIndex == null
     });
 
diff --git a/src/controllers/dashboard/devices/device.html b/src/controllers/dashboard/devices/device.html
index 4d8fb8653..aec73db00 100644
--- a/src/controllers/dashboard/devices/device.html
+++ b/src/controllers/dashboard/devices/device.html
@@ -9,7 +9,7 @@
                     </div>
 
                     <div class="inputContainer">
-                        <input is="emby-input" type="text" id="txtCustomName" label="${LabelCustomDeviceDisplayName}" />
+                        <input is="emby-input" type="text" id="txtCustomName" label="${LabelDisplayName}" />
                         <div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div>
                     </div>
                 </div>
diff --git a/src/controllers/dashboard/dlna/profile.html b/src/controllers/dashboard/dlna/profile.html
index 22c7ce73e..3ac3a71c6 100644
--- a/src/controllers/dashboard/dlna/profile.html
+++ b/src/controllers/dashboard/dlna/profile.html
@@ -8,7 +8,7 @@
                     </div>
                 </div>
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
-                    <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${TabInfo}</a>
+                    <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioInfo" data-value="tabInfo">${ButtonInfo}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioDirectPlay" data-value="tabDirectPlayProfiles">${TabDirectPlay}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioTranscoding" data-value="tabTranscodingProfiles">${Transcoding}</a>
                     <a href="#" is="emby-linkbutton" data-role="button" class="radioTabButton" id="radioContainers" data-value="tabContainerProfiles">${TabContainers}</a>
@@ -319,7 +319,7 @@
             <div data-role="content">
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
                     <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingBasics" value="tabTranscodingBasics">
-                    <label for="radioTranscodingBasics">${TabInfo}</label>
+                    <label for="radioTranscodingBasics">${ButtonInfo}</label>
                     <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingAdvanced" value="tabTranscodingAdvanced">
                     <label for="radioTranscodingAdvanced">${TabAdvanced}</label>
                 </div>
@@ -341,16 +341,16 @@
                         </div>
                     </div>
                     <div class="inputContainer">
-                        <input is="emby-input" type="text" id="txtTranscodingContainer" label="${LabelTranscodingContainer}"; required="required" />
+                        <input is="emby-input" type="text" id="txtTranscodingContainer" label="${LabelProfileContainer}"; required="required" />
                     </div>
                     <div id="fldTranscodingVideoCodec" style="margin: 1em 0;">
                         <div class="inputContainer">
-                            <input is="emby-input" type="text" id="txtTranscodingVideoCodec" label="${LabelTranscodingVideoCodec}" />
+                            <input is="emby-input" type="text" id="txtTranscodingVideoCodec" label="${LabelVideoCodec}" />
                         </div>
                     </div>
                     <div id="fldTranscodingAudioCodec" style="margin: 1em 0;">
                         <div class="inputContainer">
-                            <input is="emby-input" type="text" id="txtTranscodingAudioCodec" label="${LabelTranscodingAudioCodec}" />
+                            <input is="emby-input" type="text" id="txtTranscodingAudioCodec" label="${LabelAudioCodec}" />
                         </div>
                     </div>
                 </div>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 320a679b3..dfad07618 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -128,7 +128,7 @@ import libraryMenu from 'libraryMenu';
             name: globalize.translate('Transcoding')
         }, {
             href: 'playbackconfiguration.html',
-            name: globalize.translate('TabResumeSettings')
+            name: globalize.translate('ButtonResume')
         }, {
             href: 'streamingsettings.html',
             name: globalize.translate('TabStreaming')
diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index 078d9d605..e3a1769c2 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -17,7 +17,7 @@
                     <div class="selectContainer">
                         <select is="emby-select" id="selectLocalizationLanguage" label="${LabelPreferredDisplayLanguage}"></select>
                         <div class="fieldDescription">
-                            <div>${LabelPreferredDisplayLanguageHelp}</div>
+                            <div>${LabelDisplayLanguageHelp}</div>
                             <div style="margin-top: .25em;">
                                 <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/contributing/index.html" target="_blank">${LearnHowYouCanContribute}</a>
                             </div>
diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js
index 0400df757..85d9a4b1b 100644
--- a/src/controllers/dashboard/library.js
+++ b/src/controllers/dashboard/library.js
@@ -93,7 +93,7 @@ import 'emby-itemrefreshindicator';
         const virtualFolder = virtualFolders[index];
         const menuItems = [];
         menuItems.push({
-            name: globalize.translate('ButtonEditImages'),
+            name: globalize.translate('EditImages'),
             id: 'editimages',
             icon: 'photo'
         });
diff --git a/src/controllers/dashboard/playback.html b/src/controllers/dashboard/playback.html
index 47ae22c21..e5f392ead 100644
--- a/src/controllers/dashboard/playback.html
+++ b/src/controllers/dashboard/playback.html
@@ -3,7 +3,7 @@
         <div class="content-primary">
             <form class="playbackConfigurationForm">
                 <div class="sectionTitleContainer flex align-items-center">
-                    <h2 class="sectionTitle">${TabResumeSettings}</h2>
+                    <h2 class="sectionTitle">${ButtonResume}</h2>
                 </div>
                 <div class="inputContainer">
                     <input is="emby-input" type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required min="0" max="100" label="${LabelMinResumePercentage}"></input>
diff --git a/src/controllers/dashboard/playback.js b/src/controllers/dashboard/playback.js
index 0406c2192..101c3ac0a 100644
--- a/src/controllers/dashboard/playback.js
+++ b/src/controllers/dashboard/playback.js
@@ -32,7 +32,7 @@ import globalize from 'globalize';
             name: globalize.translate('Transcoding')
         }, {
             href: 'playbackconfiguration.html',
-            name: globalize.translate('TabResumeSettings')
+            name: globalize.translate('ButtonResume')
         }, {
             href: 'streamingsettings.html',
             name: globalize.translate('TabStreaming')
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.html b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
index dc17d9bf0..8d0b2e24e 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.html
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
@@ -23,7 +23,7 @@
     <div data-role="popup" id="popupAddTrigger" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="addTriggerForm" style="padding:1em;">
             <div class="ui-bar-a">
-                <h3>${HeaderAddScheduledTaskTrigger}</h3>
+                <h3>${ButtonAddScheduledTaskTrigger}</h3>
             </div>
             <div data-role="content">
                 <div class="selectContainer">
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index c54fbea47..5db888dfc 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -27,7 +27,7 @@ import globalize from 'globalize';
             name: globalize.translate('Transcoding')
         }, {
             href: 'playbackconfiguration.html',
-            name: globalize.translate('TabResumeSettings')
+            name: globalize.translate('ButtonResume')
         }, {
             href: 'streamingsettings.html',
             name: globalize.translate('TabStreaming')
diff --git a/src/controllers/dashboard/users/usernew.html b/src/controllers/dashboard/users/usernew.html
index 26142c9ca..67f1f61eb 100644
--- a/src/controllers/dashboard/users/usernew.html
+++ b/src/controllers/dashboard/users/usernew.html
@@ -4,7 +4,7 @@
             <form class="newUserProfileForm">
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
-                        <h2 class="sectionTitle">${HeaderAddUser}</h2>
+                        <h2 class="sectionTitle">${ButtonAddUser}</h2>
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/users/">${Help}</a>
                     </div>
 
diff --git a/src/controllers/dashboard/users/userpasswordpage.js b/src/controllers/dashboard/users/userpasswordpage.js
index d399804d3..9a3f7dfaa 100644
--- a/src/controllers/dashboard/users/userpasswordpage.js
+++ b/src/controllers/dashboard/users/userpasswordpage.js
@@ -83,7 +83,7 @@ import 'emby-button';
                     loading.hide();
 
                     import('toast').then(({default: toast}) => {
-                        toast(globalize.translate('MessageSettingsSaved'));
+                        toast(globalize.translate('SettingsSaved'));
                     });
 
                     loadUser(view, params);
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index bd0821eeb..a69d91787 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -18,7 +18,7 @@
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${ButtonPlay}" data-mode="play">
+                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${Play}" data-mode="play">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
                     </div>
@@ -193,7 +193,7 @@
                 </div>
 
                 <div id="castCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderCastCrew}</h2>
+                    <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderCastAndCrew}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div id="castContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index c57190139..bd28c68c3 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -242,7 +242,7 @@ import 'emby-select';
             return m.Type === 'Audio';
         });
         const select = page.querySelector('.selectAudio');
-        select.setLabel(globalize.translate('LabelAudio'));
+        select.setLabel(globalize.translate('Audio'));
         const selectedId = mediaSource.DefaultAudioStreamIndex;
         select.innerHTML = tracks.map(function (v) {
             const selected = v.Index === selectedId ? ' selected' : '';
@@ -271,7 +271,7 @@ import 'emby-select';
             return m.Type === 'Subtitle';
         });
         const select = page.querySelector('.selectSubtitles');
-        select.setLabel(globalize.translate('LabelSubtitles'));
+        select.setLabel(globalize.translate('Subtitles'));
         const selectedId = mediaSource.DefaultSubtitleStreamIndex == null ? -1 : mediaSource.DefaultSubtitleStreamIndex;
 
         const videoTracks = mediaSource.MediaStreams.filter(function (m) {
@@ -1438,7 +1438,7 @@ import 'emby-select';
                     name: globalize.translate('Albums'),
                     type: 'MusicAlbum'
                 }, {
-                    name: globalize.translate('HeaderBooks'),
+                    name: globalize.translate('Books'),
                     type: 'Book'
                 }];
                 renderCollectionItems(page, item, collectionItemTypes, result.Items);
@@ -1446,7 +1446,7 @@ import 'emby-select';
         });
 
         if (item.Type == 'Season') {
-            page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderEpisodes');
+            page.querySelector('#childrenTitle').innerHTML = globalize.translate('Episodes');
         } else if (item.Type == 'Series') {
             page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderSeasons');
         } else if (item.Type == 'MusicAlbum') {
diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html
index 753521f40..fa6c3125d 100644
--- a/src/controllers/livetv.html
+++ b/src/controllers/livetv.html
@@ -63,7 +63,7 @@
         <div class="pageTabContent" id="channelsTab" data-index="2">
             <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
                 <div class="paging"></div>
-                <button is="paper-icon-button-light" class="btnFilter sectionTitleButton" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+                <button is="paper-icon-button-light" class="btnFilter sectionTitleButton" title="${Filter}"><span class="material-icons filter_list"></span></button>
             </div>
             <div is="emby-itemscontainer" id="items" class="itemsContainer vertical-wrap padded-left padded-right"></div>
         </div>
diff --git a/src/controllers/livetvsettings.html b/src/controllers/livetvsettings.html
index 3f93e0a7f..ad3a9de7a 100644
--- a/src/controllers/livetvsettings.html
+++ b/src/controllers/livetvsettings.html
@@ -11,7 +11,7 @@
             <form class="liveTvSettingsForm">
                 <div class="selectContainer">
                     <select is="emby-select" id="selectGuideDays" label="${LabelNumberOfGuideDays}">
-                        <option value="">${OptionAutomatic}</option>
+                        <option value="">${OptionAuto}</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
                         <option value="3">3</option>
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 07a6556fb..dcf15adf0 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -259,7 +259,7 @@ function showDeviceMenu(button, tunerDeviceId) {
         id: 'delete'
     });
     items.push({
-        name: globalize.translate('ButtonEdit'),
+        name: globalize.translate('Edit'),
         id: 'edit'
     });
 
diff --git a/src/controllers/movies/movies.html b/src/controllers/movies/movies.html
index a754d48a8..dddda3f7f 100644
--- a/src/controllers/movies/movies.html
+++ b/src/controllers/movies/movies.html
@@ -5,7 +5,7 @@
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -47,7 +47,7 @@
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-fixed-right alphaPicker-vertical">
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index 331c696ed..5b85fbada 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -229,7 +229,7 @@ import 'emby-button';
         }, {
             name: globalize.translate('Suggestions')
         }, {
-            name: globalize.translate('TabTrailers')
+            name: globalize.translate('Trailers')
         }, {
             name: globalize.translate('Favorites')
         }, {
diff --git a/src/controllers/music/music.html b/src/controllers/music/music.html
index 6ef1afb89..84d324857 100644
--- a/src/controllers/music/music.html
+++ b/src/controllers/music/music.html
@@ -41,7 +41,7 @@
             <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${Shuffle}"><span class="material-icons shuffle"></span></button>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -57,7 +57,7 @@
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -73,7 +73,7 @@
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -93,7 +93,7 @@
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div is="emby-itemscontainer" id="items" class="itemsContainer vertical-list" style="max-width:67.5em;margin: 0 auto;"></div>
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index 65ecd79f6..5661bf842 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -181,7 +181,7 @@ import 'flexStyles';
         }, {
             name: globalize.translate('Albums')
         }, {
-            name: globalize.translate('TabAlbumArtists')
+            name: globalize.translate('HeaderAlbumArtists')
         }, {
             name: globalize.translate('Artists')
         }, {
diff --git a/src/controllers/playback/queue/index.html b/src/controllers/playback/queue/index.html
index 8d8476bb1..c881f7b22 100644
--- a/src/controllers/playback/queue/index.html
+++ b/src/controllers/playback/queue/index.html
@@ -71,7 +71,7 @@
                             <span class="material-icons audiotrack"></span>
                         </button>
 
-                        <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${ButtonSubtitles}" data-command="GoToSearch">
+                        <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${Subtitles}" data-command="GoToSearch">
                             <span class="material-icons closed_caption"></span>
                         </button>
 
@@ -129,7 +129,7 @@
                         </div>
                         <br />
                         <div>
-                            <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome">
+                            <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${Home}" data-command="GoHome">
                                 <span class="material-icons home"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index ea84b9c3f..420268ea7 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -767,7 +767,7 @@ import 'css!assets/css/videoosd';
 
             if (isPaused) {
                 btnPlayPauseIcon.classList.add('play_arrow');
-                btnPlayPause.setAttribute('title', globalize.translate('ButtonPlay') + ' (k)');
+                btnPlayPause.setAttribute('title', globalize.translate('Play') + ' (k)');
             } else {
                 btnPlayPauseIcon.classList.add('pause');
                 btnPlayPause.setAttribute('title', globalize.translate('ButtonPause') + ' (k)');
diff --git a/src/controllers/session/forgotPassword/index.html b/src/controllers/session/forgotPassword/index.html
index 80631564f..31e92c2c5 100644
--- a/src/controllers/session/forgotPassword/index.html
+++ b/src/controllers/session/forgotPassword/index.html
@@ -2,7 +2,7 @@
     <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
-                <h1>${HeaderForgotPassword}</h1>
+                <h1>${ButtonForgotPassword}</h1>
 
                 <div class="inputContainer">
                     <input is="emby-input" type="text" id="txtName" label="${LabelUser}" autocomplete="off"/>
diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js
index 45e05409d..0f2464e2d 100644
--- a/src/controllers/session/forgotPassword/index.js
+++ b/src/controllers/session/forgotPassword/index.js
@@ -6,14 +6,14 @@ import globalize from 'globalize';
         if (result.Action == 'ContactAdmin') {
             return void Dashboard.alert({
                 message: globalize.translate('MessageContactAdminToResetPassword'),
-                title: globalize.translate('HeaderForgotPassword')
+                title: globalize.translate('ButtonForgotPassword')
             });
         }
 
         if (result.Action == 'InNetworkRequired') {
             return void Dashboard.alert({
                 message: globalize.translate('MessageForgotPasswordInNetworkRequired'),
-                title: globalize.translate('HeaderForgotPassword')
+                title: globalize.translate('ButtonForgotPassword')
             });
         }
 
@@ -27,7 +27,7 @@ import globalize from 'globalize';
             msg += '<br/>';
             return void Dashboard.alert({
                 message: msg,
-                title: globalize.translate('HeaderForgotPassword'),
+                title: globalize.translate('ButtonForgotPassword'),
                 callback: function () {
                     Dashboard.navigate('forgotpasswordpin.html');
                 }
diff --git a/src/controllers/shows/tvrecommended.html b/src/controllers/shows/tvrecommended.html
index 2302279ed..b5b54a5eb 100644
--- a/src/controllers/shows/tvrecommended.html
+++ b/src/controllers/shows/tvrecommended.html
@@ -5,7 +5,7 @@
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
 
         <div is="emby-itemscontainer" class="itemsContainer padded-left padded-right"></div>
@@ -61,7 +61,7 @@
             <div class="paging"></div>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
         </div>
         <div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">
         </div>
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index ea95e9938..c58a2faad 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -29,7 +29,7 @@ import 'emby-button';
         }, {
             name: globalize.translate('TabNetworks')
         }, {
-            name: globalize.translate('TabEpisodes')
+            name: globalize.translate('Episodes')
         }];
     }
 
diff --git a/src/controllers/user/home/index.html b/src/controllers/user/home/index.html
index 79c5ccc4b..f98f373cb 100644
--- a/src/controllers/user/home/index.html
+++ b/src/controllers/user/home/index.html
@@ -1,4 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHome}" data-backbutton="true">
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${Home}" data-backbutton="true">
     <div class="homeScreenSettingsContainer padded-left padded-right padded-bottom-page">
     </div>
 </div>
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
index 851a81720..4d91f1206 100644
--- a/src/controllers/user/menu/index.html
+++ b/src/controllers/user/menu/index.html
@@ -25,7 +25,7 @@
                     <div class="listItem">
                         <span class="material-icons listItemIcon listItemIcon-transparent home"></span>
                         <div class="listItemBody">
-                            <div class="listItemBodyText">${HeaderHome}</div>
+                            <div class="listItemBodyText">${Home}</div>
                         </div>
                     </div>
                 </a>
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 60be83844..f77bb7365 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -39,14 +39,14 @@ function renderItems(page, item) {
 
     if (item.EpisodeCount) {
         sections.push({
-            name: globalize.translate('TabEpisodes'),
+            name: globalize.translate('Episodes'),
             type: 'Episode'
         });
     }
 
     if (item.TrailerCount) {
         sections.push({
-            name: globalize.translate('TabTrailers'),
+            name: globalize.translate('Trailers'),
             type: 'Trailer'
         });
     }
@@ -60,7 +60,7 @@ function renderItems(page, item) {
 
     if (item.MusicVideoCount) {
         sections.push({
-            name: globalize.translate('TabMusicVideos'),
+            name: globalize.translate('HeaderMusicVideos'),
             type: 'MusicVideo'
         });
     }
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index debae200c..5b5a1aad8 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -109,7 +109,7 @@ export function getQueryPagingHtml (options) {
         }
 
         if (options.filterButton) {
-            html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + globalize.translate('ButtonFilter') + '"><span class="material-icons filter_list"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + globalize.translate('Filter') + '"><span class="material-icons filter_list"></span></button>';
         }
 
         html += '</div>';
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index d237eead9..50061f412 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -270,7 +270,7 @@ import 'flexStyles';
     function refreshLibraryInfoInDrawer(user, drawer) {
         let html = '';
         html += '<div style="height:.5em;"></div>';
-        html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="home.html"><span class="material-icons navMenuOptionIcon home"></span><span class="navMenuOptionText">' + globalize.translate('ButtonHome') + '</span></a>';
+        html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="home.html"><span class="material-icons navMenuOptionIcon home"></span><span class="navMenuOptionText">' + globalize.translate('Home') + '</span></a>';
 
         // libraries are added here
         html += '<div class="libraryMenuOptions">';