diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/content_type.en.xliff
index 46cca65685..859e3434ea 100644
--- a/src/bundle/Resources/translations/content_type.en.xliff
+++ b/src/bundle/Resources/translations/content_type.en.xliff
@@ -366,16 +366,6 @@
         <target state="new">%name%</target>
         <note>key: content_type.view.view.title</note>
       </trans-unit>
-      <trans-unit id="d74d01091280ceabfb457980ddd459dc841ad957" resname="content_type_group.breadcrumb.add">
-        <source>Creating a new Content Type group</source>
-        <target state="new">Creating a new Content Type group</target>
-        <note>key: content_type_group.breadcrumb.add</note>
-      </trans-unit>
-      <trans-unit id="20ee2fba1b6d560dd296bbe696975e92b78ce578" resname="content_type_group.breadcrumb.edit">
-        <source>Editing Content Type group '%identifier%'</source>
-        <target state="new">Editing Content Type group '%identifier%'</target>
-        <note>key: content_type_group.breadcrumb.edit</note>
-      </trans-unit>
       <trans-unit id="83a16866c8ff14a4966553088657aafbb9db8edb" resname="content_type_group.breadcrumb.list">
         <source>Content Types</source>
         <target state="new">Content Types</target>
@@ -401,6 +391,11 @@
         <target state="new">Created Content Type group '%name%'.</target>
         <note>key: content_type_group.create.success</note>
       </trans-unit>
+      <trans-unit id="59f3d7c7674d76f2854970e9c63a8db856b1229f" resname="content_type_group.creating">
+        <source>Creating</source>
+        <target state="new">Creating</target>
+        <note>key: content_type_group.creating</note>
+      </trans-unit>
       <trans-unit id="eec79e4a9109f28892797768f085eab39eaedc31" resname="content_type_group.delete.submit">
         <source>Delete</source>
         <target state="new">Delete</target>
@@ -466,6 +461,11 @@
         <target state="new">%identifier%</target>
         <note>key: content_type_group.view.view.title</note>
       </trans-unit>
+      <trans-unit id="f34946beab1da2af6535a8e4a88145e9557de0aa" resname="editing">
+        <source>Editing</source>
+        <target state="new">Editing</target>
+        <note>key: editing</note>
+      </trans-unit>
       <trans-unit id="f99cc628dc4d82c5ee69eae79039a2f449eec064" resname="field_definition.description">
         <source>Description</source>
         <target state="new">Description</target>
diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff
index a3b7c97bb8..9b7352d81d 100644
--- a/src/bundle/Resources/translations/forms.en.xliff
+++ b/src/bundle/Resources/translations/forms.en.xliff
@@ -186,6 +186,26 @@
         <target>Content Type / Update</target>
         <note>key: role.policy.class.update</note>
       </trans-unit>
+      <trans-unit id="3551d9a7a066b2a0941f244fa91f766c089fd063" resname="role.policy.commerce">
+        <source>Commerce</source>
+        <target>Commerce</target>
+        <note>key: role.policy.commerce</note>
+      </trans-unit>
+      <trans-unit id="b5a03c317caa2abbc2a833f7a1bd96dabe75f707" resname="role.policy.commerce.all_functions">
+        <source>Commerce / All functions</source>
+        <target>Commerce / All functions</target>
+        <note>key: role.policy.commerce.all_functions</note>
+      </trans-unit>
+      <trans-unit id="2bec0e366dfe740a1a13ef2b4186513711075983" resname="role.policy.commerce.currency">
+        <source>Commerce / Currency</source>
+        <target>Commerce / Currency</target>
+        <note>key: role.policy.commerce.currency</note>
+      </trans-unit>
+      <trans-unit id="fbf8fcb1c05ac737e68351c0a85682ac6a4bef6e" resname="role.policy.commerce.region">
+        <source>Commerce / Region</source>
+        <target>Commerce / Region</target>
+        <note>key: role.policy.commerce.region</note>
+      </trans-unit>
       <trans-unit id="504ce9f80e074eeb880d5ae5f54d4811e2ab6862" resname="role.policy.comparison">
         <source>Comparison</source>
         <target>Comparison</target>
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig
index bd0aeedc96..059e3143b7 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig
@@ -1,26 +1,21 @@
-{% extends '@ibexadesign/ui/layout.html.twig' %}
+{% extends '@ibexadesign/ui/edit_base.html.twig' %}
 
 {% trans_default_domain 'content_type' %}
 
-{% block breadcrumbs %}
-    {% block breadcrumbs_admin %}{% endblock %}
-{% endblock %}
+{% block main_container_class %}ibexa-main-container--edit-container ibexa-main-container--without-anchor-menu-items{% endblock %}
 
-{% block context_menu %}
-    {% block context_menu_admin %}{% endblock %}
-{% endblock %}
+{% set anchor_params = {
+    close_href: path('ezplatform.content_type_group.list'),
+} %}
 
 {% block header %}
     {% block header_admin %}{% endblock %}
 {% endblock %}
 
 {% block content %}
