diff --git a/dashboard-ui/autoorganizesmart.html b/dashboard-ui/autoorganizesmart.html
index ea55d38de2..31d524feac 100644
--- a/dashboard-ui/autoorganizesmart.html
+++ b/dashboard-ui/autoorganizesmart.html
@@ -4,7 +4,7 @@
     <title>${TitleAutoOrganize}</title>
 </head>
 <body>
-    <div id="libraryFileOrganizerSmartMatchPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="scripts/autoorganizesmart,jqmlistview">
+    <div id="libraryFileOrganizerSmartMatchPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="scripts/autoorganizesmart,paper-icon-item,paper-fab,paper-item-body">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/bower_components/emby-apiclient/apiclient.js b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
index f2f07eeff2..75d4fc5a25 100644
--- a/dashboard-ui/bower_components/emby-apiclient/apiclient.js
+++ b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
@@ -3430,7 +3430,7 @@
 
         self.deleteSmartMatchEntries = function (entries) {
 
-            var url = self.getUrl("Library/FileOrganizations/SmartMatches");
+            var url = self.getUrl("Library/FileOrganizations/SmartMatches/Delete");
 
             var postData = {
                 Entries: entries
diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js
index 72e698ba54..6f9a823de9 100644
--- a/dashboard-ui/scripts/autoorganizesmart.js
+++ b/dashboard-ui/scripts/autoorganizesmart.js
@@ -49,42 +49,37 @@
         }
 
         var html = "";
-        var currentType;
+
+        if (infos.length) {
+            html += '<div class="paperList">';
+        }
 
         for (var i = 0, length = infos.length; i < length; i++) {
 
             var info = infos[i];
 
-            if (info.OrganizerType != currentType) {
-                currentType = info.OrganizerType;
+            html += '<paper-icon-item>';
 
-                if (html.length > 0) {
-                    html += "</ul>";
-                }
+            html += '<paper-fab mini icon="folder" item-icon class="blue"></paper-fab>';
 
-                html += "<h2>" + currentType + "</h2>";
+            html += '<paper-item-body two-line>';
 
-                html += '<ul data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="action">';
-            }
+            html += "<div>" + info.DisplayName + "</div>";
 
-            html += "<li data-role='list-divider'><h3 style='font-weight:bold'>" + info.Name + "</h3></li>";
+            html += info.MatchStrings.map(function (m) {
+                return "<div secondary>" + m + "</div>";
+            }).join('');
 
-            for (var n = 0; n < info.MatchStrings.length; n++) {
-                html += "<li title='" + info.MatchStrings[n] + "'>";
+            html += '</paper-item-body>';
 
-                html += "<a style='padding-top: 0.5em; padding-bottom: 0.5em'>";
+            html += '<paper-icon-button icon="delete" class="btnDeleteMatchEntry" data-index="' + i + '" title="' + Globalize.translate('ButtonDelete') + '"></paper-icon-button>';
 
-                html += "<p>" + info.MatchStrings[n] + "</p>";
-
-                html += "<a id='btnDeleteMatchEntry" + info.Id + "' class='btnDeleteMatchEntry' href='#' data-id='" + info.Id + "' data-matchstring='" + info.MatchStrings[n] + "' data-icon='delete'>" + Globalize.translate('ButtonDelete') + "</a>";
-
-                html += "</a>";
-
-                html += "</li>";
-            }
+            html += '</paper-icon-item>';
         }
 
-        html += "</ul>";
+        if (infos.length) {
+            html += "</div>";
+        }
 
         $('.divMatchInfos', page).html(html).trigger('create');
     }
@@ -105,12 +100,15 @@
         $('.divMatchInfos', page).on('click', '.btnDeleteMatchEntry', function () {
 
             var button = this;
+            var index = parseInt(button.getAttribute('data-index'));
 
-            var entries = [
-            {
-                Name: button.getAttribute('data-id'),
-                Value: button.getAttribute('data-matchstring')
-            }];
+            var info = currentResult.Items[index];
+            var entries = info.MatchStrings.map(function (m) {
+                return {
+                    Name: info.ItemName,
+                    Value: m
+                };
+            });
 
             ApiClient.deleteSmartMatchEntries(entries).then(function () {
 
