diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
index abe2b41bd1..9ba8822843 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
@@ -9,7 +9,7 @@
 (function() {
    "use strict";
 
-   function ListViewLayoutsPreValsController($scope) {
+   function ListViewLayoutsPreValsController($scope, editorService) {
 
       var vm = this;
       vm.focusLayoutName = false;
@@ -63,21 +63,22 @@
       }
 
       function openIconPicker(layout) {
-          vm.iconPickerDialog = {
-              view: "iconpicker",
-              show: true,
-              submit: function(model) {
-                  if (model.color) {
-                     layout.icon = model.icon + " " + model.color;
-                  } else {
-                     layout.icon = model.icon;
-                  }
-                  vm.focusLayoutName = true;
-                  vm.iconPickerDialog.show = false;
-                  vm.iconPickerDialog = null;
-              }
-          };
-      }
+            var iconPicker = {
+                submit: function(model) {
+                    if (model.color) {
+                        layout.icon = model.icon + " " + model.color;
+                    } else {
+                        layout.icon = model.icon;
+                    }
+                    vm.focusLayoutName = true;
+                    editorService.close();
+                },
+                close: function() {
+                    editorService.close();
+                }
+            };
+            editorService.iconPicker(iconPicker);
+        }
 
       activate();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
index c71f3306cd..f8ad0bb3f4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
@@ -47,11 +47,4 @@
 
    </div>
 
-   <umb-overlay
-      ng-if="vm.iconPickerDialog.show"
-      model="vm.iconPickerDialog"
-      view="vm.iconPickerDialog.view"
-      position="right">
-   </umb-overlay>
-
 </div>