diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 3cb858f875..1238c2c3e2 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -1,4 +1,4 @@
-<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,paper-input,emby-button">
+<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -33,8 +33,9 @@
                     </div>
                 </div>
                 <br />
-                <div>
-                    <paper-input type="number" id="txtNumTrailers" min="1" max="10" step="1" label="${LabelNumberTrailerToPlay}"></paper-input>
+                <br />
+                <div class="inputContainer">
+                    <input is="emby-input" type="number" id="txtNumTrailers" min="1" max="10" step="1" label="${LabelNumberTrailerToPlay}" />
                 </div>
                 <br />
                 <div>
@@ -46,18 +47,22 @@
                     <paper-checkbox class="chkUnwatchedOnly">${LabelLimitIntrosToUnwatchedContent}</paper-checkbox>
                 </div>
                 <br />
-                <div>
-                    <div>
-                        <paper-input type="text" label="${LabelCustomIntrosPath}" id="txtCustomIntrosPath" style="display: inline-block; width: 85%;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectCustomIntrosPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                <br />
+                <div class="inputContainer">
+                    <div style="display: flex; align-items: center;">
+                        <div style="flex-grow:1;">
+                            <input is="emby-input" id="txtCustomIntrosPath" label="${LabelCustomIntrosPath}" required="required" autocomplete="off" />
+                        </div>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectCustomIntrosPath" class="autoSize" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button>
                     </div>
                     <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
                 </div>
-                <br />
-                <div>
-                    <div>
-                        <paper-input type="text" label="${LabelCodecIntrosPath}" id="txtCodecIntrosPath" style="display: inline-block; width: 85%;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectCodecIntrosPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                <div class="inputContainer">
+                    <div style="display: flex; align-items: center;">
+                        <div style="flex-grow:1;">
+                            <input is="emby-input" id="txtCodecIntrosPath" label="${LabelCodecIntrosPath}" required="required" autocomplete="off" />
+                        </div>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectCodecIntrosPath" class="autoSize" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button>
                     </div>
                     <div class="fieldDescription">
                         <div>${LabelCodecIntrosPathHelp}</div>
@@ -65,7 +70,6 @@
                     </div>
                 </div>
                 <br />
-                <br />
                 <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 <p>${CinemaModeConfigurationHelp2}</p>
             </form>
diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css
index f84172a9aa..432d404428 100644
--- a/dashboard-ui/css/dashboard.css
+++ b/dashboard-ui/css/dashboard.css
@@ -8,11 +8,6 @@
     padding-top: 5px;
 }
 
