diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index cd84d89754..1f92e06279 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.158",
-  "_release": "1.4.158",
+  "version": "1.4.159",
+  "_release": "1.4.159",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.158",
-    "commit": "ffda5994565e3f458e9da09c168cfce699237a0f"
+    "tag": "1.4.159",
+    "commit": "6320b765b9390fc57210d45c8e9bfcf66d1a2706"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js b/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
index 9697335b21..dc8f4033a4 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
@@ -137,7 +137,7 @@
 
         var html = '';
 
-        html += '<div class="dialogContent smoothScrollY" style="padding-top:2em;">';
+        html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
         html += '<div class="dialogContentInner dialog-content-centered">';
         html += '<form class="newCollectionForm" style="margin:auto;">';
 
@@ -249,9 +249,9 @@
             var html = '';
             var title = items.length ? globalize.translate('sharedcomponents#HeaderAddToCollection') : globalize.translate('sharedcomponents#NewCollection');
 
-            html += '<div class="dialogHeader">';
+            html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-            html += '<div class="dialogHeaderTitle">';
+            html += '<div class="formDialogHeaderTitle">';
             html += title;
             html += '</div>';
 
@@ -272,13 +272,13 @@
             });
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
             }
 
             return new Promise(function (resolve, reject) {
 
                 if (layoutManager.tv) {
-                    centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                 }
 
                 dlg.addEventListener('close', resolve);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.css b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.css
index 442fdda8ca..9b68cf4bbd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.css
@@ -1,8 +1,15 @@
+.promptDialog {
+    border-radius: .25em !important;
+}
 
-.dialogButtons {
+.promptDialogContent {
+    padding: 1em 1.6em;
+}
+
+.promptDialogButtons {
     position: relative;
     padding: 0 !important;
-    margin: 1em;
+    margin: 1em 0;
     display: -ms-flexbox;
     display: -webkit-flex;
     display: flex;
@@ -14,13 +21,13 @@
     justify-content: flex-end;
 }
 
-.dialogButton {
+.promptDialogButton {
     color: #52B54B;
     padding: 0.35em 1em;
     margin: 0;
 }
 
-    .dialogButton:focus {
+    .promptDialogButton:focus {
         color: #fff;
         background-color: #52B54B;
     }
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
index c8bc64ff31..9ca1fcecfb 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
@@ -36,8 +36,13 @@ define(['layoutManager', 'globalize', 'css!./dialog'], function (layoutManager,
         }
 
         var dlg = dialogHelper.createDialog(dialogOptions);
+
+        dlg.classList.add('promptDialog');
+
         var html = '';
 
+        html += '<div class="promptDialogContent">';
+
         if (options.title) {
             html += '<h2>' + options.title + '</h2>';
         } 
@@ -48,16 +53,17 @@ define(['layoutManager', 'globalize', 'css!./dialog'], function (layoutManager,
             html += '<div style="margin:1em 0;">' + text + '</div>';
         }
 
-        html += '<div class="dialogButtons">';
+        html += '<div class="promptDialogButtons">';
 
         var i, length;
         for (i = 0, length = options.buttons.length; i < length; i++) {
 
             var item = options.buttons[i];
             var autoFocus = i == 0 ? ' autofocus' : '';
-            html += '<button is="emby-button" type="button" class="btnOption dialogButton" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
+            html += '<button is="emby-button" type="button" class="btnOption promptDialogButton" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
         }
 
+        html += '</div>';
         html += '</div>';
 
         dlg.innerHTML = html;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
index 34bee248e8..44f386fb0b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
@@ -64,10 +64,6 @@
     overflow-y: hidden !important;
 }
 
-.dialog > * {
-    padding: 0 24px;
-}
-
 .dialogBackdrop {
     background-color: #000;
     opacity: 0;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
index 40a1cc3007..da01f584b3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
@@ -3,25 +3,24 @@
     flex-direction: column;
 }
 
-    .formDialog .dialogHeader {
-        padding: .7em .5em;
-        display: flex;
-        align-items: center;
-        background-color: #101010;
-        flex-shrink: 0;
-    }
+.formDialogHeader {
+    padding: .7em .5em;
+    display: flex;
+    align-items: center;
+    background-color: #101010;
+    flex-shrink: 0;
+}
 
-    .formDialog .dialogHeaderTitle {
-        margin-left: .75em;
-    }
+.formDialogHeaderTitle {
+    margin-left: .75em;
+}
 
-    .formDialog .dialogContent {
-        flex-grow: 1;
-    }
+.formDialogContent {
+    flex-grow: 1;
+}
 
 .dialogContentInner {
-    padding-top: .5em;
-    padding-bottom: 30vh;
+    padding: .5em 1em 30vh 1em;
 }
 
 .dialog-content-centered {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
index c35518d162..c1fa6608df 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
@@ -299,7 +299,7 @@
 
             page.querySelector('.identifyProviderIds').innerHTML = html;
 
-            page.querySelector('.dialogHeaderTitle').innerHTML = globalize.translate('sharedcomponents#Identify');
+            page.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('sharedcomponents#Identify');
         });
     }
 
@@ -341,7 +341,7 @@
                 dlg.addEventListener('close', onDialogClosed);
 
                 if (layoutManager.tv) {
-                    scrollHelper.centerFocus.on(dlg.querySelector('.dialogContent'), false);
+                    scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
                 }
 
                 dialogHelper.open(dlg);
@@ -412,7 +412,7 @@
             document.body.appendChild(dlg);
 
             if (layoutManager.tv) {
-                scrollHelper.centerFocus.on(dlg.querySelector('.dialogContent'), false);
+                scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
             }
 
             dialogHelper.open(dlg);
@@ -458,7 +458,7 @@
             dlg.querySelector('#txtLookupYear').value = itemYear;
         }
 
-        dlg.querySelector('.dialogHeaderTitle').innerHTML = globalize.translate('sharedcomponents#Search');
+        dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('sharedcomponents#Search');
     }
 
     return {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
index 812e79c875..a021c47260 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
@@ -1,11 +1,11 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${Identify}
     </div>
 </div>
 
-<div class="dialogContent smoothScrollY">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered">
         <form class="popupIdentifyForm" style="margin:auto;">
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js
index 2428b6668a..6f66da06a9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js
@@ -1183,14 +1183,14 @@
             document.body.appendChild(dlg);
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
             }
 
             dialogHelper.open(dlg);
 
             dlg.addEventListener('close', function () {
                 if (layoutManager.tv) {
-                    centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                 }
 
                 unbindItemChanged(dlg, connectionManager.getApiClient(serverId));
diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html
index 310a88c712..9bef3ca376 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html
@@ -1,6 +1,6 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${Edit}
     </div>
     <div style="margin-left: auto; display: flex; align-items: center; justify-content: center;">
@@ -14,7 +14,7 @@
     </div>
 </div>
 
-<div class="dialogContent smoothScrollY" style="padding-top:2em;">
+<div class="formDialogContent smoothScrollY" style="padding-top:2em;">
 
     <form class="editItemMetadataForm editMetadataForm dialogContentInner dialog-content-centered">
         <div class="metadataFormFields">
diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js
index 1632aef2dc..7feac2dbac 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js
@@ -43,7 +43,7 @@
                 dlg.querySelector('.txtPersonRole', dlg).value = person.Role || '';
 
                 if (layoutManager.tv) {
-                    centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, true);
                 }
 
                 dialogHelper.open(dlg);
@@ -51,7 +51,7 @@
                 dlg.addEventListener('close', function () {
 
                     if (layoutManager.tv) {
-                        centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                        centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
 
                     if (submitted) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html
index 295d955aa2..1737f6bac8 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html
@@ -1,11 +1,11 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${Edit}
     </div>
 </div>
 
-<div class="dialogContent smoothScrollY" style="padding-top:2em;">
+<div class="formDialogContent smoothScrollY" style="padding-top:2em;">
     <form class="popupEditPersonForm dialogContentInner dialog-content-centered">
 
         <div class="inputContainer">
diff --git a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
index 416750c171..6f7ba2e9ba 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
@@ -137,7 +137,7 @@
 
         var html = '';
 
-        html += '<div class="dialogContent smoothScrollY" style="padding-top:2em;">';
+        html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
         html += '<div class="dialogContentInner dialog-content-centered">';
         html += '<form style="margin:auto;">';
 
@@ -230,9 +230,9 @@
             var html = '';
             var title = globalize.translate('sharedcomponents#HeaderAddToPlaylist');
 
-            html += '<div class="dialogHeader">';
+            html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-            html += '<div class="dialogHeaderTitle">';
+            html += '<div class="formDialogHeaderTitle">';
             html += title;
             html += '</div>';
 
@@ -251,13 +251,13 @@
             });
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
             }
 
             return new Promise(function (resolve, reject) {
 
                 if (layoutManager.tv) {
-                    centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                 }
 
                 dlg.addEventListener('close', resolve);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js
index 595a9385b9..4a3761beb1 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js
@@ -391,7 +391,7 @@
                 });
 
                 if (layoutManager.tv) {
-                    scrollHelper.centerFocus.on(dlg.querySelector('.dialogContent'), false);
+                    scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
                 }
 
                 dlg.querySelector('.btnSupporterForConverting').addEventListener('click', onSupporterButtonClick);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html
index 4770d68156..618ac9f0ce 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html
@@ -1,10 +1,10 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${HeaderNewRecording}
     </div>
 </div>
-<div class="dialogContent smoothScrollY">
+<div class="formDialogContent smoothScrollY">
     <form class="dialogContentInner dialog-content-centered">
 
         <h1 class="itemName dialogContentTitle"></h1>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js
index 73ac37a8d5..eee5197750 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js
@@ -15,7 +15,7 @@
         context.querySelector('.itemGenres').innerHTML = (programInfo.Genres || []).join(' / ');
         context.querySelector('.itemOverview').innerHTML = programInfo.Overview || '';
 
-        var timerPageImageContainer = context.querySelector('.timerPageImageContainer');
+        //var timerPageImageContainer = context.querySelector('.timerPageImageContainer');
 
         context.querySelector('.itemMiscInfoPrimary').innerHTML = mediaInfo.getPrimaryMediaInfoHtml(programInfo);
         context.querySelector('.itemMiscInfoSecondary').innerHTML = mediaInfo.getSecondaryMediaInfoHtml(programInfo);
@@ -144,7 +144,7 @@
                 });
 
                 if (layoutManager.tv) {
-                    scrollHelper.centerFocus.on(dlg.querySelector('.dialogContent'), false);
+                    scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
                 }
 
                 init(dlg);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
index 5fdd4c4023..8b80a01e86 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
@@ -1,6 +1,6 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${Edit}
     </div>
     <div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
@@ -11,7 +11,7 @@
     </div>
 </div>
 
-<div class="dialogContent smoothScrollY">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered">
         <h1 class="itemName dialogContentTitle"></h1>
         <p class="itemEpisodeName"></p>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js b/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
index 97b48ea82f..526940d7eb 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
@@ -17,7 +17,7 @@
 
         var html = '';
 
-        html += '<div class="dialogContent smoothScrollY" style="padding-top:2em;">';
+        html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
         html += '<div class="dialogContentInner dialog-content-centered">';
         html += '<form style="margin:auto;">';
 
@@ -121,9 +121,9 @@
             var html = '';
             var title = globalize.translate('sharedcomponents#RefreshMetadata');
 
-            html += '<div class="dialogHeader">';
+            html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-            html += '<div class="dialogHeaderTitle">';
+            html += '<div class="formDialogHeaderTitle">';
             html += title;
             html += '</div>';
 
@@ -142,13 +142,13 @@
             });
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
             }
 
             return new Promise(function (resolve, reject) {
 
                 if (layoutManager.tv) {
-                    centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                 }
 
                 dlg.addEventListener('close', resolve);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js
index 52017d6690..3476260c7e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js
@@ -333,7 +333,7 @@
 
         var lang = form.querySelector('#selectLanguage', form).value;
 
-        searchForSubtitles(dom.parentWithClass(form, 'dialogContent'), lang);
+        searchForSubtitles(dom.parentWithClass(form, 'formDialogContent'), lang);
 
         e.preventDefault();
         return false;
@@ -429,17 +429,13 @@
             var btnSubmit = dlg.querySelector('.btnSubmit');
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
-            }
-
-            if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.dialogContent'), false, true);
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
                 dlg.querySelector('.btnSearchSubtitles').classList.add('hide');
             } else {
                 btnSubmit.classList.add('hide');
             }
 
