diff --git a/src/components/filterdialog/filterdialog.template.html b/src/components/filterdialog/filterdialog.template.html
index 1d61f3923..e98c71bf3 100644
--- a/src/components/filterdialog/filterdialog.template.html
+++ b/src/components/filterdialog/filterdialog.template.html
@@ -6,12 +6,12 @@
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
                         data-filter="IsPlayed" />
-                    <span>${OptionPlayed}</span>
+                    <span>${Played}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
                         data-filter="IsUnPlayed" />
-                    <span>${OptionUnplayed}</span>
+                    <span>${Unplayed}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStandardFilter videoStandard"
@@ -21,7 +21,7 @@
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkFavorite"
                         data-filter="IsFavorite" />
-                    <span>${OptionFavorite}</span>
+                    <span>${Favorites}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStandardFilter chkLikes" data-filter="Likes" />
@@ -53,11 +53,11 @@
             <div class="checkboxList">
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Continuing" />
-                    <span>${OptionContinuing}</span>
+                    <span>${Continuing}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkStatus" data-filter="Ended" />
-                    <span>${OptionEnded}</span>
+                    <span>${Ended}</span>
                 </label>
             </div>
         </div>
@@ -68,11 +68,11 @@
             <div class="checkboxList">
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSubtitle" />
-                    <span>${OptionHasSubtitles}</span>
+                    <span>${Subtitles}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkTrailer" />
-                    <span>${OptionHasTrailer}</span>
+                    <span>${ButtonTrailer}</span>
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" class="chkFeatureFilter" id="chkSpecialFeature" />
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.template.html b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
index cbbc3b85f..ded68dbdb 100644
--- a/src/components/imageOptionsEditor/imageOptionsEditor.template.html
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
@@ -20,24 +20,24 @@
 
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Art" />
-                        <span>${OptionDownloadArtImage}</span>
+                        <span>${Art}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="BoxRear" />
-                        <span>${OptionDownloadBackImage}</span>
+                        <span>${Back}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Banner" />
-                        <span>${OptionDownloadBannerImage}</span>
+                        <span>${Banner}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Box" />
-                        <span>${OptionDownloadBoxImage}</span>
+                        <span>${Box}</span>
                     </label>
 
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Disc" />
-                        <span>${OptionDownloadDiscImage}</span>
+                        <span>${Disc}</span>
                     </label>
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="imageType" data-imagetype="Logo" />
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 020d9953e..d98428abb 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -248,7 +248,7 @@ events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
         [
             {
                 action: 'restart',
-                title: globalize.translate('ButtonRestart'),
+                title: globalize.translate('HeaderRestart'),
                 icon: getIconUrl()
             }
         ];
diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html
index b7af3c8c0..0ad9ea880 100644
--- a/src/controllers/dashboard/dashboard.html
+++ b/src/controllers/dashboard/dashboard.html
@@ -17,7 +17,7 @@
 
                     <div style="margin-top:1em;">
                         <button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
