diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
index 4042a2a5ec..d8d9399b94 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/image-cropper-focus-setter.element.ts
@@ -13,9 +13,9 @@ import {
 
 @customElement('umb-image-cropper-focus-setter')
 export class UmbImageCropperFocusSetterElement extends LitElement {
-	@query('#image') imageElement!: HTMLImageElement;
-	@query('#wrapper') wrapperElement!: HTMLImageElement;
-	@query('#focal-point') focalPointElement!: HTMLImageElement;
+	@query('#image') imageElement?: HTMLImageElement;
+	@query('#wrapper') wrapperElement?: HTMLImageElement;
+	@query('#focal-point') focalPointElement?: HTMLImageElement;
 
 	@property({ type: String }) src?: string;
 	@property({ attribute: false }) focalPoint: UmbImageCropperFocalPoint = { left: 0.5, top: 0.5 };
@@ -35,7 +35,7 @@ export class UmbImageCropperFocusSetterElement extends LitElement {
 	protected updated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
 		super.updated(_changedProperties);
 
-		if (_changedProperties.has('focalPoint')) {
+		if (_changedProperties.has('focalPoint') && this.focalPointElement) {
 			this.focalPointElement.style.left = `calc(${this.focalPoint.left * 100}% - ${this.#DOT_RADIUS}px)`;
 			this.focalPointElement.style.top = `calc(${this.focalPoint.top * 100}% - ${this.#DOT_RADIUS}px)`;
 		}
@@ -45,23 +45,28 @@ export class UmbImageCropperFocusSetterElement extends LitElement {
 		super.firstUpdated(_changedProperties);
 
 		this.style.setProperty('--dot-radius', `${this.#DOT_RADIUS}px`);
-		this.focalPointElement.style.left = `calc(${this.focalPoint.left * 100}% - ${this.#DOT_RADIUS}px)`;
-		this.focalPointElement.style.top = `calc(${this.focalPoint.top * 100}% - ${this.#DOT_RADIUS}px)`;
 
-		this.imageElement.onload = () => {
-			const imageAspectRatio = this.imageElement.naturalWidth / this.imageElement.naturalHeight;
+		if (this.focalPointElement) {
+			this.focalPointElement.style.left = `calc(${this.focalPoint.left * 100}% - ${this.#DOT_RADIUS}px)`;
+			this.focalPointElement.style.top = `calc(${this.focalPoint.top * 100}% - ${this.#DOT_RADIUS}px)`;
+		}
+		if (this.imageElement) {
+			this.imageElement.onload = () => {
+				if (!this.imageElement || !this.wrapperElement) return;
+				const imageAspectRatio = this.imageElement.naturalWidth / this.imageElement.naturalHeight;
 
-			if (imageAspectRatio > 1) {
-				this.imageElement.style.width = '100%';
-				this.wrapperElement.style.width = '100%';
-			} else {
-				this.imageElement.style.height = '100%';
-				this.wrapperElement.style.height = '100%';
-			}
+				if (imageAspectRatio > 1) {
+					this.imageElement.style.width = '100%';
+					this.wrapperElement.style.width = '100%';
+				} else {
+					this.imageElement.style.height = '100%';
+					this.wrapperElement.style.height = '100%';
+				}
 
-			this.imageElement.style.aspectRatio = `${imageAspectRatio}`;
-			this.wrapperElement.style.aspectRatio = `${imageAspectRatio}`;
-		};
+				this.imageElement.style.aspectRatio = `${imageAspectRatio}`;
+				this.wrapperElement.style.aspectRatio = `${imageAspectRatio}`;
+			};
+		}
 	}
 
 	async #addEventListeners() {
@@ -92,6 +97,7 @@ export class UmbImageCropperFocusSetterElement extends LitElement {
 
 	#onSetFocalPoint(event: MouseEvent) {
 		event.preventDefault();
+		if (!this.focalPointElement || !this.imageElement) return;
 
 		const image = this.imageElement.getBoundingClientRect();
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
index 63282ae372..9a93d83a37 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-image-cropper/input-image-cropper.element.ts
@@ -109,8 +109,8 @@ export class UmbInputImageCropperElement extends LitElement {
 						.focalPoint=${this.focalPoint}
 						.src=${this.src}></umb-image-cropper-focus-setter>
 					<div id="actions">
-						<uui-button>Remove files (NOT IMPLEMENTED YET)</uui-button>
-						<uui-button @click=${this.#onResetFocalPoint}>Reset focal point</uui-button>
+						<uui-button label="Remove files">Remove files (NOT IMPLEMENTED YET)</uui-button>
+						<uui-button label="Reset focal point" @click=${this.#onResetFocalPoint}>Reset focal point</uui-button>
 					</div> `;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
index 2077022012..bc03872c53 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
@@ -103,17 +103,17 @@ export class UmbPropertyEditorUIImageCropsConfigurationElement
 				<form @submit=${this.#onSubmit}>
 					<div class="input">
 						<uui-label for="alias">Alias</uui-label>
-						<uui-input id="alias" name="alias" type="text" autocomplete="false" value=""></uui-input>
+						<uui-input label="Alias" id="alias" name="alias" type="text" autocomplete="false" value=""></uui-input>
 					</div>
 					<div class="input">
 						<uui-label for="width">Width</uui-label>
-						<uui-input id="width" name="width" type="number" autocomplete="false" value="">
+						<uui-input label="Width" id="width" name="width" type="number" autocomplete="false" value="">
 							<span class="append" slot="append">px</span>
 						</uui-input>
 					</div>
 					<div class="input">
 						<uui-label for="height">Height</uui-label>
-						<uui-input id="height" name="height" type="number" autocomplete="false" value="">
+						<uui-input label="Height" id="height" name="height" type="number" autocomplete="false" value="">
 							<span class="append" slot="append">px</span>
 						</uui-input>
 					</div>
@@ -130,8 +130,8 @@ export class UmbPropertyEditorUIImageCropsConfigurationElement
 							<span class="crop-alias">${item.alias}</span>
 							<span class="crop-size">(${item.width} x ${item.height}px)</span>
 							<div class="crop-actions">
-								<uui-button @click=${() => this.#onEdit(item)}>Edit</uui-button>
-								<uui-button color="danger" @click=${() => this.#onRemove(item.alias)}>Remove</uui-button>
+								<uui-button label="Edit" @click=${() => this.#onEdit(item)}>Edit</uui-button>
+								<uui-button label="Remove" color="danger" @click=${() => this.#onRemove(item.alias)}>Remove</uui-button>
 							</div>
 						</div>
 					`,