diff --git a/packages/design-system/src/components/Dropdown/Dropdown.tsx b/packages/design-system/src/components/Dropdown/Dropdown.tsx
index 459933e6cfc..431cbbfe6a5 100644
--- a/packages/design-system/src/components/Dropdown/Dropdown.tsx
+++ b/packages/design-system/src/components/Dropdown/Dropdown.tsx
@@ -16,7 +16,7 @@ import DropdownDivider from './Primitive/DropdownDivider';
 import DropdownLink from './Primitive/DropdownLink';
 import DropdownShell from './Primitive/DropdownShell';
 import DropdownTitle from './Primitive/DropdownTitle';
-import MenuButton from './Primitive/MenuButton';
+import { DropdownButton } from './Primitive/DropdownButton';
 
 type DropdownButtonType = Omit<ClickableProps, 'children'> & {
 	label: string;
@@ -104,7 +104,7 @@ export const Dropdown = ({
 						const { label, ...entryRest } = entry;
 						const id = `${label}-${index}`;
 						return (
-							<MenuButton
+							<DropdownButton
 								{...entryRest}
 								// {...menu}
 								onClick={(event: MouseEvent<HTMLButtonElement> | KeyboardEvent) => {
@@ -118,7 +118,7 @@ export const Dropdown = ({
 								data-test={`${menuItemTest}.${id}`}
 							>
 								{label}
-							</MenuButton>
+							</DropdownButton>
 						);
 					}
 
diff --git a/packages/design-system/src/components/Dropdown/Primitive/MenuButton.tsx b/packages/design-system/src/components/Dropdown/Primitive/DropdownButton.tsx
similarity index 77%
rename from packages/design-system/src/components/Dropdown/Primitive/MenuButton.tsx
rename to packages/design-system/src/components/Dropdown/Primitive/DropdownButton.tsx
index e64ab8e692a..06edb336bd4 100644
--- a/packages/design-system/src/components/Dropdown/Primitive/MenuButton.tsx
+++ b/packages/design-system/src/components/Dropdown/Primitive/DropdownButton.tsx
@@ -9,12 +9,12 @@ import { getIconWithDeprecatedSupport } from '../../Icon/DeprecatedIconHelper';
 
 import styles from './DropdownEntry.module.scss';
 
-export type MenuButtonType = ClickableProps & /*MenuItemProps &*/ {
+export type DropdownButtonType = ClickableProps & /*MenuItemProps &*/ {
 	icon?: DeprecatedIconNames | IconNameWithSize<'M'>;
 };
 
-const MenuButton = forwardRef(
-	({ children, icon, ...props }: MenuButtonType, ref: Ref<HTMLButtonElement>) => {
+export const DropdownButton = forwardRef(
+	({ children, icon, ...props }: DropdownButtonType, ref: Ref<HTMLButtonElement>) => {
 		return (
 			<Clickable {...props} ref={ref}>
 				<div className={styles.dropdownEntry}>
@@ -34,6 +34,4 @@ const MenuButton = forwardRef(
 	},
 );
 
-MenuButton.displayName = 'MenuButton';
-
-export default MenuButton;
+DropdownButton.displayName = 'DropdownButton';
diff --git a/packages/design-system/src/components/Dropdown/index.ts b/packages/design-system/src/components/Dropdown/index.ts
index 2f29bad4e67..5bd11eca0bd 100644
--- a/packages/design-system/src/components/Dropdown/index.ts
+++ b/packages/design-system/src/components/Dropdown/index.ts
@@ -1 +1,2 @@
 export * from './Dropdown';
+export * from './Primitive/DropdownButton';
diff --git a/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.js b/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.js
index 31469c66253..90cd3c4a10b 100644
--- a/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.js
+++ b/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.js
@@ -143,5 +143,4 @@ BadgeMenuForm.propTypes = {
 	t: PropTypes.func.isRequired,
 };
 
-// eslint-disable-next-line import/prefer-default-export
 export { BadgeMenuForm };
diff --git a/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.test.js b/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.test.js
index ccfd7e2664c..fdd1ec717e8 100644
--- a/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.test.js
+++ b/packages/faceted-search/src/components/Badges/BadgeMenu/BadgeMenuForm.component.test.js
@@ -4,6 +4,8 @@ import userEvent from '@testing-library/user-event';
 import { BadgeMenuForm } from './BadgeMenuForm.component';
 import getDefaultT from '../../../translate';
 
+jest.unmock('@talend/design-system');
+
 const menuItems = [
 	{
 		id: 'item-one',
diff --git a/packages/faceted-search/src/components/BasicSearch/__snapshots__/BasicSearch.component.test.js.snap b/packages/faceted-search/src/components/BasicSearch/__snapshots__/BasicSearch.component.test.js.snap
index 0d493728901..f0a6860e7e8 100644
--- a/packages/faceted-search/src/components/BasicSearch/__snapshots__/BasicSearch.component.test.js.snap
+++ b/packages/faceted-search/src/components/BasicSearch/__snapshots__/BasicSearch.component.test.js.snap
@@ -126,80 +126,34 @@ exports[`BasicSearch should render the default html output with no badges 1`] =
     <div
       class="tc-basic-search-content-popover theme-tc-basic-search-content-popover"
     >
-      <div
-        class="tc-add-facet-popover theme-tc-add-facet-popover"
-        id="manager-id-basic-search-add-facet-popover"
+      <button
+        aria-busy="false"
+        aria-expanded="false"
+        aria-haspopup="dialog"
+        class="theme-clickable theme-button theme-secondary theme-size-S"
+        data-feature="filter.basic.add"
+        type="button"
       >
-        <div
-          class="tc-add-facet-popover-container theme-tc-add-facet-popover-container"
-          id="manager-id-basic-search-add-facet-popover"
+        <span
+          class="theme-stack theme-justify-start theme-align-center theme-nowrap theme-row theme-block theme-gap-x-XS theme-gap-y-XS"
         >
-          <div>
-            <header
-              class="theme-header tc-tooltip-header tc-add-facet-popover-header theme-tc-add-facet-popover-header"
-              id="manager-id-basic-search-add-facet-popover-null-header"
-            >
-              <form
-                class="theme-filter tc-add-facet-popover-filter theme-tc-add-facet-popover-filter theme-navbar"
-                role="search"
-              >
-                <div
-                  class="form-group"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="tc-svg-icon tc-icon theme-svg theme-search-icon tc-icon-name-talend-search"
-                    focusable="false"
-                    name="talend-search"
-                    pointer-events="none"
-                    shape-rendering="geometricPrecision"
-                  />
-                  <input
-                    aria-label="Find a filter"
-                    autocomplete="off"
-                    class="theme-search form-control"
-                    id="manager-id-basic-search-add-facet-popover-null-filter-input"
-                    name="search"
-                    placeholder="Find a filter"
-                    role="searchbox"
-                    type="search"
-                    value=""
-                  />
-                </div>
-              </form>
-            </header>
-            <div
-              class="theme-body tc-tooltip-body"
-              id="manager-id-basic-search-add-facet-popover-null-body"
+          Add filter
+          <span
+            class="theme-button__caret"
+          >
+            <svg
+              aria-hidden="true"
+              pointer-events="none"
+              shape-rendering="geometricPrecision"
+              style="width: 1.2rem; height: 1.2rem;"
             >
-              <div
-                class="theme-content tc-tooltip-content"
-                id="manager-id-basic-search-add-facet-popover-null-body-content"
-              >
-                <div
-                  class="tc-add-facet-popover-row-container theme-tc-add-facet-popover-row-container"
-                >
-                  <button
-                    class="tc-add-facet-popover-row-button theme-tc-add-facet-popover-row-button"
-                    id="manager-id-basic-search-add-facet-popover-row-button-Name"
-                    tabindex="0"
-                  >
-                    <div
-                      class="theme-stack theme-justify-start theme-align-start theme-nowrap theme-row theme-block theme-align-content-baseline theme-gap-x-S theme-gap-y-S"
-                    >
-                      <div
-                        class="theme-item theme-align-auto theme-overflow-auto theme-grow theme-shrink"
-                      >
-                        Name
-                      </div>
-                    </div>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+              <use
+                xlink:href="#chevron-down:S"
+              />
+            </svg>
+          </span>
+        </span>
+      </button>
     </div>
   </div>
   <div
diff --git a/packages/faceted-search/src/helpers/usage.helpers.js b/packages/faceted-search/src/helpers/usage.helpers.js
index c8b5949585c..e126cddad28 100644
--- a/packages/faceted-search/src/helpers/usage.helpers.js
+++ b/packages/faceted-search/src/helpers/usage.helpers.js
@@ -1,5 +1,5 @@
-import { USAGE_TRACKING_TAGS } from '../constants';
 import { pick } from 'lodash';
+import { USAGE_TRACKING_TAGS } from '../constants';
 
 export const getApplyDataFeature = feature => {
 	const formatedFeature = feature.toLowerCase().replace(' ', '_');