diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js
index 89d085c185..24f506b9dd 100644
--- a/src/components/channelMapper/channelMapper.js
+++ b/src/components/channelMapper/channelMapper.js
@@ -93,7 +93,7 @@ export default class channelMapper {
             html += '<div class="formDialogContent smoothScrollY">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<form style="margin:auto;">';
-            html += `<h1>${globalize.translate('HeaderChannels')}</h1>`;
+            html += `<h1>${globalize.translate('Channels')}</h1>`;
             html += '<div class="channels paperList">';
             html += '</div>';
             html += '</form>';
diff --git a/src/components/filterdialog/filterdialog.template.html b/src/components/filterdialog/filterdialog.template.html
index f4bbfe7395..1d61f3923e 100644
--- a/src/components/filterdialog/filterdialog.template.html
+++ b/src/components/filterdialog/filterdialog.template.html
@@ -90,7 +90,7 @@
         </div>
     </div>
 
-    <div is="emby-collapse" title="${HeaderGenres}" class="genreFilters hide">
+    <div is="emby-collapse" title="${Genres}" class="genreFilters hide">
         <div class="collapseContent filterOptions">
         </div>
     </div>
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html b/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html
index 2884ce256c..4d84544d06 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html
@@ -24,7 +24,7 @@
 
         <div class="folders">
             <div style="display: flex; align-items: center;">
-                <h1 style="margin: .5em 0;">${HeadersFolders}</h1>
+                <h1 style="margin: .5em 0;">${Folders}</h1>
                 <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add"></span>
                 </button>
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html b/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html
index ae7d65e1e5..1f2581612d 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html
@@ -18,7 +18,7 @@
 
         <div class="folders hide">
             <div style="display: flex; align-items: center;">
-                <h1 style="margin: .5em 0;">${HeadersFolders}</h1>
+                <h1 style="margin: .5em 0;">${Folders}</h1>
                 <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
                     <span class="material-icons add"></span>
                 </button>
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index d922aee84a..fdce40ab86 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -198,7 +198,7 @@ import 'css!./multiSelect';
 
             if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
                 menuItems.push({
-                    name: globalize.translate('ButtonDownload'),
+                    name: globalize.translate('Download'),
                     id: 'download',
                     icon: 'file_download'
                 });
diff --git a/src/controllers/dashboard/devices/devices.html b/src/controllers/dashboard/devices/devices.html
index 55f51d7e23..63c348c900 100644
--- a/src/controllers/dashboard/devices/devices.html
+++ b/src/controllers/dashboard/devices/devices.html
@@ -3,7 +3,7 @@
         <div class="content-primary">
             <div class="verticalSection verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center">
-                    <h2 class="sectionTitle sectionTitle-cards">${TabDevices}</h2>
+                    <h2 class="sectionTitle sectionTitle-cards">${HeaderDevices}</h2>
                     <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
                 </div>
             </div>
diff --git a/src/controllers/dashboard/users/userlibraryaccess.js b/src/controllers/dashboard/users/userlibraryaccess.js
index d32c7312b7..146777a0db 100644
--- a/src/controllers/dashboard/users/userlibraryaccess.js
+++ b/src/controllers/dashboard/users/userlibraryaccess.js
@@ -32,7 +32,7 @@ import globalize from 'globalize';
 
     function loadChannels(page, user, channels) {
         let html = '';
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderChannels') + '</h3>';
+        html += '<h3 class="checkboxListLabel">' + globalize.translate('Channels') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
         for (let i = 0, length = channels.length; i < length; i++) {
diff --git a/src/controllers/dashboard/users/usernew.js b/src/controllers/dashboard/users/usernew.js
index d3ff449d02..68b6365c02 100644
--- a/src/controllers/dashboard/users/usernew.js
+++ b/src/controllers/dashboard/users/usernew.js
@@ -22,7 +22,7 @@ import 'emby-checkbox';
 
     function loadChannels(page, channels) {
         let html = '';
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderChannels') + '</h3>';
+        html += '<h3 class="checkboxListLabel">' + globalize.translate('Channels') + '</h3>';
         html += '<div class="checkboxList paperList" style="padding:.5em 1em;">';
 
         for (let i = 0; i < channels.length; i++) {
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index 9aff1efa14..8c16daba99 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -24,7 +24,7 @@
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton" title="${ButtonDownload}">
+                <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton" title="${Download}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon get_app"></span>
                     </div>
diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html
index 5bca232fa9..0e02947c12 100644
--- a/src/controllers/livetv.html
+++ b/src/controllers/livetv.html
@@ -24,7 +24,7 @@
             <div id="upcomingTvMovies" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
-                        <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderMovies}</h2>
+                        <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Movies}</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 22a5ce51a3..9fec9a2707 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -170,7 +170,7 @@ function getTabs() {
     }, {
         name: globalize.translate('Guide')
     }, {
-        name: globalize.translate('TabChannels')
+        name: globalize.translate('Channels')
     }, {
         name: globalize.translate('TabRecordings')
     }, {
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index adedc6d18f..331c696ed8 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -231,11 +231,11 @@ import 'emby-button';
         }, {
             name: globalize.translate('TabTrailers')
         }, {
-            name: globalize.translate('TabFavorites')
+            name: globalize.translate('Favorites')
         }, {
-            name: globalize.translate('TabCollections')
+            name: globalize.translate('Collections')
         }, {
-            name: globalize.translate('TabGenres')
+            name: globalize.translate('Genres')
         }];
     }
 
@@ -403,8 +403,8 @@ import 'emby-button';
                         libraryMenu.setTitle(item.Name);
                     });
                 } else {
-                    view.setAttribute('data-title', globalize.translate('TabMovies'));
-                    libraryMenu.setTitle(globalize.translate('TabMovies'));
+                    view.setAttribute('data-title', globalize.translate('Movies'));
+                    libraryMenu.setTitle(globalize.translate('Movies'));
                 }
             }
 
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index ee182a0427..4a04f9e827 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -189,7 +189,7 @@ import 'flexStyles';
         }, {
             name: globalize.translate('Songs')
         }, {
-            name: globalize.translate('TabGenres')
+            name: globalize.translate('Genres')
         }];
     }
 
