diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index f81bfefd8..953f8b8ea 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -1,4 +1,4 @@
-<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,emby-select,emby-input,paper-checkbox,emby-button">
+<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,emby-select,emby-input,emby-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -8,10 +8,10 @@
             <form class="notificationSettingForm">
 
                 <br />
-                <div>
-                    <paper-checkbox id="chkEnabled">${LabelNotificationEnabled}</paper-checkbox>
-                </div>
-                <br />
+                <label class="checkboxContainer">
+                    <input type="checkbox" is="emby-checkbox" id="chkEnabled" />
+                    <span>${LabelNotificationEnabled}</span>
+                </label>
                 <br />
 
                 <div class="monitorUsers" style="display: none;">
diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js
index 478ee20ee..745e359ba 100644
--- a/dashboard-ui/scripts/notificationsetting.js
+++ b/dashboard-ui/scripts/notificationsetting.js
@@ -1,10 +1,10 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'emby-checkbox'], function ($) {
 
     var notificationsConfigurationKey = "notifications";
 
     function fillItems(elem, items, cssClass, idPrefix, currentList, isEnabledList) {
 
-        var html = '<div class="paperCheckboxList paperList" style="padding: .5em 1em;">';
+        var html = '<div class="checkboxList paperList" style="padding: .5em 1em;">';
 
         html += items.map(function (u) {
 
@@ -12,7 +12,7 @@
 
             var checkedHtml = isChecked ? ' checked="checked"' : '';
 
-            return '<paper-checkbox class="' + cssClass + '" type="checkbox" data-itemid="' + u.Id + '"' + checkedHtml + '>' + u.Name + '</paper-checkbox>';
+            return '<label><input is="emby-checkbox" class="' + cssClass + '" type="checkbox" data-itemid="' + u.Id + '"' + checkedHtml + '/><span>' + u.Name + '</span></label>';
 
         }).join('');
 
diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js
index 2817ac622..6402578e2 100644
--- a/dashboard-ui/scripts/syncsettings.js
+++ b/dashboard-ui/scripts/syncsettings.js
@@ -1,4 +1,4 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked'], function ($) {
 
     function loadPage(page, config) {
 
diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html
index 323f8dd20..40de156c1 100644
--- a/dashboard-ui/syncsettings.html
+++ b/dashboard-ui/syncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,paper-checkbox,emby-input,emby-button,paper-icon-button-light,material-icons">
+<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,emby-checkbox,emby-input,emby-button,paper-icon-button-light,material-icons">
 
     <div data-role="content">
         <div class="content-primary">
@@ -24,22 +24,20 @@
                         ${LabelConversionCpuCoreLimitHelp}
                     </div>
                 </div>
-                <div>
-                    <paper-checkbox id="chkEnableFullSpeedConversion">${OptionEnableFullSpeedConversion}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">
-                        ${OptionEnableFullSpeedConversionHelp}
-                    </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkEnableFullSpeedConversion" />
+                        <span>${OptionEnableFullSpeedConversion}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionEnableFullSpeedConversionHelp}</div>
                 </div>
                 <br />
-                <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block">
-                        <i class="md-icon">check</i>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
                         <span>${ButtonSave}</span>
                     </button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();">
-                        <i class="md-icon">close</i>
+                    <button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
                         <span>${ButtonCancel}</span>
                     </button>
                 </div>