diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index 70bc0bc1f7..9d6a9ba224 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -1,4 +1,4 @@
-<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,paper-checkbox,emby-input,emby-select,emby-collapse,emby-button">
+<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,emby-checkbox,emby-input,emby-select,emby-collapse,emby-button">
     <div data-role="content">
         <div class="content-primary">
             <form class="liveTvSettingsForm">
@@ -22,9 +22,12 @@
                     </select>
                     <div class="fieldDescription">${LabelNumberOfGuideDaysHelp}</div>
                 </div>
-                <div class="paperCheckboxList">
-                    <label>${LabelEnableInternetMetadataForTvPrograms}</label>
-                    <paper-checkbox id="chkMovies">${OptionTVMovies}</paper-checkbox>
+                <h3 class="checkboxListLabel">${LabelEnableInternetMetadataForTvPrograms}</h3>
+                <div class="checkboxList">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkMovies" />
+                        <span>${OptionTVMovies}</span>
+                    </label>
                 </div>
                 <br />
                 <div class="inputContainer">
@@ -36,11 +39,10 @@
                     </div>
                     <div class="fieldDescription">${LabelRecordingPathHelp}</div>
                 </div>
-                <div>
-                    <paper-checkbox id="chkEnableRecordingSubfolders">${OptionEnableRecordingSubfolders}</paper-checkbox>
-                </div>
-                <br />
-                <br />
+                <label class="checkboxContainer">
+                    <input type="checkbox" is="emby-checkbox" id="chkEnableRecordingSubfolders" />
+                    <span>${OptionEnableRecordingSubfolders}</span>
+                </label>
                 <div class="inputContainer">
                     <div style="display: flex; align-items: center;">
                         <div style="flex-grow:1;">
@@ -57,29 +59,32 @@
                         <button type="button" is="paper-icon-button-light" id="btnSelectSeriesRecordingPath" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button>
                     </div>
                 </div>
-                <div>
-                    <paper-checkbox id="chkOrganize">${OptionSendRecordingsToAutoOrganize}</paper-checkbox>
-                </div>
-                <br />
-                <br />
-                <div>
-                    <paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox>
+                <label class="checkboxContainer">
+                    <input type="checkbox" is="emby-checkbox" id="chkOrganize" />
+                    <span>${OptionSendRecordingsToAutoOrganize}</span>
+                </label>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkConvertRecordings" />
+                        <span>${OptionConvertRecordingsToStreamingFormat}</span>
+                    </label>
                     <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
                     <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
                 </div>
-                <br />
-                <div>
-                    <paper-checkbox id="chkPreserveAudio">${OptionConvertRecordingPreserveAudio}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingPreserveAudioHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkPreserveAudio" />
+                        <span>${OptionConvertRecordingPreserveAudio}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionConvertRecordingPreserveAudioHelp}</div>
                 </div>
-                <br />
                 <div>
                     <h1>${HeaderDefaultPadding}</h1>
                     <div class="inputContainer">
-                        <input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"/>
+                        <input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" />
                     </div>
                     <div class="inputContainer">
-                        <input is="emby-input" type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"/>
+                        <input is="emby-input" type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}" />
                     </div>
                 </div>
                 <br />
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 1429fe4418..0183d1a748 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -116,12 +116,6 @@ button.emby-button.mini:not(.fab) {
     padding: 0.4em 0.7em;
 }
 
-button.emby-button.notext {
-    min-width: 2.8em;
-    padding-left: .25em !important;
-    padding-right: .25em !important;
-}
-
 .ui-body-b .paperListLabel, .ui-body-b .fieldDescription, .ui-body-b .selectLabelUnfocused, .ui-body-b .inputLabelUnfocused, .ui-body-b .textareaLabelUnfocused {
     color: #ccc;
 }