diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index 689f82d615..be322d7279 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -124,6 +124,18 @@
     min-width: initial !important;
 }
 
+[is=emby-button].iconRight i {
+    margin-left: auto;
+    margin-right: .25em;
+}
+
+[is=emby-button].noflex.iconRight i {
+    position: absolute;
+    right: 0;
+    top: 25%;
+    margin-right: .5em;
+}
+
 [is=paper-icon-button-light] {
     position: relative;
     display: inline-flex;
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 0b7a3c5f7c..5ee155ccd6 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
@@ -20,6 +20,10 @@
     text-align: left;
 }
 
+    .emby-collapsible-button.noflex h3 {
+        display: inline-block;
+    }
+
 .emby-collapse-expandIcon {
     transform-origin: 50% 50%;
     transition: transform 180ms ease-out;
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 51f6e70cd5..a34b81cd19 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
@@ -71,9 +71,9 @@
 
         var title = this.getAttribute('title');
 
-        var html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button">\
+        var html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button iconRight">\
                 <h3 class="emby-collapsible-title" title="' + title + '">' + title + '</h3>\
-                <i style="margin-left: auto; margin-right: .5em;" class="md-icon emby-collapse-expandIcon">expand_more</i>\
+                <i class="md-icon emby-collapse-expandIcon">expand_more</i>\
             </button>';
 
         this.insertAdjacentHTML('afterbegin', html);