diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts
index 7471f61c93..028a4908f0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts
@@ -7,6 +7,9 @@ import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 
 @customElement('umb-tree-item-base')
 export class UmbTreeItemBaseElement extends UmbLitElement {
+	@state()
+	private _iconAlias?: string;
+
 	@state()
 	private _item?: TreeItemPresentationModel;
 
@@ -119,8 +122,8 @@ export class UmbTreeItemBaseElement extends UmbLitElement {
 				@slotchange=${(e: Event) => {
 					this._iconSlotHasChildren = this.#hasNodes(e);
 				}}></slot>
-			${this._item?.icon && !this._iconSlotHasChildren
-				? html` <uui-icon slot="icon" name="${this._item.icon}"></uui-icon> `
+			${this._iconAlias && !this._iconSlotHasChildren
+				? html` <uui-icon slot="icon" name="${this._iconAlias}"></uui-icon> `
 				: nothing}
 		`;
 	}
@@ -133,7 +136,7 @@ export class UmbTreeItemBaseElement extends UmbLitElement {
 		return this.#treeItemContext && this._item
 			? html`<umb-entity-actions-bundle
 					slot="actions"
-					entity-type=${this.#treeItemContext.type}
+					.entityType=${this.#treeItemContext.type}
 					.unique=${this.#treeItemContext.unique}
 					.label=${this._item.name}>
 			  </umb-entity-actions-bundle>`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
index 02ef376f1c..dc129f36ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
@@ -105,7 +105,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbLitEleme
 										? html` <li class="item">
 												<uui-button label="dataType.name" type="button" @click="${() => this._handleClick(dataType)}">
 													<div class="item-content">
-														<uui-icon name="${dataType.icon ?? 'umb:bug'}" class="icon"></uui-icon>
+														<uui-icon name="${'umb:bug'}" class="icon"></uui-icon>
 														${dataType.name}
 													</div>
 												</uui-button>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
index 95b64271b8..6ac3ecbe99 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -269,9 +269,9 @@ export class UmbDataTypePickerFlowModalElement extends UmbLitElement {
 				dataTypes,
 				(dataType) => dataType.id,
 				(dataType) => html`<li class="item" ?selected=${this._selection.includes(dataType.id!)}>
-					<uui-button label=${dataType.name} type="button" @click="${() => this._handleDataTypeClick(dataType)}">
+					<uui-button .label=${dataType.name} type="button" @click="${() => this._handleDataTypeClick(dataType)}">
 						<div class="item-content">
-							<uui-icon name="${dataType.icon ?? 'umb:bug'}" class="icon"></uui-icon>
+							<uui-icon name="${'umb:bug'}" class="icon"></uui-icon>
 							${dataType.name}
 						</div>
 					</uui-button>