-paper-input + .fieldDescription {
-    padding-top: 5px;
-    opacity: .9;
-}
-
 /* Tabs (e.g. advanced metadata page) */
 .localnav {
     margin-bottom: 30px !important;
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 23315296be..0d09ff7345 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -116,7 +116,7 @@ h1 a:hover {
     color: #52B54B !important;
 }
 
-input:not(.paper-input):not([type='checkbox']):not([type='radio']):not([type='file']):not([type='range']):not([is='emby-input']) {
+input:not([type='checkbox']):not([type='radio']):not([type='file']):not([type='range']):not([is='emby-input']) {
     -webkit-appearance: none;
     -webkit-font-smoothing: antialiased;
     -webkit-rtl-ordering: logical;
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index e2dc37d404..6e06cbaacf 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -5,12 +5,10 @@
 
             <form class="dashboardGeneralForm">
 
-                <div>
-                    <paper-input type="text" id="txtServerName" label="${LabelFriendlyServerName}"></paper-input>
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtServerName" label="${LabelFriendlyServerName}" />
                     <div class="fieldDescription">${LabelFriendlyServerNameHelp}</div>
-
                 </div>
-                <br /><br />
                 <div>
                     <label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
                     <select id="selectLocalizationLanguage" data-mini="true"></select>
@@ -45,11 +43,15 @@
                 <div is="emby-collapse" title="${HeaderAdvanced}">
                     <div class="collapseContent">
                         <div>
-                            <paper-input type="text" id="txtCachePath" label="${LabelCachePath}" style="display: inline-block; width: 85%;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="autoSize">
-                                <i class="md-icon">search</i>
-                            </button>
-                            <div class="fieldDescription">${LabelCachePathHelp}</div>
+                            <div class="inputContainer">
+                                <div style="display: flex; align-items: center;">
+                                    <div style="flex-grow:1;">
+                                        <input is="emby-input" id="txtCachePath" label="${LabelCachePath}" autocomplete="off" />
+                                    </div>
+                                    <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                                </div>
+                                <div class="fieldDescription">${LabelCachePathHelp}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -88,8 +90,8 @@
                         <p>${HeaderBrandingHelp}</p>
                         <br />
 
-                        <div>
-                            <paper-input type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}"></paper-input>
+                        <div class="inputContainer">
+                            <input is="emby-input" type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}" />
                             <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>
                         </div>
                         <div class="inputContainer">
@@ -113,9 +115,13 @@
                             ${OptionDisableForDevelopmentHelp}
                         </div>
                         <br /><br />
-                        <div>
-                            <paper-input type="text" id="txtDashboardSourcePath" label="${LabelDashboardSourcePath}" style="display: inline-block; width: 80%;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                        <div class="inputContainer">
+                            <div style="display: flex; align-items: center;">
+                                <div style="flex-grow:1;">
+                                    <input is="emby-input" id="txtDashboardSourcePath" label="${LabelDashboardSourcePath}" autocomplete="off" />
+                                </div>
+                                <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                            </div>
                             <div class="fieldDescription">${LabelDashboardSourcePathHelp}</div>
                         </div>
                     </div>
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index aa589c0f3f..d8f23ea46e 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -1,36 +1,32 @@
-<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="jqmlistview,scripts/device,paper-input,emby-button">
+<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="scripts/device,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
 
-            <div class="readOnlyContent">
 
-                <form class="deviceForm">
+            <form class="deviceForm">
 
-                    <p class="reportedName">
+                <p class="reportedName">
 
-                    </p>
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <paper-input type="text" id="txtCustomName" label="${LabelCustomDeviceDisplayName}"></paper-input>
-                            <div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div>
-                        </li>
-                        <li id="fldCameraUploadPath" style="display:none;">
-                            <paper-input id="txtUploadPath" label="${LabelCameraUploadPath}" style="width:85%;display:inline-block;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                            <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
-                        </li>
+                </p>
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtCustomName" label="${LabelCustomDeviceDisplayName}" />
+                    <div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div>
+                </div>
+                <div class="inputContainer hide" id="fldCameraUploadPath">
+                    <div style="display: flex; align-items: center;">
+                        <div style="flex-grow:1;">
+                            <input is="emby-input" id="txtUploadPath" label="${LabelCameraUploadPath}" required="required" autocomplete="off" />
+                        </div>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                    </div>
+                    <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
+                </div>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                </div>
+            </form>
 
-                    </ul><br />
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                        </li>
-                    </ul>
-
-                </form>
-
-            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index 70e9c7e734..dbb1283f6f 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -1,35 +1,33 @@
-<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="jqmlistview,scripts/devicesupload,paper-input,paper-checkbox,emby-button">
+<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="scripts/devicesupload,emby-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
 
-            <div class="readOnlyContent">
+            <form class="devicesUploadForm">
 
                 <p>${HeaderCameraUploadHelp}</p>
 
-                <form class="devicesUploadForm">
+                <div class="inputContainer">
+                    <div style="display: flex; align-items: center;">
+                        <div style="flex-grow:1;">
+                            <input is="emby-input" id="txtUploadPath" label="${LabelCameraUploadPath}" required="required" autocomplete="off" />
+                        </div>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button>
+                    </div>
+                    <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
+                </div>
+                <div>
+                    <br />
+                    <paper-checkbox id="chkSubfolder">${LabelCreateCameraUploadSubfolder}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelCreateCameraUploadSubfolderHelp}</div>
+                </div>
+                <br />
+                <br />
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                </div>
 
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <paper-input id="txtUploadPath" label="${LabelCameraUploadPath}" style="width:84%;display:inline-block;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                            <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
-                        </li>
-                        <li>
-                            <br />
-                            <paper-checkbox id="chkSubfolder">${LabelCreateCameraUploadSubfolder}</paper-checkbox>
-                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelCreateCameraUploadSubfolderHelp}</div>
-                        </li>
-
-                    </ul><br />
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                        </li>
-                    </ul>
-
-                </form>
-            </div>
+            </form>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index b528092648..8e0ffcfbe9 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -1,4 +1,4 @@
-<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="jqmlistview,scripts/notificationsetting,paper-input,paper-checkbox,emby-button">
+<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,emby-select,emby-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -7,11 +7,12 @@
 
             <form class="notificationSettingForm">
 
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <paper-checkbox id="chkEnabled">${LabelNotificationEnabled}</paper-checkbox>
-                    </li>
-                </ul>
+                <br />
+                <div>
+                    <paper-checkbox id="chkEnabled">${LabelNotificationEnabled}</paper-checkbox>
+                </div>
+                <br />
+                <br />
 
                 <div class="monitorUsers" style="display: none;">
                     <div class="paperListLabel">${LabelMonitorUsers}</div>
