diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
index dc75855f1e..49885008df 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
@@ -6,10 +6,10 @@ import { Subscription } from 'rxjs';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../core/context';
 import UmbSectionViewUsersElement from '../../sections/users/views/users/section-view-users.element';
-import '../../property-editors/content-picker/property-editor-content-picker.element';
 import { UmbUserStore } from '../../../core/stores/user/user.store';
 import type { UserDetails } from '../../../core/models';
 import { UmbUserContext } from './user.context';
+import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element';
 
 import '../shared/editor-entity-layout/editor-entity-layout.element';
 import { getTagLookAndColor } from '../../sections/users/user-extensions';
@@ -180,12 +180,12 @@ export class UmbEditorUserElement extends UmbContextProviderMixin(UmbContextCons
 					<div>
 						<b>Content start nodes</b>
 						<div class="faded-text">Limit the content tree to specific start nodes</div>
-						<umb-property-editor-content-picker></umb-property-editor-content-picker>
+						<umb-property-editor-ui-content-picker></umb-property-editor-ui-content-picker>
 					</div>
 					<div>
 						<b>Media start nodes</b>
 						<div class="faded-text">Limit the media library to specific start nodes</div>
-						<umb-property-editor-content-picker></umb-property-editor-content-picker>
+						<umb-property-editor-ui-content-picker></umb-property-editor-ui-content-picker>
 					</div>
 				</div>
 			</uui-box>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
index 1a3155e622..f344d70bdf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts
@@ -82,12 +82,6 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(L
 	private _usersContext?: UmbSectionViewUsersElement;
 	private _selectionSubscription?: Subscription;
 
-	constructor() {
-		super();
-
-		this.setupHeaderIntersectionObserver();
-	}
-
 	connectedCallback(): void {
 		super.connectedCallback();
 
@@ -107,21 +101,6 @@ export class UmbEditorViewUsersOverviewElement extends UmbContextConsumerMixin(L
 		this._selectionSubscription?.unsubscribe();
 	}
 
-	public setupHeaderIntersectionObserver() {
-		requestAnimationFrame(() => {
-			const el = this.shadowRoot?.querySelector('#sticky-top');
-
-			if (el) {
-				const options = { threshold: [1] };
-				const callback = (entries: IntersectionObserverEntry[]) =>
-					entries[0].target.classList.toggle('header-shadow', entries[0].intersectionRatio < 1);
-				const observer = new IntersectionObserver(callback, options);
-
-				observer.observe(el);
-			}
-		});
-	}
-
 	private _toggleViewType() {
 		const isList = window.location.pathname.split('/').pop() === 'list';