diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 21b0e8266..aafba23c3 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -1,4 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item,emby-button" data-backbutton="true" data-menubutton="false">
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,emby-checkbox,paper-fab,paper-item-body,paper-icon-item,emby-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
@@ -78,10 +78,13 @@
                     <div class="folderGroupList"></div>
                     <div class="fieldDescription paperCheckboxFieldDescription">${LabelSelectFolderGroupsHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <paper-checkbox class="chkDisplayChannelsInline">${OptionDisplayChannelsInline}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionDisplayChannelsInlineHelp}</div>
+                <br/>
+                <div class="checkboxContainer">
+                    <label>
+                        <input class="chkDisplayChannelsInline" type="checkbox" is="emby-checkbox" />
+                        <span>${OptionDisplayChannelsInline}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionDisplayChannelsInlineHelp}</div>
                 </div>
             </div>
 
@@ -105,8 +108,11 @@
 
                 </div>
 
-                <br />
-                <paper-checkbox class="chkHidePlayedFromLatest">${OptionHideWatchedContentFromLatestMedia}</paper-checkbox>
+                <br/>
+                <label class="checkboxContainer">
+                    <input class="chkHidePlayedFromLatest" type="checkbox" is="emby-checkbox"/>
+                    <span>${OptionHideWatchedContentFromLatestMedia}</span>
+                </label>
 
             </div>
             <button is="emby-button" type="submit" class="raised submit block btnSave hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index 0857a1390..2928ad085 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -4,7 +4,7 @@
 
         var folderHtml = '';
 
-        folderHtml += '<div class="paperCheckboxList">';
+        folderHtml += '<div class="checkboxList">';
         folderHtml += result.map(function (i) {
 
             var currentHtml = '';
@@ -16,7 +16,10 @@
 
             var checkedHtml = isChecked ? ' checked="checked"' : '';
 
-            currentHtml += '<paper-checkbox class="chkGroupFolder" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '>' + i.Name + '</paper-checkbox>';
+            currentHtml += '<label>';
+            currentHtml += '<input type="checkbox" is="emby-checkbox" class="chkGroupFolder" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '/>';
+            currentHtml += '<span>' + i.Name + '</span>';
+            currentHtml += '</label>';
 
             return currentHtml;
 
@@ -31,7 +34,7 @@
 
         var folderHtml = '';
 
-        folderHtml += '<div class="paperCheckboxList">';
+        folderHtml += '<div class="checkboxList">';
         folderHtml += result.Items.map(function (i) {
 
             var currentHtml = '';
@@ -41,7 +44,10 @@
             var isChecked = user.Configuration.LatestItemsExcludes.indexOf(i.Id) == -1;
             var checkedHtml = isChecked ? ' checked="checked"' : '';
 
-            currentHtml += '<paper-checkbox class="chkIncludeInLatest" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '>' + i.Name + '</paper-checkbox>';
+            currentHtml += '<label>';
+            currentHtml += '<input type="checkbox" is="emby-checkbox" class="chkIncludeInLatest" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '/>';
+            currentHtml += '<span>' + i.Name + '</span>';
+            currentHtml += '</label>';
 
             return currentHtml;