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 ddb0d9ef97..50f0c0d6b5 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
@@ -55,23 +55,28 @@
             height: 4.4vh;
             width: 4.4vh;
             vertical-align: middle;
+            font-size: 4.4vh;
         }
 
     [is="emby-button"].noflex {
         display: inline-block;
     }
 
-    [is="emby-button"].fab.mini {
+    [is="emby-button"].fab.mini:not(.autoSize) {
         min-width: 40px !important;
         min-height: 40px !important;
         height: 3.3vh !important;
         width: 3.3vh !important;
+    }
+
+    [is="emby-button"].fab.mini {
         padding: .4em;
     }
 
         [is="emby-button"].fab.mini i {
-            height: 2.6vh !important;
-            width: 2.6vh !important;
+            height: 2.4vh !important;
+            width: 2.4vh !important;
+            font-size: 2.4vh !important;
         }
 
     [is="emby-button"].fab iron-icon {
@@ -108,6 +113,8 @@
 [is=emby-button].autoSize {
     width: auto !important;
     height: auto !important;
+    min-height: initial !important;
+    min-width: initial !important;
 }
 
 [is=paper-icon-button-light] {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
index 6aa9d731f4..8045e5327f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css
@@ -22,6 +22,10 @@
     width: 100%;
 }
 
+[is="emby-select"] option {
+    color: initial;
+}
+
 .selectContainer {
     margin-bottom: 2em;
 }
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.js b/dashboard-ui/components/imagedownloader/imagedownloader.js
index 704b7e3bcc..b79cd606b4 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.js
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'paper-checkbox', 'paper-fab', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-checkbox', 'paper-fab', 'paper-icon-button-light'], function (dialogHelper, $) {
 
     var currentItemId;
     var currentItemType;
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.template.html b/dashboard-ui/components/imagedownloader/imagedownloader.template.html
index 9492d9cc40..54222e7f30 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.template.html
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.template.html
@@ -1,11 +1,11 @@
-<div style="text-align: center;">
-    <div style="margin: 0; display: inline-block;">
+<div style="text-align: center;display:flex; align-items: center; justify-content: center;margin: 0 0 1em 0;">
+    <div style="margin: 0;">
         <label for="selectImageProvider" style="display: inline-block;">${LabelSource}</label>
         <select id="selectImageProvider" style="padding-left:.5em;padding-right:0;display: inline-block;width:auto!important;">
             <option value="">${OptionAll}</option>
         </select>
     </div>
-    <div style="margin-left:.5em; display: inline-block;">
+    <div style="margin-left:1em;">
         <label for="selectBrowsableImageType" style="display: inline-block;">${LabelImage}</label>
         <select id="selectBrowsableImageType" style="padding-left:.5em;padding-right:0;display: inline-block;width:auto!important;">
             <option value="Primary">${OptionPrimary}</option>
@@ -21,10 +21,11 @@
             <option value="Thumb">${OptionThumb}</option>
         </select>
     </div>
-    <div class="availableImagesPaging" style="display: inline-block;vertical-align: middle;margin-left:.5em;"></div>
-    <div style="display: inline-block; vertical-align: middle; margin-left: .5em;">
-        <paper-checkbox id="chkAllLanguages">${LabelAllLanguages}</paper-checkbox>
-    </div>
+    <div class="availableImagesPaging" style="margin-left:1em;"></div>
+    <label style="margin: 0 0 0 1em;width:auto;">
+        <input id="chkAllLanguages" type="checkbox" is="emby-checkbox" />
+        <span>${LabelAllLanguages}</span>
+    </label>
 </div>
 
 <div class="availableImagesList" style="text-align:center;"></div>
\ No newline at end of file
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index 7c12870f2b..fbd2740bde 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paper-checkbox,emby-input,emby-button,paper-icon-button-light" data-backbutton="true" data-menubutton="false">
+<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,emby-checkbox,emby-input,emby-button,paper-icon-button-light" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="userProfileSettingsForm" style="margin: 0 auto;">
@@ -17,11 +17,11 @@
                 </div>
             </div>
 
-            <div>
-                <paper-checkbox id="chkWifi">${OptionSyncOnlyOnWifi}</paper-checkbox>
-            </div>
+            <label class="checkboxContainer">
+                <input type="checkbox" is="emby-checkbox" id="chkWifi"/>
+                <span>${OptionSyncOnlyOnWifi}</span>
+            </label>
 
-            <br />
             <h1>
                 ${HeaderCameraUpload}
             </h1>
@@ -29,7 +29,7 @@
             <p>${SelectCameraUploadServers}</p>
 
             <br />
-            <div class="paperCheckboxList uploadServerList">
+            <div class="checkboxList uploadServerList">
             </div>
 
             <br />
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index f60694f4a7..1b797e9b92 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -1083,8 +1083,8 @@
                 cssClass += ' checkedInitial';
             }
             var checkedAttribute = isChecked ? ' checked' : '';
-            itemSelectionPanel.innerHTML = '<paper-checkbox class="' + cssClass + '"' + checkedAttribute + '></paper-checkbox>';
-            var chkItemSelect = itemSelectionPanel.querySelector('paper-checkbox');
+            itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>>';
+            var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
             chkItemSelect.addEventListener('change', onSelectionChange);
         }
     }
