diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index d13eeb9863..a348b58a1e 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -26,7 +26,7 @@
                             </div>
 
                             <p id="btnInstallDiv" class="hide">
-                                <button is="emby-button" type="submit" id="btnInstall" class="raised submit block">
+                                <button is="emby-button" type="submit" id="btnInstall" class="raised button-submit block">
                                     <i class="md-icon">check</i><span>${Install}</span>
                                 </button>
                             </p>
@@ -64,7 +64,7 @@
                                         <input type="hidden" id="featureId" name="item_number" value="">
                                         <input type="hidden" name="notify_url" value="https://mb3admin.com/admin/service/services/ppipn.php">
                                         <input type="hidden" name="return" id="paypalReturnUrl" value="#">
-                                        <button is="emby-button" type="submit" id="ppButton" class="raised block" style="background-color: #179BD7;color:#fff;">
+                                        <button is="emby-button" type="submit" id="ppButton" class="raised block button-submit" style="background-color: #179BD7;color:#fff;">
                                             <i class="md-icon">check</i>
                                             <span>${RegisterWithPayPal}</span>
                                         </button>
diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index 563f3bc619..708d982149 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -4,10 +4,10 @@
 
             <div>
                 <div style="text-align:right;" class="organizeTaskPanel hide">
-                    <button is="emby-button" type="button" class="btnClearLog raised subdued">
+                    <button is="emby-button" type="button" class="btnClearLog raised button-cancel">
                         <i class="md-icon">clear_all</i><span>${ButtonClear}</span>
                     </button>
-                    <button is="emby-button" type="button" class="btnOrganize raised subdued"><i class="md-icon">check</i><span>${ButtonOrganize}</span></button>
+                    <button is="emby-button" type="button" class="btnOrganize raised button-cancel"><i class="md-icon">check</i><span>${ButtonOrganize}</span></button>
                     <progress max="100" min="0" style="width:100px;" class="organizeProgress"></progress>
                 </div>
                 <div class="listTopPaging">
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 4810f0187c..c7688684eb 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -157,7 +157,7 @@
                     <div class="fieldDescription checkboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index b73b753fb7..33bbfb0094 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.232",
-  "_release": "1.4.232",
+  "version": "1.4.234",
+  "_release": "1.4.234",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.232",
-    "commit": "dd2fb833aae5eca5981718286c39ed32d37b1a21"
+    "tag": "1.4.234",
+    "commit": "6e3e3425ec8e10a968bc92be565f62166da4ae18"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
index 25a65a1ec4..8bbfd86f4b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
@@ -16,7 +16,8 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
 
         items.push({
             name: globalize.translate('sharedcomponents#ButtonOk'),
-            id: 'ok'
+            id: 'ok',
+            type: 'submit'
         });
 
         options.buttons = items;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js b/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
index 4eb5827cbb..7f058515cc 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js
@@ -167,7 +167,7 @@
         html += '</div>';
 
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
+        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
         html += '</div>';
 
         html += '<input type="hidden" class="fldSelectedItemIds" />';
@@ -251,9 +251,9 @@
 
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += title;
-            html += '</div>';
+            html += '</h3>';
 
             html += '<a class="btnHelp" href="https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;display:inline-block;padding:.25em;display:flex;align-items:center;" title="' + globalize.translate('sharedcomponents#Help') + '"><i class="md-icon">info</i><span style="margin-left:.25em;">' + globalize.translate('sharedcomponents#Help') + '</span></a>';
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
index 5cd23133fe..f7c80885cf 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
@@ -16,12 +16,14 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
 
         items.push({
             name: globalize.translate('sharedcomponents#ButtonOk'),
-            id: 'ok'
+            id: 'ok',
+            type: 'submit'
         });
 
         items.push({
             name: globalize.translate('sharedcomponents#ButtonCancel'),
-            id: 'cancel'
+            id: 'cancel',
+            type: 'cancel'
         });
 
         options.buttons = items;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
index 4865d57e33..85cc01a64f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js
@@ -55,7 +55,14 @@ define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'require',
 
             var item = options.buttons[i];
             var autoFocus = i == 0 ? ' autofocus' : '';
-            html += '<button is="emby-button" type="button" class="btnOption raised block formDialogFooterItem" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
+
+            var buttonClass = 'btnOption raised block formDialogFooterItem';
+
+            if (item.type) {
+                buttonClass += ' button-' + item.type;
+            }
+
+            html += '<button is="emby-button" type="button" class="' + buttonClass + '" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
         }
 
         dlg.querySelector('.formDialogFooter').innerHTML = html;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.template.html b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.template.html
index 995fd4967b..61d81d900e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.template.html
@@ -1,5 +1,6 @@
 <div class="formDialogHeader">
-    <h3 class="formDialogHeaderTitle" style="margin-left:1em;"></h3>
+    <h3 class="formDialogHeaderTitle" style="margin-left:.75em;"></h3>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1" style="visibility:hidden;"><i class="md-icon">&#xE5C4;</i></button>
 </div>
 
 <div class="formDialogContent smoothScrollY">
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
index 91b7fa5cb9..45f09ec7b8 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
@@ -30,7 +30,8 @@
 }
 
 .dialog-fullscreen {
-    position: fixed;
+    /* Needed due to formDialog style */
+    position: fixed !important;
     top: 0;
     bottom: 0;
     left: 0;
@@ -38,14 +39,14 @@
     margin: 0;
 }
 
-@media screen and (max-width: 1280px), screen and (max-height: 720px) {
+@media all and (max-width: 1280px), all and (max-height: 720px) {
     .dialog-fixedSize {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        margin: 0;
+        position: fixed !important;
+        top: 0 !important;
+        bottom: 0 !important;
+        left: 0 !important;
+        right: 0 !important;
+        margin: 0 !important;
     }
 }
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index 5a7aa1ac88..e655b4d5cf 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -63,46 +63,46 @@
             font-size: 2.85em;
         }
 
-    .emby-button.noflex {
-        display: inline-block;
-        white-space: nowrap;
+.emby-button-noflex {
+    display: inline-block;
+    white-space: nowrap;
+}
+
+.emby-button.fab.mini {
+    padding: 8px;
+}
+
+    .emby-button.fab.mini > i {
+        height: auto;
+        width: auto;
+        font-size: 1.72em;
     }
 
-    .emby-button.fab.mini {
-        padding: 8px;
-    }
+.emby-button.block {
+    display: block;
+    align-items: center;
+    justify-content: center;
+    margin: .25em 0;
+    width: 100%;
+}
 
-        .emby-button.fab.mini > i {
-            height: auto;
-            width: auto;
-            font-size: 1.72em;
-        }
+.emby-button.raised:focus {
+    box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.4);
+    transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+}
 
