diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js
index 47655d8c5..83e2c229c 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.js
+++ b/dashboard-ui/components/guestinviter/guestinviter.js
@@ -111,7 +111,7 @@
                     dlg.innerHTML = html;
                     // needed for the collapsible
                     document.body.appendChild(dlg);
-                    $(dlg).trigger('create');
+                    $(dlg.querySelector('form')).trigger('create');
 
                     paperDialogHelper.open(dlg);
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index c093dbdf5..a5fcb95ad 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -245,20 +245,18 @@
                 dlg.classList.add('popupEditor');
 
                 var html = '';
-                html += '<h2 class="dialogHeader">';
-                html += '<paper-fab icon="arrow-back" mini class="btnCancel"></paper-fab>';
-                html += '</h2>';
+                html += '<div class="dialogHeader">';
+                html += '<paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>';
+                html += '<div class="dialogHeaderTitle">';
+                html += Globalize.translate('SyncMedia');
+                html += '</div>';
 
-                html += '<div>';
+                html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:auto;"><paper-button class="mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
+
+                html += '</div>';
 
                 html += '<form class="formSubmitSyncRequest" style="margin: auto;">';
 
-                html += '<div style="margin:1em 0 1.5em;">';
-                html += '<h1 style="margin: 0;display:inline-block;vertical-align:middle;">' + Globalize.translate('SyncMedia') + '</h1>';
-
-                html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
-                html += '</div>';
-
                 html += '<div class="formFields"></div>';
 
                 html += '<p>';
@@ -266,7 +264,6 @@
                 html += '</p>';
 
                 html += '</form>';
-                html += '</div>';
 
                 dlg.innerHTML = html;
                 document.body.appendChild(dlg);
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index ba5d439ac..bf09d134b 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -545,17 +545,17 @@ div.dialogHeader {
     font-size: 110%;
 }
 
-.background-theme-a div.dialogHeader {
+.ui-body-a div.dialogHeader {
     background-color: #52B54B;
     color: #fff;
 }
 
-.background-theme-a .pageContentPaperMaterial {
+.ui-body-a .pageContentPaperMaterial {
     background-color: #fff;
     padding: 1.5em;
 }
 
-.background-theme-b div.dialogHeader {
+.ui-body-b div.dialogHeader {
     background-color: #101010;
 }