diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 6c292caf9..50f9a2186 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -76,7 +76,7 @@
                 <div>
                     <p>${LabelSelectFolderGroups}</p>
                     <div class="folderGroupList"></div>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelSelectFolderGroupsHelp}</div>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelSelectFolderGroupsHelp}</div>
                 </div>
                 <br/>
                 <div class="checkboxContainer">
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index f795decc3..e786c686d 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -1,57 +1,57 @@
-<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paper-fab,paper-item-body,paper-icon-item">
+<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,listViewStyle">
 
     <div data-role="content">
         <div class="readOnlyContent" style="margin: 0 auto;">
             <h1 class="settingsMenuHeader">${HeaderSettings}</h1>
             <div>
                 <a href="#" class="clearLink lnkDisplayPreferences">
-                    <paper-icon-item>
-                        <paper-fab mini class="blue" icon="tv" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem">
+                        <button type="button" is="emby-button" class="fab mini autoSize blue" item-icon><i class="md-icon">tv</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonDisplaySettings}</div>
-                            <div secondary>${ButtonDisplaySettingsHelp}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                            <div class="secondary">${ButtonDisplaySettingsHelp}</div>
+                        </div>
+                    </div>
                 </a>
 
                 <a href="#" class="clearLink lnkHomeScreenPreferences">
-                    <paper-icon-item>
-                        <paper-fab mini class="red" icon="home" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem">
+                        <button type="button" is="emby-button" class="fab mini autoSize red" item-icon><i class="md-icon">home</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonHomeScreenSettings}</div>
-                            <div secondary>${ButtonHomeScreenSettingsHelp}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                            <div class="secondary">${ButtonHomeScreenSettingsHelp}</div>
+                        </div>
+                    </div>
                 </a>
 
                 <a href="#" class="clearLink lnkLanguagePreferences">
-                    <paper-icon-item>
-                        <paper-fab mini class="green" icon="play-circle-filled" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem">
+                        <button type="button" is="emby-button" class="fab mini autoSize green" item-icon><i class="md-icon">play_circle_filled</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonPlaybackSettings}</div>
-                            <div secondary>${ButtonPlaybackSettingsHelp}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                            <div class="secondary">${ButtonPlaybackSettingsHelp}</div>
+                        </div>
+                    </div>
                 </a>
 
                 <a href="#" class="clearLink lnkMyProfile">
-                    <paper-icon-item>
-                        <paper-fab mini class="orange" icon="person" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem">
+                        <button type="button" is="emby-button" class="fab mini autoSize orange" item-icon><i class="md-icon">person</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonProfile}</div>
-                            <div secondary>${ButtonProfileHelp}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                            <div class="secondary">${ButtonProfileHelp}</div>
+                        </div>
+                    </div>
                 </a>
 
                 <a href="#" class="clearLink lnkSync hide">
-                    <paper-icon-item>
-                        <paper-fab mini icon="sync" style="background-color: #673AB7;" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem">
+                        <button type="button" is="emby-button" class="fab mini autoSize" style="background-color: #673AB7;" item-icon><i class="md-icon">sync</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonSyncSettings}</div>
-                            <div secondary>${ButtonSyncSettingsHelp}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                            <div class="secondary">${ButtonSyncSettingsHelp}</div>
+                        </div>
+                    </div>
                 </a>
             </div>
             <div>
@@ -59,19 +59,19 @@
                 <h1 class="headerUser"></h1>
                 <div>
                     <a href="selectserver.html" class="clearLink selectServer hide">
-                        <paper-icon-item>
-                            <paper-fab mini icon="wifi" style="background-color: #444;" item-icon></paper-fab>
-                            <paper-item-body two-line>
+                        <div class="listItem">
+                            <button type="button" is="emby-button" class="fab mini autoSize"><i class="md-icon">wifi</i></button>
+                            <div class="listItemBody">
                                 <div>${HeaderSelectServer}</div>
-                            </paper-item-body>
-                        </paper-icon-item>
+                            </div>
+                        </div>
                     </a>
