diff --git a/dashboard-ui/dashboard/librarydisplay.js b/dashboard-ui/dashboard/librarydisplay.js
index d6150215fb..29b2fe1d7c 100644
--- a/dashboard-ui/dashboard/librarydisplay.js
+++ b/dashboard-ui/dashboard/librarydisplay.js
@@ -1,4 +1,4 @@
-define(['globalize'], function (globalize) {
+define(['globalize', 'emby-checkbox', 'emby-button'], function (globalize) {
 
     function getTabs() {
         return [
diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html
index f29e22f1b5..72676b3e73 100644
--- a/dashboard-ui/librarydisplay.html
+++ b/dashboard-ui/librarydisplay.html
@@ -3,30 +3,37 @@
     <div data-role="content">
         <div class="content-primary">
             <form>
-                <div>
-                    <paper-checkbox class="chkFolderView">${OptionDisplayFolderView}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionDisplayFolderViewHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkFolderView" />
+                        <span>${OptionDisplayFolderView}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionDisplayFolderViewHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <paper-checkbox class="chkDisplaySpecialsWithinSeasons">${LabelDisplaySpecialsWithinSeasons}</paper-checkbox>
+                <label class="checkboxContainer">
+                    <input type="checkbox" is="emby-checkbox" class="chkDisplaySpecialsWithinSeasons"/>
+                    <span>${LabelDisplaySpecialsWithinSeasons}</span>
+                </label>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkGroupMoviesIntoCollections" />
+                        <span>${LabelGroupMoviesIntoCollections}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
                 </div>
-                <br /><br />
-                <div>
-                    <paper-checkbox class="chkGroupMoviesIntoCollections">${LabelGroupMoviesIntoCollections}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
-                </div>
-                <br />
 
-                <div>
-                    <paper-checkbox class="chkDisplayCollectionView">${LabelDisplayCollectionsView}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkDisplayCollectionView" />
+                        <span>${LabelDisplayCollectionsView}</span>
+                    </label>
+
+                    <div class="fieldDescription checkboxFieldDescription">
                         <div>${LabelDisplayCollectionsViewHelp}</div>
                         <div><a href="https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank">${ButtonLearnMore}</a></div>
                     </div>
                 </div>
                 <br />
-                <br />
                 <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
             </form>
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 29fe59c6b6..502eab06eb 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2145,7 +2145,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/librarydisplay.html',
-            dependencies: ['emby-button', 'paper-checkbox'],
+            dependencies: [],
             autoFocus: false,
             roles: 'admin',
             controller: 'dashboard/librarydisplay'