diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index 7117ed15ea..862756109c 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-icon-button-light', 'listViewStyle'], function (dialogHelper, $) {
 
     var currentDeferred;
     var hasChanges;
@@ -116,17 +116,17 @@
 
         var html = '';
 
-        html += '<paper-icon-item role="menuitem" class="lnkPath">';
+        html += '<div class="listItem lnkPath">';
 
-        html += '<paper-fab mini style="background:#52B54B;" icon="folder" item-icon></paper-fab>';
+        html += '<i class="listItemIcon md-icon">folder</i>';
 
-        html += '<paper-item-body>';
-        html += path;
-        html += '</paper-item-body>';
+        html += '<div class="listItemBody">';
+        html += '<div class="listItemBodyText">' + path + '</div>';
+        html += '</div>';
 
-        html += '<button is="paper-icon-button-light"" class="btnRemovePath" data-index="' + index + '"><iron-icon icon="remove-circle"></iron-icon></button>';
+        html += '<button is="paper-icon-button-light"" class="btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>';
 
-        html += '</paper-icon-item>';
+        html += '</div>';
 
         return html;
     }
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index 9607eb36a3..b622650796 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -1,33 +1,37 @@
-<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>
+<div class="dialogHeader">
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
     <div class="dialogHeaderTitle">
         ${ButtonAddMediaLibrary}
     </div>
 </div>
 
-<form style="margin:auto;">
-    <div id="fldCollectionType" class="selectContainer">
-        <select is="emby-select" id="selectCollectionType" data-mini="true" required="required" label="${LabelContentType}"></select>
-        <div class="collectionTypeFieldDescription fieldDescription">
-        </div>
-    </div>
-    <div class="inputContainer">
-        <input is="emby-input" type="text" id="txtValue" required="required" label="${LabelDisplayName}" />
-    </div>
-    <div>
-        <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
-        <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-            <i class="md-icon">add</i>
-            <span>${ButtonAdd}</span>
-        </button>
-    </div>
-    <div class="paperList folderList hide" style="padding: .7em 0;"></div>
+<div class="dialogContent smoothScrollY" style="padding-top:2em;">
+    <div class="dialogContentInner dialog-content-centered">
+        <form style="margin:auto;">
+            <div id="fldCollectionType" class="selectContainer">
+                <select is="emby-select" id="selectCollectionType" data-mini="true" required="required" label="${LabelContentType}"></select>
+                <div class="collectionTypeFieldDescription fieldDescription">
+                </div>
+            </div>
+            <div class="inputContainer">
+                <input is="emby-input" type="text" id="txtValue" required="required" label="${LabelDisplayName}" />
+            </div>
+            <div>
+                <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
+                <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                    <i class="md-icon">add</i>
+                    <span>${ButtonAdd}</span>
+                </button>
+            </div>
+            <div class="paperList folderList hide" style="padding: .7em 0;"></div>
 
-    <br />
-    <div>
-        <button is="emby-button" type="submit" class="raised submit block">
-            <i class="md-icon">check</i>
-            <span>${ButtonOk}</span>
-        </button>
+            <br />
+            <div>
+                <button is="emby-button" type="submit" class="raised submit block">
+                    <i class="md-icon">check</i>
+                    <span>${ButtonOk}</span>
+                </button>
+            </div>
+        </form>
     </div>
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index 727f2509b7..03dc03a130 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -65,32 +65,32 @@
     function getSubscriptionBenefitHtml(item) {
 
         var html = '';
-        html += '<paper-icon-item>';
+        html += '<div class="listItem">';
 
-        html += '<paper-fab mini style="background-color:#52B54B;" icon="' + item.icon + '" item-icon></paper-fab>';
+        html += '<i class="listItemIcon md-icon">' + item.icon + '</i>';
 
-        html += '<paper-item-body three-line>';
+        html += '<div class="listItemBody two-line">';
         html += '<a class="clearLink" href="https://emby.media/premiere" target="_blank">';
 
-        html += '<div>';
+        html += '<h3 class="listItemBodyText">';
         html += item.name;
-        html += '</div>';
+        html += '</h3>';
 
-        html += '<div secondary style="white-space:normal;">';
+        html += '<div class="listItemBodyText secondary" style="white-space:normal;">';
         html += item.text;
         html += '</div>';
 
         html += '</a>';
-        html += '</paper-item-body>';
+        html += '</div>';
 
-        html += '</paper-icon-item>';
+        html += '</div>';
 
         return html;
     }
 
     function showPlaybackOverlay(resolve, reject) {
 
-        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'emby-button'], function (dialogHelper) {
+        require(['dialogHelper', 'listViewStyle', 'emby-button'], function (dialogHelper) {
 
             var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border',
@@ -103,7 +103,7 @@
 
             var html = '';
             html += '<h2 class="dialogHeader">';
-            html += '<paper-fab icon="arrow-back" mini class="btnCancelSupporterInfo" tabindex="-1"></paper-fab>';
+            html += '<button is="emby-button" type="button" class="fab mini btnCancelSupporterInfo" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
             html += '</h2>';
 
             html += '<div class="readOnlyContent" style="margin:0 auto 0;color:#fff;padding:1em;">';
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 6fceb50722..8985e225bd 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1513,7 +1513,6 @@ var AppInfo = {};
         define("paper-textarea", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-textarea.html"]);
         define("paper-item", ["html!" + bowerPath + "/paper-item/paper-item.html"]);
         define("paper-checkbox", ["html!" + bowerPath + "/paper-checkbox/paper-checkbox.html"]);
-        define("paper-fab", ["emby-icons", "html!" + bowerPath + "/paper-fab/paper-fab.html"]);
         define("paper-progress", ["html!" + bowerPath + "/paper-progress/paper-progress.html"]);
         define("paper-input", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-input.html"]);
         define("paper-icon-item", ['webcomponentsjs', "html!" + bowerPath + "/paper-item/paper-icon-item.html"]);