diff --git a/src/bundle/Resources/encore/ez.js.config.js b/src/bundle/Resources/encore/ez.js.config.js
index 3dcf122fde..a3b5491913 100644
--- a/src/bundle/Resources/encore/ez.js.config.js
+++ b/src/bundle/Resources/encore/ez.js.config.js
@@ -27,6 +27,7 @@ const layout = [
     path.resolve(__dirname, '../public/js/scripts/admin.notifications.js'),
     path.resolve(__dirname, '../public/js/scripts/button.trigger.js'),
     path.resolve(__dirname, '../public/js/scripts/button.prevent.default.js'),
+    path.resolve(__dirname, '../public/js/scripts/toggle.button.state.toggle.js'),
     path.resolve(__dirname, '../public/js/scripts/udw/browse.js'),
     path.resolve(__dirname, '../public/js/scripts/admin.user.menu.js'),
     path.resolve(__dirname, '../public/js/scripts/admin.prevent.click.js'),
@@ -177,7 +178,6 @@ module.exports = (Encore) => {
             path.resolve(__dirname, '../public/js/scripts/fieldType/base/multi-input-field.js'),
             ...fieldTypes,
             path.resolve(__dirname, '../public/js/scripts/sidebar/extra.actions.js'),
-            path.resolve(__dirname, '../public/js/scripts/toggle.button.state.toggle.js'),
             path.resolve(__dirname, '../public/js/scripts/edit.header.js'),
         ])
         .addEntry('ezplatform-admin-ui-settings-datetime-format-update-js', [
@@ -207,7 +207,7 @@ module.exports = (Encore) => {
             path.resolve(__dirname, '../../ui-dev/src/modules/universal-discovery/components/view-switcher/view.switcher.js'),
             path.resolve(
                 __dirname,
-                '../../ui-dev/src/modules/universal-discovery/components/tree-item-toggle-selection/tree.item.toggle.selection.js',
+                '../../ui-dev/src/modules/universal-discovery/components/tree-item-toggle-selection/tree.item.toggle.selection.js'
             ),
         ])
         .addEntry('ezplatform-admin-ui-mfu-js', [
@@ -220,17 +220,11 @@ module.exports = (Encore) => {
         .addEntry('ezplatform-admin-ui-url-management-js', [
             path.resolve(__dirname, '../public/js/scripts/button.state.toggle.js'),
             path.resolve(__dirname, '../public/js/scripts/admin.url.wildcards.create.js'),
-            path.resolve(__dirname, '../public/js/scripts/toggle.button.state.toggle.js'),
-        ])
-        .addEntry('ezplatform-admin-ui-url-management-update-js', [
-            path.resolve(__dirname, '../public/js/scripts/toggle.button.state.toggle.js'),
         ])
         .addEntry('ezplatform-admin-ui-login-js', [path.resolve(__dirname, '../public/js/scripts/login.js')])
         .addEntry('ezplatform-admin-ui-tabs-js', [
             path.resolve(__dirname, '../public/js/scripts/admin.location.tab.js'),
             path.resolve(__dirname, '../public/js/scripts/admin.location.adaptive.tabs.js'),
         ])
-        .addEntry('ezplatform-admin-ui-edit-base-js', [
-            path.resolve(__dirname, '../public/js/scripts/edit.header.js'),
-        ]);
+        .addEntry('ezplatform-admin-ui-edit-base-js', [path.resolve(__dirname, '../public/js/scripts/edit.header.js')]);
 };
diff --git a/src/bundle/Resources/public/js/scripts/admin.location.add.custom_url.js b/src/bundle/Resources/public/js/scripts/admin.location.add.custom_url.js
index 16e41afedc..8270510c78 100644
--- a/src/bundle/Resources/public/js/scripts/admin.location.add.custom_url.js
+++ b/src/bundle/Resources/public/js/scripts/admin.location.add.custom_url.js
@@ -1,11 +1,10 @@
 (function(global, doc) {
-    const modal = doc.querySelector('#ez-modal--custom-url-alias');
+    const modal = doc.querySelector('#ibexa-modal--custom-url-alias');
 
     if (modal) {
         const discardBtns = modal.querySelectorAll('[data-bs-dismiss="modal"]');
-        const submitBtn = modal.querySelector('[type="submit"]');
+        const submitBtn = modal.querySelector('#custom_url_add_add');
         const input = modal.querySelector('[required="required"]');
-        const checkboxes = modal.querySelectorAll('.ez-field-edit--ezboolean input');
         const siteRootCheckbox = modal.querySelector('[name="custom_url_add[site_root]"]');
         const toggleButtonState = () => {
             const hasValue = input.value.trim().length !== 0;
@@ -13,27 +12,19 @@
 
             submitBtn[methodName]('disabled', true);
         };
-        const toggleCheckbox = (event) => {
-            const checkbox = event.target;
-            const methodName = checkbox.checked ? 'add' : 'remove';
-
-            checkbox.closest('.ez-data-source__label').classList[methodName]('is-checked');
-        };
         const clearValues = () => {
             input.value = '';
             toggleButtonState();
         };
         const toggleSiteAccessSelect = (event) => {
             const isChecked = event.target.checked;
-            const siteAccessSelect = modal.querySelector('[name="custom_url_add[site_access]"]');
-            const methodName = isChecked ? 'removeAttribute' : 'setAttribute';
+            const siteAccessSelect = modal.querySelector('.ibexa-custom-url-from__item--siteacces .ibexa-dropdown');
 
-            siteAccessSelect[methodName]('disabled', true);
+            siteAccessSelect.classList.toggle('ibexa-dropdown--is-disabled', isChecked);
         };
 
         input.addEventListener('input', toggleButtonState, false);
         siteRootCheckbox.addEventListener('change', toggleSiteAccessSelect, false);
-        checkboxes.forEach((checkbox) => checkbox.addEventListener('change', toggleCheckbox, false));
         discardBtns.forEach((btn) => btn.addEventListener('click', clearValues, false));
     }
 })(window, window.document);
diff --git a/src/bundle/Resources/public/js/scripts/admin.location.add.translation.js b/src/bundle/Resources/public/js/scripts/admin.location.add.translation.js
index 3297cb812d..853f9752ae 100644
--- a/src/bundle/Resources/public/js/scripts/admin.location.add.translation.js
+++ b/src/bundle/Resources/public/js/scripts/admin.location.add.translation.js
@@ -1,5 +1,5 @@
 (function(global, doc) {
-    const SELECTOR_MODAL = '.ez-modal';
+    const SELECTOR_MODAL = '.ibexa-modal';
 
     doc.querySelectorAll('.ez-translation__language-wrapper--language').forEach((select) => {
         select.addEventListener(
diff --git a/src/bundle/Resources/public/js/scripts/admin.location.view.js b/src/bundle/Resources/public/js/scripts/admin.location.view.js
index f74d7fd731..12fa25fe34 100644
--- a/src/bundle/Resources/public/js/scripts/admin.location.view.js
+++ b/src/bundle/Resources/public/js/scripts/admin.location.view.js
@@ -53,7 +53,7 @@
             }
         };
         const showModal = (modalHtml) => {
-            const wrapper = doc.querySelector('.ez-modal-wrapper');
+            const wrapper = doc.querySelector('.ibexa-modal-wrapper');
 
             wrapper.innerHTML = modalHtml;
             attachModalListeners(wrapper);
@@ -106,9 +106,7 @@
 
         failedItemsData.forEach(({ contentName, contentTypeName }) => {
             const container = doc.createElement('tbody');
-            const renderedItem = rowTemplate
-                .replace('{{ content_name }}', contentName)
-                .replace('{{ content_type_name }}', contentTypeName);
+            const renderedItem = rowTemplate.replace('{{ content_name }}', contentName).replace('{{ content_type_name }}', contentTypeName);
 
             container.insertAdjacentHTML('beforeend', renderedItem);
 
diff --git a/src/bundle/Resources/public/js/scripts/admin.trash.js b/src/bundle/Resources/public/js/scripts/admin.trash.js
index 941e660865..0815b7234f 100644
--- a/src/bundle/Resources/public/js/scripts/admin.trash.js
+++ b/src/bundle/Resources/public/js/scripts/admin.trash.js
@@ -1,7 +1,7 @@
 (function(global, doc) {
     const form = doc.querySelector('form[name="location_trash"]');
     const submitButton = form.querySelector('button[type="submit"]');
-    const allOptions = form.querySelectorAll('.ez-modal__trash-option');
+    const allOptions = form.querySelectorAll('.ibexa-modal__trash-option');
     const confirmCheckbox = form.querySelector('input[name="location_trash[confirm][]"]');
     const enableButton = (button) => {
         button.disabled = false;
@@ -13,7 +13,7 @@
     };
     const refreshTrashModal = (event) => {
         const { numberOfSubitems } = event.detail;
-        const sendToTrashModal = document.querySelector('.ez-modal--trash-location');
+        const sendToTrashModal = document.querySelector('.ibexa-modal--trash-location');
         const modalBody = sendToTrashModal.querySelector('.modal-body');
         const modalSendToTrashButton = sendToTrashModal.querySelector('.modal-footer .ibexa-btn--confirm-send-to-trash');
         const { contentName } = sendToTrashModal.dataset;
@@ -28,7 +28,7 @@
                 'content'
             );
 
-            modalBody.querySelector('.ez-modal__option-description').innerHTML = message;
+            modalBody.querySelector('.ibexa-modal__option-description').innerHTML = message;
         } else {
             const message = Translator.trans(
                 /*@Desc("Are you sure you want to send this Content item to Trash?")*/ 'trash.modal.message',
diff --git a/src/bundle/Resources/public/js/scripts/button.content.edit.js b/src/bundle/Resources/public/js/scripts/button.content.edit.js
index 7979509a37..40e99c1a6d 100644
--- a/src/bundle/Resources/public/js/scripts/button.content.edit.js
+++ b/src/bundle/Resources/public/js/scripts/button.content.edit.js
@@ -30,7 +30,7 @@
             bootstrap.Modal.getOrCreateInstance(doc.querySelector('#version-draft-conflict-modal')).hide();
         };
         const showModal = (modalHtml) => {
-            const wrapper = doc.querySelector('.ez-modal-wrapper');
+            const wrapper = doc.querySelector('.ibexa-modal-wrapper');
 
             wrapper.innerHTML = modalHtml;
 
diff --git a/src/bundle/Resources/public/js/scripts/button.translation.edit.js b/src/bundle/Resources/public/js/scripts/button.translation.edit.js
index 5f608f0051..57c2ff9541 100644
--- a/src/bundle/Resources/public/js/scripts/button.translation.edit.js
+++ b/src/bundle/Resources/public/js/scripts/button.translation.edit.js
@@ -22,7 +22,7 @@
         hideTranslationsList(event) {
             const closestTranslationSelector = event.target.closest('.ez-translation-selector');
             const clickedOnTranslationsList = closestTranslationSelector && closestTranslationSelector.isSameNode(this.container);
-            const clickedOnDraftConflictModal = event.target.closest('.ez-modal--version-draft-conflict');
+            const clickedOnDraftConflictModal = event.target.closest('.ibexa-modal--version-draft-conflict');
 
             if (clickedOnTranslationsList || clickedOnDraftConflictModal) {
                 return;
diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js
index e7022f9b7a..f4a3fc81b9 100644
--- a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js
+++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js
@@ -46,7 +46,7 @@
         }
     };
     const showModal = (modalHtml) => {
-        const wrapper = doc.querySelector('.ez-modal-wrapper');
+        const wrapper = doc.querySelector('.ibexa-modal-wrapper');
 
         wrapper.innerHTML = modalHtml;
         attachModalListeners(wrapper);
diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss
index ad0a383391..28e906e253 100644
--- a/src/bundle/Resources/public/scss/_buttons.scss
+++ b/src/bundle/Resources/public/scss/_buttons.scss
@@ -261,7 +261,7 @@
 
 .ez-content-view,
 .ez-trash-list-view {
-    .ez-modal--send-to-trash {
+    .ibexa-modal--send-to-trash {
         .modal-footer {
             .form-check-inline {
                 margin-right: 0;
diff --git a/src/bundle/Resources/public/scss/_custom-url-form.scss b/src/bundle/Resources/public/scss/_custom-url-form.scss
new file mode 100644
index 0000000000..fee0ad40cf
--- /dev/null
+++ b/src/bundle/Resources/public/scss/_custom-url-form.scss
@@ -0,0 +1,29 @@
+.ibexa-custom-url-from {
+    &__item {
+        margin-bottom: calculateRem(24px);
+
+        .ibexa-dropdown,
+        .ibexa-input-text-wrapper {
+            width: calculateRem(352px);
+        }
+    }
+
+    &__info-text {
+        font-size: $ibexa-text-font-size-small;
+        color: $ibexa-color-dark-400;
+
+        &--checked {
+            display: none;
+
+            .ibexa-toggle--is-checked + & {
+                display: block;
+            }
+        }
+
+        &--unchecked {
+            .ibexa-toggle--is-checked + .ibexa-custom-url-from__info-text--checked + & {
+                display: none;
+            }
+        }
+    }
+}
diff --git a/src/bundle/Resources/public/scss/_custom.scss b/src/bundle/Resources/public/scss/_custom.scss
index 68b7473b4e..65857c7552 100644
--- a/src/bundle/Resources/public/scss/_custom.scss
+++ b/src/bundle/Resources/public/scss/_custom.scss
@@ -366,11 +366,11 @@ $pagination-disabled-bg: transparent;
 $pagination-disabled-border-color: transparent;
 
 // Modals
-$modal-header-padding-y: 24px;
+$modal-header-padding-y: 16px;
 $modal-header-padding-x: 0;
 $modal-header-border-width: 1px;
 $modal-header-border-color: $ibexa-color-base-medium;
-$modal-title-font-size: 20px;
+$modal-title-font-size: 28px;
 $modal-content-border-width: 0;
 $modal-content-border-radius: $ibexa-border-radius;
 $modal-inner-padding: 24px 0;
diff --git a/src/bundle/Resources/public/scss/_modals.scss b/src/bundle/Resources/public/scss/_modals.scss
index 8b5ab987af..26064bd51e 100644
--- a/src/bundle/Resources/public/scss/_modals.scss
+++ b/src/bundle/Resources/public/scss/_modals.scss
@@ -1,4 +1,4 @@
-.ez-modal {
+.ibexa-modal {
     .modal-dialog {
         @include modal-main();
     }
@@ -30,7 +30,7 @@
     &--table-content {
         .modal-header {
             border-width: 0;
-        }        
+        }
 
         .modal-body {
             padding-top: 0;
@@ -53,8 +53,8 @@
 
     &--wide {
         .modal-dialog {
-            max-width: calculateRem(800px); 
-            width: calculateRem(800px);       
+            max-width: calculateRem(800px);
+            width: calculateRem(800px);
         }
     }
 }
diff --git a/src/bundle/Resources/public/scss/ezplatform.scss b/src/bundle/Resources/public/scss/ezplatform.scss
index 8f6e614e86..4dd46066bd 100644
--- a/src/bundle/Resources/public/scss/ezplatform.scss
+++ b/src/bundle/Resources/public/scss/ezplatform.scss
@@ -107,3 +107,4 @@
 @import 'grid-view-item';
 @import 'list-search';
 @import 'search-links-form';
+@import 'custom-url-form';
diff --git a/src/bundle/Resources/public/scss/mixins/_modals.scss b/src/bundle/Resources/public/scss/mixins/_modals.scss
index aad0eda435..a960ac337d 100644
--- a/src/bundle/Resources/public/scss/mixins/_modals.scss
+++ b/src/bundle/Resources/public/scss/mixins/_modals.scss
@@ -57,6 +57,6 @@
     padding: $modal-footer-padding;
 
     .btn {
-        margin: 0 calculateRem(4px) 0 0;
+        margin: 0 calculateRem(16px) 0 0;
     }
 }
diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/content_url.en.xliff
index 961e9bff8c..8061b54ebb 100644
--- a/src/bundle/Resources/translations/content_url.en.xliff
+++ b/src/bundle/Resources/translations/content_url.en.xliff
@@ -37,13 +37,13 @@
         <note>key: tab.urls.add.redirect</note>
       </trans-unit>
       <trans-unit id="e84da49f6798548a0e09f5f7d5095788257f0119" resname="tab.urls.add.redirect.helper.checked">
-        <source>When checked, the alias will redirect to the destination using an HTTP 301 response.</source>
-        <target state="new">When checked, the alias will redirect to the destination using an HTTP 301 response.</target>
+        <source>The alias will redirect to the destination using an HTTP 301 response.</source>
+        <target state="new">The alias will redirect to the destination using an HTTP 301 response.</target>
         <note>key: tab.urls.add.redirect.helper.checked</note>
       </trans-unit>
       <trans-unit id="bccfa7be40c2932ae04a50767aee2184bd5ca4d5" resname="tab.urls.add.redirect.helper.unchecked">
-        <source>When unchecked, the alias will not redirect to the destination and the URL will stay the same.</source>
-        <target state="new">When unchecked, the alias will not redirect to the destination and the URL will stay the same.</target>
+        <source>The alias will not redirect to the destination and the URL will stay the same.</source>
+        <target state="new">The alias will not redirect to the destination and the URL will stay the same.</target>
         <note>key: tab.urls.add.redirect.helper.unchecked</note>
       </trans-unit>
       <trans-unit id="c1277a6823f4d281355e706e54cd723b5ed4adf7" resname="tab.urls.add.root_location_id.helper_secondary">
@@ -62,18 +62,18 @@
         <note>key: tab.urls.add.site_root</note>
       </trans-unit>
       <trans-unit id="9fc6fbd86b58ee883321610dd1726551772edaf1" resname="tab.urls.add.site_root.helper.checked">
-        <source>When checked, the alias will be placed at the site root.</source>
-        <target state="new">When checked, the alias will be placed at the site root.</target>
+        <source>The alias will be placed at the site root.</source>
+        <target state="new">The alias will be placed at the site root.</target>
         <note>key: tab.urls.add.site_root.helper.checked</note>
       </trans-unit>
       <trans-unit id="cf65d6c865f18c51e3edcd90c6779079b994595c" resname="tab.urls.add.site_root.helper.no_parent_name">
-        <source>When unchecked, the alias will be placed under the parent of this Location</source>
-        <target state="new">When unchecked, the alias will be placed under the parent of this Location</target>
+        <source>The alias will be placed under the parent of this Location</source>
+        <target state="new">The alias will be placed under the parent of this Location</target>
         <note>key: tab.urls.add.site_root.helper.no_parent_name</note>
       </trans-unit>
       <trans-unit id="db531fb5f993263b5ea57393101781b9d731a738" resname="tab.urls.add.site_root.helper.unchecked">
-        <source>When unchecked, the alias will be placed under %parent_name%</source>
-        <target state="new">When unchecked, the alias will be placed under %parent_name%</target>
+        <source>The alias will be placed under %parent_name%</source>
+        <target state="new">The alias will be placed under %parent_name%</target>
         <note>key: tab.urls.add.site_root.helper.unchecked</note>
       </trans-unit>
       <trans-unit id="25badd959ce69714e8eb349ebddbbbe126c14458" resname="tab.urls.add.title">
diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig
index 96e9d2a990..b89ac63ced 100644
--- a/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'notifications' %}
 
 <div
-    class="modal fade ez-notifications-modal ez-modal ez-modal--table-content"
+    class="modal fade ez-notifications-modal ibexa-modal ibexa-modal--table-content"
     id="view-notifications"
     tabindex="-1"
     role="dialog">
@@ -22,7 +22,7 @@
                     data-bs-dismiss="modal"
                     aria-label="Close">
                     <svg
-                        class="ibexa-icon ibexa-icon--small"
+                        class="ibexa-icon ibexa-icon--small-medium"
                         aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig
index ec96f1b553..5e4c674d69 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig
@@ -2,7 +2,7 @@
 
 {% form_theme form '@ezdesign/content/translation_add_form_fields.html.twig' %}
 
-<div class="modal fade ez-modal ez-translation" id="add-translation-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ez-translation" id="add-translation-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         {% set action = action is defined ? action : path('ezplatform.translation.add') %}
         {{ form_start(form, {'action': action}) }}
@@ -10,7 +10,7 @@
                 <div class="modal-header">
                     <h5 class="modal-title">{{ 'tab.translations.add.title'|trans|desc('Create a new translation') }}</h5>
                     <button type="button" class="close" data-bs-dismiss="modal" aria-label="{{ 'translation.modal_close'|trans|desc('Close') }}">
-                        <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                        <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                             <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                         </svg>
                     </button>
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
index 883263554f..be8464feb8 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig
@@ -2,7 +2,7 @@
 
 {% import _self as version_modal_draft_conflict %}
 
-<div class="modal fade ez-modal ez-modal--version-draft-conflict" id="version-draft-conflict-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--version-draft-conflict" id="version-draft-conflict-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -14,13 +14,13 @@
                     aria-label={{ 'draft.conflict.close'|trans|desc('Close') }}
                     title={{ 'draft.conflict.close'|trans|desc('Close') }}
                 >
-                    <svg class="ibexa-icon ibexa-icon--small" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
             </div>
             <div class="modal-body">
-                <div class="ez-modal-body__main">
+                <div class="ibexa-modal-body__main">
                     {% set number = conflicted_drafts|length %}
                     {% if number == 1 %}
                         {{ 'draft.conflict.number.one'|trans|desc('There is already one draft for this Content item.') }}
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/hide_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/hide_confirmation.html.twig
index 471f1d60a2..19731974b2 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/hide_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/hide_confirmation.html.twig
@@ -1,16 +1,16 @@
-<div class="modal fade ez-modal ez-modal--content-hide-confirmation" id="hide-content-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--content-hide-confirmation" id="hide-content-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">{{ 'content.hide.modal.title'|trans()|desc('Content hide conflict') }}</h5>
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
             </div>
             <div class="modal-body">
-                <div class="ez-modal-body__main">
+                <div class="ibexa-modal-body__main">
                     {{ 'content.hide.modal.warning_content_used_by_other_content'|trans()|desc('This content is used by other Content item(s). To avoid errors, update or remove all related content listed in the Relations tab.') }}<br/>
                     {{ 'content.hide.modal.please_confirm_to_continue'|trans()|desc('To hide the Content item anyway, click Confirm.') }}
                 </div>
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig
index 6417f76663..8698a485c2 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'locationview' %}
 
 <div
-    class="modal fade ez-modal ez-modal--table-content ez-modal--bulk-action-failed ez-bulk-action-failed-modal"
+    class="modal fade ibexa-modal ibexa-modal--table-content ibexa-modal--bulk-action-failed ez-bulk-action-failed-modal"
     id="bulk-action-failed-modal"
     tabindex="-1"
     role="dialog">
@@ -10,7 +10,7 @@
             <div class="modal-header">
                 <h5 class="modal-title">{{ 'content.view.subitems.bulk_action.limited_permissions'|trans|desc('Limited user permissions') }}</h5>
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/location_trash.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/location_trash.html.twig
index 6e77c68d81..e98944d53e 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/location_trash.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/location_trash.html.twig
@@ -1,7 +1,7 @@
 {% form_theme form '@ezdesign/ui/form_fields.html.twig' %}
 
 <div
-    class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash ez-modal--trash-location"
+    class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash ibexa-modal--trash-location"
     id="trash-location-modal"
     tabindex="-1"
     role="dialog"
@@ -20,13 +20,13 @@
                 {{ 'trash.modal.send_to_trash.message'|trans|desc('Are you sure you want to send this Content item to Trash?') }}
 
                 {% for option in form.trash_options %}
-                    <div class="ez-modal__trash-option">
-                        <p class="ez-modal__option-label">
+                    <div class="ibexa-modal__trash-option">
+                        <p class="ibexa-modal__option-label">
                             {{ form_label(option) }}
                         </p>
                         {% if option.vars.help_multiline ?? false %}
                             {% for help in option.vars.help_multiline %}
-                                <p class="ez-modal__option-description">
+                                <p class="ibexa-modal__option-description">
                                     {{ help }}
                                 </p>
                             {% endfor %}
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig
index edfca28bf4..17609fd60f 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig
@@ -2,16 +2,16 @@
 
 {% form_theme form '@ezdesign/ui/form_fields.html.twig' %}
 
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash" id="delete-user-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash" id="delete-user-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
             </button>
             <div class="modal-body">
-                <p class="ez-modal-body__main">
+                <p class="ibexa-modal-body__main">
                     {{ 'delete.modal.message'|trans|desc('Are you sure you want to delete this User?') }}
                 </p>
             </div>
diff --git a/src/bundle/Resources/views/themes/admin/content/modal/version_conflict.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/version_conflict.html.twig
index 84b97783cd..374c318fcc 100644
--- a/src/bundle/Resources/views/themes/admin/content/modal/version_conflict.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/modal/version_conflict.html.twig
@@ -1,30 +1,30 @@
 {% trans_default_domain 'version_conflict' %}
 
-<div class="modal fade ez-modal ez-modal--version-conflict" id="version-conflict-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--version-conflict" id="version-conflict-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">{{ 'version.conflict.header'|trans|desc('Version conflict') }}</h5>
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
             </div>
             <div class="modal-body">
-                <p class="ez-modal-body__explanation">
+                <p class="ibexa-modal-body__explanation">
                     <strong>
                         {{ 'version.conflict.are_you_sure'|trans|desc(
                         'Are you sure you want to continue and overwrite the published version?'
                         ) }}
                     </strong>
                 </p>
-                <p class="ez-modal-body__explanation">
+                <p class="ibexa-modal-body__explanation">
                     {{ 'version.conflict.consequences'|trans|desc(
                     'If you continue, the published version will be overwritten.'
                     ) }}
                 </p>
-                <p class="ez-modal-body__explanation">
+                <p class="ibexa-modal-body__explanation">
                     {{ 'version.conflict.choices'|trans|desc(
                     'To resolve the conflict, click Cancel and delete the draft. Then edit the published version.'
                     ) }}
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
index 17574e7d85..e238489c7d 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
@@ -10,7 +10,5 @@
     {% if disabled %}
         {% set attr = attr|merge({'disabled': disabled}) %}
     {% endif %}
-    <div class="ez-field-edit--ezboolean">
-        {{ block('toggle_widget') }}
-    </div>
+    {{ block('toggle_widget') }}
 {%- endblock -%}
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
index ccaaba2155..ef5bfe01d1 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig
@@ -1,46 +1,53 @@
 {% trans_default_domain 'content_url' %}
 {% form_theme form '@ezdesign/content/form_fields.html.twig' '@ezdesign/content/tab/url/checkbox.html.twig' %}
 
-<div class="modal fade ez-modal ez-modal--custom-url-alias" id="ez-modal--custom-url-alias" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--wide ibexa-modal--custom-url-alias" id="ibexa-modal--custom-url-alias" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         {{ form_start(form, {'action': path('ezplatform.custom_url.add')}) }}
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">{{ 'tab.urls.add.title'|trans|desc('Create a new URL alias') }}</h3>
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="{{ 'tab.urls.modal_close'|trans|desc('Close') }}">
-                    <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
             </div>
             <div class="modal-body">
-                <span class="ez-modal--custom-url-alias__label required">{{ 'tab.urls.add.path'|trans|desc('URL') }}</span>
-                {{ form_widget(form.path, {attr: { class: 'mb-3' }}) }}
-
-                <span class="ez-modal--custom-url-alias__label">{{ 'tab.urls.add.language'|trans|desc('Language') }}</span>
-                {{ form_widget(form.language, {attr: { class: 'mb-3' }}) }}
-
-                <span class="ez-modal--custom-url-alias__label">{{ 'tab.urls.add.redirect'|trans|desc('Redirect to alias destination') }}</span>
-                {{ form_widget(form.redirect) }}
-                
-                <div class="ez-modal--custom-url-alias__info-text">{{ 'tab.urls.add.redirect.helper.checked'|trans|desc('When checked, the alias will redirect to the destination using an HTTP 301 response.') }}</div>
-                <div class="ez-modal--custom-url-alias__info-text mb-4">{{ 'tab.urls.add.redirect.helper.unchecked'|trans|desc('When unchecked, the alias will not redirect to the destination and the URL will stay the same.') }}</div>
-
-                <span class="ez-modal--custom-url-alias__label">{{ 'tab.urls.add.site_root'|trans|desc('Place at the site root') }}</span>
-                {{ form_widget(form.site_root) }}
-                <div class="ez-modal--custom-url-alias__info-text">{{ 'tab.urls.add.site_root.helper.checked'|trans|desc('When checked, the alias will be placed at the site root.') }}</div>
-                <div class="ez-modal--custom-url-alias__info-text">
-                    {% if parent_name is not null %}
-                        {{ 'tab.urls.add.site_root.helper.unchecked'|trans({'%parent_name%': parent_name})|desc('When unchecked, the alias will be placed under %parent_name%') }}
-                    {% else %}
-                        {{ 'tab.urls.add.site_root.helper.no_parent_name'|trans|desc('When unchecked, the alias will be placed under the parent of this Location') }}
-                    {% endif %}
-                </div>
-
-                <span class="ez-modal--custom-url-alias__label">{{ 'tab.urls.add.site_access'|trans|desc('SiteAccess') }}</span>
-                {{ form_widget(form.site_access) }}
-                <div class="ez-modal--custom-url-alias__info-text">
-                    {{ 'tab.urls.add.root_location_id.helper_secondary'|trans|desc("If you leave this empty, the alias will be placed at main root Location.") }}
+                <div class="ibexa-custom-url-from">
+                    <div class="ibexa-custom-url-from__item">
+                        <span class="ibexa-label required">{{ 'tab.urls.add.path'|trans|desc('URL') }}</span>
+                        {{ form_widget(form.path) }}
+                    </div>
+                    <div class="ibexa-custom-url-from__item">
+                        <span class="ibexa-label">{{ 'tab.urls.add.language'|trans|desc('Language') }}</span>
+                        {{ form_widget(form.language) }}
+                    </div>
+                    <div class="ibexa-custom-url-from__item">
+                        <span class="ibexa-label">{{ 'tab.urls.add.redirect'|trans|desc('Redirect to alias destination') }}</span>
+                        {{ form_widget(form.redirect) }}
+                        <div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--checked">{{ 'tab.urls.add.redirect.helper.checked'|trans|desc('The alias will redirect to the destination using an HTTP 301 response.') }}</div>
+                        <div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--unchecked">{{ 'tab.urls.add.redirect.helper.unchecked'|trans|desc('The alias will not redirect to the destination and the URL will stay the same.') }}</div>
+                    </div>
+                    <div class="ibexa-custom-url-from__item">
+                        <span class="ibexa-label">{{ 'tab.urls.add.site_root'|trans|desc('Place at the site root') }}</span>
+                        {{ form_widget(form.site_root) }}
+                        <div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--checked">{{ 'tab.urls.add.site_root.helper.checked'|trans|desc('The alias will be placed at the site root.') }}</div>
+                        <div class="ibexa-custom-url-from__info-text ibexa-custom-url-from__info-text--unchecked">
+                            {% if parent_name is not null %}
+                                {{ 'tab.urls.add.site_root.helper.unchecked'|trans({'%parent_name%': parent_name})|desc('The alias will be placed under %parent_name%') }}
+                            {% else %}
+                                {{ 'tab.urls.add.site_root.helper.no_parent_name'|trans|desc('The alias will be placed under the parent of this Location') }}
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="ibexa-custom-url-from__item ibexa-custom-url-from__item--siteacces">
+                        <span class="ibexa-label">{{ 'tab.urls.add.site_access'|trans|desc('SiteAccess') }}</span>
+                        {{ form_widget(form.site_access) }}
+                        <div class="ibexa-custom-url-from__info-text">
+                            {{ 'tab.urls.add.root_location_id.helper_secondary'|trans|desc("If you leave this empty, the alias will be placed at main root Location.") }}
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="modal-footer">
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
index 3da57f0b3d..e567e867c6 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig
@@ -52,7 +52,7 @@
         <button
             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-btn--no-text ibexa-btn--prevented"
             data-bs-toggle="modal"
-            data-bs-target="#ez-modal--custom-url-alias"
+            data-bs-target="#ibexa-modal--custom-url-alias"
             title="{{ 'tab.urls.action.add'|trans|desc('Add a custom URL alias') }}">
             <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
                 <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
diff --git a/src/bundle/Resources/views/themes/admin/content_type/modal/delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/content_type/modal/delete_confirmation.html.twig
index a545339a73..22022cfd0f 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/modal/delete_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/modal/delete_confirmation.html.twig
@@ -1,15 +1,15 @@
 {% trans_default_domain 'content_type' %}
 
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash" id="delete-content-type-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash" id="delete-content-type-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
             </button>
             <div class="modal-body">
-                <p class="ez-modal-body__main">{{ 'content_type.field_definitions.modal.message'|trans|desc('Do you want to delete the selected Field definition(s)?') }}</p>
+                <p class="ibexa-modal-body__main">{{ 'content_type.field_definitions.modal.message'|trans|desc('Do you want to delete the selected Field definition(s)?') }}</p>
             </div>
             <div class="modal-footer">
                 {{ form_widget(form.removeFieldDefinition, { attr: { class: 'btn ibexa-btn ibexa-btn--primary'}, label: 'modal.delete'|trans|desc('Delete')}) }}
diff --git a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig
index b0e50968db..5d6c2ade93 100644
--- a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig
@@ -1,10 +1,10 @@
 {% trans_default_domain 'language' %}
 
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash" id="delete-language-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash" id="delete-language-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
             </button>
diff --git a/src/bundle/Resources/views/themes/admin/section/modal/delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/section/modal/delete_confirmation.html.twig
index f2d7a5f8ef..218dfce09a 100644
--- a/src/bundle/Resources/views/themes/admin/section/modal/delete_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/section/modal/delete_confirmation.html.twig
@@ -1,15 +1,15 @@
 {% form_theme form '@ezdesign/ui/form_fields.html.twig'  %}
 
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash" id="delete-section-modal" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash" id="delete-section-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
             </button>
             <div class="modal-body">
-                <p class="ez-modal-body__main">
+                <p class="ibexa-modal-body__main">
                     {{ 'section.modal.message'|trans|desc('Do you want to delete the Section(s)?') }}
                 </p>
             </div>
diff --git a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig
index 72d8296112..37a85b3ab4 100644
--- a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig
@@ -1,19 +1,19 @@
 {% form_theme form '@ezdesign/ui/form_fields.html.twig'  %}
 
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--send-to-trash" id="confirmEmptyTrash" tabindex="-1" role="dialog" aria-labelledby="confirmEmptyTrash"
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--send-to-trash" id="confirmEmptyTrash" tabindex="-1" role="dialog" aria-labelledby="confirmEmptyTrash"
      aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                <svg class="ibexa-icon ibexa-icon--medium" aria-hidden="true">
+                <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                     <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                 </svg>
             </button>
             <div class="modal-body">
-                <p class="ez-modal-body__main">
+                <p class="ibexa-modal-body__main">
                     {{ 'trash.delete.all.confirm'|trans({'%trashItemsCount%': trash_items_count})|desc('Are you sure you want to permanently delete %trashItemsCount% item(s)?') }}
                 </p>
-                <p class="ez-modal-body__explanation">
+                <p class="ibexa-modal-body__explanation">
                     {{ 'trash.delete.all.info'|trans|desc('This action cannot be reversed') }}
                 </p>
             </div>
diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
index ffd9f5db17..2d07656fd5 100644
--- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig
@@ -197,7 +197,7 @@
                 label: '{{ label }}',
                 message: '{{ message }}',
             })|e('html_attr')  }}"></div>
-        <div class="ez-modal-wrapper"></div>
+        <div class="ibexa-modal-wrapper"></div>
 
         {{ encore_entry_script_tags('ezplatform-admin-ui-layout-js', null, 'ezplatform') }}
         {{ encore_entry_script_tags('ezplatform-admin-ui-udw-tabs-js', null, 'ezplatform') }}
diff --git a/src/bundle/Resources/views/themes/admin/ui/modal/bulk_delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/ui/modal/bulk_delete_confirmation.html.twig
index 18733577d3..cc29bd6703 100644
--- a/src/bundle/Resources/views/themes/admin/ui/modal/bulk_delete_confirmation.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/modal/bulk_delete_confirmation.html.twig
@@ -1,4 +1,4 @@
-<div class="modal fade ez-modal ez-modal--no-header ez-modal--notice ez-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
+<div class="modal fade ibexa-modal ibexa-modal--no-header ibexa-modal--notice ibexa-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <button type="button" class="close" title="{{ 'modal.close'|trans|desc('Close') }}" data-bs-dismiss="modal">
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
index 1aef4a6bc5..2bb2875674 100644
--- a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
+++ b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig
@@ -2,7 +2,7 @@
 {% form_theme form '@ezdesign/content/form_fields.html.twig' '@ezdesign/content/tab/url/checkbox.html.twig' %}
 
  <div
-    class="modal fade ez-modal ez-modal--url-wildcards"
+    class="modal fade ibexa-modal ibexa-modal--url-wildcards"
     id="{{ id }}"
     tabindex="-1"
     role="dialog"
@@ -13,21 +13,21 @@
             <div class="modal-header">
                 <h3 class="modal-title">{{ 'url_wildcard.modal.create.title'|trans|desc('Create a new URL wildcard') }}</h3>
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="{{ 'url_wildcard.modal.create.close'|trans|desc('Close') }}">
-                    <svg class="ibexa-icon ibexa-icon--small" aria-hidden="true">
+                    <svg class="ibexa-icon ibexa-icon--small-medium" aria-hidden="true">
                         <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>
                     </svg>
                 </button>
             </div>
             <div class="modal-body">
-                <span class="ez-modal__label required">{{ 'url_wildcard.modal.create.url.wildcard'|trans|desc('URL wildcard') }}</span>
+                <span class="ibexa-modal__label required">{{ 'url_wildcard.modal.create.url.wildcard'|trans|desc('URL wildcard') }}</span>
                 {{ form_widget(form.source_url) }}
 
-                <span class="ez-modal__label required">{{ 'url_wildcard.modal.create.url.destintion'|trans|desc('Destination') }}</span>
+                <span class="ibexa-modal__label required">{{ 'url_wildcard.modal.create.url.destintion'|trans|desc('Destination') }}</span>
                 {{ form_widget(form.destination_url) }}
  
-                <span class="ez-modal__label">{{ 'url_wildcard.modal.create.redirect'|trans|desc('Redirect to wildcard destination') }}</span>
+                <span class="ibexa-modal__label">{{ 'url_wildcard.modal.create.redirect'|trans|desc('Redirect to wildcard destination') }}</span>
                 {{ form_widget(form.forward) }}
-                <div class="ez-modal__info-text">{{ 'url_wildcard.modal.create.redirect.helper'|trans|desc('When checked, the URL displayed will be the URL of the destination. When unchecked, the wildcard will not redirect to the destination and the URL will stay the same.') }}</div>
+                <div class="ibexa-modal__info-text">{{ 'url_wildcard.modal.create.redirect.helper'|trans|desc('When checked, the URL displayed will be the URL of the destination. When unchecked, the wildcard will not redirect to the destination and the URL will stay the same.') }}</div>
             </div>
             <div class="modal-footer">
                 {{ form_widget(form.create, {'attr': {'class': 'btn ibexa-btn ibexa-btn--primary', 'disabled': 'disabled'}}) }}
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
index 7bb2d91e5f..a613498978 100644
--- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
+++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig
@@ -57,7 +57,3 @@
         </div>
     </div>
 {%- endblock -%}
-
-{% block javascripts %}
-    {{ encore_entry_script_tags('ezplatform-admin-ui-url-management-update-js', null, 'ezplatform') }}
-{% endblock %}
diff --git a/src/lib/Behat/Component/DraftConflictDialog.php b/src/lib/Behat/Component/DraftConflictDialog.php
index 1f2fa35e60..aa269cf7fd 100644
--- a/src/lib/Behat/Component/DraftConflictDialog.php
+++ b/src/lib/Behat/Component/DraftConflictDialog.php
@@ -42,7 +42,7 @@ public function edit(string $versionNumber): void
     protected function specifyLocators(): array
     {
         return [
-            new VisibleCSSLocator('dialog', '#version-draft-conflict-modal.ez-modal--version-draft-conflict.show .modal-content'),
+            new VisibleCSSLocator('dialog', '#version-draft-conflict-modal.ibexa-modal--version-draft-conflict.show .modal-content'),
             new VisibleCSSLocator('addDraft', '.ibexa-btn--add-draft'),
             new VisibleCSSLocator('table', '#version-draft-conflict-modal .modal-content'),
         ];