diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
index 1003499109..1b2bff56bf 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js
@@ -189,6 +189,7 @@ const forms = {
       return createCategorySchema(allowedCategories);
     },
     form: {
+      advanced: () => ({ sections: [] }),
       base() {
         return categoryForm.base;
       },
diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/index.js
index 9680da119e..0987a324fc 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModal/index.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModal/index.js
@@ -122,6 +122,7 @@ const FormModal = () => {
       // Returns 'null' if there isn't any attributeType search params
       const attributeName = query.get('attributeName');
       const attributeType = query.get('attributeType');
+      const categoryName = query.get('categoryName');
       const dynamicZoneTarget = query.get('dynamicZoneTarget');
       const forTarget = query.get('forTarget');
       const modalType = query.get('modalType');
@@ -153,6 +154,7 @@ const FormModal = () => {
         actionType,
         attributeName,
         attributeType,
+        categoryName,
         kind,
         dynamicZoneTarget,
         forTarget,
@@ -1093,8 +1095,10 @@ const FormModal = () => {
       <ModalLayout onClose={handleClosed} labelledBy="title">
         <FormModalHeader
           actionType={state.actionType}
-          headers={headers}
+          attributeName={state.attributeName}
+          categoryName={state.categoryName}
           contentTypeKind={state.kind}
+          dynamicZoneTarget={state.dynamicZoneTarget}
           modalType={state.modalType}
           forTarget={state.forTarget}
           targetUid={state.targetUid}
diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/utils/staticData.js b/packages/core/content-type-builder/admin/src/components/FormModal/utils/staticData.js
index 733121ba91..44bd3bd71c 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModal/utils/staticData.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModal/utils/staticData.js
@@ -2,6 +2,7 @@ const INITIAL_STATE_DATA = {
   actionType: null,
   attributeName: null,
   attributeType: null,
+  categoryName: null,
   dynamicZoneTarget: null,
   forTarget: null,
   modalType: null,
diff --git a/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js b/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js
index 30b22517b4..9b902087de 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js
@@ -8,30 +8,24 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import upperFirst from 'lodash/upperFirst';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Breadcrumbs, Crumb } from '@strapi/parts/Breadcrumbs';
 import { ModalHeader } from '@strapi/parts/ModalLayout';
 import { Box } from '@strapi/parts/Box';
 import { Row } from '@strapi/parts/Row';
 import { Stack } from '@strapi/parts/Stack';
 import { ButtonText } from '@strapi/parts/Text';
-import styled from 'styled-components';
 import useDataManager from '../../hooks/useDataManager';
 import getTrad from '../../utils/getTrad';
 import AttributeIcon from '../AttributeIcon';
 
-const IconBox = styled(Box)`
-  svg {
-    color: ${({ theme }) => theme.colors.primary600};
-  }
-`;
-
 const FormModalHeader = ({
   actionType,
+  attributeName,
   attributeType,
+  categoryName,
   contentTypeKind,
+  dynamicZoneTarget,
   forTarget,
-  headers,
   modalType,
   targetUid,
 }) => {
@@ -39,20 +33,9 @@ const FormModalHeader = ({
   const { modifiedData } = useDataManager();
 
   let icon;
-  let isFontAwesomeIcon = false;
+  let headers = [];
 
-  if (modalType === 'chooseAttribute') {
-    const schema = modifiedData[forTarget][targetUid] || modifiedData[forTarget];
-
-    if (forTarget === 'components') {
-      icon = schema.schema.icon;
-      isFontAwesomeIcon = true;
-    } else if (forTarget === 'component') {
-      icon = 'component';
-    } else {
-      icon = schema.schema.kind;
-    }
-  }
+  const schema = modifiedData?.[forTarget]?.[targetUid] || modifiedData?.[forTarget] || null;
 
   if (modalType === 'contentType') {
     icon = contentTypeKind;
@@ -62,14 +45,6 @@ const FormModalHeader = ({
     icon = 'component';
   }
 
-  if (modalType === 'addComponentToDynamicZone') {
-    icon = 'dynamiczone';
-  }
-
-  if (modalType === 'attribute') {
-    icon = attributeType;
-  }
-
   const isCreatingMainSchema = ['component', 'contentType'].includes(modalType);
 
   if (isCreatingMainSchema) {
@@ -91,7 +66,7 @@ const FormModalHeader = ({
           </Box>
           <Box paddingLeft={3}>
             <ButtonText textColor="neutral800" as="h2" id="title">
-              {formatMessage({ id: headerId }, { name: headers[0].label })}
+              {formatMessage({ id: headerId }, { name: schema.schema.name })}
             </ButtonText>
           </Box>
         </Row>
@@ -99,25 +74,54 @@ const FormModalHeader = ({
     );
   }
 
+  headers = [
+    {
+      label: schema?.schema.name || null,
+      info: { category: schema?.category || null, name: schema?.schema.name },
+    },
+  ];
+
+  if (modalType === 'chooseAttribute') {
+    icon = ['component', 'components'].includes(forTarget) ? 'component' : schema.schema.kind;
+  }
+
+  if (modalType === 'addComponentToDynamicZone') {
+    icon = 'dynamiczone';
+    headers.push({ label: dynamicZoneTarget });
+  }
+
+  if (modalType === 'attribute') {
+    icon = attributeType;
+    headers.push({ label: attributeName });
+  }
+
+  if (modalType === 'editCategory') {
+    const label = formatMessage({
+      id: getTrad('modalForm.header.categories'),
+      defaultMessage: 'Categories',
+    });
+
+    headers = [{ label }, { label: categoryName }];
+  }
+
   const breadcrumbsLabel = headers.map(({ label }) => label).join(',');
 
   return (
     <ModalHeader>
       <Stack horizontal size={3}>
-        {!isFontAwesomeIcon && <AttributeIcon type={icon} />}
-        {isFontAwesomeIcon && (
-          <IconBox>
-            <FontAwesomeIcon icon={icon} />
-          </IconBox>
-        )}
+        <AttributeIcon type={icon} />
 
         <Breadcrumbs label={breadcrumbsLabel}>
           {headers.map((header, index) => {
             const label = upperFirst(header.label);
 
+            if (!label) {
+              return null;
+            }
+
             const key = `${header.label}.${index}`;
 
-            if (header.info.category) {
+            if (header.info?.category) {
               const content = `${label} (${upperFirst(header.info.category)} - ${upperFirst(
                 header.info.name
               )})`;
@@ -135,22 +139,23 @@ const FormModalHeader = ({
 
 FormModalHeader.defaultProps = {
   actionType: null,
+  attributeName: null,
   attributeType: null,
+  categoryName: null,
+  dynamicZoneTarget: null,
+  forTarget: null,
   contentTypeKind: null,
   targetUid: null,
 };
 
 FormModalHeader.propTypes = {
   actionType: PropTypes.string,
+  attributeName: PropTypes.string,
   attributeType: PropTypes.string,
+  categoryName: PropTypes.string,
   contentTypeKind: PropTypes.string,
-  forTarget: PropTypes.oneOf(['contentType', 'component', 'components']).isRequired,
-  headers: PropTypes.arrayOf(
-    PropTypes.shape({
-      icon: PropTypes.shape({ name: PropTypes.string, isCustom: PropTypes.bool }),
-      label: PropTypes.string.isRequired,
-    })
-  ).isRequired,
+  dynamicZoneTarget: PropTypes.string,
+  forTarget: PropTypes.oneOf(['contentType', 'component', 'components']),
   modalType: PropTypes.string.isRequired,
   targetUid: PropTypes.string,
 };