diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 74e84971be..062b76ca44 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'datetime', 'jQuery', 'emby-checkbox', 'emby-input', 'emby-select', 'paper-item-body', 'paper-icon-item', 'emby-textarea', 'paper-fab', 'paper-icon-button-light'], function (dialogHelper, datetime, $) {
+define(['dialogHelper', 'datetime', 'jQuery', 'emby-checkbox', 'emby-input', 'emby-select', 'listViewStyle', 'emby-textarea', 'emby-button', 'paper-icon-button-light'], function (dialogHelper, datetime, $) {
 
     var currentContext;
     var metadataEditorInfo;
@@ -968,21 +968,21 @@
         }
         var html = '';
         for (var i = 0; i < items.length; i++) {
-            html += '<paper-icon-item>';
+            html += '<div class="listItem">';
 
-            html += '<paper-fab mini style="background-color:#444;" icon="live-tv" item-icon></paper-fab>';
+            html += '<button type="button" is="emby-button" data-index="' + i + '" class="fab autoSize mini"><i class="md-icon">live_tv</i></button>';
 
-            html += '<paper-item-body>';
+            html += '<div class="listItemBody">';
 
             html += '<div class="textValue">';
             html += items[i];
             html += '</div>';
 
-            html += '</paper-item-body>';
+            html += '</div>';
 
             html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList"><iron-icon icon="delete"></iron-icon></button>';
 
-            html += '</paper-icon-item>';
+            html += '</div>';
         }
 
         list.innerHTML = html;
@@ -999,11 +999,11 @@
 
             var person = people[i];
 
-            html += '<paper-icon-item>';
+            html += '<div class="listItem">';
 
-            html += '<paper-fab class="btnEditPerson" data-index="' + i + '" mini style="background-color:#444;" icon="person" item-icon></paper-fab>';
+            html += '<button type="button" is="emby-button" data-index="' + i + '" class="btnEditPerson fab autoSize mini"><i class="md-icon">person</i></button>';
 
-            html += '<paper-item-body>';
+            html += '<div class="listItemBody">';
             html += '<a class="btnEditPerson clearLink" href="#" data-index="' + i + '">';
 
             html += '<div class="textValue">';
@@ -1011,15 +1011,15 @@
             html += '</div>';
 
             if (person.Role && person.Role != lastType) {
-                html += '<div secondary>' + (person.Role) + '</div>';
+                html += '<div class="secondary">' + (person.Role) + '</div>';
             }
 
             html += '</a>';
-            html += '</paper-item-body>';
+            html += '</div>';
 
             html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson"><iron-icon icon="delete"></iron-icon></button>';
 
-            html += '</paper-icon-item>';
+            html += '</div>';
         }
 
         elem.innerHTML = html;
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 51f761b0a1..84dce42721 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -17,8 +17,7 @@
             <br />
             <div class="localSyncStatus hide" style="text-align:right;margin:0 0 1em;">
                 <span style="vertical-align: middle;margin-right:.5em;" class="labelSyncStatus"></span>
-                <paper-spinner class="syncSpinner" active style="vertical-align: middle;"></paper-spinner>
-                <paper-fab class="btnSyncNow mini accent" icon="sync" style="margin-right:.5em;"></paper-fab>
+                <button type="button" is="emby-button" class="btnSyncNow mini accent fab autoSize" style="margin-right:.5em;"><i class="md-icon">sync</i></button>
             </div>
             <div class="syncActivity">
 
diff --git a/dashboard-ui/scripts/mysync.js b/dashboard-ui/scripts/mysync.js
index 66b6084483..1ec8ddbcc8 100644
--- a/dashboard-ui/scripts/mysync.js
+++ b/dashboard-ui/scripts/mysync.js
@@ -1,4 +1,4 @@
-define(['localsync'], function () {
+define(['loading', 'localsync'], function (loading) {
 
     function refreshSyncStatus(page) {
 
@@ -7,7 +7,11 @@
             var status = LocalSync.getSyncStatus();
 
             page.querySelector('.labelSyncStatus').innerHTML = Globalize.translate('LabelLocalSyncStatusValue', status);
-            page.querySelector('.syncSpinner').active = status == "Active";
+            if (status == 'Active') {
+                loading.show();
+            } else {
+                loading.hide();
+            }
 
             if (status == "Active") {
                 page.querySelector('.btnSyncNow').classList.add('hide');
@@ -42,7 +46,7 @@
 
         } else {
             view.querySelector('.localSyncStatus').classList.add('hide');
-            view.querySelector('.syncSpinner').active = false;
+            loading.hide();
         }
 
         view.addEventListener('viewbeforeshow', function () {
@@ -58,7 +62,7 @@
         view.addEventListener('viewbeforehide', function () {
             var page = this;
 
-            page.querySelector('.syncSpinner').active = false;
+            loading.hide();
 
             if (interval) {
                 clearInterval(interval);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ce71112ff4..7ac75dfebb 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2776,7 +2776,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/mysync.html',
-            dependencies: ['scripts/syncactivity', 'scripts/taskbutton', 'paper-spinner', 'paper-fab', 'emby-button'],
+            dependencies: ['scripts/syncactivity', 'scripts/taskbutton', 'emby-button'],
             autoFocus: false,
             transition: 'fade',
             controller: 'scripts/mysync'