From 292a9034e7e06beed40ba8d8ffa5bcbae3fd3f3a Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 19 Dec 2022 15:29:13 +0100
Subject: [PATCH] merge

---
 .../document-type/workspace-document-type.element.ts       | 7 ++++++-
 .../icon-picker/modal-layout-icon-picker.element.ts        | 2 --
 .../src/core/services/modal/modal.service.ts               | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/workspace-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/workspace-document-type.element.ts
index d542408b4d..ba51f0135a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/workspace-document-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/workspace-document-type.element.ts
@@ -153,7 +153,12 @@ export class UmbWorkspaceDocumentTypeElement extends UmbContextProviderMixin(
 		return html`
 			<umb-workspace-entity-layout alias="Umb.Workspace.DocumentType">
 				<div id="header" slot="header">
-					<umb-property-editor-ui-icon-picker></umb-property-editor-ui-icon-picker>
+					<uui-button id="icon" @click=${this._handleIconClick} compact>
+						<uui-icon
+							name="${this._documentType?.icon || 'umb:document-dashed-line'}"
+							style="color: ${this._icon.color}"></uui-icon>
+					</uui-button>
+
 					<uui-input id="name" .value=${this._documentType?.name} @input="${this._handleInput}">
 						<div id="alias" slot="append">${this._documentType?.alias}</div>
 					</uui-input>
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
index 410634737b..2ababec2fb 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
@@ -10,8 +10,6 @@ import icons from 'public-assets/icons/icons.json';
 import '@umbraco-ui/uui-color-swatch';
 import '@umbraco-ui/uui-color-swatches';
 
-import '../../../../../backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element';
-
 export interface UmbModalIconPickerData {
 	multiple: boolean;
 	selection: string[];
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts
index eb80b1d82d..ea1127ad3c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts
@@ -7,7 +7,9 @@ import './layouts/modal-layout-current-user.element';
 import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { UmbModalChangePasswordData } from './layouts/modal-layout-change-password.element';
-import { UmbModalIconPickerData } from './layouts/icon-picker/modal-layout-icon-picker.element';
+import type { UmbModalIconPickerData } from './layouts/icon-picker/modal-layout-icon-picker.element';
+
+import './layouts/icon-picker/modal-layout-icon-picker.element';
 
 import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm.element';
 import type { UmbModalContentPickerData } from './layouts/content-picker/modal-layout-content-picker.element';