From d5a8e7751b9dc299906b7641bdabf934db9ccd4e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 20 Nov 2018 15:25:02 +1100
Subject: [PATCH 1/2] Removes the word "Kim" from the list view

---
 .../src/views/propertyeditors/listview/listview.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index a39228ef71..ddd60d558e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -61,7 +61,7 @@
                            <a ng-click="createFromBlueprint(key)">
                                <i class="large {{docType.icon}}"></i>
                                <span class="menu-label">
-                                   {{value}} Kim
+                                   {{value}}
                                </span>
                            </a>
                        </li>

From 3dfa3eaac7a11d1d0608bd5ae79c6ab5decc7d6a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 20 Nov 2018 18:13:19 +1100
Subject: [PATCH 2/2] fixes media picker svg handling to only use a single IMG
 tag, else this resulted in a number of 404's with invalid paths like
 [Object,object]

---
 .../propertyeditors/mediapicker/mediapicker.html    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 7e9568bdd2..8a4a9c4bcd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -13,11 +13,18 @@
                 </p>
 
                 <!-- IMAGE -->
-                <img ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}" alt="" ng-show="media.thumbnail" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                <img ng-if="media.thumbnail"
+                     ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
+                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- SVG -->
-                <img ng-class="{'trashed': media.trashed}" ng-if="media.metaData.umbracoExtension.Value === 'svg'" ng-src="{{media.metaData.umbracoFile.Value}}" alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
-                <img ng-class="{'trashed': media.trashed}" ng-if="media.extension === 'svg'" ng-src="{{media.file}}" alt="" />
+                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value === 'svg'"
+                     ng-class="{'trashed': media.trashed}" ng-src="{{media.metaData.umbracoFile.Value}}"
+                     alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
+                <img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value !== 'svg' && media.extension === 'svg'"
+                     ng-class="{'trashed': media.trashed}" ng-src="{{media.file}}"
+                     alt=""
+                     title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
 
                 <!-- FILE -->
                 <div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail || media.metaData.umbracoExtension.Value === 'svg' || media.extension === 'svg'">