-    .emby-button.block {
-        display: block;
-        align-items: center;
-        justify-content: center;
-        margin: .25em 0;
-        width: 100%;
-    }
+.emby-button > i + span {
+    margin-left: .5em;
+}
 
-    .emby-button.raised:focus {
-        box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.4);
-        transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
-    }
+.emby-button span + i {
+    margin-left: .5em;
+}
 
-    .emby-button > i + span {
-        margin-left: .5em;
-    }
-
-    .emby-button span + i {
-        margin-left: .5em;
-    }
-
-    .emby-button.iconRight > i {
-        margin-left: auto;
-        margin-right: .25em;
-    }
+.emby-button.iconRight > i {
+    margin-left: auto;
+    margin-right: .25em;
+}
 
 .emby-button-noflex.iconRight > i {
     position: absolute;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
index 7f20a9e705..1089399d01 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css
@@ -5,7 +5,7 @@
 }
 
 .formDialogHeader {
-    padding: .8em .5em;
+    padding: 1em .5em;
     display: flex;
     align-items: center;
     flex-shrink: 0;
@@ -16,7 +16,10 @@
 }
 
 .formDialogHeaderTitle {
-    margin-left: .5em;
+    margin-left: .25em;
+    /* In case of h1, h2, h3 */
+    margin-top: 0;
+    margin-bottom: 0;
 }
 
 .formDialogContent {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html
index 00c88d81eb..4b8c663eaf 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${Settings}
-    </div>
+    </h3>
 </div>
 <div class="formDialogContent smoothScrollY">
     <form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
index 1cd0080b18..d932b767f6 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
@@ -23,8 +23,7 @@
 
 <div class="guideRequiresUnlock readOnlyContent hide" style="margin: 1em auto; text-align: center; padding: 1em; flex-shrink: 0;">
     <p class="unlockText"></p>
-    <button is="emby-button" type="button" class="raised secondary block btnUnlockGuide">
-        <i class="md-icon">check</i>
+    <button is="emby-button" type="button" class="raised button-submit block btnUnlockGuide">
         <span>${UnlockGuide}</span>
     </button>
 </div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.template.html
index 0a7378148d..3bd0d3cb41 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.template.html
@@ -10,9 +10,9 @@
 
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${HeaderEditImages}
-    </div>
+    </h3>
 </div>
 
 <div class="formDialogContent">
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 fb05a50296..d5a7f7585b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${Identify}
-    </div>
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
@@ -21,7 +21,7 @@
             </div>
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
+                <button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
                     <span>${Search}</span>
                 </button>
             </div>
@@ -43,7 +43,7 @@
             </label>
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised submit block btnSubmit formDialogFooterItem">
+                <button is="emby-button" type="submit" class="raised button-submit block btnSubmit formDialogFooterItem">
                     <span>${ButtonOk}</span>
                 </button>
             </div>
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 7f340d29fc..5a0ede25d9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${Edit}
-    </div>
+    </h3>
     <div style="margin-left: auto; display: flex; align-items: center; justify-content: center;">
         <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
             <i class="md-icon">more_vert</i>
@@ -305,7 +305,7 @@
             </div>
             <br />
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised submit block btnSave formDialogFooterItem">
+                <button is="emby-button" type="submit" class="raised button-submit block btnSave formDialogFooterItem">
                     <span>${Save}</span>
                 </button>
             </div>
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 f1848f5e8c..c3d9ec2ef8 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${Edit}
-    </div>
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
@@ -29,7 +29,7 @@
         </div>
 
         <div class="formDialogFooter">
-            <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
+            <button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
                 <span>${Save}</span>
             </button>
         </div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
index 5994d90937..41d1f05023 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js
@@ -155,7 +155,7 @@
         html += '</div>';
 
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
+        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
         html += '</div>';
 
         html += '<input type="hidden" class="fldSelectedItemIds" />';
@@ -232,9 +232,9 @@
 
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += title;
-            html += '</div>';
+            html += '</h3>';
 
             html += '</div>';
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
index c13ad2597d..abdb383a6d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
@@ -35,7 +35,7 @@ define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'require',
             dialogHelper.close(dlg);
         });
 
