diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
index a10a076b3c..46195c8fc2 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
@@ -8,6 +8,7 @@
     height: 0;
     transition-property: height;
     transition-duration: 300ms;
+    overflow: hidden;
 }
 
 .emby-collapsible-button {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.js b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.js
index 50860f53a3..51f6e70cd5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.js
@@ -47,9 +47,11 @@
 
         var collapseContent = this.parentNode.querySelector('.collapseContent');
 
-        if (collapseContent.classList.contains('expanded')) {
+        if (collapseContent.expanded) {
+            collapseContent.expanded = false;
             slideUpToHide(this, collapseContent);
         } else {
+            collapseContent.expanded = true;
             slideDownToShow(this, collapseContent);
         }
     }
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 062b76ca44..43a11332e8 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -283,22 +283,19 @@
 
         items.push({
             name: Globalize.translate('ButtonEditImages'),
-            id: 'images',
-            ironIcon: 'photo'
+            id: 'images'
         });
 
         if (LibraryBrowser.canIdentify(user, currentItem.Type)) {
             items.push({
                 name: Globalize.translate('ButtonIdentify'),
-                id: 'identify',
-                ironIcon: 'info'
+                id: 'identify'
             });
         }
 
         items.push({
             name: Globalize.translate('ButtonRefresh'),
-            id: 'refresh',
-            ironIcon: 'refresh'
+            id: 'refresh'
         });
 
         require(['actionsheet'], function (actionsheet) {
@@ -516,7 +513,7 @@
             html += '</div>';
 
             if (formatString) {
-                html += '<a class="clearLink ' + buttonId + '" href="#" target="_blank" data-role="none" style="float: none; width: 1.75em"><button type="button" is="paper-icon-button-light"><iron-icon icon="open-in-browser"></iron-icon></button></a>';
+                html += '<a class="clearLink ' + buttonId + '" href="#" target="_blank" data-role="none" style="float: none; width: 1.75em"><button type="button" is="paper-icon-button-light" class="autoSize"><i class="md-icon">open_in_browser</i></button></a>';
             }
             html += '</div>';
 
@@ -980,7 +977,7 @@
 
             html += '</div>';
 
-            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList"><iron-icon icon="delete"></iron-icon></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList autoSize"><i class="md-icon">delete</i></button>';
 
             html += '</div>';
         }
@@ -1017,7 +1014,7 @@
             html += '</a>';
             html += '</div>';
 
-            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson"><iron-icon icon="delete"></iron-icon></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson autoSize"><i class="md-icon">delete</i></button>';
 
             html += '</div>';
         }
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 3b20eb0b3e..52c2d31160 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -1,14 +1,18 @@
 <div class="dialogHeader" style="margin:0 0 2em;">
-    <button is="paper-icon-button-light" class="btnCancel" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
+        <i class="md-icon">arrow_back</i>
+    </button>
     <div class="dialogHeaderTitle">
         ${ButtonEdit}
     </div>
     <div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
-        <button is="emby-button" type="button" class="btnHeaderSave accent" tabindex="-1">
-            <iron-icon icon="check"></iron-icon>
+        <button is="emby-button" type="button" class="btnHeaderSave accent autoSize" tabindex="-1">
+            <i class="md-icon">check</i>
             <span>${ButtonSave}</span>
         </button>
-        <button is="paper-icon-button-light" class="btnMore" tabindex="-1"><iron-icon icon="more-vert"></iron-icon></button>
+        <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
+            <i class="md-icon">more_vert</i>
+        </button>
     </div>
 </div>
 
diff --git a/dashboard-ui/scripts/searchpage.js b/dashboard-ui/scripts/searchpage.js
index bab019e2f8..c15feae70a 100644
--- a/dashboard-ui/scripts/searchpage.js
+++ b/dashboard-ui/scripts/searchpage.js
@@ -176,6 +176,8 @@
             loadSuggestions(view);
         }
 
