diff --git a/src/components/filterdialog/filterdialog.template.html b/src/components/filterdialog/filterdialog.template.html
index e98c71bf3..03aba5ee3 100644
--- a/src/components/filterdialog/filterdialog.template.html
+++ b/src/components/filterdialog/filterdialog.template.html
@@ -76,7 +76,7 @@
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSpecialFeature" />
-                    <span>${OptionHasSpecialFeatures}</span>
+                    <span>${SpecialFeatures}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkThemeSong" />
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.template.html b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
index ded68dbdb..28275cdc9 100644
--- a/src/components/imageOptionsEditor/imageOptionsEditor.template.html
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
@@ -15,7 +15,7 @@
 
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Primary" />
-                        <span>${OptionDownloadPrimaryImage}</span>
+                        <span>${Primary}</span>
                     </label>
 
                     <label>
@@ -41,15 +41,15 @@
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Logo" />
-                        <span>${OptionDownloadLogoImage}</span>
+                        <span>${Logo}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Menu" />
-                        <span>${OptionDownloadMenuImage}</span>
+                        <span>${Menu}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Thumb" />
-                        <span>${OptionDownloadThumbImage}</span>
+                        <span>${Thumb}</span>
                     </label>
                 </div>
             </div>
diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 2622841b7..fb89fd298 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -11,7 +11,7 @@
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}">
-                        <option value="">${OptionNone}</option>
+                        <option value="">${None}</option>
                         <option value="amf">AMD AMF</option>
                         <option value="qsv">Intel Quick Sync</option>
                         <option value="mediacodec">MediaCodec Android</option>
diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js
index f33971b36..16e1018e4 100644
--- a/src/controllers/dashboard/metadatanfo.js
+++ b/src/controllers/dashboard/metadatanfo.js
@@ -6,7 +6,7 @@ import globalize from 'globalize';
 /* eslint-disable indent */
 
     function loadPage(page, config, users) {
-        let html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
+        let html = '<option value="" selected="selected">' + globalize.translate('None') + '</option>';
         html += users.map(function (user) {
             return '<option value="' + user.Id + '">' + user.Name + '</option>';
         }).join('');
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index 7de3b7897..efe00aec0 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -43,10 +43,10 @@ import 'paper-icon-button-light';
             name: globalize.translate('Books'),
             value: 'Book'
         }, {
-            name: globalize.translate('OptionBlockChannelContent'),
+            name: globalize.translate('Channels'),
             value: 'ChannelContent'
         }, {
-            name: globalize.translate('OptionBlockLiveTvChannels'),
+            name: globalize.translate('LiveTV'),
             value: 'LiveTvChannel'
         }, {
             name: globalize.translate('Movies'),
@@ -55,10 +55,10 @@ import 'paper-icon-button-light';
             name: globalize.translate('Music'),
             value: 'Music'
         }, {
-            name: globalize.translate('OptionBlockTrailers'),
+            name: globalize.translate('Trailers'),
             value: 'Trailer'
         }, {
-            name: globalize.translate('OptionBlockTvShows'),
+            name: globalize.translate('Shows'),
             value: 'Series'
         }];
         let html = '';
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index a69d91787..3a27f6171 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -205,14 +205,14 @@
                 </div>
 
                 <div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderSpecialFeatures}</h2>
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${SpecialFeatures}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
                 </div>
 
                 <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMusicVideos}</h2>
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${MusicVideos}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div id="musicVideosContent" 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 63225f679..f44b82c41 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -208,7 +208,7 @@ import 'emby-select';
         });
 
         const select = page.querySelector('.selectVideo');
-        select.setLabel(globalize.translate('LabelVideo'));
+        select.setLabel(globalize.translate('Video'));
         const selectedId = tracks.length ? tracks[0].Index : -1;
         select.innerHTML = tracks.map(function (v) {
             const selected = v.Index === selectedId ? ' selected' : '';
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index b99c918a1..573e5122c 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -210,7 +210,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
                 libraryBrowser.showSortMenu({
                     items: [{
-                        name: globalize.translate('OptionNameSort'),
+                        name: globalize.translate('Name'),
                         id: 'SortName'
                     }, {
                         name: globalize.translate('OptionImdbRating'),
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 0f69b3ebf..ab5aff9ec 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -195,7 +195,7 @@ import 'emby-itemscontainer';
                 btnSort.addEventListener('click', function (e) {
                     libraryBrowser.showSortMenu({
                         items: [{
-                            name: globalize.translate('OptionNameSort'),
+                            name: globalize.translate('Name'),
                             id: 'SortName,ProductionYear'
                         }, {
                             name: globalize.translate('OptionImdbRating'),
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index 5f1aa1fe6..f2c7feada 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -235,7 +235,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
                 libraryBrowser.showSortMenu({
                     items: [{
-                        name: globalize.translate('OptionNameSort'),
+                        name: globalize.translate('Name'),
                         id: 'SortName'
                     }, {
                         name: globalize.translate('OptionImdbRating'),
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index aebede39b..7e42d3401 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -239,7 +239,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
                 libraryBrowser.showSortMenu({
                     items: [{
-                        name: globalize.translate('OptionNameSort'),
+                        name: globalize.translate('Name'),
                         id: 'SortName'
                     }, {
                         name: globalize.translate('AlbumArtist'),
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index a4caab09c..6dd633d7b 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -195,7 +195,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
                 libraryBrowser.showSortMenu({
                     items: [{
-                        name: globalize.translate('OptionNameSort'),
+                        name: globalize.translate('Name'),
                         id: 'SeriesSortName,SortName'
                     }, {
                         name: globalize.translate('OptionTvdbRating'),
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index 281c921e4..ef45eba0f 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -250,7 +250,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnSort').addEventListener('click', function (e) {
                 libraryBrowser.showSortMenu({
                     items: [{
-                        name: globalize.translate('OptionNameSort'),
+                        name: globalize.translate('Name'),
                         id: 'SortName'
                     }, {
                         name: globalize.translate('OptionImdbRating'),
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index f77bb7365..77fd0c270 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -60,7 +60,7 @@ function renderItems(page, item) {
 
     if (item.MusicVideoCount) {
         sections.push({
-            name: globalize.translate('HeaderMusicVideos'),
+            name: globalize.translate('MusicVideos'),
             type: 'MusicVideo'
         });
     }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 7fbdfe4d1..fd9f26566 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -991,6 +991,7 @@
     "MusicArtist": "Music Artist",
     "MusicLibraryHelp": "Review the {0}music naming guide{1}.",
     "MusicVideo": "Music Video",
+    "MusicVideos": "Music Videos",
     "Mute": "Mute",
     "MySubtitles": "My Subtitles",
     "Name": "Name",
@@ -1276,6 +1277,7 @@
     "SortByValue": "Sort by {0}",
     "SortChannelsBy": "Sort channels by:",
     "SortName": "Sort name",
+    "SpecialFeatures": "Special Features",
     "Sports": "Sports",
     "StopRecording": "Stop recording",
     "Studios": "Studios",
@@ -1367,6 +1369,7 @@
     "ValueTimeLimitSingleHour": "Time limit: 1 hour",
     "ValueVideoCodec": "Video Codec: {0}",
     "Vertical": "Vertical",
+    "Video": "Video",
     "ViewAlbum": "View album",
     "ViewAlbumArtist": "View album artist",
     "ViewPlaybackInfo": "View playback info",