diff --git a/src/components/accessSchedule/accessSchedule.template.html b/src/components/accessSchedule/accessSchedule.template.html
index d89b69d9b..e209fbc1f 100644
--- a/src/components/accessSchedule/accessSchedule.template.html
+++ b/src/components/accessSchedule/accessSchedule.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">
diff --git a/src/components/guide/guide-settings.template.html b/src/components/guide/guide-settings.template.html
index edb2ffa8d..d4bad711b 100644
--- a/src/components/guide/guide-settings.template.html
+++ b/src/components/guide/guide-settings.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${LabelPrevious}" tabindex="-1">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" title="${Previous}" tabindex="-1">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">
diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html
index 730de5590..b0f23f4b3 100644
--- a/src/components/guide/tvguide.template.html
+++ b/src/components/guide/tvguide.template.html
@@ -29,10 +29,10 @@
 </div>
 
 <div class="guideOptions hide">
-    <button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${LabelPrevious}">
+    <button is="paper-icon-button-light" type="button" class="btnPreviousPage" title="${Previous}">
         <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
-    <button is="paper-icon-button-light" type="button" class="btnNextPage" title="${LabelNext}">
+    <button is="paper-icon-button-light" type="button" class="btnNextPage" title="${Next}">
         <span class="material-icons arrow_forward" aria-hidden="true"></span>
     </button>
 </div>
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index ab193c264..f90643ce0 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -75,9 +75,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
@@ -131,9 +131,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (index > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
             }
             html += '</div>';
         });
@@ -197,9 +197,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
@@ -236,9 +236,9 @@ import 'emby-input';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
             }
             html += '</div>';
         }
