diff --git a/packages/strapi-plugin-i18n/admin/src/components/DropdownIndicator/index.js b/packages/strapi-helper-plugin/lib/src/components/Select/DropdownIndicator.js
similarity index 100%
rename from packages/strapi-plugin-i18n/admin/src/components/DropdownIndicator/index.js
rename to packages/strapi-helper-plugin/lib/src/components/Select/DropdownIndicator.js
diff --git a/packages/strapi-helper-plugin/lib/src/components/Select/index.js b/packages/strapi-helper-plugin/lib/src/components/Select/index.js
index 2fee9184c8..d1594530a4 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Select/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Select/index.js
@@ -3,17 +3,18 @@ import ReactSelect, { components } from 'react-select';
 import PropTypes from 'prop-types';
 import Carret from '../Carret';
 import { useTheme } from 'styled-components';
+import DropdownIndicator from './DropdownIndicator';
 import getStyles from './styles';
 
-export const DropdownIndicator = props => {
-  const theme = useTheme();
+// export const DropdownIndicator = props => {
+//   const theme = useTheme();
 
-  return (
-    <components.DropdownIndicator {...props}>
-      <Carret fill={theme.main.colors.grey} />
-    </components.DropdownIndicator>
-  );
-};
+//   return (
+//     <components.DropdownIndicator {...props}>
+//       <Carret fill={theme.main.colors.grey} />
+//     </components.DropdownIndicator>
+//   );
+// };
 
 export const Select = ({ children, onChange, selectedValue, ...props }) => {
   const theme = useTheme();
diff --git a/packages/strapi-helper-plugin/lib/src/index.js b/packages/strapi-helper-plugin/lib/src/index.js
index dd44516667..7bdad8d27f 100644
--- a/packages/strapi-helper-plugin/lib/src/index.js
+++ b/packages/strapi-helper-plugin/lib/src/index.js
@@ -28,6 +28,8 @@ export { default as InputAddon } from './components/InputAddon';
 export { default as EmptyState } from './components/EmptyState';
 export * from './components/Tabs';
 export * from './components/Select';
+
+export { default as DropdownIndicator } from './components/Select/DropdownIndicator';
 export * from './components/InjectionZone';
 
 export { default as InputAddonWithErrors } from './components/InputAddonWithErrors';
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index 5f4bb2d121..f3de8b7663 100644
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -56,6 +56,11 @@
     "@buffetjs/icons": "3.3.5-next.1",
     "@buffetjs/styles": "3.3.5-next.1",
     "@buffetjs/utils": "3.3.5-next.1",
+    "@fortawesome/fontawesome-free": "^5.15.2",
+    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
+    "@fortawesome/react-fontawesome": "^0.1.14",
     "bootstrap": "^4.6.0",
     "classnames": "^2.2.5",
     "immutable": "^3.8.2",
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/DropdownIndicator.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/DropdownIndicator.js
deleted file mode 100644
index 628b29aa46..0000000000
--- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/DropdownIndicator.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Flex } from '@buffetjs/core';
-import styled from 'styled-components';
-import PropTypes from 'prop-types';
-
-const Wrapper = styled(Flex)`
-  height: 100%;
-  width: 32px;
-  background: #fafafb;
-  > svg {
-    align-self: center;
-    font-size: 11px;
-    color: #b3b5b9;
-  }
-`;
-
-const DropdownIndicator = ({ selectProps: { menuIsOpen } }) => {
-  const icon = menuIsOpen ? 'caret-up' : 'caret-down';
-
-  return (
-    <Wrapper>
-      <FontAwesomeIcon icon={icon} />
-    </Wrapper>
-  );
-};
-
-DropdownIndicator.propTypes = {
-  selectProps: PropTypes.shape({
-    menuIsOpen: PropTypes.bool.isRequired,
-  }).isRequired,
-};
-
-Wrapper.defaultProps = {
-  flexDirection: 'column',
-  justifyContent: 'center',
-};
-
-export default DropdownIndicator;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js
index d9cee36cf4..a7db810b81 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js
@@ -4,6 +4,7 @@ import { FormattedMessage, useIntl } from 'react-intl';
 import { Link, useLocation } from 'react-router-dom';
 import { findIndex, get, isArray, isEmpty, set } from 'lodash';
 import {
+  DropdownIndicator,
   LabelIconWrapper,
   NotAllowedInput,
   request,
@@ -16,7 +17,6 @@ import pluginId from '../../pluginId';
 import SelectOne from '../SelectOne';
 import SelectMany from '../SelectMany';
 import ClearIndicator from './ClearIndicator';
-import DropdownIndicator from './DropdownIndicator';
 import IndicatorSeparator from './IndicatorSeparator';
 import Option from './Option';
 import { A, BaselineAlignment } from './components';
diff --git a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
index 26e410f89c..c15453342c 100644
--- a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
+++ b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
@@ -8,13 +8,13 @@ import { useTheme } from 'styled-components';
 import { useIntl } from 'react-intl';
 import {
   BaselineAlignment,
+  DropdownIndicator,
   ModalConfirm,
   selectStyles,
   useContentManagerEditViewDataManager,
   request,
 } from 'strapi-helper-plugin';
 import { getTrad } from '../../utils';
-import DropdownIndicator from '../DropdownIndicator';
 import { cleanData, generateOptions } from './utils';
 
 const CMEditViewCopyLocale = ({ appLocales, currentLocale, localizations, readPermissions }) => {
diff --git a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/index.js b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/index.js
index 5ba4b6d3ed..9a70c98f73 100644
--- a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/index.js
+++ b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/index.js
@@ -5,13 +5,12 @@ import get from 'lodash/get';
 import Select, { components } from 'react-select';
 import { useIntl } from 'react-intl';
 import { useTheme } from 'styled-components';
-import { BaselineAlignment, selectStyles } from 'strapi-helper-plugin';
+import { DropdownIndicator, BaselineAlignment, selectStyles } from 'strapi-helper-plugin';
 import { useHistory } from 'react-router-dom';
 import { stringify } from 'qs';
 import { getTrad } from '../../utils';
 import { addStatusColorToLocale, createLocalesOption } from './utils';
 import CMEditViewCopyLocale from '../CMEditViewCopyLocale';
-import DropdownIndicator from '../DropdownIndicator';
 import OptionComponent from './Option';
 import Wrapper from './Wrapper';