-            var editorContent = dlg.querySelector('.dialogContent');
+            var editorContent = dlg.querySelector('.formDialogContent');
 
             dlg.querySelector('.subtitleList').addEventListener('click', onSubtitleListClick);
             dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick);
@@ -459,7 +455,7 @@
                 dlg.addEventListener('close', function () {
 
                     if (layoutManager.tv) {
-                        centerFocus(dlg.querySelector('.dialogContent'), false, false);
+                        centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
 
                     if (hasChanges) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html
index 9ddf6a962b..a3dd99b1a9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html
@@ -1,8 +1,8 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">${Subtitles}</div>
+    <div class="formDialogHeaderTitle">${Subtitles}</div>
 </div>
-<div class="dialogContent smoothScrollY">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered">
 
         <div class="subtitleList" style="margin-bottom:2em;"></div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
index 8cfafcb87b..3f258076d5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
@@ -111,16 +111,16 @@ define(['dialogHelper', 'voiceReceiver', 'voiceProcessor', 'globalize', 'emby-bu
             dlg.classList.add('formDialog');
 
             var html = '';
-            html += '<div class="dialogHeader">';
+            html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancelVoiceInput autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-            html += '<div class="dialogHeaderTitle">';
+            html += '<div class="formDialogHeaderTitle">';
             html += globalize.translate('sharedcomponents#VoiceInput');
             html += '</div>';
             html += '</div>';
 
             html += '<div>';
 
-            html += '<div class="dialogContent smoothScrollY" style="padding-top:2em;">';
+            html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<div class="voiceHelpContent">';
 
diff --git a/dashboard-ui/components/channelmapper/channelmapper.js b/dashboard-ui/components/channelmapper/channelmapper.js
index a1145f901b..13deeb9028 100644
--- a/dashboard-ui/components/channelmapper/channelmapper.js
+++ b/dashboard-ui/components/channelmapper/channelmapper.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'loading', 'connectionManager', 'globalize', 'actionsheet', 'paper-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-button', 'listViewStyle', 'material-icons'],
+define(['dialogHelper', 'loading', 'connectionManager', 'globalize', 'actionsheet', 'paper-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-button', 'listViewStyle', 'material-icons', 'formDialogStyle'],
 function (dialogHelper, loading, connectionManager, globalize, actionsheet) {
 
     return function (options) {
@@ -121,7 +121,7 @@ function (dialogHelper, loading, connectionManager, globalize, actionsheet) {
 
             var html = '';
 
-            html += '<div class="dialogContent">';
+            html += '<div class="formDialogContent">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<form style="margin:auto;">';
 
@@ -170,9 +170,9 @@ function (dialogHelper, loading, connectionManager, globalize, actionsheet) {
             var html = '';
             var title = globalize.translate('MapChannels');
 
-            html += '<div class="dialogHeader" style="margin:0 0 2em;">';
+            html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-            html += '<div class="dialogHeaderTitle">';
+            html += '<div class="formDialogHeaderTitle">';
             html += title;
             html += '</div>';
 
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.js b/dashboard-ui/components/fileorganizer/fileorganizer.js
index 33dce8dd1c..ceb87fa9c9 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.js
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.js
@@ -216,7 +216,7 @@
                     dlg.innerHTML = html;
                     document.body.appendChild(dlg);
 
-                    dlg.querySelector('.dialogHeaderTitle').innerHTML = Globalize.translate('FileOrganizeManually');
+                    dlg.querySelector('.formDialogHeaderTitle').innerHTML = Globalize.translate('FileOrganizeManually');
 
                     dialogHelper.open(dlg);
 
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
index d7eb66d98a..b9124b70ce 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.template.html
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
@@ -1,8 +1,8 @@
-<div class="dialogHeader" style="margin:0 0 2em;">
+<div class="formDialogHeader" style="margin:0 0 2em;">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <i class="md-icon">&#xE5C4;</i>
     </button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
     </div>
 </div>
 
diff --git a/dashboard-ui/components/guestinviter/connectlink.js b/dashboard-ui/components/guestinviter/connectlink.js
index c9ec272c71..214c8607bf 100644
--- a/dashboard-ui/components/guestinviter/connectlink.js
+++ b/dashboard-ui/components/guestinviter/connectlink.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) {
 
     function updateUserInfo(user, newConnectUsername, actionCallback, noActionCallback) {
         var currentConnectUsername = user.ConnectUserName || '';
diff --git a/dashboard-ui/components/guestinviter/connectlink.template.html b/dashboard-ui/components/guestinviter/connectlink.template.html
index f1a6b65df5..660bd6aae4 100644
--- a/dashboard-ui/components/guestinviter/connectlink.template.html
+++ b/dashboard-ui/components/guestinviter/connectlink.template.html
@@ -1,8 +1,8 @@
-<div class="dialogHeader" style="margin:0 0 2em;">
+<div class="formDialogHeader" style="margin:0 0 2em;">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <i class="md-icon">&#xE5C4;</i>
     </button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         Emby Connect
     </div>
 </div>
diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js
index f7ed117eb5..4b7c6239d4 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.js
+++ b/dashboard-ui/components/guestinviter/guestinviter.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) {
 
     function renderLibrarySharingList(context, result) {
 
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html
index 44ca6faea9..bc1ddd90d8 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.template.html
+++ b/dashboard-ui/components/guestinviter/guestinviter.template.html
@@ -1,37 +1,38 @@
-<div class="dialogHeader" style="margin:0 0 2em;">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
-        <i class="md-icon">&#xE5C4;</i>
-    </button>
-    <div class="dialogHeaderTitle">
+<div class="formDialogHeader">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <div class="formDialogHeaderTitle">
         ${HeaderInviteUser}
     </div>
 </div>
+<div class="formDialogContent smoothScrollY" style="padding-top:2em;">
+    <div class="dialogContentInner dialog-content-centered">
+        <form class="addUserForm" style="max-width: none;margin:0;">
 
-<form class="addUserForm" style="max-width: none;margin:0;">
-
-    <div class="inputContainer">
-        <input is="emby-input" type="text" id="txtConnectUsername" value="" label="${LabelConnectGuestUserName}" required />
-        <div class="fieldDescription">
-            <div>${LabelConnectGuestUserNameHelp}</div>
-            <div style="margin-top: .25em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
-        </div>
-    </div>
-
-    <div is="emby-collapse" title="${HeaderShareMediaFolders}">
-        <div class="collapseContent">
-            <div class="librarySharingList">
-
+            <div class="inputContainer">
+                <input is="emby-input" type="text" id="txtConnectUsername" value="" label="${LabelConnectGuestUserName}" required />
+                <div class="fieldDescription">
+                    <div>${LabelConnectGuestUserNameHelp}</div>
+                    <div style="margin-top: .25em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
+                </div>
             </div>
-        </div>
+
+            <div is="emby-collapse" title="${HeaderShareMediaFolders}">
+                <div class="collapseContent">
+                    <div class="librarySharingList">
+
+                    </div>
+                </div>
+            </div>
+            <p class="fieldDescription" style="margin-top:.5em;">${MessageGuestSharingPermissionsHelp}</p>
+            <br />
+            <button is="emby-button" type="submit" class="raised submit block">
+                <i class="md-icon">check</i>
+                <span>${ButtonSendInvitation}</span>
+            </button>
+            <br />
+            <br />
+            <br />
+            <br />
+        </form>
     </div>
-    <p class="fieldDescription" style="margin-top:.5em;">${MessageGuestSharingPermissionsHelp}</p>
-    <br />
-    <button is="emby-button" type="submit" class="raised submit block">
-        <i class="md-icon">check</i>
-        <span>${ButtonSendInvitation}</span>
-    </button>
-    <br />
-    <br />
-    <br />
-    <br />
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index 862756109c..9cf057f71d 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-icon-button-light', 'listViewStyle'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-icon-button-light', 'listViewStyle', 'formDialogStyle'], function (dialogHelper, $) {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index b622650796..c0562c618f 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -1,11 +1,11 @@
-<div class="dialogHeader">
+<div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="dialogHeaderTitle">
+    <div class="formDialogHeaderTitle">
         ${ButtonAddMediaLibrary}
     </div>
 </div>
 
-<div class="dialogContent smoothScrollY" style="padding-top:2em;">
+<div class="formDialogContent smoothScrollY" style="padding-top:2em;">
     <div class="dialogContentInner dialog-content-centered">
         <form style="margin:auto;">
             <div id="fldCollectionType" class="selectContainer">
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f89cba5981..098e61091a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1550,6 +1550,7 @@ var AppInfo = {};
         define("userdataButtons", [embyWebComponentsBowerPath + "/userdatabuttons/userdatabuttons"], returnFirstDependency);
         define("listView", [embyWebComponentsBowerPath + "/listview/listview"], returnFirstDependency);
         define("listViewStyle", ['css!' + embyWebComponentsBowerPath + "/listview/listview"], returnFirstDependency);
+        define("formDialogStyle", ['css!' + embyWebComponentsBowerPath + "/formdialog"], returnFirstDependency);
         define("indicators", [embyWebComponentsBowerPath + "/indicators/indicators"], returnFirstDependency);
 
         if ('registerElement' in document && 'content' in document.createElement('template')) {
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 98ef916c10..3ada0d9ce3 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -228,7 +228,7 @@
 
     function showSyncMenuInternal(options) {
 
-        require(['dialogHelper'], function (dialogHelper) {
+        require(['dialogHelper', 'formDialogStyle'], function (dialogHelper) {
 
             var userId = Dashboard.getCurrentUserId();
 
@@ -254,12 +254,12 @@
 
                 dlg.classList.add('ui-body-a');
                 dlg.classList.add('background-theme-a');
-                dlg.classList.add('popupEditor');
+                dlg.classList.add('formDialog');
 
                 var html = '';
-                html += '<div class="dialogHeader" style="margin:0 0 2em;">';
+                html += '<div class="formDialogHeader">';
                 html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-                html += '<div class="dialogHeaderTitle">';
+                html += '<div class="formDialogHeaderTitle">';
                 html += Globalize.translate('SyncMedia');
                 html += '</div>';
 
@@ -267,6 +267,9 @@
 
                 html += '</div>';
 
+                html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
+                html += '<div class="dialogContentInner dialog-content-centered">';
+
                 html += '<form class="formSubmitSyncRequest" style="margin: auto;">';
 
                 html += '<div class="formFields"></div>';
@@ -277,6 +280,10 @@
 
                 html += '</form>';
 
+                html += '</div>';
+                html += '</div>';
+
+
                 dlg.innerHTML = html;
                 document.body.appendChild(dlg);
 
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 66bef84dfd..cd807751fd 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -158,21 +158,21 @@ div.dialogHeader {
     font-size: 110%;
 }
 
-.ui-body-a div.dialogHeader {
+.ui-body-a div.formDialogHeader {
     background-color: #52B54B;
     color: #fff;
 }
 
-.ui-body-a .dialogHeader a {
+.ui-body-a .formDialogHeader a {
     color: #fff !important;
     text-transform: uppercase;
 }
 
-.ui-body-b div.dialogHeader {
+.ui-body-b div.formDialogHeader {
     background-color: #101010;
 }
 
-.dialogHeaderTitle {
+.formDialogHeaderTitle {
     margin-left: .75em;
 }
 
@@ -183,7 +183,7 @@ div.dialogHeader {
     margin-top: .7em;
 }
 
-.dialogHeader button {
+.formDialogHeader button {
     margin-top: 0;
     margin-bottom: 0;
 }