-        dlg.querySelector('.dialogContentTitle').innerHTML = options.title || '';
+        dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title || '';
 
         if (options.description) {
             dlg.querySelector('.fieldDescription').innerHTML = options.description;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.template.html b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.template.html
index a12e81c3ee..c52bcb3ebe 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.template.html
@@ -1,22 +1,21 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
-    </div>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
+        <i class="md-icon">&#xE5C4;</i>
+    </button>
+    <h3 class="formDialogHeaderTitle"></h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
-    <div class="dialogContentInner dialog-content-centered">
-        
-        <h1 class="dialogContentTitle"></h1>
+    <div class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
 
         <form>
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtInput" label=""/>
+                <input is="emby-input" type="text" id="txtInput" label="" />
                 <div class="fieldDescription"></div>
             </div>
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem">
+                <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">
                     <span>${ButtonOk}</span>
                 </button>
             </div>
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 365a8a3f67..16be87c4cd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${HeaderNewRecording}
-    </div>
+    </h3>
 </div>
 <div class="formDialogContent smoothScrollY">
     <form class="dialogContentInner dialog-content-centered">
@@ -101,11 +101,11 @@
             <div class="supporterContainer hide formDialogFooterItem">
                 <div class="supporterContainerText"></div>
                 <br/>
-                <button is="emby-button" type="button" class="btnSupporter hide raised accent block">
+                <button is="emby-button" type="button" class="btnSupporter hide raised button-submit block">
                     <span>${HeaderBecomeProjectSupporter}</span>
                 </button>
             </div>
-            <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem">
+            <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">
                 <i class="md-icon recordingDialogSubmitIcon">fiber_manual_record</i>
                 <span>${Record}</span>
             </button>
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 ab54dd335e..c12dfbff3c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${Edit}
-    </div>
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
@@ -27,7 +27,7 @@
             <br />
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem" autofocus>
+                <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit" autofocus>
                     <span>${Save}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js b/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
index 837a5cdd0e..f933190c53 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js
@@ -41,7 +41,7 @@
 
         html += '<br />';
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
+        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
         html += '</div>';
 
         html += '</form>';
@@ -123,9 +123,9 @@
 
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += title;
-            html += '</div>';
+            html += '</h3>';
 
             html += '</div>';
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
index 235ba3d93b..26435439cd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "\u062a\u062e\u0632\u064a\u0646",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
index 55e234ad41..683e3697c0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "\u0417\u0430\u043f\u0438\u0448\u0438",
     "Save": "\u0417\u0430\u043f\u043e\u043c\u043d\u0438",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
index f27576c498..717fb9a84b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Obtenir Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Grava",
     "Save": "Desa",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
index 8429b071ed..da249940c0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
@@ -279,9 +279,9 @@
     "Settings": "Einstellungen",
     "ShowIndicatorsFor": "Zeige Indikatoren f\u00fcr:",
     "NewEpisodes": "Neue Episoden",
-    "HDPrograms": "HD programs",
-    "LiveBroadcasts": "Live broadcasts",
-    "Premieres": "Premieres",
-    "RepeatEpisodes": "Repeat episodes",
-    "DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription."
+    "HDPrograms": "HD Programme",
+    "LiveBroadcasts": "Live\u00fcbertragungen",
+    "Premieres": "Premieren",
+    "RepeatEpisodes": "Wiederholung Episoden",
+    "DvrSubscriptionRequired": "Emby DVR ben\u00f6tigt eine aktive Emby Premiere Mitgliedschaft."
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
index 6b0dda139a..63bec2dd75 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
index 1a0b5148c5..6fdc107497 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
index 7bd03583b6..49fc16de8d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Tallenna",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
index 8274ac7cf1..a06b0cefbd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
index 3fad668b26..70c4fc0d6c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Speichere",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
index 2467b08f3d..9375285179 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "\u05d4\u05e7\u05dc\u05d8",
     "Save": "\u05e9\u05de\u05d5\u05e8",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
index 1b29e5d113..334511dafd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Snimi",
     "Save": "Snimi",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
index 8b5966ff28..8b2776d8bb 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Emby Premiere beszerz\u00e9se",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Felv\u00e9tel",
     "Save": "Ment\u00e9s",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
index 0df5469d5d..87e1062159 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
index 87c8a63d16..c60ead473e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Ottieni Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "Un abbonamento a Emby Premiere \u00e8 necessario per creare registrazioni personalizzate delle serie tv",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Registra",
     "Save": "Salva",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
index ab36d0de95..c52c7c31c7 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
@@ -283,5 +283,5 @@
     "LiveBroadcasts": "\u0422\u0456\u043a\u0435\u043b\u0435\u0439 \u0442\u0430\u0440\u0430\u0442\u044b\u043c\u0434\u0430\u0440",
     "Premieres": "\u041f\u0440\u0435\u043c\u044c\u0435\u0440\u0430\u043b\u0430\u0440",
     "RepeatEpisodes": "\u0411\u04e9\u043b\u0456\u043c\u0434\u0435\u0440\u0434\u0456\u04a3 \u049b\u0430\u0439\u0442\u0430\u043b\u0430\u043d\u0443\u044b",
-    "DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription."
+    "DvrSubscriptionRequired": "Emby DVR \u04af\u0448\u0456\u043d \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 Emby Premiere \u0436\u0430\u0437\u044b\u043b\u044b\u043c\u044b \u049b\u0430\u0436\u0435\u0442"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
index a6b8c5f54b..d2c27d3f49 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "\uc790\ub3d9 \uc2dc\ub9ac\uc988 \ub179\ud654\ub97c \uc608\uc57d\ud558\ub824\uba74 Emby \ud504\ub9ac\ubbf8\uc5b4 \uac00\uc785\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "\ub179\ud654",
     "Save": "\uc800\uc7a5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
index 8274ac7cf1..a06b0cefbd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
index 8289ae5056..aa97d41481 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Salveaza",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
index 07be6064d9..0894664c18 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
@@ -283,5 +283,5 @@
     "LiveBroadcasts": "\u041f\u0440\u044f\u043c\u044b\u0435 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438",
     "Premieres": "\u041f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
     "RepeatEpisodes": "\u041f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u0438\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432",
-    "DvrSubscriptionRequired": "Emby DVR requires an active Emby Premiere subscription."
+    "DvrSubscriptionRequired": "\u0414\u043b\u044f Emby DVR \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere."
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
index 8274ac7cf1..a06b0cefbd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
index f60d815a22..182b6256dd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "Uporaba te funkcionalnosti zahteva aktivno Emby Premiere narocnino.",
     "Record": "Record",
     "Save": "Save",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
index fa330dcaa8..38a3c442aa 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Kay\u0131t",
     "Save": "Kay\u0131t",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
index 508c54eff7..664666cb34 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "\u0417\u0431\u0435\u0440\u0456\u0433\u0442\u0438",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
index d7ab60ac23..b6b8e16ce2 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "Record",
     "Save": "L\u01b0u",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
index 8e78d787a9..31f4a71147 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "\u5f55\u5236",
     "Save": "\u50a8\u5b58",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
index 6607ca3620..2ef7012619 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
@@ -47,7 +47,7 @@
     "HeaderBecomeProjectSupporter": "Get Emby Premiere",
     "MessageActiveSubscriptionRequiredSeriesRecordings": "An active Emby Premiere subscription is required in order to create automated series recordings.",
     "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+    "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV, based on Emby server settings.",
     "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
     "Record": "\u9304\u5f71",
     "Save": "\u5132\u5b58",
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 a3dd99b1a9..12a7eeaa0c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html
@@ -1,6 +1,6 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">${Subtitles}</div>
+    <h3 class="formDialogHeaderTitle">${Subtitles}</h3>
 </div>
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered">
@@ -17,7 +17,7 @@
                 </div>
                 <button type="submit" is="paper-icon-button-light" title="${Search}" class="btnSearchSubtitles" style="flex-shrink: 0;"><i class="md-icon">search</i></button>
             </div>
-            <button is="emby-button" type="submit" class="raised btnSubmit block">${Search}</button>
+            <button is="emby-button" type="submit" class="raised btnSubmit block button-submit">${Search}</button>
         </form>
         <br />
         <div class="subtitleResults"></div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/sync/sync.js b/dashboard-ui/bower_components/emby-webcomponents/sync/sync.js
index 2a706ad61e..7142259192 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/sync/sync.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/sync/sync.js
@@ -393,9 +393,9 @@
             var html = '';
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += globalize.translate('sharedcomponents#Sync');
-            html += '</div>';
+            html += '</h3>';
 
             html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink lnkHelp" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:auto;"><button is="emby-button" type="button" class="mini"><i class="md-icon">info</i><span>' + globalize.translate('sharedcomponents#Help') + '</span></button></a>';
 
@@ -409,7 +409,7 @@
             html += '<div class="formFields"></div>';
 
             html += '<div class="formDialogFooter">';
-            html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem"><span>' + globalize.translate('sharedcomponents#Sync') + '</span></button>';
+            html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem"><span>' + globalize.translate('sharedcomponents#Sync') + '</span></button>';
             html += '</div>';
 
             html += '</form>';
diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
index e7a8624f98..094ffe74fb 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voicedialog.js
@@ -113,9 +113,9 @@ define(['dialogHelper', 'voiceReceiver', 'voiceProcessor', 'globalize', 'emby-bu
             var html = '';
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += globalize.translate('sharedcomponents#VoiceInput');
-            html += '</div>';
+            html += '</h3>';
             html += '</div>';
 
             html += '<div>';
@@ -141,7 +141,7 @@ define(['dialogHelper', 'voiceReceiver', 'voiceProcessor', 'globalize', 'emby-bu
             html += '<p>' + globalize.translate('sharedcomponents#MessageWeDidntRecognizeCommand') + '</p>';
 
             html += '<br/>';
-            html += '<button is="emby-button" type="button" class="submit block btnRetry raised"><i class="md-icon">mic</i><span>' +
+            html += '<button is="emby-button" type="button" class="button-submit block btnRetry raised"><i class="md-icon">mic</i><span>' +
                 globalize.translate('sharedcomponents#ButtonTryAgain') +
                 '</span></button>';
             html += '<p class="blockedMessage hide">' +
diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json
index 5e37c2a3e4..db341575ee 100644
--- a/dashboard-ui/bower_components/iron-meta/.bower.json
+++ b/dashboard-ui/bower_components/iron-meta/.bower.json
@@ -27,14 +27,14 @@
   },
   "main": "iron-meta.html",
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/iron-meta",
+  "homepage": "https://github.com/PolymerElements/iron-meta",
   "_release": "1.1.2",
   "_resolution": {
     "type": "version",
     "tag": "v1.1.2",
     "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
   },
-  "_source": "git://github.com/polymerelements/iron-meta.git",
+  "_source": "git://github.com/PolymerElements/iron-meta.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-meta"
+  "_originalSource": "PolymerElements/iron-meta"
 }
\ No newline at end of file
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 0ac5545bb4..5464094c17 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -90,7 +90,7 @@
                     </div>
                 </div>
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 <p>${CinemaModeConfigurationHelp2}</p>
             </form>
         </div>
diff --git a/dashboard-ui/components/channelmapper/channelmapper.js b/dashboard-ui/components/channelmapper/channelmapper.js
index 1baac16bab..2a6ab5e43a 100644
--- a/dashboard-ui/components/channelmapper/channelmapper.js
+++ b/dashboard-ui/components/channelmapper/channelmapper.js
@@ -172,9 +172,9 @@ function (dialogHelper, loading, connectionManager, globalize, actionsheet) {
 
             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="formDialogHeaderTitle">';
+            html += '<h3 class="formDialogHeaderTitle">';
             html += title;
-            html += '</div>';
+            html += '</h3>';
 
             html += '</div>';
 
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index c5aa93d391..5d70e2fa9a 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -148,7 +148,7 @@
         html += '<div class="results paperList" style="max-height: 300px; overflow-y: auto;"></div>';
 
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">' + Globalize.translate('ButtonOk') + '</button>';
+        html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">' + Globalize.translate('ButtonOk') + '</button>';
         html += '</div>';
 
         html += '</form>';
@@ -247,9 +247,9 @@
                 var html = '';
                 html += '<div class="formDialogHeader">';
                 html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
-                html += '<div class="formDialogHeaderTitle">';
+                html += '<h3 class="formDialogHeaderTitle">';
                 html += options.header || Globalize.translate('HeaderSelectPath');
-                html += '</div>';
+                html += '</h3>';
 
                 html += '</div>';
 
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
index bfc2126447..f358d0006e 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.template.html
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
@@ -1,7 +1,7 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
-    </div>
+    <h3 class="formDialogHeaderTitle">
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
diff --git a/dashboard-ui/components/guestinviter/connectlink.template.html b/dashboard-ui/components/guestinviter/connectlink.template.html
index 660bd6aae4..b0c020ae3c 100644
--- a/dashboard-ui/components/guestinviter/connectlink.template.html
+++ b/dashboard-ui/components/guestinviter/connectlink.template.html
@@ -2,9 +2,9 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <i class="md-icon">&#xE5C4;</i>
     </button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         Emby Connect
-    </div>
+    </h3>
 </div>
 
 <form class="addUserForm" style="max-width: none;margin:0;">
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html
index 15d731361c..6048a5cb8c 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.template.html
+++ b/dashboard-ui/components/guestinviter/guestinviter.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${HeaderInviteUser}
-    </div>
+    </h3>
 </div>
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
     <div class="dialogContentInner dialog-content-centered">
@@ -27,8 +27,7 @@
             <br />
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
-                    <i class="md-icon">check</i>
+                <button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
                     <span>${ButtonSendInvitation}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index 6eb4e006e6..a2e10af2f0 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
+    <h3 class="formDialogHeaderTitle">
         ${ButtonAddMediaLibrary}
-    </div>
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
@@ -30,7 +30,7 @@
             <br />
 
             <div class="formDialogFooter">
-                <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
+                <button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
                     <span>${ButtonOk}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
index b9c4aef2bf..868fa1edf2 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
@@ -1,7 +1,7 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
-    <div class="formDialogHeaderTitle">
-    </div>
+    <h3 class="formDialogHeaderTitle">
+    </h3>
 </div>
 
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
index 83ae72b006..f7f9020d69 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.template.html
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
@@ -21,7 +21,7 @@
             <input is="emby-input" class="txtPass" label="${LabelPassword}" required="required" autocomplete="off" type="password"/>
         </div>
         <div>
-            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+            <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
         </div>
     </div>
 </form>
@@ -60,8 +60,8 @@
             </div>
             <br /><br />
             <div>
-                <button is="emby-button" type="submit" class="raised submit block btnSubmitListingsContainer btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListingsContainer btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="button" class="raised button-cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
             </div>
         </div>
     </form>
diff --git a/dashboard-ui/components/tvproviders/xmltv.template.html b/dashboard-ui/components/tvproviders/xmltv.template.html
index e98a8a08f4..4bbd33c8fa 100644
--- a/dashboard-ui/components/tvproviders/xmltv.template.html
+++ b/dashboard-ui/components/tvproviders/xmltv.template.html
@@ -44,7 +44,7 @@
         <a class="lnkPremiere" href="https://emby.media/premiere">${ButtonLearnMore}</a>
     </div><br />
     <div>
-        <button is="emby-button" type="submit" class="raised submit block btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-        <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+        <button is="emby-button" type="submit" class="raised button-submit block btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+        <button is="emby-button" type="button" class="raised button-cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
     </div>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index 01a58b4952..0f38ccff26 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -15,21 +15,18 @@
                 <input is="emby-input" type="password" id="txtManualPassword" required="required" label="${LabelPassword}" />
             </div>
             <br />
-            <button is="emby-button" type="submit" class="raised accent block">
-                <i class="md-icon">check</i>
+            <button is="emby-button" type="submit" class="raised button-submit block">
                 <span>${ButtonSignIn}</span>
             </button>
             <div class="forgotPassword">
                 <a href="https://emby.media/community/index.php?app=core&module=global&section=lostpass" target="_blank" class="clearLink">
-                    <button is="emby-button" type="button" class="raised cancel block">
-                        <i class="md-icon">close</i>
+                    <button is="emby-button" type="button" class="raised block">
                         <span>${ButtonForgotPassword}</span>
                     </button>
                 </a>
             </div>
             <div class="skip">
-                <button is="emby-button" type="button" class="raised cancel block btnSkipConnect">
-                    <i class="md-icon">close</i>
+                <button is="emby-button" type="button" class="raised block btnSkipConnect">
                     <span>${ButtonSkip}</span>
                 </button>
                 <div class="fieldDescription" style="text-align:center;">${TextConnectToServerManually}</div>
@@ -38,8 +35,7 @@
             <div class="newUsers" style="margin-top: 2em;">
                 <h2 style="text-align: left;">${HeaderNewUsers}</h2>
                 <a href="https://emby.media/community/index.php?app=core&module=global&section=register" target="_blank" class="clearLink">
-                    <button is="emby-button" type="button" class="raised submit block btnSignupForConnect">
-                        <i class="md-icon">add</i>
+                    <button is="emby-button" type="button" class="raised button-accent block btnSignupForConnect">
                         <span>${ButtonSignUp}</span>
                     </button>
                 </a>
@@ -99,12 +95,10 @@
             <div class="recaptchaContainer"></div>
             <br />
 
-            <button is="emby-button" type="submit" class="raised accent block">
-                <i class="md-icon">check</i>
+            <button is="emby-button" type="submit" class="raised button-accent block">
                 <span>${ButtonSignUp}</span>
             </button>
             <button is="emby-button" type="button" class="raised cancel block btnCancelSignup">
-                <i class="md-icon">close</i>
                 <span>${ButtonCancel}</span>
             </button>
         </form>
@@ -117,8 +111,7 @@
                 <p style="margin: 2em 0;" class="embyIntroDownloadMessage"></p>
 
 
-                <button is="emby-button" type="button" class="raised accent block btnWelcomeNext iconRight">
-                    <i class="md-icon">arrow_forward</i>
+                <button is="emby-button" type="button" class="raised button-accent block btnWelcomeNext iconRight">
                     <span>${ButtonNext}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 7aa6b20a80..c83123318d 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -41,11 +41,11 @@
                             <p class="externalUrl"></p>
                             <p class="hide"><a class="btnConnectionHelp" href="#">${HowToConnectFromEmbyApps}</a></p>
                             <div style="margin-top: 1em;">
-                                <button is="emby-button" type="button" class="raised subdued btnRestartContainer hide" onclick="DashboardPage.restart();">
+                                <button is="emby-button" type="button" class="raised button-cancel btnRestartContainer hide" onclick="DashboardPage.restart();">
                                     <i class="md-icon">refresh</i>
                                     <span>${ButtonRestart}</span>
                                 </button>
-                                <button is="emby-button" type="button" id="btnShutdown" class="raised subdued" onclick="DashboardPage.shutdown();">
+                                <button is="emby-button" type="button" id="btnShutdown" class="raised button-cancel" onclick="DashboardPage.shutdown();">
                                     <i class="md-icon">close</i>
                                     <span>${ButtonShutdown}</span>
                                 </button>
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index fefa788c08..1f14196a3c 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -92,7 +92,7 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index 787f1f468c..bb6fbb74d3 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -53,7 +53,7 @@
                 <br />
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index ec54ab37a4..db56eadac6 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -23,7 +23,7 @@
                     <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 8537e7c8f2..073026ea2e 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -328,10 +328,10 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block">
+                    <button is="emby-button" type="submit" class="raised button-submit block">
                         <i class="md-icon">check</i><span>${ButtonSave}</span>
                     </button>
-                    <button is="emby-button" type="button" class="subdued raised block" onclick="Dashboard.navigate('dlnaprofiles.html');">
+                    <button is="emby-button" type="button" class="button-cancel raised block" onclick="Dashboard.navigate('dlnaprofiles.html');">
                         <i class="md-icon">close</i><span>${ButtonCancel}</span>
                     </button>
 
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index be27b1d398..2f47fbddfc 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -50,7 +50,7 @@
                 <br />
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block">
+                    <button is="emby-button" type="submit" class="raised button-submit block">
                         <i class="md-icon">check</i><span>${ButtonSave}</span>
                     </button>
                 </div>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 5e98c03d99..35de4069c3 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -94,7 +94,7 @@
                 </div>
 
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html
index d4272e4c92..3c4bd841ac 100644
--- a/dashboard-ui/home.html
+++ b/dashboard-ui/home.html
@@ -30,7 +30,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="NextUp">
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton button-accent" data-category="NextUp">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html
index 3ae1840a60..f38b4ce0bb 100644
--- a/dashboard-ui/librarydisplay.html
+++ b/dashboard-ui/librarydisplay.html
@@ -50,7 +50,9 @@
                     <div class="fieldDescription checkboxFieldDescription">${OptionEnableExternalContentInSuggestionsHelp}</div>
                 </div>
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block">
+                    <span>${ButtonSave}</span>
+                </button>
 
             </form>
         </div>
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index d5ecab12f6..5303346f84 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -26,7 +26,7 @@
                         <div class="fieldDescription">${LabelToHelp}</div>
                     </div>
                     <br />
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">add</i><span>${ButtonAdd}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">add</i><span>${ButtonAdd}</span></button>
                 </div>
 
             </form>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 6b9ee8054f..b4d6b85d0f 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -71,7 +71,7 @@
                 </div>
 
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
             </form>
 
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index daf305c36f..cf74ed4937 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -90,7 +90,7 @@
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestRecordings}</h1>
                 <button is="emby-button" type="button" class="raised more mini" data-type="latest">${ButtonMore}</button>
-                <button is="emby-button" type="button" class="raised submit mini accent categorySyncButton" data-category="Latest">
+                <button is="emby-button" type="button" class="raised submit mini button-accent categorySyncButton" data-category="Latest">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 5840127075..279fb7acae 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -31,7 +31,7 @@
                         </div>
                         <div>
 
-                            <button is="emby-button" type="button" class="raised btnRefresh block subdued">
+                            <button is="emby-button" type="button" class="raised btnRefresh block button-cancel">
                                 <i class="md-icon">refresh</i>
                                 <span>${ButtonRefreshGuideData}</span>
                             </button>
diff --git a/dashboard-ui/livetvtunerprovider-hdhomerun.html b/dashboard-ui/livetvtunerprovider-hdhomerun.html
index adfc60d993..9955f26a86 100644
--- a/dashboard-ui/livetvtunerprovider-hdhomerun.html
+++ b/dashboard-ui/livetvtunerprovider-hdhomerun.html
@@ -27,8 +27,8 @@
                 <p>${DrmChannelsNotImported}</p>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/livetvtunerprovider-m3u.html b/dashboard-ui/livetvtunerprovider-m3u.html
index 4af50a9f32..daa21f2f6d 100644
--- a/dashboard-ui/livetvtunerprovider-m3u.html
+++ b/dashboard-ui/livetvtunerprovider-m3u.html
@@ -15,8 +15,8 @@
                     </div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 0516f5dfe9..0179f64f28 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -21,13 +21,11 @@
                 <span>${RememberMe}</span>
             </label>
 
-            <button is="emby-button" type="submit" class="raised accent block">
-                <i class="md-icon">check</i>
+            <button is="emby-button" type="submit" class="raised button-submit block">
                 <span>${ButtonSignIn}</span>
             </button>
             <div style="margin-top:.5em;">
                 <button is="emby-button" type="button" class="raised cancel block btnCancel">
-                    <i class="md-icon">close</i>
                     <span>${ButtonCancel}</span>
                 </button>
             </div>
@@ -45,7 +43,6 @@
 
             <div class="readOnlyContent" style="margin: 2em auto 0;">
                 <button is="emby-button" type="button" class="raised cancel block btnManual">
-                    <i class="md-icon">lock</i>
                     <span>${ButtonManualLogin}</span>
                 </button>
             </div>
@@ -53,14 +50,12 @@
 
         <div class="readOnlyContent" style="margin: .5em auto 1em;">
             <button is="emby-button" type="button" class="raised cancel block btnForgotPassword">
-                <i class="md-icon">info</i>
                 <span>${ButtonForgotPassword}</span>
             </button>
 
             <div class="connectButtons hide">
                 <a href="selectserver.html" class="clearLink">
                     <button is="emby-button" type="button" class="raised cancel block">
-                        <i class="md-icon">settings</i>
                         <span>${ButtonChangeServer}</span>
                     </button>
                 </a>
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 0152cf17b5..bb57c2d419 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -35,7 +35,7 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 954c99bf1a..52835febb8 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -59,7 +59,7 @@
 
                     <br />
                     <br />
-                    <div><button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
+                    <div><button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
                 </form>
             </div>
 
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 9cd0cf528c..be0dc5a5aa 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -42,7 +42,7 @@
                     </label>
                     <div class="fieldDescription checkboxFieldDescription">${LabelKodiMetadataEnableExtraThumbsHelp}</div>
                 </div>
-                <div><button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
             </form>
         </div>
 
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 35887f0fcb..98b0a2dadc 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -62,7 +62,7 @@
                 </div>
 
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index a42af6912d..5f69d8c1df 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -26,7 +26,7 @@
         <div id="resumableSection" class="homePageSection hide">
             <div>
                 <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderResume}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Resume">
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton button-accent" data-category="Resume">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
@@ -38,7 +38,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderLatestMovies}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Latest">
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton button-accent" data-category="Latest">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index b682bbf2b8..6dc70f2589 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -89,7 +89,7 @@
                     </label>
                 </div>
             </div>
-            <button is="emby-button" type="submit" class="raised submit block btnSave hide">
+            <button is="emby-button" type="submit" class="raised button-submit block btnSave hide">
                 <i class="md-icon">check</i>
                 <span>${ButtonSave}</span>
             </button>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 62db1aca53..257f8561cc 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -111,7 +111,7 @@
                 </label>
 
             </div>
-            <button is="emby-button" type="submit" class="raised submit block btnSave hide">
+            <button is="emby-button" type="submit" class="raised button-submit block btnSave hide">
                 <i class="md-icon">check</i>
                 <span>${ButtonSave}</span>
             </button>
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index de6e463c7c..bebe736005 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -94,7 +94,7 @@
                 </div>
             </div>
 
-            <button is="emby-button" type="submit" class="raised submit block btnSave hide">
+            <button is="emby-button" type="submit" class="raised button-submit block btnSave hide">
                 <i class="md-icon">check</i>
                 <span>${ButtonSave}</span>
             </button>
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 84c6ba2e52..f230ade6a2 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -8,7 +8,7 @@
             <div style="vertical-align:top;margin: .5em 0 0 1em;display:inline-block;">
                 <h2 class="username" style="margin: 0;"></h2>
                 <br />
-                <button is="emby-button" type="button" class="raised cancel hide" id="btnDeleteImage">
+                <button is="emby-button" type="button" class="raised hide" id="btnDeleteImage">
                     <i class="md-icon">delete</i>
                     <span>${ButtonDeleteImage}</span>
                 </button>
@@ -61,7 +61,7 @@
                     <input is="emby-input" type="password" id="txtNewPasswordConfirm" label="${LabelNewPasswordConfirm}" autocomplete="off" />
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     <button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide">
                         <i class="md-icon">lock</i>
                         <span>${ButtonResetPassword}</span>
@@ -88,7 +88,7 @@
                     <div class="fieldDescription checkboxFieldDescription">${LabelInNetworkSignInWithEasyPasswordHelp}</div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block">
+                    <button is="emby-button" type="submit" class="raised button-submit block">
                         <i class="md-icon">check</i><span>${ButtonSave}</span>
                     </button>
                     <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide">
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 6fba76f601..73a894e692 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -18,7 +18,7 @@
 
         <div class="supporterPromotionContainer hide" style="text-align: right; position: static;">
             <div class="customSupporterPromotion supporterPromotion inlineSupporterPromotion">
-                <button is="emby-button" type="button" class="raised accent block btnSyncSupporter">
+                <button is="emby-button" type="button" class="raised button-accent block btnSyncSupporter">
                     <div class="mainText">
                     </div>
                     <div class="btnLearnMore" style="font-weight: normal; margin-top: .25em;">
@@ -30,7 +30,7 @@
         <div class="ehsContent" style="clear:both;">
             <br />
             <div class="localSyncStatus hide" style="text-align:right;margin:0 0 1em;">
-                <button type="button" is="emby-button" class="btnSyncNow mini accent fab autoSize" style="margin-right:.5em;"><i class="md-icon">sync</i></button>
+                <button type="button" is="emby-button" class="btnSyncNow mini button-accent fab autoSize" style="margin-right:.5em;"><i class="md-icon">sync</i></button>
             </div>
             <div class="syncActivity">
 
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index 8e0ffcfbe9..f81bfefd84 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -57,9 +57,9 @@
                 </div>
                 <div>
                     <br />
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index c7559eb01c..cc5727280e 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -174,7 +174,7 @@
                                 <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageText" label="${LabelMessageText}" required />
                             </div>
                             <p>
-                                <button is="emby-button" class="sendMessageElement accent block raised" type="submit" raised>${ButtonSend}</button>
+                                <button is="emby-button" class="sendMessageElement button-submit block raised" type="submit" raised>${ButtonSend}</button>
                             </p>
                         </form>
                     </div>
@@ -187,7 +187,7 @@
                                 <input is="emby-input" class="typeTextElement" type="text" id="txtTypeText" label="${LabelTypeText}" required />
                             </div>
                             <p>
-                                <button is="emby-button" class="typeTextElement accent block raised" type="submit" raised>${ButtonSend}</button>
+                                <button is="emby-button" class="typeTextElement button-submit block raised" type="submit" raised>${ButtonSend}</button>
                             </p>
                         </form>
                     </div>
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 802eeaea12..1a1c6de4b7 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -25,7 +25,7 @@
 
 
                 <br />
-                <div><button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
+                <div><button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3cf7251cd3..01b30b4514 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1617,6 +1617,7 @@ var AppInfo = {};
     function onDialogOpen(dlg) {
         if (dlg.classList.contains('formDialog')) {
             if (!dlg.classList.contains('background-theme-a')) {
+
                 dlg.classList.add('background-theme-b');
                 dlg.classList.add('ui-body-b');
             }
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 4673d68d94..458198dd48 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -12,7 +12,7 @@
 
         html += '<br/>';
         html += '<br/>';
-        html += '<button is="emby-button" type="submit" class="raised submit block"><span>' + Globalize.translate('ButtonSave') + '</span></button>';
+        html += '<button is="emby-button" type="submit" class="raised button-submit block"><span>' + Globalize.translate('ButtonSave') + '</span></button>';
 
         page.querySelector('.syncJobForm').innerHTML = html;
 
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index 7284c3090c..c938edfaf1 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -32,7 +32,7 @@
 
             <div class="connectLogin hide" style="margin:1em 0;">
                 <a href="connectlogin.html?mode=connect" class="clearLink">
-                    <button is="emby-button" type="button" class="raised accent block">
+                    <button is="emby-button" type="button" class="raised button-accent block">
                         <i class="md-icon">check</i>
                         <span>${ButtonSignInWithConnect}</span>
                     </button>
diff --git a/dashboard-ui/serviceworker.js b/dashboard-ui/serviceworker.js
index be85aeb51b..fba101b81f 100644
--- a/dashboard-ui/serviceworker.js
+++ b/dashboard-ui/serviceworker.js
@@ -1,102 +1 @@
-var staticFileCacheName = 'staticfiles';
-var staticFileList;
-
-var baseUrl = self.location.toString().substring(0, self.location.toString().lastIndexOf('/'));
-var staticFileBaseUrl = baseUrl + '/staticfiles';
-
-console.log('service worker location: ' + self.location);
-console.log('service worker base url: ' + baseUrl);
-
-function getStaticFileList() {
-
-    if (staticFileList) {
-        return Promise.resolve(staticFileList);
-    }
-
-    return fetch('staticfiles').then(function (response) {
-        return response.json().then(function (list) {
-            staticFileList = list;
-            return list;
-        });
-    });
-}
-
-self.addEventListener('install', function (event) {
-    event.waitUntil(
-      caches.open(staticFileCacheName).then(function (cache) {
-          return getStaticFileList().then(function (files) {
-              return cache.addAll(files);
-          });
-      })
-    );
-});
-
-function isCacheable(request) {
-
-    if ((request.method || '').toUpperCase() !== 'GET') {
-        return false;
-    }
-
-    var url = request.url || '';
-
-    if (url.indexOf(baseUrl) != 0) {
-        return false;
-    }
-
-    if (url.indexOf(staticFileBaseUrl) == 0) {
-        return false;
-    }
-
-    return true;
-}
-
-if (self.location.toString().indexOf('localhost') == -1) {
-    self.addEventListener('fetch', function (event) {
-
-        if (!isCacheable(event.request)) {
-            return;
-        }
-
-        event.respondWith(
-          caches.open(staticFileCacheName).then(function (cache) {
-              return cache.match(event.request).then(function (response) {
-                  return response || fetch(event.request).then(function (response) {
-                      cache.put(event.request, response.clone());
-                      return response;
-                  });
-              });
-          })
-        );
-    });
-}
-
-self.addEventListener('activate', function (event) {
-
-    event.waitUntil(
-      caches.open(staticFileCacheName).then(function (cache) {
-          return getStaticFileList().then(function (staticFiles) {
-
-              var setOfExpectedUrls = new Set(staticFiles);
-
-              return cache.keys().then(function (existingRequests) {
-
-                  var existingBaseUrl = baseUrl + '/';
-
-                  return Promise.all(
-                    existingRequests.map(function (existingRequest) {
-                        if (!setOfExpectedUrls.has(existingRequest.url.replace(existingBaseUrl, ''))) {
-
-                            console.log('deleting cached file: ' + existingRequest.url);
-                            return cache.delete(existingRequest);
-                        }
-                    })
-                  );
-              });
-          });
-      }).then(function () {
-          return self.clients.claim();
-      })
-    );
-});
-
 importScripts("bower_components/emby-webcomponents/serviceworker/notifications.js", "bower_components/emby-webcomponents/serviceworker/sync.js");
\ No newline at end of file
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 246fa34533..86bf02f6b1 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -18,7 +18,7 @@
                     </select>
                     <div class="fieldDescription">${LabelChannelStreamQualityHelp}</div>
                 </div>
-                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index ba8c174185..fb7147edee 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -13,7 +13,7 @@
                     <div class="supporterContainer hide">
                         <br />
                         <a class="clearLink" href="http://emby.media/premiere" target="_blank">
-                            <button is="emby-button" type="button" class="raised block accent"><i class="md-icon">check</i><span>${HeaderBecomeProjectSupporter}</span></button>
+                            <button is="emby-button" type="button" class="raised block button-accent"><i class="md-icon">check</i><span>${HeaderBecomeProjectSupporter}</span></button>
                         </a>
                     </div>
                 </div>
@@ -41,7 +41,7 @@
 
                     </div>
                     <p>
-                        <button is="emby-button" type="submit" id="mbLegacyKeyBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" id="mbLegacyKeyBtn" class="raised block button-submit"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </p>
                 </form>
                 <br />
@@ -53,7 +53,7 @@
                                 <div class="fieldDescription">${LabelSupporterEmailAddress}</div>
                             </div>
                             <p>
-                                <button is="emby-button" type="submit" id="mbRetrieveKeyBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonRetrieveKey}</span></button>
+                                <button is="emby-button" type="submit" id="mbRetrieveKeyBtn" class="raised block button-submit"><i class="md-icon">check</i><span>${ButtonRetrieveKey}</span></button>
                             </p>
                         </form>
                     </div>
@@ -78,7 +78,7 @@
                                 <input is="emby-input" type="password" required id="txtOldKey" label="${LabelOldSupporterKey}" />
                             </div>
                             <p>
-                                <button is="emby-button" type="submit" id="mbLinkKeysBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonLinkKeys}</span></button>
+                                <button is="emby-button" type="submit" id="mbLinkKeysBtn" class="raised block button-submit"><i class="md-icon">check</i><span>${ButtonLinkKeys}</span></button>
                             </p>
                         </form>
                     </div>
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 8231ff210b..a06a2cf344 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -1,46 +1,36 @@
-button.emby-button:not(.fab).blue {
-    color: #03a9f4;
-}
-
-    button.emby-button:not(.fab).blue:hover {
-        background: #e1f5f3;
-    }
-
-button.emby-button.menuButton {
-    color: #212121;
-    text-align: left;
-}
-
-    button.emby-button.menuButton:hover {
-        background: #e1f5f3;
-    }
-
-
-button.emby-button.submit {
-    color: #52B54B;
-}
-
-.ui-body-a .emby-button.raised {
-    background: #52B54B;
+.ui-body-a .raised {
+    background: #3388cc;
     color: #fff;
 }
 
-.ui-body-b .emby-button.raised {
+.ui-body-b .raised {
     background: #404040;
     color: #fff;
 }
 
-.ui-body-a .emby-button.raised.subdued {
+.ui-body-a .button-submit {
+    background: #52B54B;
+    color: #fff;
+}
+
+.ui-body-a .button-cancel {
     background: #fff;
     color: inherit;
 }
 
-.ui-body-b .emby-button.raised.subdued {
-    background: #262626;
+.ui-body-b .button-submit {
+    background: #52B54B;
+    color: #fff;
 }
 
-button.emby-button.more {
-    color: #3388cc;
+.ui-body-a .button-accent {
+    background: #52B54B;
+    color: #fff;
+}
+
+.ui-body-b .button-accent {
+    background: #52B54B;
+    color: #fff;
 }
 
 button.emby-button.raised.more {
@@ -48,61 +38,7 @@ button.emby-button.raised.more {
     color: #fff;
 }
 
-button.emby-button.secondary {
-    color: #4285f4;
-}
-
-button.emby-button.raised.secondary {
-    background: #4285f4;
-    color: #fff;
-}
-
-button.emby-button.accent {
-    color: #52B54B;
-}
-
-button.emby-button.raised.accent {
-    background: #52B54B;
-    color: #fff;
-}
-
-button.emby-button.alt {
-    color: #F57F17;
-}
-
-button.emby-button.raised.alt {
-    background: #F57F17;
-    color: #fff;
-}
-
-.ui-body-b button.emby-button.cancel {
-    color: #444;
-}
-
-.ui-body-b button.emby-button.raised.cancel {
-    background: #444;
-    color: #fff;
-}
-
-button.emby-button.cancelDark {
-    color: #444;
-}
-
-button.emby-button.raised.cancelDark {
-    background: #444;
-    color: #fff;
-}
-
-.ui-body-b button.emby-button.raised.subdued:not([disabled]) {
-    background: #404040;
-    color: #fff;
-}
-
-.ui-body-b button.emby-button.raised[disabled].subdued {
-    background: #111;
-}
-
-button.emby-button span {
+.emby-button > span {
     vertical-align: middle;
 }
 
@@ -160,4 +96,4 @@ div.dialogHeader {
 .ui-body-a .formDialogHeader a {
     color: #fff !important;
     text-transform: uppercase;
-}
\ No newline at end of file
+}
diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html
index c4963a4204..04c75c61b1 100644
--- a/dashboard-ui/tv.html
+++ b/dashboard-ui/tv.html
@@ -30,7 +30,7 @@
         <div id="resumableSection" class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Resume">
+                <button is="emby-button" type="button" class="raised mini categorySyncButton button-accent" data-category="Resume">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
@@ -42,7 +42,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="NextUp">
+                <button is="emby-button" type="button" class="raised mini categorySyncButton button-accent" data-category="NextUp">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
@@ -55,7 +55,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestEpisodes}</h1>
-                <button is="emby-button" type="button" class="raised submit mini categorySyncButton accent" data-category="Latest">
+                <button is="emby-button" type="button" class="raised mini categorySyncButton button-accent" data-category="Latest">
                     <span>${ButtonSync}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 02547da144..9feae19b85 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -40,9 +40,9 @@
 
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html
index c93ac2fd52..9f020758d5 100644
--- a/dashboard-ui/wizardagreement.html
+++ b/dashboard-ui/wizardagreement.html
@@ -18,11 +18,11 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued">
+                    <button is="emby-button" type="button" onclick="history.back();" class="raised">
                         <i class="md-icon">arrow_back</i>
                         <span>${LabelPrevious}</span>
                     </button>
-                    <button is="emby-button" type="submit" class="raised raised accent">
+                    <button is="emby-button" type="submit" class="raised button-accent">
                         <span>${LabelNext}</span>
                         <i class="md-icon">arrow_forward</i>
                     </button>
diff --git a/dashboard-ui/wizardcomponents.html b/dashboard-ui/wizardcomponents.html
index 0359e6ccf6..9343c9300e 100644
--- a/dashboard-ui/wizardcomponents.html
+++ b/dashboard-ui/wizardcomponents.html
@@ -51,11 +51,11 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued">
+                    <button is="emby-button" type="button" onclick="history.back();" class="raised">
                         <i class="md-icon">arrow_back</i>
                         <span>${LabelPrevious}</span>
                     </button>
-                    <button is="emby-button" type="submit" class="raised raised accent">
+                    <button is="emby-button" type="submit" class="raised button-accent">
                         <span>${LabelNext}</span>
                         <i class="md-icon">arrow_forward</i>
                     </button>
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index 699d00d2a0..eaead9024f 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -37,8 +37,8 @@
             </p>
 
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised btnWizardNext accent"><i class="md-icon">check</i><span>${LabelFinish}</span></button>
+                <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnWizardNext button-accent"><i class="md-icon">check</i><span>${LabelFinish}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index 1dab98491f..275616c32b 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -16,8 +16,8 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised accent" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised button-accent" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html
index 87d9457f1f..ee07ae0148 100644
--- a/dashboard-ui/wizardlivetvguide.html
+++ b/dashboard-ui/wizardlivetvguide.html
@@ -27,8 +27,8 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised btnNext accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnNext button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 <button is="emby-button" type="button" class="raised btnSkip" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button>
             </div>
         </div>
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index 39a5252fe2..ac49c12e93 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -27,8 +27,8 @@
                 </div>
                 <br />
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                    <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                     <button is="emby-button" type="button" class="btnSkip raised" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index 0d07194572..0b3bfc80a1 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -14,8 +14,8 @@
             <p>${WindowsServiceIntro2}</p>
 
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" id="btnNextPage" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" id="btnNextPage" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index 7ce1652c95..c5e208d248 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -29,8 +29,8 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                    <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 63b52d69b0..dd514113b5 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -22,7 +22,7 @@
                 <br />
 
                 <div class="wizardNavigation" style="text-align:right;">
-                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                    <button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index 8a0c1b8d2b..12257dac2e 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -24,8 +24,8 @@
                 </div>
                 <br />
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
+                    <button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>