diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index e26e1f0d21..1ce19bf817 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -30,10 +30,10 @@
                 <table data-role="table" data-mode="reflow" class="tblOrganizationResults stripedTable ui-responsive table-stroke">
                     <thead>
                         <tr>
-                            <th data-priority="1"></th>
                             <th data-priority="2">${HeaderDate}</th>
                             <th data-priority="1">${HeaderSource}</th>
                             <th data-priority="3">${HeaderDestination}</th>
+                            <th data-priority="1"></th>
                         </tr>
                     </thead>
                     <tbody class="resultBody"></tbody>
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 8367cd2f58..e3e9bc267e 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -505,6 +505,82 @@ select {
         color: #fff;
     }
 
+.ui-body-a select {
+    background: none;
+    border-color: rgb(221, 221, 221);
+}
+
+    .ui-body-a select option {
+        color: #000;
+    }
+
+a[data-role='button'], button:not([data-role='none']):not(.clearButton) {
+    -webkit-font-smoothing: antialiased;
+    -webkit-user-select: none;
+    background-clip: padding-box;
+    border-radius: .3125em;
+    border: 1px solid #ddd !important;
+    color: rgb(51, 51, 51) !important;
+    cursor: pointer !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: 500 !important;
+    margin: 0 .25em !important;
+    display: inline-block;
+    padding: .8em 1em;
+    text-align: center;
+    text-decoration: none !important;
+    background: #f6f6f6 !important;
+    font-size: 16px;
+    -webkit-box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(0,0,0,.15) /*{global-box-shadow-color}*/;
+    -moz-box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(0,0,0,.15) /*{global-box-shadow-color}*/;
+    box-shadow: 0 1px 3px /*{global-box-shadow-size}*/ rgba(0,0,0,.15) /*{global-box-shadow-color}*/;
+}
+
+    a[data-role='button']:not([data-inline='true']), button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
+        display: block;
+        margin: .5em 0 !important;
+    }
+
+    a[data-role='button']:focus, button:not([data-role='none']):focus {
+        -webkit-box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
+        -moz-box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
+        box-shadow: 0 0 12px #3388cc /*{a-active-background-color}*/;
+    }
+
+    button:not([data-role='none']):not([data-inline='true']):not(.clearButton) {
+        width: 100%;
+    }
+
+div[data-role="controlgroup"] a[data-role='button'] {
+    display: inline-block !important;
+    margin: 0 !important;
+    -webkit-box-shadow: none !important;
+    -moz-box-shadow: none !important;
+    box-shadow: none !important;
+    border-radius: 0;
+}
+
+    div[data-role="controlgroup"] a[data-role='button']:first-child {
+        border-bottom-left-radius: .3125em;
+        border-top-left-radius: .3125em;
+    }
+
+    div[data-role="controlgroup"] a[data-role='button']:last-child {
+        border-bottom-right-radius: .3125em;
+        border-top-right-radius: .3125em;
+    }
+
+    div[data-role="controlgroup"] a[data-role='button'] + a[data-role='button'] {
+        border-left-width: 0 !important;
+        margin: 0 0 0 -3px !important;
+    }
+
+div[data-role="controlgroup"] a.ui-btn-active {
+    background: #38c !important;
+    color: #fff !important;
+}
+
 .smoothScrollX {
     overflow-x: scroll;
     -webkit-overflow-scrolling: touch;
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 07f7896b30..2c3605e000 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -118,10 +118,13 @@
                                     </li>
                                 </ul>
 
-                                <h2>
-                                    <span style="vertical-align:middle;">${HeaderHttpHeaders}</span>
-                                    <button class="btnAddIdentificationHttpHeader" data-icon="plus" data-iconpos="notext" data-inline="true" type="button" style="vertical-align:middle;margin-left:.25em;">${ButtonAdd}</button>
-                                </h2>
+                                <div>
+                                    <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
+                                    <paper-button raised class="submit mini btnAddIdentificationHttpHeader" style="margin-left:1em;">
+                                        <iron-icon icon="add"></iron-icon>
+                                        <span>${ButtonNew}</span>
+                                    </paper-button>
+                                </div>
                                 <div class="httpHeaderIdentificationList"></div>
                             </div>
                         </div>
@@ -286,10 +289,13 @@
                         <div data-role="collapsible">
                             <h2>${HeaderXmlSettings}</h2>
                             <div>
-                                <h2>
-                                    <span style="vertical-align:middle;">${HeaderXmlDocumentAttributes}</span>
-                                    <button class="btnAddXmlDocumentAttribute" data-icon="plus" data-iconpos="notext" data-inline="true" type="button" style="vertical-align:middle;margin-left:.25em;">${ButtonAdd}</button>
-                                </h2>
+                                <div>
+                                    <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
+                                    <paper-button raised class="submit mini btnAddXmlDocumentAttribute" style="margin-left:1em;">
+                                        <iron-icon icon="add"></iron-icon>
+                                        <span>${ButtonNew}</span>
+                                    </paper-button>
+                                </div>
                                 <div class="xmlDocumentAttributeList"></div>
                                 <div class="fieldDescription">${XmlDocumentAttributeListHelp}</div>
                                 <br />
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html
index b9ecf3e55c..acfabbd6ae 100644
--- a/dashboard-ui/dlnaprofiles.html
+++ b/dashboard-ui/dlnaprofiles.html
@@ -20,7 +20,12 @@
                     <div style="position: relative;">
                         <h2>${HeaderCustomDlnaProfiles}</h2>
                         <div style="position: absolute; right: 0; top: -12px;">
-                            <a data-role="button" data-icon="plus" data-mini="true" href="dlnaprofile.html">${ButtonNew}</a>
+                            <a class="clearLink" href="dlnaprofile.html">
+                                <paper-button raised class="submit mini">
+                                    <iron-icon icon="add"></iron-icon>
+                                    <span>${ButtonNew}</span>
+                                </paper-button>
+                            </a>
                         </div>
                     </div>
 
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 1e490c5085..a620a74078 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -248,7 +248,7 @@
                                         <div style="display: inline-block; width: 80%;">
                                             <input type="text" class="txtEditableListview" />
                                         </div>
-                                        <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
+                                        <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
                                     </div>
                                     <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listCountries"></ul>
                                 </div>
@@ -260,7 +260,7 @@
                                         <div style="display: inline-block; width: 80%;">
                                             <input type="text" class="txtEditableListview" />
                                         </div>
-                                        <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
+                                        <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
                                     </div>
                                     <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listGenres"></ul>
                                 </div>
@@ -281,7 +281,7 @@
                                         <div style="display: inline-block; width: 80%;">
                                             <input type="text" class="txtEditableListview" />
                                         </div>
-                                        <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
+                                        <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
                                     </div>
                                     <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listKeywords"></ul>
                                 </div>
@@ -293,7 +293,7 @@
                                         <div style="display: inline-block; width: 80%;">
                                             <input type="text" class="txtEditableListview" />
                                         </div>
-                                        <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
+                                        <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
                                     </div>
                                     <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listStudios"></ul>
                                 </div>
@@ -305,7 +305,7 @@
                                         <div style="display: inline-block; width: 80%;">
                                             <input type="text" class="txtEditableListview" />
                                         </div>
-                                        <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
+                                        <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
                                     </div>
                                     <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listTags"></ul>
                                 </div>
@@ -355,7 +355,9 @@
                             <label for="selectLanguage">${LabelLanguage}</label>
                             <select id="selectLanguage" required="required" data-mini="true"></select>
                         </div>
-                        <button type="submit" data-icon="search" class="btnSearchSubtitles" data-inline="true" data-iconpos="notext" data-mini="true" style="vertical-align: bottom;">${ButtonSearch}</button>
+                        <button type="submit" class="clearButton btnSearchSubtitles" style="width:auto;">
+                            <paper-icon-button icon="search" title="${ButtonSearch}"></paper-icon-button>
+                        </button>
                     </form>
                     <br />
                     <div class="readOnlyContent" style="max-width: 700px;">
@@ -412,7 +414,7 @@
 
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px; position: relative;">
 
-                <button type="button" data-icon="back" data-mini="true" data-inline="true" data-iconpos="notext" style="position: absolute; top: 8px; left: 10px; margin: 0;" class="btnIdentifyBack">${ButtonSearch}</button>
+                <paper-icon-button icon="arrow-back" class="btnIdentifyBack" style="position: absolute; top: 8px; left: 10px; margin: 0;"></paper-icon-button>
 
                 <h3 class="identificationHeader">${HeaderIdentifyItem}</h3>
             </div>
@@ -561,7 +563,6 @@
         </div>
 
         <div data-role="popup" class="popup popupSubtitleViewer">
-            <a href="#" data-rel="back" data-role="button" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>
             <div class="subtitleViewerContent">
                 <pre class="subtitleContent" style="margin: 0; border-radius: 0;"></pre>
             </div>
@@ -586,8 +587,8 @@
                             <input type="text" id="txtLookupName" required="required" />
                         </div>
 
-                        <button type="submit" data-icon="search" data-mini="true" data-inline="true" data-iconpos="notext">
-                            ${ButtonSearch}
+                        <button type="submit" class="clearButton" style="width:auto;">
+                            <paper-icon-button icon="search" title="${ButtonSearch}"></paper-icon-button>
                         </button>
                     </div>
 
@@ -614,6 +615,7 @@
                         <output id="imageOutput"></output>
                     </div>
                     <div id="fldUpload" style="display: none;">
+                        <br />
                         <div>
                             <label for="selectImageType">${LabelImageType}</label>
                             <select id="selectImageType" name="selectImageType">
@@ -640,7 +642,6 @@
 
         <div data-role="popup" class="popup popupDownload" data-theme="a">
 
-            <a href="#" data-rel="back" data-role="button" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-theme="b">${ButtonClose}</a>
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
                 <h3>${HeaderBrowseOnlineImages}</h3>
             </div>
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index 956d1b4ca4..53f260ad6b 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="episodesPage" data-role="page" class="page libraryPage" data-require="jqmcheckbox,jqmcontrolgroup,jqmpanel,scripts/episodes,jqmicons">
+    <div id="episodesPage" data-role="page" class="page libraryPage" data-require="jqmcheckbox,jqmcontrolgroup,jqmpanel,scripts/episodes">
 
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index dc4ba8e612..c9459515d5 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -20,9 +20,9 @@
                     <table id="tblPaths" data-role="table" data-mode="reflow" class="ui-responsive">
                         <thead>
                             <tr>
-                                <th></th>
                                 <th>${HeaderFrom}</th>
                                 <th>${HeaderTo}</th>
+                                <th></th>
                             </tr>
                         </thead>
                         <tbody class="tbodyPathSubstitutions"></tbody>
@@ -47,9 +47,9 @@
                             <div class="fieldDescription">${LabelToHelp}</div>
                         </div>
                         <br />
-                        <p>
-                            <button type="submit" data-mini="true" data-icon="plus">${ButtonAdd}</button>
-                        </p>
+                        <button type="submit" data-role="none" class="clearButton">
+                            <paper-button raised class="submit block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></paper-button>
+                        </button>
                     </div>
 
                 </form>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 258045a69f..f984c7d3b2 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -16,17 +16,6 @@
 
                 <form class="librarySettingsForm">
 
-                    <ul data-role="listview" class="ulForm">
-                        <li class="fldImagesByName" style="display:none;">
-                            <label for="txtItemsByNamePath">${LabelImagesByNamePath}</label>
-                            <div style="display: inline-block; width: 85%;">
-                                <input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" />
-                            </div>
-                            <button id="btnSelectIBNPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
-                            <div class="fieldDescription">${LabelImagesByNamePathHelp}</div>
-                        </li>
-                    </ul>
-
                     <div data-role="collapsible">
                         <h2>${HeaderAudio}</h2>
                         <div>
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index ef33dcefad..c02e3dd35a 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -62,29 +62,6 @@
                         <h2>${HeaderChapters}</h2>
                         <div>
                             <br />
-                            <div style="display: none;">
-                                <p>${HeaderChapterDownloadingHelp}</p>
-
-                                <div class="chapterDownloadSettings" style="display: none;">
-                                    <fieldset data-role="controlgroup">
-                                        <legend>${HeaderDownloadChaptersFor}</legend>
-                                        <input type="checkbox" id="chkDownloadChapterMovies" />
-                                        <label for="chkDownloadChapterMovies">${OptionMovies}</label>
-
-                                        <input type="checkbox" id="chkDownloadChapterEpisodes" />
-                                        <label for="chkDownloadChapterEpisodes">${OptionEpisodes}</label>
-                                    </fieldset>
-                                    <br />
-                                    <div class="chapterFetchers">
-                                    </div>
-                                    <br />
-                                    <br />
-                                </div>
-                                <div class="noChapterProviders" style="display: none; color: green;">
-                                    <p>${MessageNoChapterProviders}</p>
-                                    <br />
-                                </div>
-                            </div>
                             <ul data-role="listview" class="ulForm" style="margin-bottom:0!important;">
                                 <li>
                                     <label>${HeaderExtractChapterImagesFor}</label>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 26381e24ec..6145abdd6e 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paperbuttonstyle,jqmicons" data-backbutton="true" data-menubutton="false">
+    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 3fcecc27ac..5e9a5cbb7b 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile,paperbuttonstyle,jqmicons" data-backbutton="true" data-menubutton="false">
+    <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <br />
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html
index eb2ad9b82c..bb369c727c 100644
--- a/dashboard-ui/reports.html
+++ b/dashboard-ui/reports.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-contextname="${HeaderReports}" data-require="jqmcheckbox,jqmcontrolgroup,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss,jqmicons">
+    <div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-contextname="${HeaderReports}" data-require="jqmcheckbox,jqmcontrolgroup,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss">
         <div data-role="content">
             <div style="text-align: center;">
                 <div class="viewControls">
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index a52a4a37a0..75b013af00 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -217,16 +217,6 @@
 
             html += '<tr>';
 
-            html += '<td class="organizerButtonCell">';
-
-
-            if (item.Status != 'Success') {
-                html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="delete" data-mini="true" data-iconpos="notext" class="btnDeleteResult organizerButton" title="' + Globalize.translate('ButtonDeleteFile') + '">' + Globalize.translate('ButtonDeleteFile') + '</button>';
-                html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="action" data-mini="true" data-iconpos="notext" class="btnProcessResult organizerButton" title="' + Globalize.translate('ButtonOrganizeFile') + '">' + Globalize.translate('ButtonOrganizeFile') + '</button>';
-            }
-
-            html += '</td>';
-
             html += '<td>';
 
             var date = parseISO8601Date(item.Date, { toLocal: true });
@@ -257,6 +247,16 @@
             html += item.TargetPath || '';
             html += '</td>';
 
+            html += '<td class="organizerButtonCell">';
+
+
+            if (item.Status != 'Success') {
+                html += '<paper-icon-button data-resultid="' + item.Id + '" icon="folder" class="btnProcessResult organizerButton" title="' + Globalize.translate('ButtonOrganizeFile') + '"></paper-icon-button>';
+                html += '<paper-icon-button data-resultid="' + item.Id + '" icon="delete" class="btnDeleteResult organizerButton" title="' + Globalize.translate('ButtonDeleteFile') + '"></paper-icon-button>';
+            }
+
+            html += '</td>';
+
             html += '</tr>';
 
             return html;
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index b8f63b99a9..4b5703169d 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -751,7 +751,7 @@
 
                 html += "<span style='color:#009F00;margin-left:5px;margin-right:5px;'>" + progress + "%</span>";
 
-                html += '<button type="button" data-icon="delete" data-iconpos="notext" data-inline="true" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">' + Globalize.translate('ButtonStop') + '</button>';
+                html += '<paper-icon-button title="' + Globalize.translate('ButtonStop') + '" icon="cancel" onclick="DashboardPage.stopTask(\'' + task.Id + '\');"></paper-icon-button>';
             }
             else if (task.State == "Cancelling") {
                 html += '<span style="color:#cc0000;">' + Globalize.translate('LabelStopping') + '</span>';
diff --git a/dashboard-ui/scripts/directorybrowser.js b/dashboard-ui/scripts/directorybrowser.js
index f002c2d8e7..02cdb1fbc4 100644
--- a/dashboard-ui/scripts/directorybrowser.js
+++ b/dashboard-ui/scripts/directorybrowser.js
@@ -138,7 +138,7 @@
         html += '<label for="txtDirectoryPickerPath" class="lblDirectoryPickerPath">' + Globalize.translate('LabelCurrentPath') + '</label>';
 
         html += '<div><input id="txtDirectoryPickerPath" name="txtDirectoryPickerPath" type="text" required="required" style="font-weight:bold;width:82%;display:inline-block;" />';
-        html += '<button class="btnRefreshDirectories" type="button" data-icon="refresh" data-inline="true" data-mini="true" data-iconpos="notext">' + Globalize.translate('ButtonRefresh') + '</button>';
+        html += '<paper-icon-button icon="refresh" class="btnRefreshDirectories" title="' + Globalize.translate('ButtonRefresh') + '"></paper-icon-button>';
         html += '</div>';
 
         html += '</div>';
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index 9c095861a3..06b49d9bce 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -210,9 +210,9 @@
 
         if (showControls) {
             html += '<div data-role="controlgroup" data-type="horizontal" style="display:inline-block;">';
-            html += '<button data-icon="arrow-l" data-iconpos="notext" data-inline="true" data-mini="true" class="btnPreviousPage" ' + (startIndex ? '' : 'disabled') + '>' + Globalize.translate('ButtonPreviousPage') + '</button>';
 
-            html += '<button data-icon="arrow-r" data-iconpos="notext" data-inline="true" data-mini="true" class="btnNextPage" ' + (startIndex + limit > totalRecordCount ? 'disabled' : '') + '>' + Globalize.translate('ButtonNextPage') + '</button>';
+            html += '<paper-icon-button icon="arrow-back" title="' + Globalize.translate('ButtonPreviousPage') + '" class="btnPreviousPage" ' + (startIndex ? '' : 'disabled') + '></paper-icon-button>';
+            html += '<paper-icon-button icon="arrow-forward" title="' + Globalize.translate('ButtonNextPage') + '" class="btnNextPage" ' + (startIndex + limit > totalRecordCount ? 'disabled' : '') + '></paper-icon-button>';
             html += '</div>';
         }
 
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 6c0b4bd9d7..e6fc48637d 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -228,7 +228,7 @@
         });
     }
 
