diff --git a/dashboard-ui/dlnaserversettings.html b/dashboard-ui/dlnaserversettings.html
index c1a1af66df..a47776ba43 100644
--- a/dashboard-ui/dlnaserversettings.html
+++ b/dashboard-ui/dlnaserversettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server" data-require="scripts/dlnaserversettings">
+    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server" data-require="scripts/dlnaserversettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -29,12 +29,11 @@
                             <div class="fieldDescription">${LabelEnableBlastAliveMessagesHelp}</div>
                         </li>
                         <li>
-                            <label for="txtBlastInterval">${LabelBlastMessageInterval}</label>
-                            <input type="number" id="txtBlastInterval" min="1" max="300" />
+                            <paper-input type="number" id="txtBlastInterval" min="1" max="300" label="${LabelBlastMessageInterval}"></paper-input>
                             <div class="fieldDescription">${LabelBlastMessageIntervalHelp}</div>
                         </li>
                         <li>
-                            <label for="selectUser">${LabelDefaultUser}</label>
+                            <label for="selectUser" class="selectLabel">${LabelDefaultUser}</label>
                             <select id="selectUser" data-mini="true"></select>
                             <div class="fieldDescription">${LabelDefaultUserHelp}</div>
                         </li>
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index 53380dc37d..cd55188d6f 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings">
+    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -29,8 +29,7 @@
                             <div class="fieldDescription">${LabelEnableDlnaDebugLoggingHelp}</div>
                         </li>
                         <li>
-                            <label for="txtClientDiscoveryInterval">${LabelEnableDlnaClientDiscoveryInterval}</label>
-                            <input type="number" id="txtClientDiscoveryInterval" min="1" max="300" />
+                            <paper-input type="number" id="txtClientDiscoveryInterval" min="1" max="300" label="${LabelEnableDlnaClientDiscoveryInterval}"></paper-input>
                             <div class="fieldDescription">${LabelEnableDlnaClientDiscoveryIntervalHelp}</div>
                         </li>
                     </ul>
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index d1352aea32..4e68446a2a 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -4,7 +4,7 @@
     <title>${TitleNotifications}</title>
 </head>
 <body>
-    <div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting">
+    <div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -35,7 +35,7 @@
 
                     <div>
                         <div>
-                            <label for="selectUsers">${LabelSendNotificationToUsers}</label>
+                            <label for="selectUsers" class="selectLabel">${LabelSendNotificationToUsers}</label>
                             <select id="selectUsers">
                                 <option value="All">${OptionAllUsers}</option>
                                 <option value="Admins">${OptionAdminUsers}</option>
@@ -63,8 +63,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtTitle">${LabelMessageTitle}</label>
-                            <input id="txtTitle" type="text" required="required" />
+                            <paper-input id="txtTitle" type="text" required label="${LabelMessageTitle}"></paper-input>
                             <div class="fieldDescription tokenHelp">
                                 <div>${LabelAvailableTokens}</div>
                                 <div class="tokenList" style="margin-top: .5em;"></div>
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 03bc170c7b..4b24401dd8 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -4,7 +4,7 @@
     <title>${TitlePlayback}</title>
 </head>
 <body>
-    <div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings">
+    <div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -20,8 +20,7 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtRemoteClientBitrateLimit">${LabelRemoteClientBitrateLimit}</label>
-                            <input type="number" id="txtRemoteClientBitrateLimit" pattern="[0-9]*" required="required" min="0" step=".25" />
+                            <paper-input type="number" id="txtRemoteClientBitrateLimit" pattern="[0-9]*" required min="0" step=".25" label="${LabelRemoteClientBitrateLimit}"></paper-input>
                             <div class="fieldDescription">${LabelRemoteClientBitrateLimitHelp}</div>
                         </li>
                     </ul>
