diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index 4d2cd611e0..198e31a6c5 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -2,8 +2,6 @@ import '@umbraco-ui/uui-css/dist/uui-css.css';
 import '@umbraco-cms/css';
 
 // TODO: remove these imports when they are part of UUI
-import '@umbraco-ui/uui-color-swatch';
-import '@umbraco-ui/uui-color-swatches';
 import '@umbraco-ui/uui-modal';
 import '@umbraco-ui/uui-modal-container';
 import '@umbraco-ui/uui-modal-dialog';
@@ -17,7 +15,6 @@ import { UUIIconRegistryEssential } from '@umbraco-ui/uui';
 import { css, html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 
-
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 import { OpenAPI, RuntimeLevel, ServerResource } from '@umbraco-cms/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
index fb85c037e8..f355a041c4 100644
--- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
@@ -1,15 +1,13 @@
-import type { UUIColorSwatchesEvent } from '@umbraco-ui/uui-color-swatches';
+import type { UUIColorSwatchesEvent } from '@umbraco-ui/uui';
 
 import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
+import { styleMap } from 'lit/directives/style-map.js';
 import { UmbModalLayoutElement } from '../modal-layout.element';
 
 import icons from '../../../../../public-assets/icons/icons.json';
 
-import '@umbraco-ui/uui-color-swatch';
-import '@umbraco-ui/uui-color-swatches';
-
 export interface UmbModalIconPickerData {
 	multiple: boolean;
 	selection: string[];
@@ -56,6 +54,7 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 				overflow-y: scroll;
 				max-height: 100%;
 				min-height: 0;
+				padding: 2px;
 			}
 
 			#icon-selection .icon {
@@ -74,7 +73,7 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 			#icon-selection .icon:focus,
 			#icon-selection .icon:hover,
 			#icon-selection .icon.selected {
-				background-color: var(--uui-color-selected);
+				outline: 2px solid var(--uui-color-selected);
 			}
 
 			uui-button {
@@ -91,7 +90,7 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 	iconlist = icons.map((icon) => icon.name);
 
 	@property({ type: Array })
-	iconlistFiltered: Array<string>;
+	iconlistFiltered: Array<string> = [];
 
 	@property({ type: Array })
 	colorlist = [
@@ -118,10 +117,13 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 	];
 
 	@state()
-	private _currentColor: string;
+	private _currentColor?: string;
 
 	@state()
-	private _currentIcon: string;
+	private _currentIcon?: string;
+
+	@state()
+	private _isLight = false;
 
 	private _changeIcon(e: { target: HTMLInputElement; type: any; key: unknown }) {
 		if (e.type == 'click' || (e.type == 'keyup' && e.key == 'Enter')) {
@@ -137,10 +139,6 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 		}
 	}
 
-	private _setColor(color: string) {
-		return 'color: ' + color;
-	}
-
 	private _close() {
 		this.modalHandler?.close();
 	}
@@ -149,11 +147,9 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 		this.modalHandler?.close({ color: this._currentColor, icon: this._currentIcon });
 	}
 
-	constructor() {
-		super();
-		this._currentColor = '';
-		this._currentIcon = '';
-		this.iconlistFiltered = [];
+	private _onColorChange(e: UUIColorSwatchesEvent) {
+		this._currentColor = e.target.value;
+		this._isLight = e.target.isLight;
 	}
 
 	connectedCallback(): void {
@@ -170,8 +166,14 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 					${this.renderSearchbar()}
 					<hr />
 					<uui-color-swatches
-						.swatches="${this.colorlist}"
-						@change="${(e: UUIColorSwatchesEvent) => (this._currentColor = e.target.value)}"></uui-color-swatches>
+						.value="${this._currentColor || ''}"
+						label="Color switcher for icons"
+						@change="${this._onColorChange}">
+						${this.colorlist.map(
+							(color) =>
+								html` <uui-color-swatch label="${color}" title="${color}" value="${color}"></uui-color-swatch> `
+						)}
+					</uui-color-swatches>
 
 					<hr />
 					<uui-scroll-container id="icon-selection">${this.renderIconSelection()}</uui-scroll-container>
@@ -199,8 +201,9 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 			return html`
 				<uui-icon
 					tabindex="0"
-					.style="${this._setColor(this._currentColor)}"
+					style=${styleMap({ color: this._currentColor })}
 					class="icon ${icon === this._currentIcon ? 'selected' : ''}"
+					title="${icon}"
 					name="${icon}"
 					label="${icon}"
 					id="${icon}"
diff --git a/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatch-0.0.0.tgz b/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatch-0.0.0.tgz
deleted file mode 100644
index e9a42bb942..0000000000
Binary files a/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatch-0.0.0.tgz and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatches-2.0.0.tgz b/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatches-2.0.0.tgz
deleted file mode 100644
index f741e8b847..0000000000
Binary files a/src/Umbraco.Web.UI.Client/umbraco-ui-uui-color-swatches-2.0.0.tgz and /dev/null differ