diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index 2be6cff2c4..ce9ddfc4f1 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -19,47 +19,37 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtPortNumber">${LabelLocalHttpServerPortNumber}</label>
-                            <input type="number" id="txtPortNumber" name="txtPortNumber" pattern="[0-9]*" required="required" min="1" />
+                            <paper-input type="number" id="txtPortNumber" label="${LabelLocalHttpServerPortNumber}" pattern="[0-9]*" required="required" min="1"></paper-input>
                             <div class="fieldDescription">${LabelLocalHttpServerPortNumberHelp}</div>
                         </li>
                         <li>
-                            <label for="txtPublicPort">${LabelPublicHttpPort}</label>
-                            <input type="number" id="txtPublicPort" pattern="[0-9]*" required="required" min="1" />
+                            <paper-input type="number" label="${LabelPublicHttpPort}" id="txtPublicPort" pattern="[0-9]*" required="required" min="1"></paper-input>
                             <div class="fieldDescription">${LabelPublicHttpPortHelp}</div>
                         </li>
                         <li>
-                            <label for="txtDdns">${LabelExternalDDNS}</label>
-                            <input id="txtDdns" />
+                            <paper-input id="txtDdns" type="text" label="${LabelExternalDDNS}"></paper-input>
                             <div class="fieldDescription">${LabelExternalDDNSHelp}</div>
                         </li>
                         <li>
-                            <label for="txtHttpsPort">${LabelHttpsPort}</label>
-                            <input type="number" id="txtHttpsPort" pattern="[0-9]*" required="required" min="1" />
+                            <paper-input type="number" id="txtHttpsPort" pattern="[0-9]*" required="required" min="1" label="${LabelHttpsPort}"></paper-input>
                             <div class="fieldDescription">${LabelHttpsPortHelp}</div>
                         </li>
                         <li>
-                            <label for="txtPublicHttpsPort">${LabelPublicHttpsPort}</label>
-                            <input type="number" id="txtPublicHttpsPort" pattern="[0-9]*" required="required" min="1" />
+                            <paper-input type="number" id="txtPublicHttpsPort" pattern="[0-9]*" required="required" min="1" label="${LabelPublicHttpsPort}"></paper-input>
                             <div class="fieldDescription">${LabelPublicHttpsPortHelp}</div>
                         </li>
                         <li>
-                            <label for="txtCertificatePath">${LabelCustomCertificatePath}</label>
-                            <div style="display: inline-block; width: 85%;">
-                                <input type="text" id="txtCertificatePath" />
-                            </div>
-                            <button id="btnSelectCertPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
+                            <paper-input type="text" id="txtCertificatePath" label="${LabelCustomCertificatePath}" style="display: inline-block; width: 80%;"></paper-input>
+                            <paper-icon-button id="btnSelectCertPath" icon="search" title="${ButtonSelectDirectory}"></paper-icon-button>
                             <div class="fieldDescription">${LabelCustomCertificatePathHelp}</div>
                         </li>
                         <li>
-                            <label for="chkEnableHttps" data-mini="true">${LabelEnableHttps}</label>
-                            <input type="checkbox" id="chkEnableHttps" data-mini="true" />
-                            <div class="fieldDescription">${LabelEnableHttpsHelp}</div>
+                            <paper-checkbox id="chkEnableHttps">${LabelEnableHttps}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelEnableHttpsHelp}</div>
                         </li>
                         <li>
-                            <label for="chkEnableUpnp">${LabelEnableAutomaticPortMap}</label>
-                            <input type="checkbox" id="chkEnableUpnp" data-mini="true" />
-                            <div class="fieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
+                            <paper-checkbox id="chkEnableUpnp">${LabelEnableAutomaticPortMap}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
                         </li>
                     </ul>
 
diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js
index 2aa9dca9b7..4d787d8a50 100644
--- a/dashboard-ui/scripts/dashboardhosting.js
+++ b/dashboard-ui/scripts/dashboardhosting.js
@@ -6,13 +6,13 @@
         $('#txtPublicPort', page).val(config.PublicPort);
         $('#txtPublicHttpsPort', page).val(config.PublicHttpsPort);
 
-        $('#chkEnableHttps', page).checked(config.EnableHttps).checkboxradio('refresh');
+        $('#chkEnableHttps', page).checked(config.EnableHttps);
         $('#txtHttpsPort', page).val(config.HttpsPortNumber);
 
         $('#txtDdns', page).val(config.WanDdns || '');
         $('#txtCertificatePath', page).val(config.CertificatePath || '');
 
-        $('#chkEnableUpnp', page).checked(config.EnableUPnP).checkboxradio('refresh');
+        $('#chkEnableUpnp', page).checked(config.EnableUPnP);
 
         Dashboard.hideLoadingMsg();
     }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 164ff82fec..9d4860ea22 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1496,7 +1496,7 @@ var Dashboard = {
             // The native app can handle a little bit more than safari
             if (AppInfo.isNativeApp) {
 
-                quality -= 15;
+                quality -= 10;
 
                 if (isBackdrop) {
                     quality -= 20;
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index f1251b0102..95009d9cc8 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -378,12 +378,16 @@ paper-menu-item {
     padding: .5em 0;
 }
 
-.ui-page-theme-b paper-input label, .ui-page-theme-b paper-textarea label {
-    font-size: 20px !important;
+paper-input label, paper-textarea label {
+    font-size: 18px !important;
     font-family: inherit !important;
     color: #858585 !important;
 }
 
+.ui-page-theme-b paper-input label, .ui-page-theme-b paper-textarea label {
+    color: #858585 !important;
+}
+
 .ui-page-theme-a .label-is-highlighted label {
     color: green !important;
 }