diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Search.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Search.js
new file mode 100644
index 0000000000..ff86470e3c
--- /dev/null
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Search.js
@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+import { colors } from 'strapi-helper-plugin';
+
+const Search = styled.input`
+  width: 100%;
+  padding: 0 21px;
+  outline: 0;
+  color: ${colors.leftMenu.black};
+`;
+
+export default Search;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js
new file mode 100644
index 0000000000..17b766255a
--- /dev/null
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js
@@ -0,0 +1,34 @@
+import styled from 'styled-components';
+import { colors } from 'strapi-helper-plugin';
+
+const SearchWrapper = styled.div`
+  position: relative;
+  margin-top: -2px;
+  &::after {
+    display: block;
+    content: '';
+    height: 2px;
+    width: calc(100% - 20px);
+    background: ${colors.leftMenu.lightGrey};
+  }
+  > svg {
+    position: absolute;
+    bottom: 15px;
+    left: 0;
+    font-size: 11px;
+  }
+  button {
+    position: absolute;
+    top: 1px;
+    right: 0;
+    padding: 5px 0 0px 5px;
+    line-height: 11px;
+    outline: 0;
+    i,
+    svg {
+      font-size: 11px;
+    }
+  }
+`;
+
+export default SearchWrapper;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js
index ab22159a8e..5f3d74b10f 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js
@@ -36,6 +36,17 @@ const Wrapper = styled.div`
     font-size: 1em;
     color: #bdbdbd;
   }
+
+  .search {
+    display: flex;
+    padding-top: 2px;
+    color: #919bae;
+    > button {
+      margin-top: -8px;
+      font-size: 1.3rem;
+      outline: 0;
+    }
+  }
 `;
 
 Wrapper.defaultProps = {
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/index.js
index 1be2760ee2..0bf265042a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/index.js
@@ -1,9 +1,12 @@
-import React, { useState } from 'react';
+import React, { createRef, useEffect, useState } from 'react';
 import { Label, ErrorMessage } from '@buffetjs/styles';
 import { AutoSizer, Collection } from 'react-virtualized';
 import PropTypes from 'prop-types';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import useDataManager from '../../hooks/useDataManager';
 import CellRenderer from './CellRenderer';
+import Search from './Search';
+import SearchWrapper from './SearchWrapper';
 import Wrapper from './Wrapper';
 
 const ComponentIconPicker = ({
@@ -15,9 +18,7 @@ const ComponentIconPicker = ({
   value,
 }) => {
   const { allIcons, allComponentsIconAlreadyTaken } = useDataManager();
-  const [originalIcon] = useState(value);
-
-  const icons = allIcons.filter(ico => {
+  const initialIcons = allIcons.filter(ico => {
     if (isCreating) {
       return !allComponentsIconAlreadyTaken.includes(ico);
     }
@@ -27,6 +28,18 @@ const ComponentIconPicker = ({
       .filter(icon => icon !== originalIcon)
       .includes(ico);
   });
+  const ref = createRef();
+  const [originalIcon] = useState(value);
+  const [showSearch, setShowSearch] = useState(false);
+  const [search, setSearch] = useState('');
+  const [icons, setIcons] = useState(initialIcons);
+  const toggleSearch = () => setShowSearch(prev => !prev);
+
+  useEffect(() => {
+    if (showSearch && ref.current) {
+      ref.current.focus();
+    }
+  }, [ref, showSearch]);
 
   const cellCount = icons.length;
 
@@ -54,9 +67,42 @@ const ComponentIconPicker = ({
 
   return (
     <Wrapper error={error !== null}>
-      <Label htmlFor={name} style={{ marginBottom: 12 }}>
-        {label}
-      </Label>
+      <div className="search">
+        <Label htmlFor={name} style={{ marginBottom: 12 }}>
+          {label}
+        </Label>
+        {!showSearch ? (
+          <button onClick={toggleSearch} type="button">
+            <FontAwesomeIcon icon="search" />
+          </button>
+        ) : (
+          <SearchWrapper>
+            <FontAwesomeIcon icon="search" />
+            <button onClick={toggleSearch}></button>
+            <Search
+              ref={ref}
+              onChange={({ target: { value } }) => {
+                setSearch(value);
+                setIcons(() =>
+                  initialIcons.filter(icon => icon.includes(value))
+                );
+              }}
+              value={search}
+              placeholder="search…"
+            />
+            <button
+              onClick={() => {
+                setSearch('');
+                setIcons(initialIcons);
+                toggleSearch();
+              }}
+              type="button"
+            >
+              <FontAwesomeIcon icon="times" />
+            </button>
+          </SearchWrapper>
+        )}
+      </div>
       <AutoSizer disableHeight>
         {({ width }) => {
           return (