@@ -291,13 +291,13 @@ import 'emby-input';
         const btnSortable = elem.querySelector('.btnSortable');
         const inner = btnSortable.querySelector('.material-icons');
         if (elem.previousSibling) {
-            btnSortable.title = globalize.translate('ButtonUp');
+            btnSortable.title = globalize.translate('Up');
             btnSortable.classList.add('btnSortableMoveUp');
             btnSortable.classList.remove('btnSortableMoveDown');
             inner.classList.remove('keyboard_arrow_down');
             inner.classList.add('keyboard_arrow_up');
         } else {
-            btnSortable.title = globalize.translate('ButtonDown');
+            btnSortable.title = globalize.translate('Down');
             btnSortable.classList.remove('btnSortableMoveUp');
             btnSortable.classList.add('btnSortableMoveDown');
             inner.classList.remove('keyboard_arrow_up');
diff --git a/src/components/subtitlesettings/subtitlesettings.template.html b/src/components/subtitlesettings/subtitlesettings.template.html
index af9139188..2884b26ef 100644
--- a/src/components/subtitlesettings/subtitlesettings.template.html
+++ b/src/components/subtitlesettings/subtitlesettings.template.html
@@ -14,7 +14,7 @@
                 <option value="Smart">${Smart}</option>
                 <option value="OnlyForced">${OnlyForcedSubtitles}</option>
                 <option value="Always">${AlwaysPlaySubtitles}</option>
-                <option value="None">${NoSubtitles}</option>
+                <option value="None">${None}</option>
             </select>
             <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp hide">${DefaultSubtitlesHelp}</div>
             <div class="fieldDescription subtitlesSmartHelp subtitlesHelp hide">${SmartSubtitlesHelp}</div>
diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index 9ac0a9083..078d9d605 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -19,7 +19,7 @@
                         <div class="fieldDescription">
                             <div>${LabelPreferredDisplayLanguageHelp}</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">${LabelReadHowYouCanContribute}</a>
+                                <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/contributing/index.html" target="_blank">${LearnHowYouCanContribute}</a>
                             </div>
                         </div>
                     </div>
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index bc6bc5f5a..9aff1efa1 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -42,7 +42,7 @@
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton" title="${ButtonShuffle}">
+                <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton" title="${Shuffle}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon shuffle"></span>
                     </div>
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 119d265a1..9d4ba0939 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1452,7 +1452,7 @@ import 'emby-select';
         } else if (item.Type == 'MusicAlbum') {
             page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderTracks');
         } else {
-            page.querySelector('#childrenTitle').innerHTML = globalize.translate('HeaderItems');
+            page.querySelector('#childrenTitle').innerHTML = globalize.translate('Items');
         }
 
         if (item.Type == 'MusicAlbum' || item.Type == 'Season') {
@@ -1652,7 +1652,7 @@ import 'emby-select';
 
         if (!items.length) {
             renderCollectionItemType(page, parentItem, {
-                name: globalize.translate('HeaderItems')
+                name: globalize.translate('Items')
             }, items);
         }
 
diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html
index fdf19bd91..5bca232fa 100644
--- a/src/controllers/livetv.html
+++ b/src/controllers/livetv.html
@@ -15,7 +15,7 @@
             <div id="upcomingEpisodes" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
-                        <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${TabShows}</h2>
+                        <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Shows}</h2>
                         <span class="material-icons chevron_right"></span>
                     </a>
                 </div>
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 4a20d02fc..22a5ce51a 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -168,7 +168,7 @@ function getTabs() {
     return [{
         name: globalize.translate('Programs')
     }, {
-        name: globalize.translate('TabGuide')
+        name: globalize.translate('Guide')
     }, {
         name: globalize.translate('TabChannels')
     }, {
diff --git a/src/controllers/movies/movies.html b/src/controllers/movies/movies.html
index a2221c510..a754d48a8 100644
--- a/src/controllers/movies/movies.html
+++ b/src/controllers/movies/movies.html
@@ -4,7 +4,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="btnSort autoSize" title="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
 
@@ -46,7 +46,7 @@
     <div class="pageTabContent" 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="btnSort autoSize" title="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
 
@@ -75,7 +75,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="btnSort autoSize" title="${ButtonSort}"><span class="material-icons sort_by_alpha"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
             <button type="button" is="paper-icon-button-light" class="btnNewCollection autoSize"><span class="material-icons add"></span></button>
         </div>
 
diff --git a/src/controllers/music/music.html b/src/controllers/music/music.html
index 1e22ae9f3..6ef1afb89 100644
--- a/src/controllers/music/music.html
+++ b/src/controllers/music/music.html
@@ -38,9 +38,9 @@
         <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="btnPlayAll musicglobalButton" title="${HeaderPlayAll}"><span class="material-icons play_arrow"></span></button>
-            <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${ButtonShuffle}"><span class="material-icons shuffle"></span></button>
+            <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="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
 
@@ -92,7 +92,7 @@
     <div class="pageTabContent" id="songsTab" data-index="5">
         <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="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
 
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index e16afa2d5..ee182a042 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -187,7 +187,7 @@ import 'flexStyles';
         }, {
             name: globalize.translate('TabPlaylists')
         }, {
-            name: globalize.translate('TabSongs')
+            name: globalize.translate('Songs')
         }, {
             name: globalize.translate('TabGenres')
         }];
diff --git a/src/controllers/playback/queue/index.html b/src/controllers/playback/queue/index.html
index 2720dfe3f..8d8476bb1 100644
--- a/src/controllers/playback/queue/index.html
+++ b/src/controllers/playback/queue/index.html
@@ -59,7 +59,7 @@
                             <span class="material-icons forward_30"></span>
                         </button>
 
-                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${ButtonShuffle}">
+                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${Shuffle}">
                             <span class="material-icons shuffle"></span>
                         </button>
 
@@ -81,7 +81,7 @@
                             <span class="material-icons fullscreen"></span>
                         </button>
 
-                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${ButtonShuffle}">
+                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${Shuffle}">
                             <span class="material-icons shuffle"></span>
                         </button>
 
@@ -99,7 +99,7 @@
                 <div is="emby-collapse" title="${HeaderNavigation}">
                     <div class="collapseContent">
                         <div>
-                            <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize button-submit" title="${ButtonArrowUp}" data-command="MoveUp">
+                            <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize button-submit" title="${Up}" data-command="MoveUp">
                                 <span class="material-icons keyboard_arrow_up"></span>
                             </button>
                         </div>
@@ -120,7 +120,7 @@
                             <button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back">
                                 <span class="material-icons arrow_back"></span>
                             </button>
-                            <button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize button-submit" title="${ButtonArrowDown}" data-command="MoveDown">
+                            <button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize button-submit" title="${Down}" data-command="MoveDown">
                                 <span class="material-icons keyboard_arrow_down"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnContextMenu btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu">
diff --git a/src/controllers/shows/tvrecommended.html b/src/controllers/shows/tvrecommended.html
index 035f1db6a..bdc21fdc8 100644
--- a/src/controllers/shows/tvrecommended.html
+++ b/src/controllers/shows/tvrecommended.html
@@ -4,7 +4,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="btnSort autoSize" title="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
 
@@ -60,7 +60,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="btnSort autoSize" title="${ButtonSort}"><span class="material-icons sort_by_alpha"></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>
         </div>
         <div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index c519e0ac5..3d78997ba 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -17,7 +17,7 @@ import 'emby-button';
 
     function getTabs() {
         return [{
-            name: globalize.translate('TabShows')
+            name: globalize.translate('Shows')
         }, {
             name: globalize.translate('Suggestions')
         }, {
@@ -318,8 +318,8 @@ import 'emby-button';
                         libraryMenu.setTitle(item.Name);
                     });
                 } else {
-                    view.setAttribute('data-title', globalize.translate('TabShows'));
-                    libraryMenu.setTitle(globalize.translate('TabShows'));
+                    view.setAttribute('data-title', globalize.translate('Shows'));
+                    libraryMenu.setTitle(globalize.translate('Shows'));
                 }
             }
 
