diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 2a5a276a5c..d6328a4dfd 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -126,7 +126,7 @@
     margin: 7px;
 }
 
-.ui-page-theme-b .visualCardBox {
+.ui-body-b .visualCardBox {
     background: rgba(40,40,40,.85);
     border-radius: 3px;
 }
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 48ea22c87d..1cc45ecfdf 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -16,8 +16,9 @@
     background-color: #242424;
 }
 
-.ui-page-theme-b {
-    color: #fff;
+.ui-body-b {
+    /* Need the important tag for paper dialogs with this class */
+    color: #fff !important;
 }
 
 .pageWithAbsoluteTabs {
@@ -716,7 +717,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         font-weight: 400;
     }
 
-.ui-page-theme-a .detailSectionHeader {
+.ui-body-a .detailSectionHeader {
     background-color: transparent;
     border: 1px solid #ddd;
     border-width: 0 0 1px 0;
@@ -725,7 +726,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     margin-bottom: .5em;
 }
 
-    .ui-page-theme-a .detailSectionHeader, .ui-page-theme-a .detailSectionHeader h3 {
+    .ui-body-a .detailSectionHeader, .ui-body-a .detailSectionHeader h3 {
         font-size: 20px;
     }
 
@@ -733,7 +734,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     font-size: 13px;
 }
 
-.ui-page-theme-b .detailSectionHeader {
+.ui-body-b .detailSectionHeader {
     background-color: #141414;
 }
 
@@ -1548,7 +1549,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         background-position: center center;
     }
 
-.ui-page-theme-b .listItem:hover {
+.ui-body-b .listItem:hover {
     background-color: rgba(51,51,51,.6) !important;
 }
 
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 57fcb3512d..867e80430d 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -157,7 +157,7 @@
     color: #333;
 }
 
-.ui-page-theme-b .logoLibraryMenuButtonText, .ui-bar-b .logoLibraryMenuButtonText {
+.ui-body-b .logoLibraryMenuButtonText, .ui-bar-b .logoLibraryMenuButtonText {
     color: #fff;
 }
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 5730fb3f25..2f6625c4ac 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -496,12 +496,12 @@ select {
         display: block;
     }
 
-.ui-page-theme-b select {
+.ui-body-b select {
     border-color: #1f1f1f;
     background: #373737;
 }
 
-    .ui-page-theme-b select option {
+    .ui-body-b select option {
         color: #fff;
     }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 02a66f1230..a342247473 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -788,7 +788,7 @@
 
             if (commands.indexOf('managesubtitles') != -1) {
                 items.push({
-                    name: Globalize.translate('ButtonManageSubtitles'),
+                    name: Globalize.translate('ButtonEditSubtitles'),
                     id: 'managesubtitles',
                     ironIcon: 'closed-caption'
                 });
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index eedaf7d666..c32bb38619 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -238,6 +238,14 @@
                 });
             }
 
+            if (commands.indexOf('managesubtitles') != -1) {
+                items.push({
+                    name: Globalize.translate('ButtonEditSubtitles'),
+                    id: 'managesubtitles',
+                    ironIcon: 'closed-caption'
+                });
+            }
+
             if (commands.indexOf('instantmix') != -1) {
                 items.push({
                     name: Globalize.translate('ButtonInstantMix'),
@@ -246,14 +254,6 @@
                 });
             }
 
-            if (commands.indexOf('managesubtitles') != -1) {
-                items.push({
-                    name: Globalize.translate('ButtonManageSubtitles'),
-                    id: 'managesubtitles',
-                    ironIcon: 'closed-caption'
-                });
-            }
-
             items.push({
                 name: Globalize.translate('ButtonOpen'),
                 id: 'open',
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index 27ba66dcc6..f18ff3820f 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -147,7 +147,7 @@
 
         if (createIfNeeded && !elem) {
 
-            var html = '<div class="searchResultsOverlay ui-page-theme-b smoothScrollY">';
+            var html = '<div class="searchResultsOverlay ui-body-b smoothScrollY">';
 
             html += '<div class="searchResultsContainer"><div class="itemsContainer"></div></div></div>';
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 92bdc22cdd..3dac69ba4d 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2384,9 +2384,13 @@ pageClassOn('pageshow', "page", function () {
     if (currentTheme == 'a') {
         docElem.classList.add('background-theme-a');
         docElem.classList.remove('background-theme-b');
+        docElem.classList.add('ui-body-a');
+        docElem.classList.remove('ui-body-b');
     } else {
         docElem.classList.add('background-theme-b');
         docElem.classList.remove('background-theme-a');
+        docElem.classList.add('ui-body-b');
+        docElem.classList.remove('ui-body-a');
     }
 
     if (currentTheme != 'a' && !$.browser.mobile) {
diff --git a/dashboard-ui/strings/html/fr.json b/dashboard-ui/strings/html/fr.json
index f3d2be7832..c3144cf790 100644
--- a/dashboard-ui/strings/html/fr.json
+++ b/dashboard-ui/strings/html/fr.json
@@ -361,7 +361,7 @@
     "LabelImagesByNamePath": "R\u00e9pertoire de stockage des images t\u00e9l\u00e9charg\u00e9es :",
     "LabelImagesByNamePathHelp": "Veuillez sp\u00e9cifier un emplacement personnalis\u00e9 pour les images t\u00e9l\u00e9charg\u00e9es d'acteurs, artistes, genre, et studios .",
     "LabelMetadataPath": "Chemin des m\u00e9tadonn\u00e9es :",
-    "LabelMetadataPathHelp": "Veuillez sp\u00e9cifier un emplacement personnalis\u00e9 pour les images d'art et les m\u00e9tadonn\u00e9es t\u00e9l\u00e9charg\u00e9es. Par d\u00e9faut, stockage dans le r\u00e9pertoire de m\u00e9dias.",
+    "LabelMetadataPathHelp": "Veuillez sp\u00e9cifier un emplacement personnalis\u00e9 pour les images d'art et les m\u00e9tadonn\u00e9es t\u00e9l\u00e9charg\u00e9es.",
     "LabelTranscodingTempPath": "Chemin d'acc\u00e8s du r\u00e9pertoire temporaire de transcodage :",
     "LabelTranscodingTempPathHelp": "Ce r\u00e9pertoire contient les fichiers temporaires utilis\u00e9s par le transcodeur. Sp\u00e9cifier un chemin personnel ou laiss\u00e9 vide pour utilise le chemin par d\u00e9faut des r\u00e9pertoires du serveur",
     "TabBasics": "Standards",
@@ -1409,8 +1409,8 @@
     "OptionAllowVideoPlaybackTranscoding": "Autoriser la lecture de vid\u00e9os n\u00e9cessitant un transcodage",
     "OptionAllowMediaPlaybackTranscodingHelp": "Les utilisateurs recevront un message d'erreur compr\u00e9hensible lorsque le contenu n'est pas lisible en raison des restrictions appliqu\u00e9es.",
     "TabStreaming": "Streaming",
-    "LabelRemoteClientBitrateLimit": "Limite de d\u00e9bit du client distant (Mbps):",
-    "LabelRemoteClientBitrateLimitHelp": "Une limite de d\u00e9bit optionnelle du streaming pour tous les clients distant. Utile pour \u00e9viter que les clients demandent une bande passante sup\u00e9rieure \u00e0 ce que votre connexion peu fournir.",
+    "LabelRemoteClientBitrateLimit": "Limite de d\u00e9bit de streaming Internet (Mbps):",
+    "LabelRemoteClientBitrateLimitHelp": "Une limite de d\u00e9bit optionnelle du streaming pour toutes les connexions r\u00e9seau. Utile pour \u00e9viter que les clients demandent une bande passante sup\u00e9rieure \u00e0 ce que votre connexion peu fournir.",
     "LabelConversionCpuCoreLimit": "Limite de c\u0153ur CPU:",
     "LabelConversionCpuCoreLimitHelp": "Limite le nombre de c\u0153ur du processeur utilis\u00e9s pendant le transcodage.",
     "OptionEnableFullSpeedConversion": "Autoriser le transcodage rapide",
diff --git a/dashboard-ui/strings/html/pt-PT.json b/dashboard-ui/strings/html/pt-PT.json
index c9ce8cde8c..1d1fef9c8e 100644
--- a/dashboard-ui/strings/html/pt-PT.json
+++ b/dashboard-ui/strings/html/pt-PT.json
@@ -120,7 +120,7 @@
     "ReferToMediaLibraryWiki": "Consulte a wiki",
     "LabelCountry": "Pa\u00eds:",
     "LabelLanguage": "Idioma:",
-    "LabelTimeLimitHours": "Time limit (hours):",
+    "LabelTimeLimitHours": "Limite de tempo (horas):",
     "ButtonJoinTheDevelopmentTeam": "Junta-te \u00e0 Equipa de Desenvolvimento!",
     "HeaderPreferredMetadataLanguage": "Idioma preferido para metadados",
     "LabelSaveLocalMetadata": "Guardar imagens e metadados nas pastas multim\u00e9dia",
diff --git a/dashboard-ui/strings/javascript/ar.json b/dashboard-ui/strings/javascript/ar.json
index 568a066efc..38af360e36 100644
--- a/dashboard-ui/strings/javascript/ar.json
+++ b/dashboard-ui/strings/javascript/ar.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/bg-BG.json b/dashboard-ui/strings/javascript/bg-BG.json
index b68545cf67..a8c5aa2940 100644
--- a/dashboard-ui/strings/javascript/bg-BG.json
+++ b/dashboard-ui/strings/javascript/bg-BG.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/ca.json b/dashboard-ui/strings/javascript/ca.json
index 6e1acbd289..e4934c2b0d 100644
--- a/dashboard-ui/strings/javascript/ca.json
+++ b/dashboard-ui/strings/javascript/ca.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/cs.json b/dashboard-ui/strings/javascript/cs.json
index e5808c3536..ca9dd7ebab 100644
--- a/dashboard-ui/strings/javascript/cs.json
+++ b/dashboard-ui/strings/javascript/cs.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/da.json b/dashboard-ui/strings/javascript/da.json
index 29640b0391..2f9a8f7820 100644
--- a/dashboard-ui/strings/javascript/da.json
+++ b/dashboard-ui/strings/javascript/da.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/de.json b/dashboard-ui/strings/javascript/de.json
index b3d5371f8a..9462e024d5 100644
--- a/dashboard-ui/strings/javascript/de.json
+++ b/dashboard-ui/strings/javascript/de.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Wenn Sie die Sprachsteuerung f\u00fcr die App nicht erlaubt haben so m\u00fcssen Sie dies zuvor \u00e4ndern bevor Sie es erneut probieren.",
     "MessageNoItemsFound": "Keine Eintr\u00e4ge gefunden.",
     "ButtonManageServer": "Konfiguriere Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Einstellungen",
     "ButtonViewArtist": "Zeige Darsteller",
     "ButtonViewAlbum": "Zeige Album",
diff --git a/dashboard-ui/strings/javascript/el.json b/dashboard-ui/strings/javascript/el.json
index 609324e698..f32494b336 100644
--- a/dashboard-ui/strings/javascript/el.json
+++ b/dashboard-ui/strings/javascript/el.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/en-GB.json b/dashboard-ui/strings/javascript/en-GB.json
index 0e201ff2d3..00728b1d94 100644
--- a/dashboard-ui/strings/javascript/en-GB.json
+++ b/dashboard-ui/strings/javascript/en-GB.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/en-US.json b/dashboard-ui/strings/javascript/en-US.json
index c8a51dcc6e..42565ed9f5 100644
--- a/dashboard-ui/strings/javascript/en-US.json
+++ b/dashboard-ui/strings/javascript/en-US.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/es-AR.json b/dashboard-ui/strings/javascript/es-AR.json
index 02d34e9d8e..070710b68e 100644
--- a/dashboard-ui/strings/javascript/es-AR.json
+++ b/dashboard-ui/strings/javascript/es-AR.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/es-MX.json b/dashboard-ui/strings/javascript/es-MX.json
index 2b49cb45f2..8b833f1787 100644
--- a/dashboard-ui/strings/javascript/es-MX.json
+++ b/dashboard-ui/strings/javascript/es-MX.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Si ha negado el acceso a la voz a la aplicaci\u00f3n necesitara reconfigurar antes de intentarlo de nuevo.",
     "MessageNoItemsFound": "No se encontraron \u00edtems.",
     "ButtonManageServer": "Administrar Servidor",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferencias",
     "ButtonViewArtist": "Ver artista",
     "ButtonViewAlbum": "Ver album",
diff --git a/dashboard-ui/strings/javascript/es.json b/dashboard-ui/strings/javascript/es.json
index 7f0a63f5cf..b60538b9c0 100644
--- a/dashboard-ui/strings/javascript/es.json
+++ b/dashboard-ui/strings/javascript/es.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/fi.json b/dashboard-ui/strings/javascript/fi.json
index 4d21b7dbe5..293a7acaf8 100644
--- a/dashboard-ui/strings/javascript/fi.json
+++ b/dashboard-ui/strings/javascript/fi.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/fr.json b/dashboard-ui/strings/javascript/fr.json
index 99c62d37b9..93a3f733b8 100644
--- a/dashboard-ui/strings/javascript/fr.json
+++ b/dashboard-ui/strings/javascript/fr.json
@@ -39,7 +39,7 @@
     "TextEnjoyBonusFeatures": "Profitez bien des fonctionnalit\u00e9s bonus",
     "TitleLiveTV": "TV en direct",
     "ButtonCancelSyncJob": "Annuler la t\u00e2che de synchro",
-    "ButtonSelectView": "Select view",
+    "ButtonSelectView": "S\u00e9lectionnez un affichage",
     "TitleSync": "Sync.",
     "OptionAutomatic": "Auto",
     "HeaderSelectDate": "S\u00e9lectionnez la date",
@@ -48,7 +48,7 @@
     "HeaderMyMedia": "Mes medias",
     "ButtonRemoveFromCollection": "Supprimer de la collection",
     "LabelAutomaticUpdateLevel": "Niveau de mise \u00e0 jour automatique :",
-    "LabelAutomaticUpdateLevelForPlugins": "Automatic update level for plugins:",
+    "LabelAutomaticUpdateLevelForPlugins": "Niveau de mise \u00e0 jour automatique des plugins :",
     "TitleNotifications": "Notifications",
     "ErrorLaunchingChromecast": "Une erreur a \u00e9t\u00e9 rencontr\u00e9e lors du lancement de Chromecast. Veuillez vous assurer que votre appareil est bien connect\u00e9 \u00e0 votre r\u00e9seau sans-fil.",
     "MessageErrorLoadingSupporterInfo": "Il y a eu une erreur lors du chargement des informations de supporter. Veuillez r\u00e9essayer plus tard.",
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Si vous avez supprim\u00e9 l'acc\u00e8s par commande vocale \u00e0 l'application, vous devrez reconfigurer avant de r\u00e9essayer.",
     "MessageNoItemsFound": "Aucun \u00e9l\u00e9ment trouv\u00e9",
     "ButtonManageServer": "G\u00e9rer le serveur",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Pr\u00e9f\u00e9rences",
     "ButtonViewArtist": "Voir l'artiste",
     "ButtonViewAlbum": "Voir l'album",
diff --git a/dashboard-ui/strings/javascript/gsw.json b/dashboard-ui/strings/javascript/gsw.json
index 361c4697ff..b46b27b289 100644
--- a/dashboard-ui/strings/javascript/gsw.json
+++ b/dashboard-ui/strings/javascript/gsw.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/he.json b/dashboard-ui/strings/javascript/he.json
index 8656436945..d8cdfa1559 100644
--- a/dashboard-ui/strings/javascript/he.json
+++ b/dashboard-ui/strings/javascript/he.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/hr.json b/dashboard-ui/strings/javascript/hr.json
index 8c23dd042d..8ea9593db5 100644
--- a/dashboard-ui/strings/javascript/hr.json
+++ b/dashboard-ui/strings/javascript/hr.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/it.json b/dashboard-ui/strings/javascript/it.json
index a16a5b327b..aead2721aa 100644
--- a/dashboard-ui/strings/javascript/it.json
+++ b/dashboard-ui/strings/javascript/it.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Se tu hai negato l'accesso all app avrai bisogno di reconfigurarlo prima di riprovarci.",
     "MessageNoItemsFound": "Nessun elemento trovato.",
     "ButtonManageServer": "Gestisci Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferenze",
     "ButtonViewArtist": "Visualizza artista",
     "ButtonViewAlbum": "Visualizza album",
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 11f6af76bc..39fed2042c 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -811,6 +811,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/kk.json b/dashboard-ui/strings/javascript/kk.json
index d8109e8cc0..cb5365cf51 100644
--- a/dashboard-ui/strings/javascript/kk.json
+++ b/dashboard-ui/strings/javascript/kk.json
@@ -39,14 +39,14 @@
     "TextEnjoyBonusFeatures": "\u0421\u044b\u0439\u0430\u049b\u044b \u049b\u04b1\u0440\u0430\u043c\u0434\u0430\u0441\u0442\u0430\u0440\u0434\u044b \u0442\u0430\u043c\u0430\u0448\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437",
     "TitleLiveTV": "\u042d\u0444\u0438\u0440\u043b\u0456\u043a \u0422\u0414",
     "ButtonCancelSyncJob": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443\u0434\u0456 \u0431\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
-    "ButtonSelectView": "Select view",
+    "ButtonSelectView": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0456 \u0442\u0430\u04a3\u0434\u0430\u0443",
     "TitleSync": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443",
     "OptionAutomatic": "\u0410\u0432\u0442\u043e\u0442\u0430\u04a3\u0434\u0430\u0443",
     "HeaderSelectDate": "\u041a\u04af\u043d\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u0443",
     "ButtonDonate": "\u049a\u0430\u0439\u044b\u0440\u043c\u0430\u043b\u0430\u0443",
     "LabelRecurringDonationCanBeCancelledHelp": "\u049a\u0430\u0439\u0442\u0430\u043b\u0430\u043c\u0430 \u049b\u0430\u0439\u044b\u0440\u043c\u0430\u043b\u0434\u044b\u049b\u0442\u0430\u0440 PayPal \u0435\u0441\u0435\u043f \u0448\u043e\u0442\u044b \u0430\u0440\u049b\u044b\u043b\u044b \u04d9\u0440 \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0434\u0430 \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
     "HeaderMyMedia": "\u041c\u0435\u043d\u0456\u04a3 \u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043c",
-    "ButtonRemoveFromCollection": "Remove from Collection",
+    "ButtonRemoveFromCollection": "\u0416\u0438\u044b\u043d\u0442\u044b\u049b\u0442\u0430\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u0443",
     "LabelAutomaticUpdateLevel": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u0436\u0430\u04a3\u0430\u0440\u0442\u0443 \u0434\u0435\u04a3\u0433\u0435\u0439\u0456:",
     "LabelAutomaticUpdateLevelForPlugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440\u0434\u0456 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u0436\u0430\u04a3\u0430\u0440\u0442\u0443 \u0434\u0435\u04a3\u0433\u0435\u0439\u0456:",
     "TitleNotifications": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443\u043b\u0430\u0440",
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "\u0415\u0433\u0435\u0440 \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0493\u0430 \u0434\u0430\u0443\u044b\u0441\u0442\u044b\u049b \u049b\u0430\u0442\u044b\u043d\u0430\u0443\u0434\u0430\u043d \u0431\u0430\u0441 \u0442\u0430\u0440\u0442\u0441\u0430\u04a3\u044b\u0437, \u049b\u0430\u0439\u0442\u0430 \u04d9\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u043d\u0443\u0456\u04a3\u0456\u0437\u0434\u0435\u043d \u0430\u043b\u0434\u044b\u043d\u0430\u043d \u049b\u0430\u0439\u0442\u0430 \u0442\u0435\u04a3\u0448\u0435\u0443\u0456\u04a3\u0456\u0437 \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u0430\u0434\u044b.",
     "MessageNoItemsFound": "\u0415\u0448\u049b\u0430\u043d\u0434\u0430\u0439 \u0442\u0430\u0440\u043c\u0430\u049b\u0442\u0430\u0440 \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
     "ButtonManageServer": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u0431\u0430\u0441\u049b\u0430\u0440\u0443",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "\u0422\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440",
     "ButtonViewArtist": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043d\u044b \u049b\u0430\u0440\u0430\u0443",
     "ButtonViewAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u044b \u049b\u0430\u0440\u0430\u0443",
diff --git a/dashboard-ui/strings/javascript/ms.json b/dashboard-ui/strings/javascript/ms.json
index 31063a4170..2479d08244 100644
--- a/dashboard-ui/strings/javascript/ms.json
+++ b/dashboard-ui/strings/javascript/ms.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/nb.json b/dashboard-ui/strings/javascript/nb.json
index 5539973849..835751c7a3 100644
--- a/dashboard-ui/strings/javascript/nb.json
+++ b/dashboard-ui/strings/javascript/nb.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/nl.json b/dashboard-ui/strings/javascript/nl.json
index 02c8a0ee0a..a19e8d80e9 100644
--- a/dashboard-ui/strings/javascript/nl.json
+++ b/dashboard-ui/strings/javascript/nl.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Als u spraak toegang uitgeschakeld heeft moet u dit opnieuw configureren voordat u verder gaat.",
     "MessageNoItemsFound": "Geen items gevonden.",
     "ButtonManageServer": "Beheer server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Voorkeuren",
     "ButtonViewArtist": "Bekijk artiest",
     "ButtonViewAlbum": "Bekijk album",
diff --git a/dashboard-ui/strings/javascript/pl.json b/dashboard-ui/strings/javascript/pl.json
index 9518250bdc..8fe35209ee 100644
--- a/dashboard-ui/strings/javascript/pl.json
+++ b/dashboard-ui/strings/javascript/pl.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/pt-BR.json b/dashboard-ui/strings/javascript/pt-BR.json
index 4dd1e45d6f..9494aa5709 100644
--- a/dashboard-ui/strings/javascript/pt-BR.json
+++ b/dashboard-ui/strings/javascript/pt-BR.json
@@ -39,7 +39,7 @@
     "TextEnjoyBonusFeatures": "Aproveite Funcionalidades Extras",
     "TitleLiveTV": "TV ao Vivo",
     "ButtonCancelSyncJob": "Cancelar tarefa de sincroniza\u00e7\u00e3o",
-    "ButtonSelectView": "Select view",
+    "ButtonSelectView": "Selecionar visualiza\u00e7\u00e3o",
     "TitleSync": "Sinc",
     "OptionAutomatic": "Auto",
     "HeaderSelectDate": "Selecionar Data",
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "Se voc\u00ea negou o acesso de voz \u00e0 app, voc\u00ea necessitar\u00e1 reconfigurar antes de tentar novamente.",
     "MessageNoItemsFound": "Nenhum item encontrado.",
     "ButtonManageServer": "Gerenciar Servidor",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Prefer\u00eancias",
     "ButtonViewArtist": "Ver artista",
     "ButtonViewAlbum": "Ver \u00e1lbum",
diff --git a/dashboard-ui/strings/javascript/pt-PT.json b/dashboard-ui/strings/javascript/pt-PT.json
index ca23cd4427..fdb6bd3c2f 100644
--- a/dashboard-ui/strings/javascript/pt-PT.json
+++ b/dashboard-ui/strings/javascript/pt-PT.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/ro.json b/dashboard-ui/strings/javascript/ro.json
index 657c5bb2b7..aefb4b86f7 100644
--- a/dashboard-ui/strings/javascript/ro.json
+++ b/dashboard-ui/strings/javascript/ro.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/ru.json b/dashboard-ui/strings/javascript/ru.json
index e2d16722a3..0faa45bb37 100644
--- a/dashboard-ui/strings/javascript/ru.json
+++ b/dashboard-ui/strings/javascript/ru.json
@@ -39,14 +39,14 @@
     "TextEnjoyBonusFeatures": "\u041f\u0440\u0438\u043e\u0431\u0440\u0435\u0442\u0438\u0442\u0435 \u0431\u043e\u043d\u0443\u0441\u043d\u044b\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b",
     "TitleLiveTV": "\u042d\u0444\u0438\u0440",
     "ButtonCancelSyncJob": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044e",
-    "ButtonSelectView": "Select view",
+    "ButtonSelectView": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0438\u0434",
     "TitleSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
     "OptionAutomatic": "\u0410\u0432\u0442\u043e",
     "HeaderSelectDate": "\u0412\u044b\u0431\u043e\u0440 \u0434\u0430\u0442\u044b",
     "ButtonDonate": "\u041f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u0442\u044c",
     "LabelRecurringDonationCanBeCancelledHelp": "\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u044b\u0435 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432 \u043b\u044e\u0431\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u0447\u0435\u0440\u0435\u0437 \u0432\u0430\u0448\u0443 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c PayPal.",
     "HeaderMyMedia": "\u041c\u043e\u0438 \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
-    "ButtonRemoveFromCollection": "Remove from Collection",
+    "ButtonRemoveFromCollection": "\u0418\u0437\u044a\u044f\u0442\u044c \u0438\u0437 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
     "LabelAutomaticUpdateLevel": "\u0421\u0442\u0435\u043f\u0435\u043d\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f:",
     "LabelAutomaticUpdateLevelForPlugins": "\u0421\u0442\u0435\u043f\u0435\u043d\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432:",
     "TitleNotifications": "\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f",
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "\u0415\u0441\u043b\u0438 \u043e\u0442\u043a\u0430\u0437\u0430\u043d\u043e \u0432 \u0433\u043e\u043b\u043e\u0441\u043e\u0432\u043e\u043c \u0434\u043e\u0441\u0442\u0443\u043f\u0435 \u043a \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044e, \u043f\u0435\u0440\u0435\u0434 \u043d\u043e\u0432\u043e\u0439 \u043f\u043e\u043f\u044b\u0442\u043a\u043e\u0439 \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430 \u043f\u0435\u0440\u0435\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430.",
     "MessageNoItemsFound": "\u041d\u0438\u043a\u0430\u043a\u0438\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.",
     "ButtonManageServer": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c...",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
     "ButtonViewArtist": "\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044f",
     "ButtonViewAlbum": "\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0430\u043b\u044c\u0431\u043e\u043c",
diff --git a/dashboard-ui/strings/javascript/sl-SI.json b/dashboard-ui/strings/javascript/sl-SI.json
index 8680a1dfcd..5a8a36f828 100644
--- a/dashboard-ui/strings/javascript/sl-SI.json
+++ b/dashboard-ui/strings/javascript/sl-SI.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/sv.json b/dashboard-ui/strings/javascript/sv.json
index 37f3ed930a..2d4f05c22f 100644
--- a/dashboard-ui/strings/javascript/sv.json
+++ b/dashboard-ui/strings/javascript/sv.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/tr.json b/dashboard-ui/strings/javascript/tr.json
index aebb79e532..7d85581c9b 100644
--- a/dashboard-ui/strings/javascript/tr.json
+++ b/dashboard-ui/strings/javascript/tr.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/uk.json b/dashboard-ui/strings/javascript/uk.json
index 8f52a001e2..92e3cca6f4 100644
--- a/dashboard-ui/strings/javascript/uk.json
+++ b/dashboard-ui/strings/javascript/uk.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/vi.json b/dashboard-ui/strings/javascript/vi.json
index f1182cb5fc..8762c4be38 100644
--- a/dashboard-ui/strings/javascript/vi.json
+++ b/dashboard-ui/strings/javascript/vi.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/zh-CN.json b/dashboard-ui/strings/javascript/zh-CN.json
index 2e47e797c8..f929f4ac4e 100644
--- a/dashboard-ui/strings/javascript/zh-CN.json
+++ b/dashboard-ui/strings/javascript/zh-CN.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/strings/javascript/zh-TW.json b/dashboard-ui/strings/javascript/zh-TW.json
index f423cd9953..de1c6aa6d8 100644
--- a/dashboard-ui/strings/javascript/zh-TW.json
+++ b/dashboard-ui/strings/javascript/zh-TW.json
@@ -801,6 +801,7 @@
     "MessageIfYouBlockedVoice": "If you denied voice access to the app you'll need to reconfigure before trying again.",
     "MessageNoItemsFound": "No items found.",
     "ButtonManageServer": "Manage Server",
+    "ButtonEditSubtitles": "Edit subtitles",
     "ButtonPreferences": "Preferences",
     "ButtonViewArtist": "View artist",
     "ButtonViewAlbum": "View album",
diff --git a/dashboard-ui/subtitleeditor/edititemsubtitles.js b/dashboard-ui/subtitleeditor/edititemsubtitles.js
index 35a2871e2c..0ae434ca2b 100644
--- a/dashboard-ui/subtitleeditor/edititemsubtitles.js
+++ b/dashboard-ui/subtitleeditor/edititemsubtitles.js
@@ -96,7 +96,7 @@
 
         if (subs.length) {
 
-            html += '<h1>' + Globalize.translate('HeaderCurrentSubtitles') + '</h1>';
+            html += '<h1 style="margin-top:1.5em;">' + Globalize.translate('HeaderCurrentSubtitles') + '</h1>';
             html += '<div class="paperList">';
 
             html += subs.map(function (s) {
@@ -146,6 +146,9 @@
 
             html += '</div>';
         }
+        else {
+            html += '<br/>';
+        }
 
         var elem = $('.subtitleList', page).html(html).trigger('create');
 
@@ -305,13 +308,18 @@
 
                 var dlg = document.createElement('paper-dialog');
 
+                dlg.setAttribute('with-backdrop', 'with-backdrop');
+                dlg.setAttribute('role', 'alertdialog');
                 dlg.entryAnimation = 'scale-up-animation';
                 dlg.exitAnimation = 'fade-out-animation';
                 dlg.classList.add('fullscreen-editor-paper-dialog');
                 dlg.classList.add('ui-body-b');
 
                 var html = '';
-                html += '<h2 class="dialogHeader">' + item.Name + '</h2>';
+                html += '<h2 class="dialogHeader">';
+                html += '<paper-fab icon="arrow-back" class="mini"></paper-fab>';
+                html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + item.Name + '</div>';
+                html += '</h2>';
 
                 html += '<div class="editorContent">';
                 html += Globalize.translateDocument(template);
@@ -325,43 +333,48 @@
                 // Has to be assigned a z-index after the call to .open() 
                 $(dlg).on('iron-overlay-closed', onDialogClosed);
 
-                document.body.classList.add('bodyWithPopupOpen');
+                //document.body.classList.add('bodyWithPopupOpen');
                 dlg.open();
 
-                window.location.hash = 'subtitleeditor?id=' + itemId;
+                window.location.hash = getHash(itemId);
 
-                // We need to use a timeout or onHashChange will fire immediately while opening
-                setTimeout(function () {
+                window.addEventListener('hashchange', onHashChange);
 
-                    window.addEventListener('hashchange', onHashChange);
+                currentDialog = dlg;
 
-                    currentDialog = dlg;
+                var editorContent = dlg.querySelector('.editorContent');
+                reload(editorContent, item);
 
-                    var editorContent = dlg.querySelector('.editorContent');
-                    reload(editorContent, item);
+                ApiClient.getCultures().done(function (languages) {
 
-                    fillLanguages(editorContent);
+                    fillLanguages(editorContent, languages);
+                });
 
-                }, 0);
+                $('paper-fab', dlg).on('click', closeDialog);
             });
         });
     }
 
+    function getHash(itemId) {
+        return 'subtitleeditor?id=' + itemId;
+    }
+
     function onHashChange() {
 
+        // In some browsers this will fire immediately after opening the dialog, despite the fact that we bound the event after setting the hash
+        if (currentItem && window.location.hash == '#' + getHash(currentItem.Id)) {
+            return;
+        }
+
         if (currentDialog) {
-            closeDialog(false);
+            closeDialog();
         }
     }
 
-    function closeDialog(updateHash) {
+    function closeDialog() {
 
         window.removeEventListener('hashchange', onHashChange);
 
-        if (updateHash) {
-            window.location.hash = '';
-        }
-
         if (currentDialog) {
             currentDialog.close();
         }
@@ -369,16 +382,14 @@
 
     function onDialogClosed() {
         currentDialog = null;
+
         window.removeEventListener('hashchange', onHashChange);
-        document.body.classList.remove('bodyWithPopupOpen');
+        //document.body.classList.remove('bodyWithPopupOpen');
         $(this).remove();
-    }
 
-    function fillLanguages(editorContent) {
-        ApiClient.getCultures().done(function (languages) {
-
-            fillLanguages(editorContent, languages);
-        });
+        if ((window.location.hash || '').length > 1) {
+            history.back();
+        }
     }
 
     window.SubtitleEditor = {
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css
index 3bfa7d3a41..2c4c5bf1a0 100644
--- a/dashboard-ui/themes/android.css
+++ b/dashboard-ui/themes/android.css
@@ -18,7 +18,7 @@
     background-color: #383838;
 }
 
-.ui-page-theme-b .visualCardBox {
+.ui-body-b .visualCardBox {
     background: rgba(56,56,56,.85);
 }
 
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
index 5e44386cf1..93cd9ef506 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
@@ -2613,14 +2613,7 @@ $.widget( "mobile.page", {
 			this._on( this.window, { navigate: "_filterNavigateEvents" });
 		},
 
-		_setOptions: function( options ) {
-			if ( options.theme !== undefined && options.theme !== "none" ) {
-				this.element.removeClass( "ui-overlay-" + this.options.theme )
-					.addClass( "ui-overlay-" + options.theme );
-			} else if ( options.theme !== undefined ) {
-				this.element.removeClass( "ui-overlay-" + this.options.theme );
-			}
-
+		_setOptions: function (options) {
 			this._super( options );
 		},
 
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
index 301b88b95a..20e195dd61 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
@@ -224,7 +224,7 @@ html body .ui-group-theme-a .ui-bar-inherit {
 }
 
 /* Page and overlay */
-.ui-overlay-a,
+.ui-body-a,
 .ui-page-theme-a .ui-panel-wrapper {
 	background-color: 			#f9f9f9 /*{a-page-background-color}*/;
 	border-color:	 		#bbb /*{a-page-border}*/;
@@ -242,10 +242,6 @@ html .ui-panel-page-container-a {
 	border-color:	 		#ddd /*{a-body-border}*/;
 	color: 					#333 /*{a-body-color}*/;
 }
-.ui-body-a {
-	border-width: 1px;
-	border-style: solid;
-}
 
 /* Links */
 .ui-page-theme-a a,
@@ -374,7 +370,7 @@ html body .ui-group-theme-b .ui-bar-inherit {
 }
 
 /* Page and overlay */
-.ui-overlay-b,
+.ui-body-b,
 .ui-page-theme-b .ui-panel-wrapper {
 	background-color: 			#252525 /*{b-page-background-color}*/;
 	border-color:	 		#454545 /*{b-page-border}*/;
@@ -392,10 +388,6 @@ html .ui-panel-page-container-b {
 	border-color:	 		#1d1d1d /*{b-body-border}*/;
 	color: 					#fff /*{b-body-color}*/;
 }
-.ui-body-b {
-	border-width: 1px;
-	border-style: solid;
-}
 
 /* Links */
 .ui-page-theme-b a,
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 9f99cc8196..c69f735f30 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -79,11 +79,11 @@
         color: #fff;
     }
 
-.ui-page-theme-b paper-button.cancel {
+.ui-body-b paper-button.cancel {
     color: #444;
 }
 
-.ui-page-theme-b paper-button[raised].cancel {
+.ui-body-b paper-button[raised].cancel {
     background: #444;
     color: #fff;
 }
@@ -97,16 +97,16 @@ paper-button[raised].cancelDark {
     color: #fff;
 }
 
-.ui-page-theme-b paper-button.subdued:not([disabled]) {
+.ui-body-b paper-button.subdued:not([disabled]) {
     color: #404040;
 }
 
-.ui-page-theme-b paper-button[raised].subdued:not([disabled]) {
+.ui-body-b paper-button[raised].subdued:not([disabled]) {
     background: #404040;
     color: #fff;
 }
 
-.ui-page-theme-b paper-button[raised][disabled].subdued {
+.ui-body-b paper-button[raised][disabled].subdued {
     background: #111;
 }
 
@@ -234,7 +234,7 @@ paper-icon-button paper-ripple {
     color: inherit !important;
 }
 
-.ui-page-theme-b paper-icon-button[disabled] {
+.ui-body-b paper-icon-button[disabled] {
     color: #444 !important;
 }
 
@@ -292,7 +292,7 @@ paper-fab {
             background: #686868 !important;
         }
 
-.ui-page-theme-b paper-fab[disabled].subdued {
+.ui-body-b paper-fab[disabled].subdued {
     background: #222;
 }
 
@@ -362,27 +362,27 @@ paper-menu-item {
     flex-grow: 1;
 }
 
-.ui-page-theme-b paper-item-body [secondary] {
+.ui-body-b paper-item-body [secondary] {
     color: #aaa;
 }
 
-.ui-page-theme-b paper-checkbox paper-ripple {
+.ui-body-b paper-checkbox paper-ripple {
     color: #fff !important;
 }
 
-.ui-page-theme-b paper-checkbox #checkboxLabel.paper-checkbox {
+.ui-body-b paper-checkbox #checkboxLabel.paper-checkbox {
     color: inherit;
 }
 
-.ui-page-theme-b .paperCheckboxFieldDescription {
+.ui-body-b .paperCheckboxFieldDescription {
     color: #ccc;
 }
 
-.ui-page-theme-b paper-checkbox #checkbox.paper-checkbox {
+.ui-body-b paper-checkbox #checkbox.paper-checkbox {
     border-color: #ccc;
 }
 
-.ui-page-theme-b paper-checkbox #checkbox.checked.paper-checkbox {
+.ui-body-b paper-checkbox #checkbox.checked.paper-checkbox {
     background-color: #2ad;
     border-color: #2ad;
 }
@@ -397,23 +397,23 @@ paper-input label, paper-textarea label {
     font-family: inherit !important;
 }
 
-.ui-page-theme-b paper-input label, .ui-page-theme-b paper-textarea label {
+.ui-body-b paper-input label, .ui-body-b paper-textarea label {
     color: #858585 !important;
 }
 
-.ui-page-theme-a paper-input label, .ui-page-theme-a paper-textarea label {
+.ui-body-a paper-input label, .ui-body-a paper-textarea label {
     color: #656565 !important;
 }
 
-.ui-page-theme-a .label-is-highlighted label {
+.ui-body-a .label-is-highlighted label {
     color: green !important;
 }
 
-.ui-page-theme-b .label-is-highlighted label {
+.ui-body-b .label-is-highlighted label {
     color: #52B54B !important;
 }
 
-.ui-page-theme-b paper-input input, .ui-page-theme-b paper-textarea textarea {
+.ui-body-b paper-input input, .ui-body-b paper-textarea textarea {
     color: #fff !important;
 }
 
@@ -421,7 +421,7 @@ paper-input .focused-line, paper-textarea .focused-line {
     background-color: #52B54B !important;
 }
 
-.ui-page-theme-b .unfocused-line.paper-input-container, .ui-page-theme-b .unfocused-line.paper-textarea-container {
+.ui-body-b .unfocused-line.paper-input-container, .ui-body-b .unfocused-line.paper-textarea-container {
     background: #454545;
 }
 
@@ -445,7 +445,7 @@ paper-textarea.mono textarea {
     background-color: #fff;
 }
 
-.ui-page-theme-b .paperList {
+.ui-body-b .paperList {
     background-color: #303030;
 }
 
@@ -495,7 +495,7 @@ paper-dialog paper-radio-group paper-radio-button {
 }
 
 .fullscreen-editor-paper-dialog {
-    position: absolute !important;
+    position: fixed !important;
     top: 0 !important;
     bottom: 0 !important;
     left: 0 !important;
@@ -503,4 +503,22 @@ paper-dialog paper-radio-group paper-radio-button {
     margin: 0 !important;
     border-radius: 0 !important;
     background-color: #222 !important;
+    max-height: none !important;
+    max-width: none !important;
+}
+
+@media all and (min-width: 1280px) and (min-height: 720px) {
+
+    .fullscreen-editor-paper-dialog {
+        top: 5% !important;
+        bottom: 5% !important;
+        left: 5% !important;
+        right: 5% !important;
+    }
+}
+
+.fullscreen-editor-paper-dialog .dialogHeader {
+    font-weight: inherit !important;
+    line-height: 1 !important;
+    line-height: initial !important;
 }