diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index ec17d9c2f9..fd032ff7ea 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -7,7 +7,7 @@
 
                 <p>${CinemaModeConfigurationHelp}</p>
                 <div style="margin-top: 2em;">
-                    <div class="paperCheckboxListLabel">${LabelEnableCinemaModeFor}</div>
+                    <div class="paperListLabel">${LabelEnableCinemaModeFor}</div>
                     <div class="paperCheckboxList">
                         <paper-checkbox class="chkMovies">${OptionMovies}</paper-checkbox>
                         <paper-checkbox class="chkEpisodes">${OptionEpisodes}</paper-checkbox>
@@ -15,7 +15,7 @@
                 </div>
                 <br />
                 <div>
-                    <div class="paperCheckboxListLabel">${LabelSelectInternetTrailersForCinemaMode}</div>
+                    <div class="paperListLabel">${LabelSelectInternetTrailersForCinemaMode}</div>
                     <div class="paperCheckboxList">
                         <paper-checkbox class="chkUpcomingTheaterTrailers">${OptionUpcomingMoviesInTheaters}</paper-checkbox>
                         <paper-checkbox class="chkUpcomingDvdTrailers">${OptionUpcomingDvdMovies}</paper-checkbox>
diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
index 69148eb425..33c15be14d 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.template.html
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
@@ -59,7 +59,7 @@
                 <paper-checkbox class="chkAllTuners">${OptionEnableForAllTuners}</paper-checkbox>
                 <div class="selectTunersSection hide">
                     <br /><br />
-                    <div class="paperCheckboxListLabel">${HeaderTuners}</div>
+                    <div class="paperListLabel">${HeaderTuners}</div>
                     <div class="paperCheckboxList paperList tunerList">
                     </div>
                 </div>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index c2be846da9..54ec2331ca 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -71,7 +71,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm" style="margin-bottom:0!important;">
                         <li>
-                            <div class="paperCheckboxListLabel">${HeaderExtractChapterImagesFor}</div>
+                            <div class="paperListLabel">${HeaderExtractChapterImagesFor}</div>
                             <div class="paperCheckboxList">
                                 <paper-checkbox id="chkChaptersMovies">${OptionMovies}</paper-checkbox>
 
@@ -103,7 +103,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <div class="paperCheckboxListLabel">${HeaderDownloadPeopleMetadataFor}</div>
+                            <div class="paperListLabel">${HeaderDownloadPeopleMetadataFor}</div>
                             <div class="paperCheckboxList">
                                 <paper-checkbox id="chkPeopleActors">${OptionActors}</paper-checkbox>
 
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 584042f6fd..09ce52a901 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -43,7 +43,7 @@
                             </div>
                         </div>
 
-                        <div class="paperCheckboxListLabel">${HeaderFetchImages}</div>
+                        <div class="paperListLabel">${HeaderFetchImages}</div>
                         <div class="imageSelections paperCheckboxList">
 
                             <paper-checkbox class="imageType hide" data-imagetype="Primary">${OptionDownloadPrimaryImage}</paper-checkbox>
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index d9a91d3ddd..3df928af7c 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -10,14 +10,14 @@
                     <input type="text" id="PreventChromeAutocomplete" name="PreventChromeAutocomplete" autocomplete="address-level4" />
                 </div>
 
-                <div class="paperCheckboxListLabel">${HeaderDownloadSubtitlesFor}</div>
+                <div class="paperListLabel">${HeaderDownloadSubtitlesFor}</div>
                 <div class="paperCheckboxList">
                     <paper-checkbox id="chkSubtitlesMovies">${OptionMovies}</paper-checkbox>
                     <paper-checkbox id="chkSubtitlesEpisodes">${OptionEpisodes}</paper-checkbox>
                 </div>
                 <br />
                 <div>
-                    <div class="paperCheckboxListLabel">${LabelDownloadLanguages}</div>
+                    <div class="paperListLabel">${LabelDownloadLanguages}</div>
                     <div class="downloadLanguages paperList paperCheckboxList" style="max-height: 150px; overflow-y: auto; padding: .5em 1em;">
                     </div>
                 </div>
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index 1e4d61b80b..f8a0fb8083 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -14,7 +14,7 @@
                 </ul>
 
                 <div class="monitorUsers" style="display: none;">
-                    <div class="paperCheckboxListLabel">${LabelMonitorUsers}</div>
+                    <div class="paperListLabel">${LabelMonitorUsers}</div>
                     <div class="monitorUsersList">
                     </div>
                     <br />
diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js
index fbb8e38207..583a0d9ada 100644
--- a/dashboard-ui/scripts/devicesupload.js
+++ b/dashboard-ui/scripts/devicesupload.js
@@ -21,7 +21,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">';
+        html += '<div class="paperListLabel">';
         html += Globalize.translate('LabelEnableCameraUploadFor');
         html += '</div>';
 
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index c0968f2df8..00a0582f48 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -150,7 +150,7 @@
 
         var i, length, plugin, id;
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelImageFetchers') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('LabelImageFetchers') + '</div>';
         html += '<div class="paperList">';
 
         for (i = 0, length = plugins.length; i < length; i++) {
@@ -220,7 +220,7 @@
             return;
         }
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelMetadataSavers') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('LabelMetadataSavers') + '</div>';
         html += '<div class="paperCheckboxList paperList">';
 
         for (var i = 0, length = plugins.length; i < length; i++) {
@@ -253,7 +253,7 @@
 
         var i, length, plugin;
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelMetadataDownloaders') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('LabelMetadataDownloaders') + '</div>';
         html += '<div class="paperList">';
 
         for (i = 0, length = plugins.length; i < length; i++) {
@@ -323,7 +323,7 @@
             return;
         }
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelMetadataReaders') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('LabelMetadataReaders') + '</div>';
         html += '<div class="paperList">';
 
         for (var i = 0, length = plugins.length; i < length; i++) {
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 60394e1628..0eab063d65 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -4,7 +4,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
 
         html += '<div class="paperCheckboxList paperList">';
 
@@ -29,7 +29,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
 
         html += '<div class="paperCheckboxList paperList">';
 
@@ -60,7 +60,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderDevices') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('HeaderDevices') + '</div>';
 
         html += '<div class="paperCheckboxList paperList">';
 
diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index ebd2650f3d..42de474279 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -4,7 +4,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
 
         html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
 
@@ -28,7 +28,7 @@
 
         var html = '';
 
-        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
+        html += '<div class="paperListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
 
         html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
 
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index 9a2a09ee20..58fbb23f8b 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -55,7 +55,7 @@
 
         var html = '';
 
-        html += '<p class="paperCheckboxListLabel">' + Globalize.translate('HeaderBlockItemsWithNoRating') + '</p>';
+        html += '<p class="paperListLabel">' + Globalize.translate('HeaderBlockItemsWithNoRating') + '</p>';
 
         html += '<div class="paperCheckboxList">';
 
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 05741a2888..0c65c09b2a 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -427,16 +427,16 @@ paper-input label, paper-textarea label {
     font-family: inherit !important;
 }
 
-.paperCheckboxListLabel {
+.paperListLabel {
     font-size: 16px;
     margin-bottom: .5em;
 }
 
-.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .paperCheckboxListLabel, .ui-body-b .fieldDescription {
+.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .paperListLabel, .ui-body-b .fieldDescription {
     color: #ccc;
 }
 
-.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .paperCheckboxListLabel, .ui-body-a .fieldDescription {
+.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .paperListLabel, .ui-body-a .fieldDescription {
     color: #656565;
 }
 
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index df67f26685..14d563e492 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -46,7 +46,7 @@
                     </li>
                 </ul>
                 <div id="featureAccessFields">
-                    <div class="paperCheckboxListLabel">${HeaderFeatureAccess}</div>
+                    <div class="paperListLabel">${HeaderFeatureAccess}</div>
                     <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
                         <paper-checkbox id="chkEnableContentDeletion">${OptionAllowDeleteLibraryContent}</paper-checkbox>
                         <paper-checkbox id="chkEnableDownloading">${OptionAllowContentDownloading}</paper-checkbox>
@@ -56,7 +56,7 @@
                 </div>
                 <div>
                     <br />
-                    <div class="paperCheckboxListLabel">${HeaderPlayback}</div>
+                    <div class="paperListLabel">${HeaderPlayback}</div>
                     <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
                         <paper-checkbox id="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</paper-checkbox>
                         <paper-checkbox id="chkEnableAudioPlaybackTranscoding">${OptionAllowAudioPlaybackTranscoding}</paper-checkbox>
@@ -67,7 +67,7 @@
                 </div>
                 <div>
                     <br />
-                    <div class="paperCheckboxListLabel">${HeaderRemoteControl}</div>
+                    <div class="paperListLabel">${HeaderRemoteControl}</div>
                     <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
                         <paper-checkbox id="chkEnableRemoteControlOtherUsers">${OptionAllowRemoteControlOthers}</paper-checkbox>
                         <paper-checkbox id="chkRemoteControlSharedDevices">${OptionAllowRemoteSharedDevices}</paper-checkbox>
@@ -77,7 +77,7 @@
                 </div>
                 <div>
                     <br />
-                    <div class="paperCheckboxListLabel">${HeaderSync}</div>
+                    <div class="paperListLabel">${HeaderSync}</div>
                     <div class="paperCheckboxList paperList" style="padding:.5em 1em;">
                         <paper-checkbox id="chkEnableSync">${OptionAllowSyncContent}</paper-checkbox>
                         <paper-checkbox id="chkEnableSyncTranscoding">${OptionAllowSyncTranscoding}</paper-checkbox>