diff --git a/packages/core/content-type-builder/admin/src/components/ComponentIconPicker/index.js b/packages/core/content-type-builder/admin/src/components/ComponentIconPicker/index.js
index 6a8da46ca9..81d6746381 100644
--- a/packages/core/content-type-builder/admin/src/components/ComponentIconPicker/index.js
+++ b/packages/core/content-type-builder/admin/src/components/ComponentIconPicker/index.js
@@ -104,7 +104,7 @@ const ComponentIconPicker = ({ error, isCreating, intlLabel, name, onChange, val
               </Searchbar>
             </div>
           ) : (
-            <IconButton onClick={toggleSearch} aria-label="Edit" icon={<SearchIcon />} />
+            <IconButton onClick={toggleSearch} aria-label="Edit" icon={<SearchIcon />} noBorder />
           )}
         </Row>
         <Stack size={1}>
diff --git a/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js b/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js
index ebbbe61ea8..ebe8f998a1 100644
--- a/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js
+++ b/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js
@@ -4,39 +4,45 @@
  *
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import { Select, Option } from '@strapi/parts/Select';
+import { ComboboxOption, CreatableCombobox } from '@strapi/parts/Combobox';
 import useDataManager from '../../hooks/useDataManager';
 
-// FIXME replace with Creatable Combobox
 const SelectCategory = ({ error, intlLabel, name, onChange, value }) => {
   const { formatMessage } = useIntl();
   const { allComponentsCategories } = useDataManager();
+  const [categories, setCategories] = useState(allComponentsCategories);
 
   const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';
   const label = formatMessage(intlLabel);
 
+  const handleChange = value => {
+    onChange({ target: { name, value, type: 'select-category' } });
+  };
+
+  const handleCreateOption = value => {
+    setCategories(prev => [...prev, value]);
+    handleChange(value);
+  };
+
   return (
-    <Select
+    <CreatableCombobox
       error={errorMessage}
-      label={label}
       id={name}
+      label={label}
       name={name}
-      onChange={value => {
-        onChange({ target: { name, value, type: 'select-category' } });
-      }}
-      value={value || ''}
+      onChange={handleChange}
+      onCreateOption={handleCreateOption}
+      value={value}
     >
-      {allComponentsCategories.map(category => {
-        return (
-          <Option key={category} value={category}>
-            {category}
-          </Option>
-        );
-      })}
-    </Select>
+      {categories.map(category => (
+        <ComboboxOption key={category} value={category}>
+          {category}
+        </ComboboxOption>
+      ))}
+    </CreatableCombobox>
   );
 };