diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 66bcb2d1fd..f2e4180479 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1497,8 +1497,19 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 
 .itemsListview {
     margin: 0 auto !important;
+    max-width: 1000px;
 }
 
+.itemsListview {
+    background-color: transparent !important;
+    box-shadow: none !important;
+}
+
+    .itemsListview .listItem {
+        border-bottom: 1px solid #303030;
+        padding-left: 0;
+    }
+
     .itemsListview .ui-li-count {
         right: 1em;
         top: 70%;
@@ -1515,6 +1526,18 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         left: 55px;
     }
 
+    .itemsListview .content-icon {
+        display: none !important;
+    }
+
+    .itemsListview paper-item-body {
+        min-height: 0 !important;
+    }
+
+    .itemsListview .mediaItem {
+        padding: 7px 0;
+    }
+
 .listviewImage {
     width: 80px;
     height: 80px;
@@ -1523,27 +1546,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     background-position: center center;
 }
 
-.listviewIcon {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 70px;
-    height: 70px;
-    background-repeat: no-repeat;
-    background-size: contain;
-    background-position: center center;
-}
-
-.listViewAside {
-    position: absolute;
-    right: 0;
-    top: 10%;
-}
-
-    .listViewAside button {
-        padding: 15px 10px;
-        margin: 0 !important;
-        vertical-align: middle;
+    .listviewImage.small {
+        width: 70px;
+        height: 70px;
+        background-repeat: no-repeat;
+        background-size: cover;
+        background-position: center center;
     }
 
 button.listviewMenuButton {
@@ -1555,71 +1563,17 @@ paper-icon-button.listviewMenuButton {
     margin-left: 20px !important;
 }
 
-.ui-li-has-icon > .ui-btn {
-    padding-left: 5.25em !important;
-    padding-top: 5px !important;
-    padding-bottom: 5px !important;
-}
-
-.listItem h3 {
-    font-weight: 400;
-}
-
-.ui-li-has-icon h3 {
-    margin-bottom: 10px !important;
-}
-
-.listItem > .ui-btn + .ui-btn {
-    border: 0 !important;
-    width: 60px !important;
-    height: 90% !important;
-    top: 5% !important;
-    padding-left: 0 !important;
-}
-
-.listItem a:first-child {
-    margin-right: 0 !important;
-    background-color: transparent !important;
-    padding-top: 0;
-    padding-bottom: 0;
-}
-
-.listItem.ui-li-has-thumb .ui-btn {
-    padding-left: 5.9em !important;
-}
-
-.ui-page-theme-a .listItem a:first-child {
-    border-color: #d8d8d8 !important;
-}
-
-.ui-page-theme-b .listItem a:first-child {
-    border-color: #383838 !important;
-}
-
-.listItem a + a {
-    background-color: transparent !important;
-    z-index: 999;
-}
-
-.ui-page-theme-a .listItem:hover a {
-    background-color: #eee !important;
-}
-
-.ui-page-theme-b .listItem:hover a {
+.ui-page-theme-b .listItem:hover {
     background-color: rgba(51,51,51,.6) !important;
 }
 
-.listviewSubLink:hover {
-    color: #2ad;
-}
-
 .listViewUserDataButtons {
     visibility: hidden;
 }
 
 @media all and (min-width: 1200px) {
 
-    li:hover .listViewUserDataButtons {
+    .listItem:hover .listViewUserDataButtons {
         visibility: visible !important;
     }
 }
@@ -1631,13 +1585,6 @@ paper-icon-button.listviewMenuButton {
     }
 }
 
-@media all and (max-width: 600px) {
-
-    .listViewAsideText {
-        display: none;
-    }
-}
-
 .tapHoldMenu li a, .playFlyout li a {
     font-size: 14px;
     font-weight: 500 !important;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index b331f9a23f..c1c2e5f9aa 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1043,18 +1043,16 @@
 
         getListViewHtml: function (options) {
 
-            require(['jqmlistview']);
-
             var outerHtml = "";
 
-            outerHtml += '<ul data-role="listview" class="itemsListview">';
-
             if (options.title) {
-                outerHtml += '<li data-role="list-divider">';
+                outerHtml += '<h1>';
                 outerHtml += options.title;
-                outerHtml += '</li>';
+                outerHtml += '</h1>';
             }
 
+            outerHtml += '<div class="paperList itemsListview">';
+
             var index = 0;
             var groupTitle = '';
 
@@ -1068,9 +1066,13 @@
 
                     if (itemGroupTitle != groupTitle) {
 
-                        html += '<li data-role="list-divider">';
+                        outerHtml += '</div>';
+
+                        html += '<h1>';
                         html += itemGroupTitle;
-                        html += '</li>';
+                        html += '</h1>';
+
+                        html += '<div class="paperList itemsListview">';
 
                         groupTitle = itemGroupTitle;
                     }
@@ -1078,19 +1080,10 @@
 
                 var dataAttributes = LibraryBrowser.getItemDataAttributes(item, options, index);
 
-                var cssClass = options.smallIcon ? 'ui-li-has-icon listItem' : 'ui-li-has-thumb listItem';
+                var cssClass = 'listItem';
 
                 var href = LibraryBrowser.getHref(item, options.context);
-                html += '<li class="' + cssClass + '"' + dataAttributes + ' data-itemid="' + item.Id + '" data-playlistitemid="' + (item.PlaylistItemId || '') + '" data-href="' + href + '" data-icon="false">';
-
-                var defaultAction = options.defaultAction;
-                if (defaultAction == 'play' || defaultAction == 'playallfromhere') {
-                    if (item.PlayAccess != 'Full') {
-                        defaultAction = null;
-                    }
-                }
-                var defaultActionAttribute = defaultAction ? (' data-action="' + defaultAction + '" class="itemWithAction mediaItem"') : ' class="mediaItem"';
-                html += '<a' + defaultActionAttribute + ' href="' + href + '">';
+                html += '<paper-icon-item class="' + cssClass + '"' + dataAttributes + ' data-itemid="' + item.Id + '" data-playlistitemid="' + (item.PlaylistItemId || '') + '" data-href="' + href + '" data-icon="false">';
 
                 var imgUrl;
 
@@ -1143,15 +1136,15 @@
                     var minLazyIndex = 16;
                     if (options.smallIcon) {
                         if (index < minLazyIndex) {
-                            html += '<div class="listviewIcon ui-li-icon" style="background-image:url(\'' + imgUrl + '\');"></div>';
+                            html += '<div class="listviewImage small" style="background-image:url(\'' + imgUrl + '\');"></div>';
                         } else {
-                            html += '<div class="listviewIcon ui-li-icon lazy" data-src="' + imgUrl + '"></div>';
+                            html += '<div class="listviewImage lazy small" data-src="' + imgUrl + '"></div>';
                         }
                     } else {
                         if (index < minLazyIndex) {
-                            html += '<div class="listviewImage ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');"></div>';
+                            html += '<div class="listviewImage" style="background-image:url(\'' + imgUrl + '\');"></div>';
                         } else {
-                            html += '<div class="listviewImage ui-li-thumb lazy" data-src="' + imgUrl + '"></div>';
+                            html += '<div class="listviewImage lazy" data-src="' + imgUrl + '"></div>';
                         }
                     }
                 }
@@ -1171,8 +1164,6 @@
                 }
                 textlines.push(displayName);
 
-                var verticalTextLines = 2;
-
                 if (item.Type == 'Audio') {
                     textlines.push(item.ArtistItems.map(function (a) {
                         return a.Name;
@@ -1200,53 +1191,57 @@
                     textlines.push(LibraryBrowser.getMiscInfoHtml(item));
                 }
 
-                html += '<h3>';
-                html += textlines[0];
-                html += '</h3>';
-
-                if (textlines.length > 1 && verticalTextLines > 1) {
-                    html += '<p>';
-                    html += textlines[1] || '&nbsp;';
-                    html += '</p>';
+                if (textlines.length > 2) {
+                    html += '<paper-item-body three-line>';
+                } else {
+                    html += '<paper-item-body two-line>';
                 }
 
-                if (textlines.length > 2 && verticalTextLines > 2) {
-                    html += '<p>';
-                    html += textlines[2] || '&nbsp;';
-                    html += '</p>';
-                }
-
-                html += LibraryBrowser.getSyncIndicator(item);
-
-                if (item.Type == 'Series' || item.Type == 'Season' || item.Type == 'BoxSet' || item.MediaType == 'Video') {
-                    if (item.UserData.UnplayedItemCount) {
-                        //html += '<span class="ui-li-count">' + item.UserData.UnplayedItemCount + '</span>';
-                    } else if (item.UserData.Played && item.Type != 'TvChannel') {
-                        html += '<div class="playedIndicator"><iron-icon icon="check"></iron-icon></div>';
+                var defaultAction = options.defaultAction;
+                if (defaultAction == 'play' || defaultAction == 'playallfromhere') {
+                    if (item.PlayAccess != 'Full') {
+                        defaultAction = null;
                     }
                 }
-                html += '</a>';
+                var defaultActionAttribute = defaultAction ? (' data-action="' + defaultAction + '" class="itemWithAction mediaItem clearLink"') : ' class="mediaItem clearLink"';
+                html += '<a' + defaultActionAttribute + ' href="' + href + '">';
+
+                for (var i = 0, textLinesLength = textlines.length; i < textLinesLength; i++) {
+
+                    if (i == 0) {
+                        html += '<div>';
+                    } else {
+                        html += '<div secondary>';
+                    }
+                    html += textlines[i] || '&nbsp;';
+                    html += '</div>';
+                }
+
+                //html += LibraryBrowser.getSyncIndicator(item);
+
+                //if (item.Type == 'Series' || item.Type == 'Season' || item.Type == 'BoxSet' || item.MediaType == 'Video') {
+                //    if (item.UserData.UnplayedItemCount) {
+                //        //html += '<span class="ui-li-count">' + item.UserData.UnplayedItemCount + '</span>';
+                //    } else if (item.UserData.Played && item.Type != 'TvChannel') {
+                //        html += '<div class="playedIndicator"><iron-icon icon="check"></iron-icon></div>';
+                //    }
+                //}
+                html += '</a>';
+                html += '</paper-item-body>';
 
-                html += '<div class="listViewAside">';
-                html += '<span class="listViewAsideText">';
-                html += textlines[verticalTextLines] || LibraryBrowser.getRatingHtml(item, false);
-                html += '</span>';
-                //html += '<button type="button" data-role="none" class="listviewMenuButton imageButton listViewMoreButton" data-icon="none">';
-                //html += '</button>';
                 html += '<paper-icon-button icon="' + AppInfo.moreIcon + '" class="listviewMenuButton"></paper-icon-button>';
                 html += '<span class="listViewUserDataButtons">';
                 html += LibraryBrowser.getUserDataIconsHtml(item);
                 html += '</span>';
-                html += '</div>';
 
-                html += '</li>';
+                html += '</paper-icon-item>';
 
                 index++;
                 return html;
 
             }).join('');
 
-            outerHtml += '</ul>';
+            outerHtml += '</div>';
 
             return outerHtml;
         },
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 44bd5f19f2..ce54c9fc86 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -1124,13 +1124,6 @@
         PlaylistManager.showPanel(selection);
     }
 
-    function onListviewSubLinkClick(e) {
-
-        var elem = e.target;
-        Dashboard.navigate(elem.getAttribute('data-href'));
-        return false;
-    }
-
     function onItemWithActionClick(e) {
 
         var elem = this;
@@ -1155,6 +1148,7 @@
         else if (action == 'playallfromhere') {
 
             index = elemWithAttributes.getAttribute('data-index');
+
             itemsContainer = $(elem).parents('.itemsContainer');
 
             playAllFromHere(index, itemsContainer, 'play');
@@ -1166,7 +1160,7 @@
     function playAllFromHere(index, itemsContainer, method) {
 
         var ids = $('.mediaItem', itemsContainer).get().map(function (i) {
-            return i.getAttribute('data-itemid') || i.parentNode.getAttribute('data-itemid');
+            return i.getAttribute('data-itemid') || i.parentNode.getAttribute('data-itemid') || i.parentNode.parentNode.getAttribute('data-itemid');
         });
 
         ids = ids.slice(index);
@@ -1237,7 +1231,7 @@
 
             toggleSelections(page);
 
-        }).on('click', '.itemWithAction', onItemWithActionClick).on('click', '.listviewSubLink', onListviewSubLinkClick);
+        }).on('click', '.itemWithAction', onItemWithActionClick);
 
         var itemsContainers = page.getElementsByClassName('itemsContainer');
         for (var i = 0, length = itemsContainers.length; i < length; i++) {