diff --git a/dashboard-ui/dashboard/dashboardgeneral.js b/dashboard-ui/dashboard/dashboardgeneral.js
index 7d7f51d313..b87ab58a48 100644
--- a/dashboard-ui/dashboard/dashboardgeneral.js
+++ b/dashboard-ui/dashboard/dashboardgeneral.js
@@ -1,4 +1,4 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked', 'emby-checkbox', 'emby-collapse', 'emby-textarea', 'emby-input', 'emby-select'], function ($) {
 
     var brandingConfigKey = "branding";
     var currentBrandingOptions;
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 6e06cbaacf..1f6304b69f 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -9,9 +9,8 @@
                     <input is="emby-input" type="text" id="txtServerName" label="${LabelFriendlyServerName}" />
                     <div class="fieldDescription">${LabelFriendlyServerNameHelp}</div>
                 </div>
-                <div>
-                    <label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
-                    <select id="selectLocalizationLanguage" data-mini="true"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectLocalizationLanguage" label="${LabelPreferredDisplayLanguage}"></select>
                     <div class="fieldDescription">
                         <div>${LabelPreferredDisplayLanguageHelp}</div>
                         <div style="margin-top: .25em;">
@@ -19,25 +18,28 @@
                         </div>
                     </div>
                 </div>
-                <br /><br />
 
-                <div id="fldRunAtStartup" style="display: none;">
-                    <paper-checkbox id="chkRunAtStartup">${LabelRunServerAtStartup}</paper-checkbox>
-                    <div id="windowsStartupDescription" class="fieldDescription paperCheckboxFieldDescription" style="display: none;">
+                <div id="fldRunAtStartup" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkRunAtStartup" />
+                        <span>${LabelRunServerAtStartup}</span>
+                    </label>
+                    <div id="windowsStartupDescription" class="fieldDescription checkboxFieldDescription" style="display: none;">
                         ${LabelRunServerAtStartupHelp}
                     </div>
-                    <br /><br />
                 </div>
 
-                <div>
-                    <paper-checkbox id="chkUsageData">${OptionEnableAnonymousUsageReporting}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkUsageData" />
+                        <span>${OptionEnableAnonymousUsageReporting}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">
                         ${OptionEnableAnonymousUsageReportingHelp}
                         <div style="margin-top:.5em;">
                             <a target="_blank" href="https://emby.media/privacy">${ButtonLearnMore}</a>
                         </div>
                     </div>
-                    <br /><br />
                 </div>
 
                 <div is="emby-collapse" title="${HeaderAdvanced}">
@@ -59,15 +61,12 @@
                 <div is="emby-collapse" title="${HeaderAutomaticUpdates}">
                     <div class="collapseContent">
                         <br />
-                        <div class="fldAutomaticUpdates">
-                            <div data-role="controlgroup">
-                                <input type="checkbox" id="chkEnableAutomaticServerUpdates" data-mini="true" />
-                                <label for="chkEnableAutomaticServerUpdates">${OptionEnableAutomaticServerUpdates}</label>
-                            </div>
-                        </div>
-                        <div>
-                            <label class="lnlAutomaticUpdateLevel selectLabel" for="selectAutomaticUpdateLevel"></label>
-                            <select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel">
+                        <label class="fldAutomaticUpdates checkboxContainer">
+                            <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticServerUpdates" />
+                            <span>${OptionEnableAutomaticServerUpdates}</span>
+                        </label>
+                        <div class="selectContainer">
+                            <select is="emby-select" id="selectAutomaticUpdateLevel" label="${LabelAutomaticUpdateLevel}">
                                 <option value="Release">${OptionRelease}</option>
                                 <option value="Beta">${OptionBeta}</option>
                                 <option value="Dev">${OptionDev}</option>
@@ -76,11 +75,12 @@
                                 ${DevBuildWarning}
                             </div>
                         </div>
-                        <div id="fldEnableAutomaticRestart" style="display: none;">
-                            <paper-checkbox id="chkEnableAutomaticRestart">${LabelAllowServerAutoRestart}</paper-checkbox>
-                            <div class="fieldDescription paperCheckboxFieldDescription">
-                                ${LabelAllowServerAutoRestartHelp}
-                            </div>
+                        <div id="fldEnableAutomaticRestart" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticRestart" />
+                                <span>${LabelAllowServerAutoRestart}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${LabelAllowServerAutoRestartHelp}</div>
                         </div>
                     </div>
                 </div>
@@ -104,17 +104,17 @@
                 <div is="emby-collapse" title="${HeaderDeveloperOptions}">
                     <div class="collapseContent">
                         <br />
-                        <div>
-                            <paper-checkbox id="chkEnableDashboardResponseCache">${OptionEnableWebClientResponseCache}</paper-checkbox>
+                        <label class="checkboxContainer">
+                            <input is="emby-checkbox" type="checkbox" id="chkEnableDashboardResponseCache" />
+                            <span>${OptionEnableWebClientResponseCache}</span>
+                        </label>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEnableMinification" />
+                                <span>${OptionEnableWebClientResourceMinification}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${OptionDisableForDevelopmentHelp}</div>
                         </div>
-                        <br />
-                        <div>
-                            <paper-checkbox id="chkEnableMinification">${OptionEnableWebClientResourceMinification}</paper-checkbox>
-                        </div>
-                        <div class="fieldDescription paperCheckboxFieldDescription">
-                            ${OptionDisableForDevelopmentHelp}
-                        </div>
-                        <br /><br />
                         <div class="inputContainer">
                             <div style="display: flex; align-items: center;">
                                 <div style="flex-grow:1;">
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ecf98b4948..29fe59c6b6 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1970,7 +1970,6 @@ var AppInfo = {};
 
         defineRoute({
             path: '/dashboardgeneral.html',
-            dependencies: ['emby-collapse', 'emby-textarea', 'emby-input', 'paper-checkbox'],
             controller: 'dashboard/dashboardgeneral',
             autoFocus: false,
             roles: 'admin'