diff --git a/src/components/filter_group/_filter_group.scss b/src/components/filter_group/_filter_group.scss
index 22d22a54c6b..54cb4fcf428 100644
--- a/src/components/filter_group/_filter_group.scss
+++ b/src/components/filter_group/_filter_group.scss
@@ -18,10 +18,6 @@
     min-width: $euiSize * 6;
   }
 
-  > .euiFilterButton--hasIcon {
-    min-width: $euiSize * 8;
-  }
-
   // Force popover anchors to expand for now
   .euiPopover__anchor {
     display: block;
diff --git a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
index 6f4c6ef3667..d76d41f8aff 100644
--- a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`EuiSearchFilters render - no filters 1`] = `
+exports[`EuiSearchBarFilters render - no filters 1`] = `
 <div
   class="euiFilterGroup"
 />
 `;
 
-exports[`EuiSearchFilters render - with filters 1`] = `
+exports[`EuiSearchBarFilters render - with filters 1`] = `
 <div
   class="euiFilterGroup"
 >
diff --git a/src/components/search_bar/index.ts b/src/components/search_bar/index.ts
index dc304a83a10..503dab55789 100644
--- a/src/components/search_bar/index.ts
+++ b/src/components/search_bar/index.ts
@@ -12,5 +12,6 @@ export type {
   QueryType,
 } from './search_bar';
 export { EuiSearchBar, Query, Ast } from './search_bar';
+export { EuiSearchBarFilters } from './search_filters';
 export type { SearchFilterConfig } from './search_filters';
 export type { FieldValueOptionType } from './filters/field_value_selection_filter';
diff --git a/src/components/search_bar/search_bar.tsx b/src/components/search_bar/search_bar.tsx
index bab5a1e8d49..a91f60c8b54 100644
--- a/src/components/search_bar/search_bar.tsx
+++ b/src/components/search_bar/search_bar.tsx
@@ -12,7 +12,7 @@ import { htmlIdGenerator } from '../../services/accessibility';
 import { isString } from '../../services/predicate';
 import { EuiFlexGroup, EuiFlexItem } from '../flex';
 import { EuiSearchBox, SchemaType } from './search_box';
-import { EuiSearchFilters, SearchFilterConfig } from './search_filters';
+import { EuiSearchBarFilters, SearchFilterConfig } from './search_filters';
 import { Query } from './query';
 import { CommonProps } from '../common';
 import { EuiFieldSearchProps } from '../form/field_search';
@@ -255,7 +255,7 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {
 
     const filtersBar = !filters ? undefined : (
       <EuiFlexItem className="euiSearchBar__filtersHolder" grow={false}>
-        <EuiSearchFilters
+        <EuiSearchBarFilters
           filters={filters}
           query={query}
           onChange={this.onFiltersChange}
diff --git a/src/components/search_bar/search_filters.test.tsx b/src/components/search_bar/search_filters.test.tsx
index 2cb1a274f49..b817dc09a87 100644
--- a/src/components/search_bar/search_filters.test.tsx
+++ b/src/components/search_bar/search_filters.test.tsx
@@ -10,10 +10,10 @@ import React from 'react';
 import { render } from '../../test/rtl';
 import { requiredProps } from '../../test';
 
-import { EuiSearchFilters, SearchFilterConfig } from './search_filters';
+import { EuiSearchBarFilters, SearchFilterConfig } from './search_filters';
 import { Query } from './query';
 
-describe('EuiSearchFilters', () => {
+describe('EuiSearchBarFilters', () => {
   test('render - no filters', () => {
     const props = {
       ...requiredProps,
@@ -22,7 +22,7 @@ describe('EuiSearchFilters', () => {
       filters: [],
     };
 
-    const { container } = render(<EuiSearchFilters {...props} />);
+    const { container } = render(<EuiSearchBarFilters {...props} />);
 
     expect(container.firstChild).toMatchSnapshot();
   });
@@ -49,7 +49,7 @@ describe('EuiSearchFilters', () => {
       filters,
     };
 
-    const { container } = render(<EuiSearchFilters {...props} />);
+    const { container } = render(<EuiSearchBarFilters {...props} />);
 
     expect(container.firstChild).toMatchSnapshot();
   });
diff --git a/src/components/search_bar/search_filters.tsx b/src/components/search_bar/search_filters.tsx
index 4b02380b24b..242624379e4 100644
--- a/src/components/search_bar/search_filters.tsx
+++ b/src/components/search_bar/search_filters.tsx
@@ -13,15 +13,15 @@ import { EuiFilterGroup } from '../filter_group';
 
 export type { SearchFilterConfig } from './filters';
 
-interface EuiSearchFiltersProps {
+interface EuiSearchBarFiltersProps {
   query: Query;
   onChange: (query: Query) => void;
   filters: SearchFilterConfig[];
 }
 
-type DefaultProps = Pick<EuiSearchFiltersProps, 'filters'>;
+type DefaultProps = Pick<EuiSearchBarFiltersProps, 'filters'>;
 
-export class EuiSearchFilters extends Component<EuiSearchFiltersProps> {
+export class EuiSearchBarFilters extends Component<EuiSearchBarFiltersProps> {
   static defaultProps: DefaultProps = {
     filters: [],
   };
diff --git a/upcoming_changelogs/6900.md b/upcoming_changelogs/6900.md
new file mode 100644
index 00000000000..14619862faa
--- /dev/null
+++ b/upcoming_changelogs/6900.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed `EuiFilterButton` icon display