+        libraryBrowser.createCardMenus(searchResults);
+
         view.querySelector('.txtSearch').addEventListener('input', function () {
             onSearchChange(this.value);
         });
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 7ac75dfebb..50462731cf 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2784,7 +2784,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/mysyncjob.html',
-            dependencies: ['paper-fab', 'paper-item-body', 'paper-icon-item'],
+            dependencies: [],
             autoFocus: false,
             transition: 'fade',
             controller: 'scripts/syncjob'
@@ -2946,7 +2946,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/syncjob.html',
-            dependencies: ['paper-fab', 'paper-item-body', 'paper-icon-item'],
+            dependencies: [],
             autoFocus: false,
             transition: 'fade',
             controller: 'scripts/syncjob'
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 3ddd08fb4f..8a714501f3 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'datetime', 'paper-progress', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function ($, datetime) {
+define(['jQuery', 'datetime', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function ($, datetime) {
 
     function renderJob(page, job, dialogOptions) {
 
@@ -83,7 +83,7 @@
         html += '</div>';
 
         html += '<div class="secondary" style="padding-top:5px;">';
-        html += '<paper-progress class="mini" style="width:100%;" value="' + (jobItem.Progress || 0) + '"></paper-progress>';
+        html += '<div style="background:#e0e0e0;height:4px;"><div style="background:#52B54B;width:' + (jobItem.Progress || 0) + '%;height:100%;"></div></div>';
         html += '</div>';
 
         html += '</div>';
diff --git a/dashboard-ui/scripts/wizardcomponents.js b/dashboard-ui/scripts/wizardcomponents.js
index 71bf5c5c9a..875e92bc1c 100644
--- a/dashboard-ui/scripts/wizardcomponents.js
+++ b/dashboard-ui/scripts/wizardcomponents.js
@@ -19,6 +19,7 @@
             }
 
             if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') {
+
                 view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="https://ffmpeg.zeranoe.com/builds">https://ffmpeg.zeranoe.com</a>');
 
                 if (systemInfo.SystemArchitecture == 'X86') {
@@ -28,30 +29,28 @@
                     instructions = 'Download FFmpeg 64-Bit Static';
                 }
 
-                view.querySelector('.downloadInstructions').innerHTML = instructions;
-
             } else if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') {
 
                 view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://johnvansickle.com/ffmpeg">http://johnvansickle.com/ffmpeg</a>');
+
                 if (systemInfo.SystemArchitecture == 'X86') {
                     instructions = 'Download x86 build';
                 }
                 else if (systemInfo.SystemArchitecture == 'X64') {
                     instructions = 'Download x86_64 build';
                 }
-                view.querySelector('.downloadInstructions').innerHTML = instructions;
 
             } else if (systemInfo.OperatingSystem == 'Osx' && systemInfo.SystemArchitecture == 'X64') {
 
                 view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://evermeet.cx/ffmpeg">http://evermeet.cx/ffmpeg</a>');
                 instructions = 'Download both ffmpeg and ffprobe, and extract them to the same folder.';
-                view.querySelector('.downloadInstructions').innerHTML = instructions;
 
             } else {
                 view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://ffmpeg.org">https://ffmpeg.org/download.html</a>');
-                view.querySelector('.downloadInstructions').innerHTML = '';
             }
 
+            view.querySelector('.downloadInstructions').innerHTML = instructions;
+
             var selectEncoderPath = view.querySelector('#selectEncoderPath');
             selectEncoderPath.value = 'Custom';
             onSelectEncoderPathChange.call(selectEncoderPath);
diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html
index 2bbab79f1d..9f53a05e08 100644
--- a/dashboard-ui/search.html
+++ b/dashboard-ui/search.html
@@ -24,6 +24,6 @@
             </div>
         </div>
 
-        <div class="searchResults hide"></div>
+        <div class="searchResults hide itemsContainer"></div>
     </div>
 </div>
\ No newline at end of file