@@ -1145,7 +1145,7 @@
 
     function showSelections(initialCard) {
 
-        require(['paper-checkbox'], function () {
+        require(['emby-checkbox'], function () {
             var cards = document.querySelectorAll('.card');
             for (var i = 0, length = cards.length; i < length; i++) {
                 showSelection(cards[i], initialCard == cards[i]);
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 3b12ab8ab3..e923e73f75 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -119,7 +119,7 @@
 
     function showActivePlayerMenu(playerInfo) {
 
-        require(['dialogHelper', 'paper-checkbox', ], function (dialogHelper) {
+        require(['dialogHelper', 'emby-checkbox', 'emby-button'], function (dialogHelper) {
             showActivePlayerMenuInternal(dialogHelper, playerInfo);
         });
     }
@@ -147,10 +147,11 @@
 
         if (playerInfo.supportedCommands.indexOf('DisplayContent') != -1) {
 
-            html += '<div>';
+            html += '<label class="checkboxContainer" style="margin-bottom:0;">';
             var checkedHtml = MediaController.enableDisplayMirroring() ? ' checked' : '';
-            html += '<paper-checkbox class="chkMirror"' + checkedHtml + '>' + Globalize.translate('OptionEnableDisplayMirroring') + '</paper-checkbox>';
-            html += '</div>';
+            html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
+            html += '<span>' + Globalize.translate('OptionEnableDisplayMirroring') + '</span>';
+            html += '</label>';
         }
 
         html += '</div>';
diff --git a/dashboard-ui/scripts/mysyncsettings.js b/dashboard-ui/scripts/mysyncsettings.js
index 534aa2c179..0000b378c6 100644
--- a/dashboard-ui/scripts/mysyncsettings.js
+++ b/dashboard-ui/scripts/mysyncsettings.js
@@ -2,7 +2,7 @@
 
     function loadForm(page, user) {
 
-        page.querySelector('#txtSyncPath').value = appSettings.syncPath();
+        page.querySelector('#txtSyncPath').value = appSettings.syncPath() || '';
         page.querySelector('#chkWifi').checked = appSettings.syncOnlyOnWifi();
 
         var uploadServers = appSettings.cameraUploadServers();
@@ -10,7 +10,7 @@
         page.querySelector('.uploadServerList').innerHTML = ConnectionManager.getSavedServers().map(function (s) {
 
             var checkedHtml = uploadServers.indexOf(s.Id) == -1 ? '' : ' checked';
-            var html = '<paper-checkbox' + checkedHtml + ' class="chkUploadServer" data-id="' + s.Id + '">' + s.Name + '</paper-checkbox>';
+            var html = '<label><input type="checkbox" is="emby-checkbox"' + checkedHtml + ' class="chkUploadServer" data-id="' + s.Id + '"/><span>' + s.Name + '</span></label>';
 
             return html;