-    <div class="row align-items-stretch ez-main-row">
-        <div class="px-0 pb-4 ez-content-container">
-            <div class="container ez-container">
-                {% block form %}
-                {% endblock %}
-            </div>
+    <div class="row">
+        <div class="col col-10 offset-1">
+            {% block form %}{% endblock %}
         </div>
     </div>
 {% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig
index cc3c573261..228a52bdf6 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig
@@ -4,37 +4,26 @@
 
 {% trans_default_domain 'content_type' %}
 
-{% block breadcrumbs_admin %}
-    {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
-        { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
-        { url: path('ezplatform.content_type_group.list'), value: 'content_type_group.breadcrumb.list'|trans|desc('Content Types') },
-        { value: 'content_type_group.breadcrumb.add'|trans|desc('Creating a new Content Type group') }
-    ]} %}
-{% endblock %}
-
-{% block context_menu_admin %}
+{% block header_admin %}
     {% set content_type_group_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.content_type_group_create.sidebar_right') %}
-    {{ knp_menu_render(content_type_group_create_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) }}
-{% endblock %}
 
-{% block header_admin %}
-    {% include '@ibexadesign/ui/page_title.html.twig' with {
+    {% include '@ibexadesign/ui/edit_header.html.twig' with {
+        action_name: 'content_type_group.creating'|trans|desc('Creating'),
+        icon_name: 'file',
         title: 'content_type_group.view.add.title'|trans|desc('Creating a new Content Type group'),
+        context_actions: knp_menu_render(content_type_group_create_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'})
     } %}
 {% endblock %}
 
 {% block form %}
     {{ form_start(form) }}
-
-    <section>
-        <div class="card ibexa-card ibexa-card--light">
-            <div class="card-body ibexa-card__body">
-                {{ form_row(form.identifier, {'attr': {'autofocus': 'autofocus'}}) }}
+        <section>
+            <div class="card ibexa-card ibexa-card--light">
+                <div class="card-body ibexa-card__body">
+                    {{ form_row(form.identifier, {'attr': {'autofocus': 'autofocus'}}) }}
+                </div>
             </div>
-        </div>
-    </section>
-
-    {{ form_widget(form.create, {'attr': {'hidden': 'hidden'}}) }}
-
+        </section>
+        {{ form_widget(form.create, {'attr': {'hidden': 'hidden'}}) }}
     {{ form_end(form) }}
 {% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig
index 2acbb11ead..334b26b76e 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig
@@ -4,42 +4,27 @@
 
 {% trans_default_domain 'content_type' %}
 
-{% block breadcrumbs_admin %}
-    {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
-        { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
-        { url: path('ezplatform.content_type_group.list'), value: 'content_type_group.breadcrumb.list'|trans|desc('Content Types') },
-        { value: 'content_type_group.breadcrumb.edit'|trans({ '%identifier%': content_type_group.identifier })|desc('Editing Content Type group \'%identifier%\'') }
-    ]} %}
-{% endblock %}
-
-{% block context_menu_admin %}
+{% block header_admin %}
     {% set content_type_group_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.content_type_group_edit.sidebar_right', [], {'save_id': form.update.vars.id}) %}
-    {{ knp_menu_render(content_type_group_edit_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) }}
-{% endblock %}
 
-{% block header_admin %}
-    {% include '@ibexadesign/ui/page_title.html.twig' with {
+    {% include '@ibexadesign/ui/edit_header.html.twig' with {
+        action_name: 'editing'|trans|desc('Editing'),
+        icon_name: 'file',
         title: 'content_type_group.view.edit.title'|trans({'%identifier%': content_type_group.identifier})|desc('Editing Content Type group \'%identifier%\''),
+        show_autosave_status: false,
+        context_actions: knp_menu_render(content_type_group_edit_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'})
     } %}
 {% endblock %}
 
 {% block form %}
     {{ form_start(form) }}
-
-    <section>
-        <div class="card ibexa-card ibexa-card--light">
-            <div class="card-body ibexa-card__body">
-                {{ form_row(form.identifier) }}
+        <section>
+            <div class="card ibexa-card ibexa-card--light">
+                <div class="card-body ibexa-card__body">
+                    {{ form_row(form.identifier) }}
+                </div>
             </div>
-        </div>
-    </section>
-
-    {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }}
-
+        </section>
+        {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }}
     {{ form_end(form) }}
 {% endblock %}
-
-{% block right_sidebar %}
-    {% set content_type_group_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.content_type_group_edit.sidebar_right', [], {'save_id': form.update.vars.id}) %}
-    {{ knp_menu_render(content_type_group_edit_sidebar_right, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) }}
-{% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig
index cecf1b7bff..a77d2f4162 100644
--- a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig
@@ -17,7 +17,7 @@
         icon_name: 'content-type',
         show_autosave_status: true,
         description: content_type.description,
-        subtitle: 'editing_details'|trans({ '%location_name%': parent_location.contentInfo.name })|desc('under %location_name%'),
+        subtitle: 'editing_details'|trans({ '%location_name%': parent_location.contentInfo.name, '%language%': language.name })|desc('under %location_name% in %language%'),
     } %}
 {% endblock %}