diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 76e06590e..639f717e8 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -244,7 +244,7 @@
             </button>
             <div class="paperList" id="listGenres"></div>
         </div>
-        <div data-mini="true" data-role="collapsible" id="peopleCollapsible" style="display: none; margin-top: 3em;">
+        <div id="peopleCollapsible" style="display: none; margin-top: 3em;">
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderPeople}
             </h1>
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 0353733da..4279b39e2 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmlistview,jqmcollapsible,jqmpopup,scripts/dlnaprofile,jqmcheckbox,emby-button">
+<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jQuery,jqmlistview,emby-collapse,jqmpopup,scripts/dlnaprofile,jqmcheckbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -46,9 +46,8 @@
 
 
                     <br />
-                    <div data-role="collapsible">
-                        <h2>${HeaderIdentification}</h2>
-                        <div>
+                    <div is="emby-collapse" title="${HeaderIdentification}">
+                        <div class="collapseContent">
                             <br />
                             <p>${HeaderIdentificationCriteriaHelp}</p>
                             <br />
@@ -110,9 +109,9 @@
                             <div class="httpHeaderIdentificationList"></div>
                         </div>
                     </div>
-                    <div data-role="collapsible">
-                        <h2>${HeaderDisplaySettings}</h2>
-                        <div>
+
+                    <div is="emby-collapse" title="${HeaderDisplaySettings}">
+                        <div class="collapseContent">
                             <br />
                             <ul data-role="listview" class="ulForm">
                                 <li>
@@ -129,9 +128,8 @@
                         </div>
                     </div>
 
-                    <div data-role="collapsible">
-                        <h2>${HeaderImageSettings}</h2>
-                        <div>
+                    <div is="emby-collapse" title="${HeaderImageSettings}">
+                        <div class="collapseContent">
                             <br />
                             <ul data-role="listview" class="ulForm">
                                 <li>
@@ -173,9 +171,8 @@
                         </div>
                     </div>
 
-                    <div data-role="collapsible">
-                        <h2>${HeaderPlaybackSettings}</h2>
-                        <div>
+                    <div is="emby-collapse" title="${HeaderPlaybackSettings}">
+                        <div class="collapseContent">
                             <br />
                             <ul data-role="listview" class="ulForm">
                                 <li>
@@ -196,9 +193,9 @@
                             </ul>
                         </div>
                     </div>
-                    <div data-role="collapsible">
-                        <h2>${HeaderServerSettings}</h2>
-                        <div>
+
+                    <div is="emby-collapse" title="${HeaderServerSettings}">
+                        <div class="collapseContent">
                             <p>${HeaderProfileServerSettingsHelp}</p>
                             <br />
                             <ul data-role="listview" class="ulForm">
@@ -258,9 +255,8 @@
                         </div>
                     </div>
 
-                    <div data-role="collapsible">
-                        <h2>${HeaderSubtitleProfiles}</h2>
-                        <div>
+                    <div is="emby-collapse" title="${HeaderSubtitleProfiles}">
+                        <div class="collapseContent">
                             <p>${HeaderSubtitleProfilesHelp}</p>
                             <p><button type="button" class="btnAddSubtitleProfile" data-icon="plus">${ButtonAdd}</button></p>
                             <div class="subtitleProfileList"></div>
@@ -268,9 +264,8 @@
                         </div>
                     </div>
 
-                    <div data-role="collapsible">
-                        <h2>${HeaderXmlSettings}</h2>
-                        <div>
+                    <div is="emby-collapse" title="${HeaderXmlSettings}">
+                        <div class="collapseContent">
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
                                 <button is="emby-button" type="button" class="raised submit mini btnAddXmlDocumentAttribute" style="margin-left:1em;">
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index 5f986b748..5bcfcb63e 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -64,7 +64,7 @@
 
             if (positive && positive.length > 0) {
 
-                html += '<div data-role="collapsible" data-collapsed="true" style="margin-top: 2em;" >';
+                html += '<div style="margin-top: 2em;" >';
                 html += '<h3>' + Globalize.translate('HeaderLatestReviews') + '</h3>';
 
                 html += "<div><br/>";
diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html
index 0be734fe0..fb60807bf 100644
--- a/dashboard-ui/search.html
+++ b/dashboard-ui/search.html
@@ -22,18 +22,11 @@
                 text-indent: 12.5%;
             }
         }
-
-        .searchPageSearchButton {
-            display: none;
-        }
     </style>
 
     <button is="paper-icon-button-light" style="position: absolute; top: .6em; left: 0; z-index: 1;" tabindex="-1" class="btnBack autoSize searchBackButton">
         <i class="md-icon">&#xE5C4;</i>
     </button>
-    <button is="paper-icon-button-light" style="position: absolute; top: .6em; left: 0; z-index: 1;" tabindex="-1" class="btnBack autoSize searchPageSearchButton">
-        <i class="md-icon">search</i>
-    </button>
 
     <div data-role="content" style="padding-top:0!important;padding-left:0!important;padding-right:0!important;">
         <div class="readOnlyContent" style="text-align: center;margin: 0 auto;">
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 889d984d2..da8b88b44 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -1,4 +1,4 @@
-<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmlistview,jqmpopup,scripts/userparentalcontrol,paper-checkbox,emby-button">
+<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmlistview,jqmpopup,scripts/userparentalcontrol,paper-checkbox,emby-button,emby-collapse">
 
     <div data-role="content">
         <div class="content-primary">
@@ -38,10 +38,9 @@
                 </div>
                 <br />
 
-                <div class="accessScheduleSection" style="display:none;">
-                    <div data-role="collapsible">
-                        <h2>${HeaderAccessSchedule}</h2>
-                        <div>
+                <div class="accessScheduleSection" style="display: none;">
+                    <div is="emby-collapse" title="${HeaderAccessSchedule}">
+                        <div class="collapseContent">
                             <p>${HeaderAccessScheduleHelp}</p>
 
                             <button class="btnAddSchedule" type="button" data-icon="plus" data-mini="true">${ButtonAddSchedule}</button>
@@ -53,11 +52,9 @@
                     </div>
                     <br />
                 </div>
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-                    </li>
-                </ul>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                </div>
 
             </form>