@@ -22,9 +23,8 @@
                 </div>
 
                 <div>
-                    <div>
-                        <label for="selectUsers" class="selectLabel">${LabelSendNotificationToUsers}</label>
-                        <select id="selectUsers">
+                    <div class="selectContainer">
+                        <select is="emby-select" id="selectUsers" label="${LabelSendNotificationToUsers}">
                             <option value="All">${OptionAllUsers}</option>
                             <option value="Admins">${OptionAdminUsers}</option>
                             <option value="Custom">${OptionCustomUsers}</option>
@@ -37,7 +37,6 @@
                         </div>
                     </div>
                     <br />
-                    <br />
                 </div>
 
                 <div>
@@ -49,22 +48,19 @@
                 </div>
 
                 <br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <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>
-                        </div>
-                    </li>
-                    <li>
-                        <br />
-                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtTitle" type="text" required label="${LabelMessageTitle}"/>
+                    <div class="fieldDescription tokenHelp">
+                        <div>${LabelAvailableTokens}</div>
+                        <div class="tokenList" style="margin-top: .5em;"></div>
+                    </div>
+                </div>
+                <div>
+                    <br />
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
-                    </li>
-
-                </ul>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                </div>
             </form>
 
         </div>
diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js
index 0d1a30d4b9..d844039030 100644
--- a/dashboard-ui/scripts/device.js
+++ b/dashboard-ui/scripts/device.js
@@ -3,9 +3,9 @@
     function load(page, device, capabilities) {
 
         if (capabilities.SupportsContentUploading) {
-            $('#fldCameraUploadPath', page).show();
+            $('#fldCameraUploadPath', page).removeClass('hide');
         } else {
-            $('#fldCameraUploadPath', page).hide();
+            $('#fldCameraUploadPath', page).addClass('hide');
         }
 
         $('#txtCustomName', page).val(device.CustomName || '');
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index bdb9106111..a7fe7b3832 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1393,13 +1393,8 @@ var AppInfo = {};
         define("cryptojs-sha1", [sha1Path]);
         define("cryptojs-md5", [md5Path]);
 
-        define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]);
-        define("paper-icon-button", ["html!" + bowerPath + "/paper-icon-button/paper-icon-button.html"]);
-
         define("paper-checkbox", ["html!" + bowerPath + "/paper-checkbox/paper-checkbox.html"]);
 
-        define("paper-collapse-item", ["html!" + bowerPath + "/paper-collapse-item/paper-collapse-item.html"]);
-
         define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]);
 
         define("dashboardcss", ['css!css/dashboard']);
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index 74106b8a83..39a5252fe2 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -1,4 +1,4 @@
-<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,paper-input,emby-button">
+<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,emby-input,emby-button">
 
     <div data-role="content">
 
@@ -21,12 +21,11 @@
                     <div class="fieldDescription">${AdditionalLiveTvProvidersCanBeInstalledLater}</div>
                 </div>
                 <br />
-                <div>
-                    <paper-input class="txtDevicePath" label="${LabelTunerIpAddress}" required="required"></paper-input>
+                <div class="inputContainer">
+                    <input is="emby-input" class="txtDevicePath" label="${LabelTunerIpAddress}" required="required" />
                     <div class="fieldDescription">${HelpMoreTunersCanBeAdded}</div>
                 </div>
                 <br />
-                <br />
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
                     <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>