diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 589b709429..86cad473ef 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -729,6 +729,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         font-size: 20px;
     }
 
+.detailSectionHeader paper-button {
+    font-size: 13px;
+}
+
 .ui-page-theme-b .detailSectionHeader {
     background-color: #141414;
 }
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 2615bc6f46..41a2025460 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -21,7 +21,10 @@
 
                         <div>
                             <h1 style="display:inline-block;vertical-align:middle;">${HeaderTunerDevices}</h1>
-                            <paper-fab class="btnAddDevice mini" icon="add" title="${ButtonAdd}" style="margin-left:1em;"></paper-fab>
+                            <paper-button raised class="btnAddDevice submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                                <iron-icon icon="add"></iron-icon>
+                                <span>${ButtonAdd}</span>
+                            </paper-button>
                         </div>
                         <div class="devicesList">
                         </div>
@@ -30,7 +33,10 @@
                             <br />
                             <div>
                                 <h1 style="display:inline-block;vertical-align:middle;">${HeaderGuideProviders}</h1>
-                                <paper-fab class="btnAddProvider mini" icon="add" title="${ButtonAdd}" style="margin-left:1em;"></paper-fab>
+                                <paper-button raised class="btnAddProvider submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                                    <iron-icon icon="add"></iron-icon>
+                                    <span>${ButtonAdd}</span>
+                                </paper-button>
                             </div>
                             <p>${AddGuideProviderHelp}</p>
                             <div class="providerList">
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 5e03fdadf7..0fc5a28864 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -94,6 +94,4 @@
         }
     });
 
-    window.CinemaModeConfigurationPage = new cinemaModeConfigurationPage();
-
 })(jQuery, document, window);
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 98ae5c7be3..18859b87e5 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -10,18 +10,24 @@
             <div class="content-primary">
                 <br />
                 <div class="detailSectionHeader">
-                    <h3 style="margin:.6em 0;">
+                    <h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                         <span style="vertical-align:middle;">${HeaderUsers}</span>
-                        <paper-fab class="btnAddUser mini" icon="add" title="${ButtonAddUser}" style="margin-left:1em;"></paper-fab>
                     </h3>
+                    <paper-button raised class="btnAddUser submit mini" style="margin-left:1em;" title="${ButtonAddUser}">
+                        <iron-icon icon="add"></iron-icon>
+                        <span>${ButtonAdd}</span>
+                    </paper-button>
                 </div>
                 <div class="localUsers" style="text-align:left;margin-top:.5em;"></div>
 
                 <div class="detailSectionHeader" style="margin-top:2.5em;">
-                    <h3 style="margin:.6em 0;">
-                        <span style="vertical-align:middle;">${HeaderGuests}</span>
-                        <paper-fab class="btnInvite mini" icon="add" title="${ButtonInviteUser}" style="margin-left:1em;"></paper-fab>
+                    <h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                        ${HeaderGuests}
                     </h3>
+                    <paper-button raised class="btnInvite submit mini" style="margin-left:1em;" title="${ButtonInviteUser}">
+                        <iron-icon icon="add"></iron-icon>
+                        <span>${ButtonAdd}</span>
+                    </paper-button>
                 </div>
                 <div class="connectUsers" style="text-align:left;margin-top:.5em;"></div>