-    $(document).on('pageinit', "#indexPage", function () {
+    pageIdOn('pageinit', "indexPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 0b5507a4d8..bf19ba190e 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2565,7 +2565,7 @@
                     //html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
                     var viewPanelClass = options.viewPanelClass || 'viewPanel';
                     var title = options.viewIcon == 'filter-list' ? Globalize.translate('ButtonFilter') : Globalize.translate('ButtonMenu');
-                    html += '<paper-icon-button title="' + title + '" icon="' + (options.viewIcon || AppInfo.moreIcon) + '" onclick="require([\'jqmicons\']);jQuery(\'.' + viewPanelClass + '\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"></paper-icon-button>';
+                    html += '<paper-icon-button title="' + title + '" icon="' + (options.viewIcon || AppInfo.moreIcon) + '" onclick="jQuery(\'.' + viewPanelClass + '\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"></paper-icon-button>';
                 }
 
                 html += '</div>';
diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js
index 94b008dbbd..298356bfbe 100644
--- a/dashboard-ui/scripts/librarypathmapping.js
+++ b/dashboard-ui/scripts/librarypathmapping.js
@@ -41,10 +41,6 @@
 
             var mapHtml = '<tr>';
 
-            mapHtml += '<td>';
-            mapHtml += '<button class="btnDeletePath" data-index="' + index + '" data-mini="true" data-inline="true" data-icon="delete" data-iconpos="notext" type="button" style="margin:0 .5em 0 0;">Delete</button>';
-            mapHtml += '</td>';
-
             mapHtml += '<td style="vertical-align:middle;">';
             mapHtml += map.From;
             mapHtml += '</td>';
@@ -53,6 +49,10 @@
             mapHtml += map.To;
             mapHtml += '</td>';
 
+            mapHtml += '<td>';
+            mapHtml += '<paper-icon-button data-index="' + index + '" icon="delete" class="btnDeletePath"></paper-icon-button>';
+            mapHtml += '</td>';
+
             mapHtml += '</tr>';
 
             index++;
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index f323a37366..8106cc0c4d 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -12,8 +12,6 @@
 
         $('#selectEnableRealtimeMonitor', page).val(config.EnableLibraryMonitor);
 
-        $('#txtItemsByNamePath', page).val(config.ItemsByNamePath || '');
-
         $('#chkEnableAudioArchiveFiles', page).checked(config.EnableAudioArchiveFiles).checkboxradio("refresh");
         $('#chkEnableVideoArchiveFiles', page).checked(config.EnableVideoArchiveFiles).checkboxradio("refresh");
 
@@ -27,8 +25,6 @@
 
         ApiClient.getServerConfiguration().done(function (config) {
 
-            config.ItemsByNamePath = $('#txtItemsByNamePath', form).val();
-
             config.SeasonZeroDisplayName = $('#txtSeasonZeroName', form).val();
 
             config.EnableLibraryMonitor = $('#selectEnableRealtimeMonitor', form).val();
@@ -59,26 +55,6 @@
 
         var page = this;
 
-        $('#btnSelectIBNPath', page).on("click.selectDirectory", function () {
-
-            var picker = new DirectoryBrowser(page);
-
-            picker.show({
-
-                callback: function (path) {
-
-                    if (path) {
-                        $('#txtItemsByNamePath', page).val(path);
-                    }
-                    picker.close();
-                },
-
-                header: Globalize.translate('HeaderSelectImagesByNamePath'),
-
-                instruction: Globalize.translate('HeaderSelectImagesByNamePathHelp')
-            });
-        });
-
         $('.librarySettingsForm').off('submit', onSubmit).on('submit', onSubmit);
     });
 
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index 3d17b7c016..1875989a5b 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -81,7 +81,7 @@
             html += '</td>';
 
             html += '<td>';
-            html += '<button data-tunerid="' + tuner.Id + '" type="button" data-inline="true" data-icon="refresh" data-mini="true" data-iconpos="notext" class="btnResetTuner organizerButton" title="' + Globalize.translate('ButtonResetTuner') + '">' + Globalize.translate('ButtonResetTuner') + '</button>';
+            html += '<paper-icon-button data-tunerid="' + tuner.Id + '" icon="refresh" class="btnResetTuner" title="' + Globalize.translate('ButtonResetTuner') + '"></paper-icon-button>';
             html += '</td>';
 
             html += '</tr>';
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index f8a02b02e9..291ffcac75 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -107,7 +107,7 @@
         html += '</p><ul class="mediaFolderLocations" data-inset="true" data-role="listview" data-split-icon="minus">';
 
         html += '<li data-role="list-divider" class="mediaLocationsHeader">' + Globalize.translate('HeaderMediaLocations');
-        html += '<button type="button" data-icon="plus" data-mini="true" data-iconpos="notext" data-inline="true" onclick="MediaLibraryPage.addMediaLocation(' + index + ');">' + Globalize.translate('ButtonAdd') + '</button>';
+        html += '<paper-fab class="mini subdued" icon="add" title="' + Globalize.translate('ButtonAdd') + '" onclick="MediaLibraryPage.addMediaLocation(' + index + ');" style="margin-left:1em;"></paper-fab>';
         html += '</li>';
 
         for (var i = 0, length = virtualFolder.Locations.length; i < length; i++) {
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index 2f2ea98e71..a05e0bc888 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -43,115 +43,15 @@
 
     function loadChapters(page, config, providers) {
 
-        if (providers.length) {
-            $('.noChapterProviders', page).hide();
-            $('.chapterDownloadSettings', page).show();
-        } else {
-            $('.noChapterProviders', page).show();
-            $('.chapterDownloadSettings', page).hide();
-        }
-
         $('#chkChaptersMovies', page).checked(config.EnableMovieChapterImageExtraction).checkboxradio("refresh");
         $('#chkChaptersEpisodes', page).checked(config.EnableEpisodeChapterImageExtraction).checkboxradio("refresh");
         $('#chkChaptersOtherVideos', page).checked(config.EnableOtherVideoChapterImageExtraction).checkboxradio("refresh");
 
-        $('#chkDownloadChapterMovies', page).checked(config.DownloadMovieChapters).checkboxradio("refresh");
-        $('#chkDownloadChapterEpisodes', page).checked(config.DownloadEpisodeChapters).checkboxradio("refresh");
-
         $('#chkExtractChaptersDuringLibraryScan', page).checked(config.ExtractDuringLibraryScan).checkboxradio("refresh");
 
-        renderChapterFetchers(page, config, providers);
-
         Dashboard.hideLoadingMsg();
     }
 
-    function renderChapterFetchers(page, config, plugins) {
-
-        var html = '';
-
-        if (!plugins.length) {
-            $('.chapterFetchers', page).html(html).hide().trigger('create');
-            return;
-        }
-
-        var i, length, plugin, id;
-
-        html += '<div class="ui-controlgroup-label" style="margin-bottom:0;padding-left:2px;">';
-        html += Globalize.translate('LabelChapterDownloaders');
-        html += '</div>';
-
-        html += '<div style="display:inline-block;width: 75%;vertical-align:top;">';
-        html += '<div data-role="controlgroup" class="chapterFetcherGroup">';
-
-        for (i = 0, length = plugins.length; i < length; i++) {
-
-            plugin = plugins[i];
-
-            id = 'chkChapterFetcher' + i;
-
-            var isChecked = config.DisabledFetchers.indexOf(plugin.Name) == -1 ? ' checked="checked"' : '';
-
-            html += '<input class="chkChapterFetcher" type="checkbox" name="' + id + '" id="' + id + '" data-pluginname="' + plugin.Name + '" data-mini="true"' + isChecked + '>';
-            html += '<label for="' + id + '">' + plugin.Name + '</label>';
-        }
-
-        html += '</div>';
-        html += '</div>';
-
-        if (plugins.length > 1) {
-            html += '<div style="display:inline-block;vertical-align:top;margin-left:5px;">';
-
-            for (i = 0, length = plugins.length; i < length; i++) {
-
-                html += '<div style="margin:6px 0;">';
-                if (i == 0) {
-                    html += '<button data-inline="true" disabled="disabled" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Up</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Down</button>';
-                } else if (i == (plugins.length - 1)) {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Up</button>';
-                    html += '<button data-inline="true" disabled="disabled" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Down</button>';
-                }
-                else {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Up</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">Down</button>';
-                }
-                html += '</div>';
-            }
-        }
-
-        html += '</div>';
-        html += '<div class="fieldDescription">' + Globalize.translate('LabelChapterDownloadersHelp') + '</div>';
-
-        var elem = $('.chapterFetchers', page).html(html).show().trigger('create');
-
-        $('.btnDown', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-pluginindex'));
-
-            var elemToMove = $('.chapterFetcherGroup .ui-checkbox', page)[index];
-
-            var insertAfter = $(elemToMove).next('.ui-checkbox')[0];
-
-            elemToMove.parentNode.removeChild(elemToMove);
-            $(elemToMove).insertAfter(insertAfter);
-
-            $('.chapterFetcherGroup', page).controlgroup('destroy').controlgroup();
-        });
-
-        $('.btnUp', elem).on('click', function () {
-
-            var index = parseInt(this.getAttribute('data-pluginindex'));
-
-            var elemToMove = $('.chapterFetcherGroup .ui-checkbox', page)[index];
-
-            var insertBefore = $(elemToMove).prev('.ui-checkbox')[0];
-
-            elemToMove.parentNode.removeChild(elemToMove);
-            $(elemToMove).insertBefore(insertBefore);
-
-            $('.chapterFetcherGroup', page).controlgroup('destroy').controlgroup();
-        });
-    }
-
     function onSubmit() {
         var form = this;
 
@@ -311,22 +211,8 @@
             config.EnableEpisodeChapterImageExtraction = $('#chkChaptersEpisodes', form).checked();
             config.EnableOtherVideoChapterImageExtraction = $('#chkChaptersOtherVideos', form).checked();
 
-            config.DownloadMovieChapters = $('#chkDownloadChapterMovies', form).checked();
-            config.DownloadEpisodeChapters = $('#chkDownloadChapterEpisodes', form).checked();
             config.ExtractDuringLibraryScan = $('#chkExtractChaptersDuringLibraryScan', form).checked();
 
-            config.DisabledFetchers = $('.chkChapterFetcher:not(:checked)', form).get().map(function (c) {
-
-                return c.getAttribute('data-pluginname');
-
-            });
-
-            config.FetcherOrder = $('.chkChapterFetcher', form).get().map(function (c) {
-
-                return c.getAttribute('data-pluginname');
-
-            });
-
             ApiClient.updateNamedConfiguration("chapters", config);
         });
     }
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index d7a1a45722..2811e171a7 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -175,17 +175,18 @@
 
             for (i = 0, length = plugins.length; i < length; i++) {
 
-                html += '<div style="margin:6px 0;">';
-                if (i == 0) {
-                    html += '<button data-inline="true" disabled="disabled" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
-                } else if (i == (plugins.length - 1)) {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" disabled="disabled" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
+                html += '<div style="margin:6px 0 0;">';
+
+                if (i > 0) {
+                    html += '<paper-icon-button class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
+                } else {
+                    html += '<paper-icon-button disabled class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
                 }
-                else {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
+
+                if (i < (plugins.length - 1)) {
+                    html += '<paper-icon-button class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
+                } else {
+                    html += '<paper-icon-button disabled class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
                 }
                 html += '</div>';
             }
@@ -298,17 +299,18 @@
 
             for (i = 0, length = plugins.length; i < length; i++) {
 
-                html += '<div style="margin:6px 0;">';
-                if (i == 0) {
-                    html += '<button data-inline="true" disabled="disabled" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
-                } else if (i == (plugins.length - 1)) {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" disabled="disabled" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
+                html += '<div style="margin:6px 0 0;">';
+
+                if (i > 0) {
+                    html += '<paper-icon-button class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
+                } else {
+                    html += '<paper-icon-button disabled class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
                 }
-                else {
-                    html += '<button data-inline="true" class="btnUp" data-pluginindex="' + i + '" type="button" data-icon="arrow-u" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonUp') + '</button>';
-                    html += '<button data-inline="true" class="btnDown" data-pluginindex="' + i + '" type="button" data-icon="arrow-d" data-mini="true" data-iconpos="notext" style="margin: 0 1px;">' + Globalize.translate('ButtonDown') + '</button>';
+
+                if (i < (plugins.length - 1)) {
+                    html += '<paper-icon-button class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
+                } else {
+                    html += '<paper-icon-button disabled class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
                 }
                 html += '</div>';
             }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c28dba81e8..328056266a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -782,7 +782,7 @@ var Dashboard = {
 
     showUserFlyout: function () {
 
-        require(['jqmpanel', 'jqmicons'], function () {
+        require(['jqmpanel'], function () {
             var html = '<div data-role="panel" data-position="right" data-display="overlay" id="userFlyout" data-position-fixed="true" data-theme="a">';
 
             html += '<h3 class="userHeader">';
@@ -2209,7 +2209,6 @@ var AppInfo = {};
                     depends = depends || [];
 
                     if (newHtml.indexOf('type-interior') != -1) {
-                        depends.push('jqmicons');
                         depends.push('jqmpopup');
                         depends.push('jqmlistview');
                         depends.push('jqmcollapsible');
@@ -2281,9 +2280,31 @@ var AppInfo = {};
 
 })();
 
-Dashboard.jQueryMobileInit();
+function pageClassOn(eventName, className, fn) {
 
-$(document).on('pagecreate', ".page", function () {
+    $(document).on(eventName, function (e) {
+
+        var target = e.target;
+
+        if (target.classList.contains(className)) {
+            fn.call(target, e);
+        }
+    });
+}
+
+function pageIdOn(eventName, id, fn) {
+
+    $(document).on(eventName, function (e) {
+
+        var target = e.target;
+
+        if (target.id == id) {
+            fn.call(target, e);
+        }
+    });
+}
+
+pageClassOn('pagecreate', "page", function () {
 
     var page = $(this);
 
@@ -2306,7 +2327,9 @@ $(document).on('pagecreate', ".page", function () {
         }
     }
 
-}).on('pageshow', ".page", function () {
+});
+
+pageClassOn('pageshow', "page", function () {
 
     var page = this;
 
@@ -2327,15 +2350,10 @@ $(document).on('pagecreate', ".page", function () {
         document.body.classList.remove('darkScrollbars');
     }
 
-    var isWizardPage = page.classList.contains('wizardPage');
     Dashboard.ensurePageTitle(page);
 
     var apiClient = window.ApiClient;
 
-    if (isWizardPage) {
-        require(['jqmicons']);
-    }
-
     if (apiClient && apiClient.accessToken() && Dashboard.getCurrentUserId()) {
 
         var isSettingsPage = page.classList.contains('type-interior');
@@ -2365,7 +2383,7 @@ $(document).on('pagecreate', ".page", function () {
             }
         }
 
-        if (!isConnectMode && this.id !== "loginPage" && !page.classList.contains('forgotPasswordPage') && !isWizardPage && this.id !== 'publicSharedItemPage') {
+        if (!isConnectMode && this.id !== "loginPage" && !page.classList.contains('forgotPasswordPage') && !page.classList.contains('wizardPage') && this.id !== 'publicSharedItemPage') {
 
             Logger.log('Not logged into server. Redirecting to login.');
             Dashboard.logout();
@@ -2380,4 +2398,7 @@ $(document).on('pagecreate', ".page", function () {
     if (apiClient && !apiClient.isWebSocketOpen()) {
         Dashboard.refreshSystemInfoFromServer();
     }
-});
\ No newline at end of file
+
+});
+
+Dashboard.jQueryMobileInit();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index b86368b674..6567089ef6 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -218,7 +218,7 @@
 
     function showPendingUserMenu(elem) {
 
-        require(['jqmpopup'], function() {
+        require(['jqmpopup'], function () {
             var card = $(elem).parents('.card');
             var page = $(elem).parents('.page');
             var id = card.attr('data-id');
@@ -281,9 +281,8 @@
 
         html += '<div class="cardFooter">';
 
-        html += '<div class="cardText" style="text-align:right; float:right;">';
-
-        html += '<button class="btnUserMenu" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 2px 0 0;"></button>';
+        html += '<div class="cardText" style="text-align:right; float:right;padding:0;">';
+        html += '<paper-icon-button icon="' + AppInfo.moreIcon + '" class="btnUserMenu"></paper-icon-button>';
         html += "</div>";
 
         html += '<div class="cardText" style="margin-right: 30px; padding: 11px 0 10px;">';
@@ -470,6 +469,11 @@
             showInvitePopup(page);
         });
 
+        $('.btnAddUser', page).on('click', function () {
+
+            Dashboard.navigate('usernew.html');
+        });
+
         $('.addUserForm').off('submit', onSubmit).on('submit', onSubmit);
 
     }).on('pagebeforeshow', "#userProfilesPage", function () {
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
index ef0b00fe93..11b72fafe0 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
@@ -386,10 +386,6 @@
 		// data-ignored
 		ignoreContentEnabled: false,
 
-		buttonMarkup: {
-			hoverDelay: 200
-		},
-
 		// disable the alteration of the dynamic base tag or links in the case
 		// that a dynamic base tag isn't supported
 		dynamicBaseEnabled: true,
@@ -801,13 +797,6 @@ $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
 				$.mobile.links( this );
 			}
 
-		    var thisElem = this[0];
-
-			// Run buttonmarkup
-			if ( $.fn.buttonMarkup ) {
-			    $(thisElem.querySelectorAll($.fn.buttonMarkup.initSelector)).jqmEnhanceable().buttonMarkup();
-			}
-
 			// Enhance widgets
 			$.each( $.mobile.widgets, function( name, constructor ) {
 
@@ -1092,7 +1081,6 @@ $.extend( $.support, {
 	cssPseudoElement: !!propExists( "content" ),
 	touchOverflow: !!propExists( "overflowScrolling" ),
 	cssTransform3d: transform3dTest(),
-	boxShadow: !!propExists( "boxShadow" ) && !bb,
 	fixedPosition: true,
 	scrollTop: ("pageXOffset" in window ||
 		"scrollTop" in document.documentElement ||
@@ -1119,11 +1107,6 @@ $.mobile.ajaxBlacklist =
 			// Opera Mini
 			operamini;
 
-// For ruling out shadows via css
-if ( !$.support.boxShadow ) {
-	$( "html" ).addClass( "ui-noboxshadow" );
-}
-
 })( jQuery );
 
 
@@ -1337,264 +1320,6 @@ if ( !$.support.boxShadow ) {
 	$.fn.animationComplete.defaultDuration = 1000;
 })( jQuery );
 
-
-// buttonMarkup is deprecated as of 1.4.0 and will be removed in 1.5.0.
-
-(function( $, undefined ) {
-
-// General policy: Do not access data-* attributes except during enhancement.
-// In all other cases we determine the state of the button exclusively from its
-// className. That's why optionsToClasses expects a full complement of options,
-// and the jQuery plugin completes the set of options from the default values.
-
-// Map classes to buttonMarkup boolean options - used in classNameToOptions()
-var reverseBoolOptionMap = {
-		"ui-shadow" : "shadow",
-		"ui-corner-all" : "corners",
-		"ui-btn-inline" : "inline",
-		"ui-shadow-icon" : "iconshadow", /* TODO: Remove in 1.5 */
-		"ui-mini" : "mini"
-	},
-	getAttrFixed = function() {
-		var ret = $.mobile.getAttribute.apply( this, arguments );
-
-		return ( ret == null ? undefined : ret );
-	},
-	capitalLettersRE = /[A-Z]/g;
-
-// optionsToClasses:
-// @options: A complete set of options to convert to class names.
-// @existingClasses: extra classes to add to the result
-//
-// Converts @options to buttonMarkup classes and returns the result as an array
-// that can be converted to an element's className with .join( " " ). All
-// possible options must be set inside @options. Use $.fn.buttonMarkup.defaults
-// to get a complete set and use $.extend to override your choice of options
-// from that set.
-function optionsToClasses( options, existingClasses ) {
-	var classes = existingClasses ? existingClasses : [];
-
-	// Add classes to the array - first ui-btn
-	classes.push( "ui-btn" );
-
-	// If there is a theme
-	if ( options.theme ) {
-		classes.push( "ui-btn-" + options.theme );
-	}
-
-	// If there's an icon, add the icon-related classes
-	if ( options.icon ) {
-		classes = classes.concat([
-			"ui-icon-" + options.icon,
-			"ui-btn-icon-" + options.iconpos
-		]);
-		if ( options.iconshadow ) {
-			classes.push( "ui-shadow-icon" ); /* TODO: Remove in 1.5 */
-		}
-	}
-
-	// Add the appropriate class for each boolean option
-	if ( options.inline ) {
-		classes.push( "ui-btn-inline" );
-	}
-	if ( options.shadow ) {
-		classes.push( "ui-shadow" );
-	}
-	if ( options.corners ) {
-		classes.push( "ui-corner-all" );
-	}
-	if ( options.mini ) {
-		classes.push( "ui-mini" );
-	}
-
-	// Create a string from the array and return it
-	return classes;
-}
-
-// classNameToOptions:
-// @classes: A string containing a .className-style space-separated class list
-//
-// Loops over @classes and calculates an options object based on the
-// buttonMarkup-related classes it finds. It records unrecognized classes in an
-// array.
-//
-// Returns: An object containing the following items:
-//
-// "options": buttonMarkup options found to be present because of the
-// presence/absence of corresponding classes
-//
-// "unknownClasses": a string containing all the non-buttonMarkup-related
-// classes found in @classes
-//
-// "alreadyEnhanced": A boolean indicating whether the ui-btn class was among
-// those found to be present
-function classNameToOptions( classes ) {
-	var idx, map, unknownClass,
-		alreadyEnhanced = false,
-		noIcon = true,
-		o = {
-			icon: "",
-			inline: false,
-			shadow: false,
-			corners: false,
-			iconshadow: false,
-			mini: false
-		},
-		unknownClasses = [];
-
-	classes = classes.split( " " );
-
-	// Loop over the classes
-	for ( idx = 0 ; idx < classes.length ; idx++ ) {
-
-		// Assume it's an unrecognized class
-		unknownClass = true;
-
-		// Recognize boolean options from the presence of classes
-		map = reverseBoolOptionMap[ classes[ idx ] ];
-		if ( map !== undefined ) {
-			unknownClass = false;
-			o[ map ] = true;
-
-		// Recognize the presence of an icon and establish the icon position
-		} else if ( classes[ idx ].indexOf( "ui-btn-icon-" ) === 0 ) {
-			unknownClass = false;
-			noIcon = false;
-			o.iconpos = classes[ idx ].substring( 12 );
-
-		// Establish which icon is present
-		} else if ( classes[ idx ].indexOf( "ui-icon-" ) === 0 ) {
-			unknownClass = false;
-			o.icon = classes[ idx ].substring( 8 );
-
-		// Establish the theme - this recognizes one-letter theme swatch names
-		} else if ( classes[ idx ].indexOf( "ui-btn-" ) === 0 && classes[ idx ].length === 8 ) {
-			unknownClass = false;
-			o.theme = classes[ idx ].substring( 7 );
-
-		// Recognize that this element has already been buttonMarkup-enhanced
-		} else if ( classes[ idx ] === "ui-btn" ) {
-			unknownClass = false;
-			alreadyEnhanced = true;
-		}
-
-		// If this class has not been recognized, add it to the list
-		if ( unknownClass ) {
-			unknownClasses.push( classes[ idx ] );
-		}
-	}
-
-	// If a "ui-btn-icon-*" icon position class is absent there cannot be an icon
-	if ( noIcon ) {
-		o.icon = "";
-	}
-
-	return {
-		options: o,
-		unknownClasses: unknownClasses,
-		alreadyEnhanced: alreadyEnhanced
-	};
-}
-
-function camelCase2Hyphenated( c ) {
-	return "-" + c.toLowerCase();
-}
-
-// $.fn.buttonMarkup:
-// DOM: gets/sets .className
-//
-// @options: options to apply to the elements in the jQuery object
-// @overwriteClasses: boolean indicating whether to honour existing classes
-//
-// Calculates the classes to apply to the elements in the jQuery object based on
-// the options passed in. If @overwriteClasses is true, it sets the className
-// property of each element in the jQuery object to the buttonMarkup classes
-// it calculates based on the options passed in.
-//
-// If you wish to preserve any classes that are already present on the elements
-// inside the jQuery object, including buttonMarkup-related classes that were
-// added by a previous call to $.fn.buttonMarkup() or during page enhancement
-// then you should omit @overwriteClasses or set it to false.
-$.fn.buttonMarkup = function( options, overwriteClasses ) {
-	var idx, data, el, retrievedOptions, optionKey,
-		defaults = $.fn.buttonMarkup.defaults;
-
-	for ( idx = 0 ; idx < this.length ; idx++ ) {
-		el = this[ idx ];
-		data = overwriteClasses ?
-
-			// Assume this element is not enhanced and ignore its classes
-			{ alreadyEnhanced: false, unknownClasses: [] } :
-
-			// Otherwise analyze existing classes to establish existing options and
-			// classes
-			classNameToOptions( el.className );
-
-		retrievedOptions = $.extend( {},
-
-			// If the element already has the class ui-btn, then we assume that
-			// it has passed through buttonMarkup before - otherwise, the options
-			// returned by classNameToOptions do not correctly reflect the state of
-			// the element
-			( data.alreadyEnhanced ? data.options : {} ),
-
-			// Finally, apply the options passed in
-			options );
-
-		// If this is the first call on this element, retrieve remaining options
-		// from the data-attributes
-		if ( !data.alreadyEnhanced ) {
-			for ( optionKey in defaults ) {
-				if ( retrievedOptions[ optionKey ] === undefined ) {
-					retrievedOptions[ optionKey ] = getAttrFixed( el,
-						optionKey.replace( capitalLettersRE, camelCase2Hyphenated )
-					);
-				}
-			}
-		}
-
-		el.className = optionsToClasses(
-
-			// Merge all the options and apply them as classes
-			$.extend( {},
-
-				// The defaults form the basis
-				defaults,
-
-				// Add the computed options
-				retrievedOptions
-			),
-
-			// ... and re-apply any unrecognized classes that were found
-			data.unknownClasses ).join( " " );
-		if ( el.tagName.toLowerCase() !== "button" ) {
-			el.setAttribute( "role", "button" );
-		}
-	}
-
-	return this;
-};
-
-// buttonMarkup defaults. This must be a complete set, i.e., a value must be
-// given here for all recognized options
-$.fn.buttonMarkup.defaults = {
-	icon: "",
-	iconpos: "left",
-	theme: null,
-	inline: false,
-	shadow: true,
-	corners: true,
-	iconshadow: false, /* TODO: Remove in 1.5. Option deprecated in 1.4. */
-	mini: false
-};
-
-$.extend( $.fn.buttonMarkup, {
-    initSelector: "a[data-role='button'], button:not([data-role='none'])"
-});
-
-})( jQuery );
-
-
 /*!
  * jQuery UI Widget c0ab71056b936627e8a7821f03c044aec6280a40
  * http://jqueryui.com
@@ -3956,7 +3681,6 @@ $.widget( "mobile.page", {
 
 				if (contentElem.classList.contains('type-interior')) {
 				    dependencies = dependencies || [];
-				    dependencies.push('jqmicons');
 				    dependencies.push('jqmpopup');
 				    dependencies.push('jqmlistview');
 				    dependencies.push('jqmcollapsible');
@@ -4757,8 +4481,7 @@ $.widget( "mobile.page", {
 
 
 (function( $, window, undefined ) {
-	var	$html = $( "html" ),
-		$window = $.mobile.window;
+	var	$window = $.mobile.window;
 
 	// trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
 	$( window.document ).trigger( "mobileinit" );
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.css
index fb7cbc0c6b..bac9af1659 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.css
@@ -293,76 +293,6 @@ button.ui-btn-icon-notext,
 }
 
 
-.ui-field-contain,
-.ui-mobile fieldset.ui-field-contain {
-	display: block;
-	position: relative;
-	overflow: visible;
-	clear: both;
-	padding: .8em 0;
-}
-.ui-field-contain > label ~ [class*="ui-"],
-.ui-field-contain .ui-controlgroup-controls {
-	margin: 0;
-}
-.ui-field-contain:last-child {
-	border-bottom-width: 0;
-}
-@media (min-width: 28em) {
-	.ui-field-contain,
-	.ui-mobile fieldset.ui-field-contain {
-		padding: 0;
-		margin: 1em 0;
-		border-bottom-width: 0;
-	}
-	.ui-field-contain:before,
-	.ui-field-contain:after {
-		content: "";
-		display: table;
-	}
-	.ui-field-contain:after {
-		clear: both;
-	}
-	.ui-field-contain > label,
-	.ui-field-contain .ui-controlgroup-label,
-	.ui-field-contain > .ui-rangeslider > label {
-		float: left;
-		width: 20%;
-		margin: .5em 2% 0 0;
-	}
-	.ui-popup .ui-field-contain > label,
-	.ui-popup .ui-field-contain .ui-controlgroup-label,
-	.ui-popup .ui-field-contain > .ui-rangeslider > label {
-		float: none;
-		width: auto;
-		margin: 0 0 .4em;
-	}
-	.ui-field-contain > label ~ [class*="ui-"],
-	.ui-field-contain .ui-controlgroup-controls {
-		float: left;
-		width: 78%;
-		-webkit-box-sizing: border-box;
-		-moz-box-sizing: border-box;
-		box-sizing: border-box;
-	}
-	/* ui-hide-label deprecated in 1.4. TODO: Remove in 1.5 */
-	.ui-hide-label > label ~ [class*="ui-"],
-	.ui-hide-label .ui-controlgroup-controls,
-	.ui-popup .ui-field-contain > label ~ [class*="ui-"],
-	.ui-popup .ui-field-contain .ui-controlgroup-controls {
-		float: none;
-		width: 100%;
-	}
-	.ui-field-contain > label ~ .ui-btn-inline {
-		width: auto;
-		margin-right: .625em;
-	}
-	.ui-field-contain > label ~ .ui-btn-inline.ui-btn-icon-notext {
-		width: 1.75em;
-	}
-}
-
-
 /* content configurations. */
 .ui-grid-a,
 .ui-grid-b,
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
index 512784a1df..301b88b95a 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css
@@ -19,9 +19,7 @@ html {
 body,
 button,
 .ui-btn {
-	font-size: 1em;
-	line-height: 1.3;
-	font-family: sans-serif /*{global-font-family}*/;
+	line-height: 1.3 /*{global-font-family}*/;
 }
 legend {
 	color: inherit;
@@ -35,13 +33,7 @@ div.ui-controlgroup-label {
 
 /* Separators
 -----------------------------------------------------------------------------------------------------------*/
-/* Field contain separator (< 28em) */
-.ui-field-contain {
-	border-bottom-color: #828282;
-	border-bottom-color: rgba(0,0,0,.15);
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
+
 
 /* Table opt-in classes: strokes between each row, and alternating row stripes */
 /* Classes table-stroke and table-stripe are deprecated in 1.4. */
@@ -533,23 +525,4 @@ button[disabled] {
 .ui-btn:focus,
 .ui-btn.ui-focus {
 	outline: 0;
-}
-/* Unset box-shadow in browsers that don't do it right */
-.ui-noboxshadow .ui-shadow,
-.ui-noboxshadow .ui-shadow-inset,
-.ui-noboxshadow .ui-overlay-shadow,
-.ui-noboxshadow .ui-shadow-icon.ui-btn:after,
-.ui-noboxshadow .ui-shadow-icon .ui-btn:after,
-.ui-noboxshadow .ui-focus,
-.ui-noboxshadow .ui-btn:focus,
-.ui-noboxshadow  input:focus,
-.ui-noboxshadow .ui-panel {
-	-webkit-box-shadow: none !important;
-	-moz-box-shadow: none !important;
-	box-shadow: none !important;
-}
-.ui-noboxshadow .ui-btn:focus,
-.ui-noboxshadow .ui-focus {
-	outline-width: 1px;
-	outline-style: auto;
 }
\ No newline at end of file
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 70609d54c1..dfaebef217 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -277,6 +277,15 @@ paper-tabs paper-ripple {
     color: #38c !important;
 }
 
+paper-fab {
+    vertical-align: middle;
+}
+
+paper-fab.mini {
+    width: 22px;
+    height: 22px;
+}
+
 paper-fab.subdued {
     background: #484848;
     color: #fff;
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 90999d0254..c9e05431e6 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -33,7 +33,7 @@
                     <div>
                         <div>
                             <div class="ui-controlgroup-label" style="display:inline-block;">${LabelBlockContentWithTags}</div>
-                            <button type="button" class="btnAddBlockedTag" data-inline="true" data-mini="true" data-iconpos="notext" data-icon="plus" style="vertical-align:middle;margin: -5px 0 0 1em;">${ButtonAdd}</button>
+                            <paper-fab class="btnAddBlockedTag mini" icon="add" title="${ButtonAdd}" style="margin-left:1em;"></paper-fab>
                         </div>
                         <div class="blockedTags" style="margin-top:.5em;">
 
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 95c1b2b15a..98ae5c7be3 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -12,9 +12,7 @@
                 <div class="detailSectionHeader">
                     <h3 style="margin:.6em 0;">
                         <span style="vertical-align:middle;">${HeaderUsers}</span>
-                        <a data-role="button" data-icon="plus" href="usernew.html" data-inline="true" data-mini="true" data-iconpos="notext" style="margin: 0 .5em; vertical-align:middle;">
-                            ${ButtonAddUser}
-                        </a>
+                        <paper-fab class="btnAddUser mini" icon="add" title="${ButtonAddUser}" style="margin-left:1em;"></paper-fab>
                     </h3>
                 </div>
                 <div class="localUsers" style="text-align:left;margin-top:.5em;"></div>
@@ -22,9 +20,7 @@
                 <div class="detailSectionHeader" style="margin-top:2.5em;">
                     <h3 style="margin:.6em 0;">
                         <span style="vertical-align:middle;">${HeaderGuests}</span>
-                        <a class="btnInvite" data-role="button" data-icon="plus" href="#" data-rel="popup" data-position-to="window" data-inline="true" data-mini="true" data-iconpos="notext" style="margin: 0 0 0 .5em; vertical-align:middle;">
-                            ${ButtonInviteUser}
-                        </a>
+                        <paper-fab class="btnInvite mini" icon="add" title="${ButtonInviteUser}" style="margin-left:1em;"></paper-fab>
                     </h3>
                 </div>
                 <div class="connectUsers" style="text-align:left;margin-top:.5em;"></div>