From 5a2b4f031bce3fb0b870cb4a1f86ebf604297b6d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 23 Mar 2017 15:00:30 +0100
Subject: [PATCH 1/2] fixes: U4-9654 7.6.0-beta: Legacy icons are not resolved
 in new listview picker

---
 .../components/umbminilistview.directive.js          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
index 74ee9d65ea..ce14aaedc5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function MiniListViewDirective(entityResource) {
+    function MiniListViewDirective(entityResource, iconHelper) {
 
         function link(scope, el, attr, ctrl) {
 
@@ -19,6 +19,11 @@
 
             function open(node) {
 
+                // convert legacy icon for node
+                if(node && node.icon) {
+                    node.icon = iconHelper.convertFromLegacyIcon(node.icon);
+                }
+
                 goingForward = true;
 
                 var miniListView = {
@@ -58,6 +63,11 @@
                         // update children
                         miniListView.children = data.items;
                         _.each(miniListView.children, function(c) {
+                            // convert legacy icon for node
+                            if(c.icon) {
+                                c.icon = iconHelper.convertFromLegacyIcon(c.icon);
+                            }
+                            // set published state for content
                             if (c.metaData) {
                                 c.hasChildren = c.metaData.HasChildren;
                                 if(scope.entityType === "Document") {

From d1d83c84a009754343e250a28b5c5434b981ba38 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 28 Mar 2017 14:27:05 +0200
Subject: [PATCH 2/2] fixes icons on listviews.

---
 .../src/common/directives/components/umbtable.directive.js  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
index bf593397b6..17d4dd93ff 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
@@ -1,7 +1,7 @@
 (function () {
    'use strict';
 
-   function TableDirective() {
+   function TableDirective(iconHelper) {
 
       function link(scope, el, attr, ctrl) {
 
@@ -43,6 +43,10 @@
             }
          };
 
+         scope.getIcon = function (entry) {
+             return iconHelper.convertFromLegacyIcon(entry.icon);
+         };
+
       }
 
       var directive = {