diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 0cdee8e9fc..0152cf17b5 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -1,4 +1,4 @@
-<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox,emby-button">
+<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,emby-checkbox,emby-button,emby-select">
 
     <div data-role="content">
 
@@ -6,30 +6,32 @@
 
             <form class="metadataConfigurationForm">
 
-                <div>
-                    <paper-checkbox id="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkEnableInternetProviders" />
+                        <span>${LabelDownloadInternetMetadata}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <paper-checkbox id="chkSaveLocal">${LabelSaveLocalMetadata}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkSaveLocal" />
+                        <span>${LabelSaveLocalMetadata}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <paper-checkbox id="chkDownloadImagesInAdvance">${OptionDownloadImagesInAdvance}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
-                    <br />
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkDownloadImagesInAdvance" />
+                        <span>${OptionDownloadImagesInAdvance}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <label for="selectLanguage" class="selectLabel">${LabelMetadataDownloadLanguage}</label>
-                    <select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}" required="required"></select>
                 </div>
-                <br />
-                <div>
-                    <label for="selectCountry" class="selectLabel">${LabelCountry}</label>
-                    <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectCountry" label="${LabelCountry}" required="required"></select>
                 </div>
                 <br />
                 <div>
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index a74f4e4dbf..d8ecdd8450 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -1,4 +1,4 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked'], function ($) {
 
     function load(page, config, allCultures, allCountries) {
         if (!config || !allCultures || !allCountries) {