diff --git a/src/controllers/session/addServer/index.html b/src/controllers/session/addServer/index.html
index d25a8eef98..31dd66b33c 100644
--- a/src/controllers/session/addServer/index.html
+++ b/src/controllers/session/addServer/index.html
@@ -8,7 +8,7 @@
             </div>
             <br />
             <button is="emby-button" type="submit" class="raised button-submit block">
-                <span>${ButtonConnect}</span>
+                <span>${Connect}</span>
             </button>
             <button is="emby-button" type="button" class="raised button-cancel block btnCancel">
                 <span>${ButtonCancel}</span>
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index 3d78997bab..ea95e99386 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -25,7 +25,7 @@ import 'emby-button';
         }, {
             name: globalize.translate('TabUpcoming')
         }, {
-            name: globalize.translate('TabGenres')
+            name: globalize.translate('Genres')
         }, {
             name: globalize.translate('TabNetworks')
         }, {
diff --git a/src/controllers/user/profile/index.html b/src/controllers/user/profile/index.html
index 59eb7d416f..52b58bd264 100644
--- a/src/controllers/user/profile/index.html
+++ b/src/controllers/user/profile/index.html
@@ -12,7 +12,7 @@
                     <span>${ButtonAddImage}</span>
                 </button>
                 <button is="emby-button" type="button" class="raised hide" id="btnDeleteImage">
-                    <span>${ButtonDeleteImage}</span>
+                    <span>${DeleteImage}</span>
                 </button>
             </div>
         </div>
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 306282b5fd..60be838448 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -25,7 +25,7 @@ function renderItems(page, item) {
 
     if (item.MovieCount) {
         sections.push({
-            name: globalize.translate('TabMovies'),
+            name: globalize.translate('Movies'),
             type: 'Movie'
         });
     }
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 29d859740a..5ee485e815 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -395,10 +395,10 @@ import 'flexStyles';
         addPluginPagesToMainMenu(links, pluginItems, 'server');
         links.push({
             divider: true,
-            name: globalize.translate('TabDevices')
+            name: globalize.translate('HeaderDevices')
         });
         links.push({
-            name: globalize.translate('TabDevices'),
+            name: globalize.translate('HeaderDevices'),
             href: 'devices.html',
             pageIds: ['devicesPage', 'devicePage'],
             icon: 'devices'
@@ -426,7 +426,7 @@ import 'flexStyles';
             icon: 'live_tv'
         });
         links.push({
-            name: globalize.translate('TabDVR'),
+            name: globalize.translate('HeaderDVR'),
             href: 'livetvsettings.html',
             pageIds: ['liveTvSettingsPage'],
             icon: 'dvr'