-                            <span>${ButtonRestart}</span>
+                            <span>${HeaderRestart}</span>
                         </button>
                         <button is="emby-button" type="button" id="btnShutdown" class="raised" onclick="DashboardPage.shutdown(this);">
                             <span>${ButtonShutdown}</span>
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index a1ce7f489..fbfc632c9 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -724,7 +724,7 @@ import 'emby-itemscontainer';
                 confirm({
                     title: globalize.translate('HeaderRestart'),
                     text: globalize.translate('MessageConfirmRestart'),
-                    confirmText: globalize.translate('ButtonRestart'),
+                    confirmText: globalize.translate('HeaderRestart'),
                     primary: 'delete'
                 }).then(function () {
                     const page = dom.parentWithClass(btn, 'page');
diff --git a/src/controllers/dashboard/dlna/profile.html b/src/controllers/dashboard/dlna/profile.html
index 3ac3a71c6..1850076a7 100644
--- a/src/controllers/dashboard/dlna/profile.html
+++ b/src/controllers/dashboard/dlna/profile.html
@@ -29,7 +29,7 @@
                         <div class="checkboxList paperList checkboxList-paperList">
                             <label>
                                 <input is="emby-checkbox" type="checkbox" id="chkAudio" data-value="Audio" class="chkMediaType" />
-                                <span>${OptionProfileAudio}</span>
+                                <span>${Audio}</span>
                             </label>
                             <label>
                                 <input is="emby-checkbox" type="checkbox" id="chkPhoto" data-value="Photo" class="chkMediaType" />
@@ -279,7 +279,7 @@
             <div data-role="content">
                 <div class="selectContainer">
                     <select id="selectDirectPlayProfileType" name="selectDirectPlayProfileType" is="emby-select" label="${LabelType}">
-                        <option value="Audio">${OptionProfileAudio}</option>
+                        <option value="Audio">${Audio}</option>
                         <option value="Photo">${OptionProfilePhoto}</option>
                         <option value="Video">${OptionProfileVideo}</option>
                     </select>
@@ -327,7 +327,7 @@
                 <div class="tabContent tabTranscodingBasics" style="display: none;">
                     <div class="selectContainer">
                         <select id="selectTranscodingProfileType" name="selectTranscodingProfileType" is="emby-select" label="${LabelType}">
-                            <option value="Audio">${OptionProfileAudio}</option>
+                            <option value="Audio">${Audio}</option>
                             <option value="Photo">${OptionProfilePhoto}</option>
                             <option value="Video">${OptionProfileVideo}</option>
                         </select>
@@ -403,7 +403,7 @@
                 <div class="tabContent tabContainerBasics">
                     <div class="selectContainer">
                         <select id="selectContainerProfileType" name="selectContainerProfileType" is="emby-select" label="${LabelType}">
-                            <option value="Audio">${OptionProfileAudio}</option>
+                            <option value="Audio">${Audio}</option>
                             <option value="Photo">${OptionProfilePhoto}</option>
                             <option value="Video">${OptionProfileVideo}</option>
                         </select>
@@ -436,7 +436,7 @@
                     <select id="selectCodecProfileType" name="selectCodecProfileType" is="emby-select" label="${LabelType}">
                         <option value="Video">${OptionProfileVideo}</option>
                         <option value="VideoAudio">${OptionProfileVideoAudio}</option>
-                        <option value="Audio">${OptionProfileAudio}</option>
+                        <option value="Audio">${Audio}</option>
                     </select>
                 </div>
                 <div class="inputContainer">
@@ -462,7 +462,7 @@
             <div data-role="content">
                 <div class="selectContainer">
                     <select id="selectResponseProfileType" name="selectResponseProfileType" is="emby-select" label="${LabelType}">
-                        <option value="Audio">${OptionProfileAudio}</option>
+                        <option value="Audio">${Audio}</option>
                         <option value="Photo">${OptionProfilePhoto}</option>
                         <option value="Video">${OptionProfileVideo}</option>
                     </select>
diff --git a/src/controllers/dashboard/dlna/profiles.js b/src/controllers/dashboard/dlna/profiles.js
index cdfdcf821..4eb830df6 100644
--- a/src/controllers/dashboard/dlna/profiles.js
+++ b/src/controllers/dashboard/dlna/profiles.js
@@ -81,7 +81,7 @@ import 'emby-button';
     function getTabs() {
         return [{
             href: 'dlnasettings.html',
-            name: globalize.translate('TabSettings')
+            name: globalize.translate('Settings')
         }, {
             href: 'dlnaprofiles.html',
             name: globalize.translate('TabProfiles')
diff --git a/src/controllers/dashboard/dlna/settings.html b/src/controllers/dashboard/dlna/settings.html
index 0a78782f8..765bf2d8a 100644
--- a/src/controllers/dashboard/dlna/settings.html
+++ b/src/controllers/dashboard/dlna/settings.html
@@ -7,7 +7,7 @@
 
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
-                        <h2 class="sectionTitle">${TabSettings}</h2>
+                        <h2 class="sectionTitle">${Settings}</h2>
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/networking/dlna.html">${Help}</a>
                     </div>
                 </div>
diff --git a/src/controllers/dashboard/dlna/settings.js b/src/controllers/dashboard/dlna/settings.js
index 9e7d78d79..fb93441a5 100644
--- a/src/controllers/dashboard/dlna/settings.js
+++ b/src/controllers/dashboard/dlna/settings.js
@@ -38,7 +38,7 @@ import globalize from 'globalize';
     function getTabs() {
         return [{
             href: 'dlnasettings.html',
-            name: globalize.translate('TabSettings')
+            name: globalize.translate('Settings')
         }, {
             href: 'dlnaprofiles.html',
             name: globalize.translate('TabProfiles')
diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 402532e60..2622841b7 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -91,7 +91,7 @@
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}">
-                        <option value="-1">${OptionAuto}</option>
+                        <option value="-1">${Auto}</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
                         <option value="3">3</option>
@@ -132,7 +132,7 @@
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
-                        <option value="">${OptionAuto}</option>
+                        <option value="">${Auto}</option>
                         <option value="veryslow">veryslow</option>
                         <option value="slower">slower</option>
                         <option value="slow">slow</option>
diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index e3a1769c2..9e1b9046d 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -4,7 +4,7 @@
             <form class="dashboardGeneralForm">
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
-                        <h2 class="sectionTitle">${TabSettings}</h2>
+                        <h2 class="sectionTitle">${Settings}</h2>
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/settings.html">${Help}</a>
                     </div>
                 </div>
diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js
index 85d9a4b1b..d2bf379eb 100644
--- a/src/controllers/dashboard/library.js
+++ b/src/controllers/dashboard/library.js
@@ -234,7 +234,7 @@ import 'emby-itemrefreshindicator';
             value: 'books',
             message: getLink('BookLibraryHelp', 'https://docs.jellyfin.org/general/server/media/books.html')
         }, {
-            name: globalize.translate('OptionHomeVideos'),
+            name: globalize.translate('Photos'),
             value: 'homevideos'
         }, {
             name: globalize.translate('FolderTypeMusicVideos'),
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index e5f5b9241..4eb5477a2 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -118,7 +118,7 @@ function showPluginMenu(page, elem) {
 
     if (configHref) {
         menuItems.push({
-            name: globalize.translate('ButtonSettings'),
+            name: globalize.translate('Settings'),
             id: 'open',
             icon: 'mode_edit'
         });
diff --git a/src/controllers/dashboard/users/useredit.html b/src/controllers/dashboard/users/useredit.html
index 400c0c35b..eacb3ed15 100644
--- a/src/controllers/dashboard/users/useredit.html
+++ b/src/controllers/dashboard/users/useredit.html
@@ -11,7 +11,7 @@
             </div>
 
             <div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" data-mini="true">
-                <a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${TabProfile}</a>
+                <a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${HeaderProfile}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
diff --git a/src/controllers/dashboard/users/userlibraryaccess.html b/src/controllers/dashboard/users/userlibraryaccess.html
index 363e52a71..a1378adbb 100644
--- a/src/controllers/dashboard/users/userlibraryaccess.html
+++ b/src/controllers/dashboard/users/userlibraryaccess.html
@@ -11,7 +11,7 @@
             </div>
 
             <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${HeaderProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
diff --git a/src/controllers/dashboard/users/userparentalcontrol.html b/src/controllers/dashboard/users/userparentalcontrol.html
index ffbd183a2..ca656cc66 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.html
+++ b/src/controllers/dashboard/users/userparentalcontrol.html
@@ -9,7 +9,7 @@
             </div>
 
             <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${HeaderProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index 0c74c2c01..7de3b7897 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -40,7 +40,7 @@ import 'paper-icon-button-light';
 
     function loadUnratedItems(page, user) {
         const items = [{
-            name: globalize.translate('OptionBlockBooks'),
+            name: globalize.translate('Books'),
             value: 'Book'
         }, {
             name: globalize.translate('OptionBlockChannelContent'),
@@ -49,10 +49,10 @@ import 'paper-icon-button-light';
             name: globalize.translate('OptionBlockLiveTvChannels'),
             value: 'LiveTvChannel'
         }, {
-            name: globalize.translate('OptionBlockMovies'),
+            name: globalize.translate('Movies'),
             value: 'Movie'
         }, {
-            name: globalize.translate('OptionBlockMusic'),
+            name: globalize.translate('Music'),
             value: 'Music'
         }, {
             name: globalize.translate('OptionBlockTrailers'),
diff --git a/src/controllers/dashboard/users/userpassword.html b/src/controllers/dashboard/users/userpassword.html
index 0f6ea2d78..463a6c653 100644
--- a/src/controllers/dashboard/users/userpassword.html
+++ b/src/controllers/dashboard/users/userpassword.html
@@ -9,7 +9,7 @@
             </div>
 
             <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${HeaderProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${HeaderPassword}</a>
@@ -31,7 +31,7 @@
                         <div>
                             <button is="emby-button" type="submit" class="raised button-submit block"><span>${Save}</span></button>
                             <button is="emby-button" type="button" id="btnResetPassword" class="raised button-cancel block hide">
-                                <span>${ButtonResetPassword}</span>
+                                <span>${HeaderResetPassword}</span>
                             </button>
                         </div>
                     </div>
diff --git a/src/controllers/livetvsettings.html b/src/controllers/livetvsettings.html
index ad3a9de7a..374ab9a4a 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="">${OptionAuto}</option>
+                        <option value="">${Auto}</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
                         <option value="3">3</option>
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 91b428ec6..0f69b3ebf 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -219,7 +219,7 @@ import 'emby-itemscontainer';
                             name: globalize.translate('OptionReleaseDate'),
                             id: 'PremiereDate,SortName,ProductionYear'
                         }, {
-                            name: globalize.translate('OptionRuntime'),
+                            name: globalize.translate('Runtime'),
                             id: 'Runtime,SortName,ProductionYear'
                         }],
                         callback: function () {
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 7d03c9107..aebede39b 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -242,7 +242,7 @@ import 'emby-itemscontainer';
                         name: globalize.translate('OptionNameSort'),
                         id: 'SortName'
                     }, {
-                        name: globalize.translate('OptionAlbumArtist'),
+                        name: globalize.translate('AlbumArtist'),
                         id: 'AlbumArtist,SortName'
                     }, {
                         name: globalize.translate('OptionCommunityRating'),
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 4c4f229e5..d30c74deb 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -158,13 +158,13 @@ import 'emby-itemscontainer';
                         name: globalize.translate('OptionTrackName'),
                         id: 'Name'
                     }, {
-                        name: globalize.translate('OptionAlbum'),
+                        name: globalize.translate('Album'),
                         id: 'Album,SortName'
                     }, {
-                        name: globalize.translate('OptionAlbumArtist'),
+                        name: globalize.translate('AlbumArtist'),
                         id: 'AlbumArtist,Album,SortName'
                     }, {
-                        name: globalize.translate('OptionArtist'),
+                        name: globalize.translate('Artist'),
                         id: 'Artist,Album,SortName'
                     }, {
                         name: globalize.translate('OptionDateAdded'),
@@ -179,7 +179,7 @@ import 'emby-itemscontainer';
                         name: globalize.translate('OptionReleaseDate'),
                         id: 'PremiereDate,AlbumArtist,Album,SortName'
                     }, {
-                        name: globalize.translate('OptionRuntime'),
+                        name: globalize.translate('Runtime'),
                         id: 'Runtime,AlbumArtist,Album,SortName'
                     }],
                     callback: function () {
diff --git a/src/controllers/playback/queue/index.html b/src/controllers/playback/queue/index.html
index c881f7b22..f38f9cd01 100644
--- a/src/controllers/playback/queue/index.html
+++ b/src/controllers/playback/queue/index.html
@@ -135,7 +135,7 @@
                             <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">
                                 <span class="material-icons search"></span>
                             </button>
-                            <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
+                            <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${Settings}" data-command="GoToSettings">
                                 <span class="material-icons settings"></span>
                             </button>
                         </div>
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index 5fe70d7be..a4caab09c 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -216,7 +216,7 @@ import 'emby-itemscontainer';
                         name: globalize.translate('OptionPlayCount'),
                         id: 'PlayCount,SeriesSortName,SortName'
                     }, {
-                        name: globalize.translate('OptionRuntime'),
+                        name: globalize.translate('Runtime'),
                         id: 'Runtime,SeriesSortName,SortName'
                     }],
                     callback: function () {
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
index 4d91f1206..3ba7829b3 100644
--- a/src/controllers/user/menu/index.html
+++ b/src/controllers/user/menu/index.html
@@ -1,4 +1,4 @@
-<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderSettings}" data-backbutton="true">
+<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${Settings}" data-backbutton="true">
     <div class="padded-left padded-right padded-bottom-page padded-top">
         <div class="readOnlyContent" style="margin: 0 auto;">
             <div class="verticalSection verticalSection-extrabottompadding">
@@ -7,7 +7,7 @@
                     <div class="listItem">
                         <span class="material-icons listItemIcon listItemIcon-transparent person"></span>
                         <div class="listItemBody">
-                            <div class="listItemBodyText">${ButtonProfile}</div>
+                            <div class="listItemBodyText">${HeaderProfile}</div>
                         </div>
                     </div>
                 </a>
diff --git a/src/controllers/user/profile/index.html b/src/controllers/user/profile/index.html
index 52b58bd26..c45f5ccb9 100644
--- a/src/controllers/user/profile/index.html
+++ b/src/controllers/user/profile/index.html
@@ -35,7 +35,7 @@
                         <span>${Save}</span>
                     </button>
                     <button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide">
-                        <span>${ButtonResetPassword}</span>
+                        <span>${HeaderResetPassword}</span>
                     </button>
                 </div>
             </div>
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index 5b5a1aad8..033c47d1c 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -182,9 +182,9 @@ export function showSortMenu (options) {
         html += '</h2>';
         html += '<div>';
         isChecked = options.query.SortOrder == 'Ascending' ? ' checked' : '';
-        html += '<label class="radio-label-block"><input type="radio" is="emby-radio" name="SortOrder" value="Ascending" class="menuSortOrder" ' + isChecked + ' /><span>' + globalize.translate('OptionAscending') + '</span></label>';
+        html += '<label class="radio-label-block"><input type="radio" is="emby-radio" name="SortOrder" value="Ascending" class="menuSortOrder" ' + isChecked + ' /><span>' + globalize.translate('Ascending') + '</span></label>';
         isChecked = options.query.SortOrder == 'Descending' ? ' checked' : '';
-        html += '<label class="radio-label-block"><input type="radio" is="emby-radio" name="SortOrder" value="Descending" class="menuSortOrder" ' + isChecked + ' /><span>' + globalize.translate('OptionDescending') + '</span></label>';
+        html += '<label class="radio-label-block"><input type="radio" is="emby-radio" name="SortOrder" value="Descending" class="menuSortOrder" ' + isChecked + ' /><span>' + globalize.translate('Descending') + '</span></label>';
         html += '</div>';
         html += '</div>';
         dlg.innerHTML = html;
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index e1b0ff780..e6b96e744 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -293,10 +293,10 @@ import 'flexStyles';
             html += '</h3>';
 
             if (appHost.supports('multiserver')) {
-                html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><span class="material-icons navMenuOptionIcon wifi"></span><span class="navMenuOptionText">' + globalize.translate('ButtonSelectServer') + '</span></a>';
+                html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><span class="material-icons navMenuOptionIcon wifi"></span><span class="navMenuOptionText">' + globalize.translate('HeaderSelectServer') + '</span></a>';
             }
 
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSettings" data-itemid="settings" href="#"><span class="material-icons navMenuOptionIcon settings"></span><span class="navMenuOptionText">' + globalize.translate('ButtonSettings') + '</span></a>';
+            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSettings" data-itemid="settings" href="#"><span class="material-icons navMenuOptionIcon settings"></span><span class="navMenuOptionText">' + globalize.translate('Settings') + '</span></a>';
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><span class="material-icons navMenuOptionIcon exit_to_app"></span><span class="navMenuOptionText">' + globalize.translate('ButtonSignOut') + '</span></a>';
             html += '</div>';
         }