diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
index 66528781b6..6fb76226e2 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
@@ -4,7 +4,7 @@ import '../../src/backoffice/documents/documents/modals/document-picker/document
 import './layouts/media-picker/modal-layout-media-picker.element';
 import './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element';
 import '../../src/backoffice/users/current-user/modals/current-user/current-user-modal.element';
-import '../../src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.element';
+import '../../src/backoffice/shared/modals/icon-picker/icon-picker-modal.element';
 import '../../src/backoffice/settings/languages/language-picker/language-picker-modal-layout.element';
 import './layouts/link-picker/modal-layout-link-picker.element';
 import './layouts/basic/modal-layout-basic.element';
@@ -15,7 +15,7 @@ import { BehaviorSubject } from 'rxjs';
 import type { UUIModalDialogElement } from '@umbraco-ui/uui-modal-dialog';
 import type { UmbModalDocumentPickerData } from '../../src/backoffice/documents/documents/modals/document-picker';
 import { UmbModalChangePasswordData } from './layouts/modal-layout-change-password.element';
-import type { UmbModalIconPickerData } from '../../src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.element';
+import type { UmbModalIconPickerData } from '../../src/backoffice/shared/modals/icon-picker/icon-picker-modal.element';
 import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm.element';
 import type { UmbModalPropertyEditorUIPickerData } from './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element';
 import type { UmbModalMediaPickerData } from './layouts/media-picker/modal-layout-media-picker.element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.stories.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.stories.ts
index 35e869ce4b..d3e65d40f9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.stories.ts
@@ -1,10 +1,10 @@
 import '../../components/body-layout/body-layout.element';
-import './modal-layout-icon-picker.element';
+import './icon-picker-modal.element';
 
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import type { UmbModalLayoutIconPickerElement, UmbModalIconPickerData } from './modal-layout-icon-picker.element';
+import type { UmbModalLayoutIconPickerElement, UmbModalIconPickerData } from './icon-picker-modal.element';
 
 export default {
 	title: 'API/Modals/Layouts/Icon Picker',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.test.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.test.ts
index 1fedae1a79..e3776c06a2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import { UmbModalLayoutIconPickerElement } from './modal-layout-icon-picker.element';
+import { UmbModalLayoutIconPickerElement } from './icon-picker-modal.element';
 import { defaultA11yConfig } from '@umbraco-cms/test-utils';
 
 describe('umb-modal-layout-icon-picker', () => {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
index 5f649038f3..3dd25e1cac 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts
@@ -3,7 +3,7 @@ import { html } from 'lit-html';
 
 import type { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element';
 import './property-editor-ui-icon-picker.element';
-import type { UmbModalLayoutIconPickerElement } from 'src/backoffice/shared/modals/icon-picker/modal-layout-icon-picker.element';
+import type { UmbModalLayoutIconPickerElement } from 'src/backoffice/shared/modals/icon-picker/icon-picker-modal.element';
 
 export default {
 	title: 'Property Editor UIs/Icon Picker',