diff --git a/src/controllers/wizard/finish/index.html b/src/controllers/wizard/finish/index.html
index 4d54a10cd..3447ced02 100644
--- a/src/controllers/wizard/finish/index.html
+++ b/src/controllers/wizard/finish/index.html
@@ -6,7 +6,7 @@
             <div class="wizardNavigation">
                 <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
                     <span class="material-icons arrow_back"></span>
-                    <span>${LabelPrevious}</span>
+                    <span>${Previous}</span>
                 </button>
                 <button is="emby-button" type="button" class="raised btnWizardNext button-submit">
                     <span class="material-icons check"></span>
diff --git a/src/controllers/wizard/library.html b/src/controllers/wizard/library.html
index 8bc2a5b29..f43cb534e 100644
--- a/src/controllers/wizard/library.html
+++ b/src/controllers/wizard/library.html
@@ -12,10 +12,10 @@
             <div class="wizardNavigation">
                 <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
                     <span class="material-icons arrow_back"></span>
-                    <span>${LabelPrevious}</span>
+                    <span>${Previous}</span>
                 </button>
                 <button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();">
-                    <span>${LabelNext}</span>
+                    <span>${Next}</span>
                     <span class="material-icons arrow_forward"></span>
                 </button>
             </div>
diff --git a/src/controllers/wizard/remote/index.html b/src/controllers/wizard/remote/index.html
index 0718c2dc3..0334f584c 100644
--- a/src/controllers/wizard/remote/index.html
+++ b/src/controllers/wizard/remote/index.html
@@ -22,10 +22,10 @@
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
                         <span class="material-icons arrow_back"></span>
-                        <span>${LabelPrevious}</span>
+                        <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
-                        <span>${LabelNext}</span>
+                        <span>${Next}</span>
                         <span class="material-icons arrow_forward"></span>
                     </button>
                 </div>
diff --git a/src/controllers/wizard/settings/index.html b/src/controllers/wizard/settings/index.html
index d4f537cf9..d1f557d8f 100644
--- a/src/controllers/wizard/settings/index.html
+++ b/src/controllers/wizard/settings/index.html
@@ -17,10 +17,10 @@
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
                         <span class="material-icons arrow_back"></span>
-                        <span>${LabelPrevious}</span>
+                        <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
-                        <span>${LabelNext}</span>
+                        <span>${Next}</span>
                         <span class="material-icons arrow_forward"></span>
                     </button>
                 </div>
diff --git a/src/controllers/wizard/start/index.html b/src/controllers/wizard/start/index.html
index 05e282bee..5306d2ca7 100644
--- a/src/controllers/wizard/start/index.html
+++ b/src/controllers/wizard/start/index.html
@@ -19,7 +19,7 @@
 
                 <div class="wizardNavigation" style="text-align:right;">
                     <button is="emby-button" type="submit" class="raised button-submit">
-                        <span>${LabelNext}</span>
+                        <span>${Next}</span>
                         <span class="material-icons arrow_forward"></span>
                     </button>
                 </div>
diff --git a/src/controllers/wizard/user/index.html b/src/controllers/wizard/user/index.html
index 3ce0b3ba7..24429d043 100644
--- a/src/controllers/wizard/user/index.html
+++ b/src/controllers/wizard/user/index.html
@@ -23,10 +23,10 @@
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
                         <span class="material-icons arrow_back"></span>
-                        <span>${LabelPrevious}</span>
+                        <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
-                        <span>${LabelNext}</span>
+                        <span>${Next}</span>
                         <span class="material-icons arrow_forward"></span>
                     </button>
                 </div>
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 7a56be678..306282b5f 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -32,7 +32,7 @@ function renderItems(page, item) {
 
     if (item.SeriesCount) {
         sections.push({
-            name: globalize.translate('TabShows'),
+            name: globalize.translate('Shows'),
             type: 'Series'
         });
     }
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index 83d683a69..debae200c 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -105,7 +105,7 @@ export function getQueryPagingHtml (options) {
         }
 
         if (options.sortButton) {
-            html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + globalize.translate('ButtonSort') + '"><span class="material-icons sort_by_alpha"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + globalize.translate('Sort') + '"><span class="material-icons sort_by_alpha"></span></button>';
         }
 
         if (options.filterButton) {
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 543aa6f3d..29d859740 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -567,7 +567,7 @@ import 'flexStyles';
                     view.ImageTags = {};
                     view.icon = 'live_tv';
                     const guideView = Object.assign({}, view);
-                    guideView.Name = globalize.translate('ButtonGuide');
+                    guideView.Name = globalize.translate('Guide');
                     guideView.ImageTags = {};
                     guideView.icon = 'dvr';
                     guideView.url = 'livetv.html?tab=1';