-                    <paper-icon-item class="btnLogout">
-                        <paper-fab mini icon="lock" style="background-color: #444;" item-icon></paper-fab>
-                        <paper-item-body two-line>
+                    <div class="listItem btnLogout">
+                        <button type="button" is="emby-button" class="fab mini autoSize"><i class="md-icon">lock</i></button>
+                        <div class="listItemBody">
                             <div>${ButtonSignOut}</div>
-                        </paper-item-body>
-                    </paper-icon-item>
+                        </div>
+                    </div>
                 </div>
             </div>
 
@@ -80,12 +80,12 @@
                 <h1>${HeaderAdmin}</h1>
                 <div>
                     <a href="dashboard.html" class="clearLink">
-                        <paper-icon-item>
-                            <paper-fab mini icon="settings" style="background-color: #444;" item-icon></paper-fab>
-                            <paper-item-body two-line>
+                        <div class="listItem">
+                            <button type="button" is="emby-button" class="fab mini autoSize"><i class="md-icon">settings</i></button>
+                            <div class="listItemBody">
                                 <div>${ButtonServerDashboard}</div>
-                            </paper-item-body>
-                        </paper-icon-item>
+                            </div>
+                        </div>
                     </a>
                 </div>
             </div>
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 1789fec86..f76197092 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -1,21 +1,21 @@
-define(['scripts/livetvcomponents', 'emby-button'], function () {
+define(['scripts/livetvcomponents', 'emby-button', 'listViewStyle'], function () {
 
     function getRecordingGroupHtml(group) {
 
         var html = '';
 
-        html += '<paper-icon-item>';
+        html += '<div class="listItem">';
 
         html += '<button type="button" is="emby-button" class="fab mini autoSize blue" item-icon><i class="md-icon">live_tv</i></button>';
 
-        html += '<paper-item-body two-line>';
+        html += '<div class="listItemBody">';
         html += '<a href="livetvrecordinglist.html?groupid=' + group.Id + '" class="clearLink">';
 
         html += '<div>';
         html += group.Name;
         html += '</div>';
 
-        html += '<div secondary>';
+        html += '<div class="secondary">';
         if (group.RecordingCount == 1) {
             html += Globalize.translate('ValueItemCount', group.RecordingCount);
         } else {
@@ -24,8 +24,8 @@
         html += '</div>';
 
         html += '</a>';
-        html += '</paper-item-body>';
-        html += '</paper-icon-item>';
+        html += '</div>';
+        html += '</div>';
 
         return html;
     }
@@ -177,9 +177,7 @@
 
         }).then(function (result) {
 
-            require(['paper-item-body', 'paper-icon-item'], function () {
-                renderRecordingGroups(context, result.Items);
-            });
+            renderRecordingGroups(context, result.Items);
         });
     }
 
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 7f698368f..6fe55a2be 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -161,8 +161,6 @@
                 case 2:
                     document.body.classList.remove('autoScrollY');
                     depends.push('scripts/livetvchannels');
-                    depends.push('paper-icon-item');
-                    depends.push('paper-item-body');
                     break;
                 case 3:
                     document.body.classList.remove('autoScrollY');
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 0f9391400..83464b3c7 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -290,8 +290,6 @@
                     break;
                 case 4:
                     depends.push('scripts/songs');
-                    depends.push('paper-icon-item');
-                    depends.push('paper-item-body');
                     break;
                 case 5:
                     depends.push('scripts/musicgenres');
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index 8abdf10ef..16bf77a52 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -1,4 +1,4 @@
-define([], function () {
+define(['listViewStyle'], function () {
 
     function renderViews(page, user, result) {
 
@@ -68,17 +68,17 @@
 
             var currentHtml = '';
 
-            currentHtml += '<paper-icon-item class="viewItem" data-viewid="' + view.Id + '">';
+            currentHtml += '<div class="listItem viewItem" data-viewid="' + view.Id + '">';
 
-            currentHtml += '<paper-fab mini style="background-color:#444;" icon="folder-open" item-icon></paper-fab>';
+            currentHtml += '<button type="button" is="emby-button" class="fab mini autoSize" item-icon><i class="md-icon">folder_open</i></button>';
 
-            currentHtml += '<paper-item-body>';
+            currentHtml += '<div class="listItemBody">';
 
             currentHtml += '<div>';
             currentHtml += view.Name;
             currentHtml += '</div>';
 
-            currentHtml += '</paper-item-body>';
+            currentHtml += '</div>';
 
             if (index > 0) {
 
@@ -90,7 +90,7 @@
             }
 
 
-            currentHtml += '</paper-icon-item>';
+            currentHtml += '</div>';
 
             index++;
             return currentHtml;
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index df19ad5e7..50f35fe7f 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -25,11 +25,11 @@
 
         var html = '';
 
-        html += '<paper-icon-item class="serverItem" data-id="' + server.Id + '">';
+        html += '<div class="listItem serverItem" data-id="' + server.Id + '">';
 
-        html += '<paper-fab mini class="blue lnkServer" icon="wifi" item-icon></paper-fab>';
+        html += '<button type="button" is="emby-button" class="fab mini autoSize blue lnkServer" item-icon><i class="md-icon">wifi</i></button>';
 
-        html += '<paper-item-body class="lnkServer" two-line>';
+        html += '<div class="listItemBody lnkServer">';
         html += '<a class="clearLink" href="#">';
 
         html += '<div>';
@@ -41,13 +41,13 @@
         //html += '</div>';
 
         html += '</a>';
-        html += '</paper-item-body>';
+        html += '</div>';
 
         if (server.Id) {
             html += '<button is="paper-icon-button-light" class="btnServerMenu autoSize"><i class="md-icon">' + AppInfo.moreIcon.replace('-', '_') + '</i></button>';
         }
 
-        html += '</paper-icon-item>';
+        html += '</div>';
 
         return html;
     }
@@ -268,21 +268,21 @@
 
             var html = '';
 
-            html += '<paper-icon-item class="inviteItem" data-id="' + invite.Id + '">';
+            html += '<div class="listItem inviteItem" data-id="' + invite.Id + '">';
 
-            html += '<paper-fab mini class="blue lnkServer" icon="wifi" item-icon></paper-fab>';
+            html += '<button type="button" is="emby-button" class="fab mini autoSize blue lnkServer" item-icon><i class="md-icon">wifi</i></button>';
 
-            html += '<paper-item-body two-line>';
+            html += '<div class="listItemBody">';
 
             html += '<div>';
             html += invite.Name;
             html += '</div>';
 
-            html += '</paper-item-body>';
+            html += '</div>';
 
             html += '<button is="paper-icon-button-light" class="btnInviteMenu autoSize"><i class="md-icon">' + AppInfo.moreIcon.replace('-','_') + '</i></button>';
 
-            html += '</paper-icon-item>';
+            html += '</div>';
 
             return html;
         }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index e5d618565..b36893628 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2760,7 +2760,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/mypreferenceshome.html',
-            dependencies: ['emby-checkbox', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'emby-button'],
+            dependencies: ['emby-checkbox', 'emby-button'],
             autoFocus: false,
             transition: 'fade',
             controller: 'scripts/mypreferenceshome'
@@ -2912,7 +2912,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/selectserver.html',
-            dependencies: ['paper-fab', 'paper-item-body', 'paper-icon-item', 'emby-button'],
+            dependencies: ['listViewStyle', 'emby-button'],
             autoFocus: false,
             anonymous: true,
             controller: 'scripts/selectserver'
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 623f8cc5c..7e19daa4c 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -231,16 +231,16 @@ paper-fab.accent {
     background-color: #52B54B;
 }
 
-paper-fab.green {
-    background-color: #81c784;
+.fab.green {
+    background-color: #81c784 !important;
 }
 
-paper-fab.orange {
-    background-color: #ffd54f;
+.fab.orange {
+    background-color: #ffd54f !important;
 }
 
-paper-fab.red {
-    background-color: #e57373;
+.fab.red {
+    background-color: #e57373 !important;
 }
 
 paper-menu-item {