diff --git a/CHANGELOG.md b/CHANGELOG.md
index c326eee1f35..28e9b4178af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@ No public interface changes since `27.1.0`.
 - Added `index.d.ts` file to `lib/test`  and `es/test` ([#3715](https://github.com/elastic/eui/pull/3715))
 - Added `descriptionFlexItemProps` and `fieldFlexItemProps` props to `EuiDescribedFormGroup` ([#3717](https://github.com/elastic/eui/pull/3717))
 - Expanded `EuiBasicTable`'s default action's name configuration to accept a function that returns a React node ([#3739](https://github.com/elastic/eui/pull/3739))
-- Added internal use only button building blocks for reusability in other button components ([#3730](https://github.com/elastic/eui/pull/3730))
 
 ## [`27.0.0`](https://github.com/elastic/eui/tree/v27.0.0)
 - Added `paddingSize` prop to `EuiCard` ([#3638](https://github.com/elastic/eui/pull/3638))
diff --git a/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap b/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
index 5a12b3e9c5c..8d73fa7dd02 100644
--- a/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
+++ b/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`EuiSkipLink is rendered 1`] = `
   rel="noreferrer"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -27,7 +27,7 @@ exports[`EuiSkipLink props onClick is rendered 1`] = `
   rel="noreferrer"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -43,7 +43,7 @@ exports[`EuiSkipLink props position absolute is rendered 1`] = `
   rel="noreferrer"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -60,7 +60,7 @@ exports[`EuiSkipLink props position fixed is rendered 1`] = `
   tabindex="0"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -76,7 +76,7 @@ exports[`EuiSkipLink props position static is rendered 1`] = `
   rel="noreferrer"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -93,7 +93,7 @@ exports[`EuiSkipLink props tabIndex is rendered 1`] = `
   tabindex="-1"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
diff --git a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
index a182dd61cc6..a43deaf32db 100644
--- a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
+++ b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
@@ -383,49 +383,40 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
                               size="xs"
                             >
                               <button
-                                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
+                                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
                                 data-test-subj="tablePaginationPopoverButton"
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <EuiButtonContent
+                                <span
                                   className="euiButtonEmpty__content"
-                                  iconSide="right"
-                                  iconType="arrowDown"
-                                  textProps={
-                                    Object {
-                                      "className": "euiButtonEmpty__text",
-                                    }
-                                  }
                                 >
-                                  <span
-                                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                  <EuiIcon
+                                    aria-hidden="true"
+                                    className="euiButtonEmpty__icon"
+                                    size="m"
+                                    type="arrowDown"
                                   >
-                                    <EuiIcon
-                                      className="euiButtonContent__icon"
+                                    <div
+                                      aria-hidden="true"
+                                      className="euiButtonEmpty__icon"
+                                      data-euiicon-type="arrowDown"
                                       size="m"
-                                      type="arrowDown"
-                                    >
-                                      <div
-                                        className="euiButtonContent__icon"
-                                        data-euiicon-type="arrowDown"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                    <span
-                                      className="euiButtonEmpty__text"
+                                    />
+                                  </EuiIcon>
+                                  <span
+                                    className="euiButtonEmpty__text"
+                                  >
+                                    <EuiI18n
+                                      default="Rows per page"
+                                      token="euiTablePagination.rowsPerPage"
                                     >
-                                      <EuiI18n
-                                        default="Rows per page"
-                                        token="euiTablePagination.rowsPerPage"
-                                      >
-                                        Rows per page
-                                      </EuiI18n>
-                                      : 
-                                      2
-                                    </span>
+                                      Rows per page
+                                    </EuiI18n>
+                                    : 
+                                    2
                                   </span>
-                                </EuiButtonContent>
+                                </span>
                               </button>
                             </EuiButtonEmpty>
                           </div>
@@ -554,25 +545,15 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
                                         onClick={[Function]}
                                         rel="noreferrer"
                                       >
-                                        <EuiButtonContent
+                                        <span
                                           className="euiButtonEmpty__content"
-                                          iconSide="left"
-                                          textProps={
-                                            Object {
-                                              "className": "euiButtonEmpty__text",
-                                            }
-                                          }
                                         >
                                           <span
-                                            className="euiButtonContent euiButtonEmpty__content"
+                                            className="euiButtonEmpty__text"
                                           >
-                                            <span
-                                              className="euiButtonEmpty__text"
-                                            >
-                                              1
-                                            </span>
+                                            1
                                           </span>
-                                        </EuiButtonContent>
+                                        </span>
                                       </a>
                                     </EuiButtonEmpty>
                                   </EuiI18n>
@@ -630,31 +611,21 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
                                         aria-controls="generated-id"
                                         aria-current={true}
                                         aria-label="Page 2 of 2"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-1"
                                         disabled={true}
                                         onClick={[Function]}
                                         type="button"
                                       >
-                                        <EuiButtonContent
+                                        <span
                                           className="euiButtonEmpty__content"
-                                          iconSide="left"
-                                          textProps={
-                                            Object {
-                                              "className": "euiButtonEmpty__text",
-                                            }
-                                          }
                                         >
                                           <span
-                                            className="euiButtonContent euiButtonEmpty__content"
+                                            className="euiButtonEmpty__text"
                                           >
-                                            <span
-                                              className="euiButtonEmpty__text"
-                                            >
-                                              2
-                                            </span>
+                                            2
                                           </span>
-                                        </EuiButtonContent>
+                                        </span>
                                       </button>
                                     </EuiButtonEmpty>
                                   </EuiI18n>
diff --git a/src/components/button/__snapshots__/button.test.tsx.snap b/src/components/button/__snapshots__/button.test.tsx.snap
index 8e699c46818..4df2e87c8ca 100644
--- a/src/components/button/__snapshots__/button.test.tsx.snap
+++ b/src/components/button/__snapshots__/button.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`EuiButton is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -25,7 +25,7 @@ exports[`EuiButton props color danger is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -40,7 +40,7 @@ exports[`EuiButton props color ghost is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -55,7 +55,7 @@ exports[`EuiButton props color primary is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -70,7 +70,7 @@ exports[`EuiButton props color secondary is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -85,7 +85,7 @@ exports[`EuiButton props color text is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -100,7 +100,7 @@ exports[`EuiButton props color warning is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -109,32 +109,13 @@ exports[`EuiButton props color warning is rendered 1`] = `
 </button>
 `;
 
-exports[`EuiButton props contentProps is rendered 1`] = `
-<button
-  class="euiButton euiButton--primary"
-  type="button"
->
-  <span
-    aria-label="aria-label"
-    class="euiButtonContent euiButton__content testClass1 testClass2"
-    data-test-subj="test subject string"
-  >
-    <span
-      class="euiButton__text"
-    >
-      Content
-    </span>
-  </span>
-</button>
-`;
-
 exports[`EuiButton props fill is rendered 1`] = `
 <button
   class="euiButton euiButton--primary euiButton--fill"
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -149,7 +130,7 @@ exports[`EuiButton props fullWidth is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -166,7 +147,7 @@ exports[`EuiButton props href secures the rel attribute when the target is _blan
   target="_blank"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -181,10 +162,11 @@ exports[`EuiButton props iconSide left is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButton__icon"
       data-euiicon-type="user"
     />
     <span
@@ -198,14 +180,15 @@ exports[`EuiButton props iconSide left is rendered 1`] = `
 
 exports[`EuiButton props iconSide right is rendered 1`] = `
 <button
-  class="euiButton euiButton--primary"
+  class="euiButton euiButton--primary euiButton--iconRight"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButton__content"
+    class="euiButton__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButton__icon"
       data-euiicon-type="user"
     />
     <span
@@ -223,10 +206,11 @@ exports[`EuiButton props iconType is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButton__icon"
       data-euiicon-type="user"
     />
     <span
@@ -238,12 +222,12 @@ exports[`EuiButton props iconType is rendered 1`] = `
 
 exports[`EuiButton props isDisabled is rendered 1`] = `
 <button
-  class="euiButton euiButton--primary euiButton-isDisabled"
+  class="euiButton euiButton--primary"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -254,28 +238,12 @@ exports[`EuiButton props isDisabled is rendered 1`] = `
 
 exports[`EuiButton props isDisabled renders a button even when href is defined 1`] = `
 <button
-  class="euiButton euiButton--primary euiButton-isDisabled"
-  disabled=""
-  type="button"
->
-  <span
-    class="euiButtonContent euiButton__content"
-  >
-    <span
-      class="euiButton__text"
-    />
-  </span>
-</button>
-`;
-
-exports[`EuiButton props isDisabled renders if passed as disabled 1`] = `
-<button
-  class="euiButton euiButton--primary euiButton-isDisabled"
+  class="euiButton euiButton--primary"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -286,15 +254,15 @@ exports[`EuiButton props isDisabled renders if passed as disabled 1`] = `
 
 exports[`EuiButton props isLoading is rendered 1`] = `
 <button
-  class="euiButton euiButton--primary euiButton-isDisabled"
+  class="euiButton euiButton--primary"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
-      class="euiLoadingSpinner euiLoadingSpinner--medium euiButtonContent__spinner"
+      class="euiLoadingSpinner euiLoadingSpinner--medium euiButton__spinner"
     />
     <span
       class="euiButton__text"
@@ -309,7 +277,7 @@ exports[`EuiButton props size m is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -324,7 +292,7 @@ exports[`EuiButton props size s is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButton__content"
+    class="euiButton__content"
   >
     <span
       class="euiButton__text"
@@ -332,22 +300,3 @@ exports[`EuiButton props size s is rendered 1`] = `
   </span>
 </button>
 `;
-
-exports[`EuiButton props textProps is rendered 1`] = `
-<button
-  class="euiButton euiButton--primary"
-  type="button"
->
-  <span
-    class="euiButtonContent euiButton__content"
-  >
-    <span
-      aria-label="aria-label"
-      class="euiButton__text testClass1 testClass2"
-      data-test-subj="test subject string"
-    >
-      Content
-    </span>
-  </span>
-</button>
-`;
diff --git a/src/components/button/__snapshots__/button_content.test.tsx.snap b/src/components/button/__snapshots__/button_content.test.tsx.snap
deleted file mode 100644
index 0625a6a37f6..00000000000
--- a/src/components/button/__snapshots__/button_content.test.tsx.snap
+++ /dev/null
@@ -1,79 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EuiButtonContent is rendered 1`] = `
-<span
-  aria-label="aria-label"
-  class="euiButtonContent testClass1 testClass2"
-  data-test-subj="test subject string"
->
-  <span />
-</span>
-`;
-
-exports[`EuiButtonContent props children is rendered 1`] = `
-<span
-  class="euiButtonContent"
->
-  <span>
-    Content
-  </span>
-</span>
-`;
-
-exports[`EuiButtonContent props iconSide is rendered 1`] = `
-<span
-  class="euiButtonContent euiButtonContent--iconRight"
->
-  <div
-    class="euiButtonContent__icon"
-    data-euiicon-type="bolt"
-  />
-  <span />
-</span>
-`;
-
-exports[`EuiButtonContent props iconType is rendered 1`] = `
-<span
-  class="euiButtonContent"
->
-  <div
-    class="euiButtonContent__icon"
-    data-euiicon-type="bolt"
-  />
-  <span />
-</span>
-`;
-
-exports[`EuiButtonContent props isLoading is rendered 1`] = `
-<span
-  class="euiButtonContent"
->
-  <span
-    class="euiLoadingSpinner euiLoadingSpinner--medium euiButtonContent__spinner"
-  />
-  <span />
-</span>
-`;
-
-exports[`EuiButtonContent props isLoading replaces iconType with spinner 1`] = `
-<span
-  class="euiButtonContent"
->
-  <span
-    class="euiLoadingSpinner euiLoadingSpinner--medium euiButtonContent__spinner"
-  />
-  <span />
-</span>
-`;
-
-exports[`EuiButtonContent props textProps is rendered 1`] = `
-<span
-  class="euiButtonContent"
->
-  <span
-    aria-label="aria-label"
-    class="testClass1 testClass2"
-    data-test-subj="test subject string"
-  />
-</span>
-`;
diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss
index d77c41f9db6..2551d35f3f5 100644
--- a/src/components/button/_button.scss
+++ b/src/components/button/_button.scss
@@ -10,6 +10,8 @@
   min-width: $euiButtonMinWidth;
 
   .euiButton__content {
+    @include euiButtonContent;
+
     padding: 0 ($euiSize - $euiSizeXS);
   }
 
@@ -23,6 +25,12 @@
     line-height: $euiButtonHeightSmall; // prevents descenders from getting cut off
   }
 
+  &.euiButton--iconRight {
+    .euiButton__content {
+      @include euiButtonContent($isReverse: true);
+    }
+  }
+
   &:hover,
   &:active {
     @include euiSlightShadowHover;
@@ -36,12 +44,19 @@
   }
 
   &:disabled {
-    @include euiButtonContentDisabled;
-
     color: $euiButtonColorDisabledText;
     border-color: $euiButtonColorDisabled;
     pointer-events: none;
 
+    .euiButton__content {
+      pointer-events: auto;
+      cursor: not-allowed;
+    }
+
+    .euiButton__spinner {
+      border-color: euiLoadingSpinnerBorderColors(currentColor);
+    }
+
     &.euiButton--fill {
       // Only increase the contrast of background color to text to 2.0 for disabled
       color: makeHighContrastColor($euiButtonColorDisabled, $euiButtonColorDisabled, 2);
diff --git a/src/components/button/_button_content.scss b/src/components/button/_button_content.scss
deleted file mode 100644
index e1933a0cbf7..00000000000
--- a/src/components/button/_button_content.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.euiButtonContent {
-  @include euiButtonContent;
-}
-
-.euiButtonContent--iconRight {
-  @include euiButtonContent($isReverse: true);
-}
diff --git a/src/components/button/_index.scss b/src/components/button/_index.scss
index 61a1784e7f4..2815f912feb 100644
--- a/src/components/button/_index.scss
+++ b/src/components/button/_index.scss
@@ -1,5 +1,4 @@
 @import 'button';
-@import 'button_content';
 @import 'button_empty/index';
 @import 'button_icon/index';
 @import 'button_toggle/index';
diff --git a/src/components/button/button.test.tsx b/src/components/button/button.test.tsx
index bcc7c3cd655..69f0ba0af97 100644
--- a/src/components/button/button.test.tsx
+++ b/src/components/button/button.test.tsx
@@ -21,8 +21,7 @@ import React from 'react';
 import { render, mount } from 'enzyme';
 import { requiredProps } from '../../test/required_props';
 
-import { EuiButton, COLORS, SIZES } from './button';
-import { ICON_SIDES } from './button_content';
+import { EuiButton, COLORS, SIZES, ICON_SIDES } from './button';
 
 describe('EuiButton', () => {
   test('is rendered', () => {
@@ -52,12 +51,6 @@ describe('EuiButton', () => {
 
         expect(component).toMatchSnapshot();
       });
-
-      it('renders if passed as disabled', () => {
-        const component = render(<EuiButton disabled />);
-
-        expect(component).toMatchSnapshot();
-      });
     });
 
     describe('isLoading', () => {
@@ -141,21 +134,5 @@ describe('EuiButton', () => {
         expect(handler.mock.calls.length).toEqual(1);
       });
     });
-
-    test('contentProps is rendered', () => {
-      const component = render(
-        <EuiButton contentProps={requiredProps}>Content</EuiButton>
-      );
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('textProps is rendered', () => {
-      const component = render(
-        <EuiButton textProps={requiredProps}>Content</EuiButton>
-      );
-
-      expect(component).toMatchSnapshot();
-    });
   });
 });
diff --git a/src/components/button/button.tsx b/src/components/button/button.tsx
index c230b0d2214..7d01b5f9e44 100644
--- a/src/components/button/button.tsx
+++ b/src/components/button/button.tsx
@@ -17,7 +17,12 @@
  * under the License.
  */
 
-import React, { FunctionComponent, Ref, ButtonHTMLAttributes } from 'react';
+import React, {
+  FunctionComponent,
+  HTMLAttributes,
+  Ref,
+  ButtonHTMLAttributes,
+} from 'react';
 import classNames from 'classnames';
 
 import {
@@ -27,14 +32,13 @@ import {
   PropsForButton,
   keysOf,
 } from '../common';
+import { EuiLoadingSpinner } from '../loading';
 
 import { getSecureRelForTarget } from '../../services';
 
-import {
-  EuiButtonContentProps,
-  EuiButtonContentType,
-  EuiButtonContent,
-} from './button_content';
+import { IconType, EuiIcon } from '../icon';
+
+export type ButtonIconSide = 'left' | 'right';
 
 export type ButtonColor =
   | 'primary'
@@ -68,121 +72,35 @@ const sizeToClassNameMap: { [size in ButtonSize]: string | null } = {
 
 export const SIZES = keysOf(sizeToClassNameMap);
 
-/**
- * Extends EuiButtonContentProps which provides
- * `iconType`, `iconSide`, and `textProps`
- */
-export interface EuiButtonProps extends EuiButtonContentProps, CommonProps {
-  /**
-   * Make button a solid color for prominence
-   */
+const iconSideToClassNameMap: { [side in ButtonIconSide]: string | null } = {
+  left: null,
+  right: 'euiButton--iconRight',
+};
+
+export const ICON_SIDES = keysOf(iconSideToClassNameMap);
+
+export interface EuiButtonProps extends CommonProps {
+  iconType?: IconType;
+  iconSide?: ButtonIconSide;
   fill?: boolean;
   /**
-   * Any of our named colors. `text` color is set for deprecation
+   * `text` color is set for deprecation
    */
   color?: ButtonColor;
-  /**
-   * Use size `s` in confined spaces
-   */
   size?: ButtonSize;
-  /**
-   * `disabled` is also allowed
-   */
+  isLoading?: boolean;
   isDisabled?: boolean;
-  /**
-   * Extends the button to 100% width
-   */
   fullWidth?: boolean;
   /**
-   * Force disables the button and changes the icon to a loading spinner
+   * Object of props passed to the <span/> wrapping the button's content
    */
-  isLoading?: boolean;
+  contentProps?: HTMLAttributes<HTMLSpanElement>;
   /**
-   * Object of props passed to the <span/> wrapping the button's content
+   * Object of props passed to the <span/> wrapping the component's {children}
    */
-  contentProps?: EuiButtonContentType;
+  textProps?: HTMLAttributes<HTMLSpanElement>;
 }
 
-export interface EuiButtonDisplayProps extends EuiButtonProps {
-  element: 'a' | 'button' | 'span' | 'label';
-}
-
-/**
- * *INTERNAL ONLY*
- * Component for displaying any element as a button
- * EuiButton is largely responsible for providing relevant props
- * and the logic for element-specific attributes
- */
-const EuiButtonDisplay = React.forwardRef<HTMLElement, EuiButtonDisplayProps>(
-  (
-    {
-      children,
-      className,
-      iconType,
-      iconSide = 'left',
-      color = 'primary',
-      size = 'm',
-      fill = false,
-      isDisabled,
-      isLoading,
-      contentProps,
-      textProps,
-      fullWidth,
-      element = 'button',
-      ...rest
-    },
-    ref
-  ) => {
-    const classes = classNames(
-      'euiButton',
-      color ? colorToClassNameMap[color] : null,
-      size ? sizeToClassNameMap[size] : null,
-      className,
-      {
-        'euiButton--fill': fill,
-        'euiButton--fullWidth': fullWidth,
-        'euiButton-isDisabled': isDisabled,
-      }
-    );
-
-    const contentClassNames = classNames(
-      'euiButton__content',
-      contentProps && contentProps.className
-    );
-
-    const textClassNames = classNames(
-      'euiButton__text',
-      textProps && textProps.className
-    );
-
-    const innerNode = (
-      <EuiButtonContent
-        isLoading={isLoading}
-        iconType={iconType}
-        iconSide={iconSide}
-        textProps={{ ...textProps, className: textClassNames }}
-        {...contentProps}
-        // className has to come last to override contentProps.className
-        className={contentClassNames}>
-        {children}
-      </EuiButtonContent>
-    );
-
-    return React.createElement(
-      element,
-      {
-        className: classes,
-        ref,
-        ...rest,
-      },
-      innerNode
-    );
-  }
-);
-
-EuiButtonDisplay.displayName = 'EuiButtonDisplay';
-export { EuiButtonDisplay };
-
 type EuiButtonPropsForAnchor = PropsForAnchor<
   EuiButtonProps,
   {
@@ -203,26 +121,79 @@ export type Props = ExclusiveUnion<
 >;
 
 export const EuiButton: FunctionComponent<Props> = ({
+  children,
+  className,
+  iconType,
+  iconSide = 'left',
+  color = 'primary',
+  size = 'm',
+  fill = false,
   isDisabled,
-  disabled,
+  isLoading,
   href,
   target,
   rel,
   type = 'button',
   buttonRef,
+  contentProps,
+  textProps,
+  fullWidth,
   ...rest
 }) => {
-  const buttonIsDisabled = rest.isLoading || isDisabled || disabled;
-  const element = href && !isDisabled ? 'a' : 'button';
-
-  let elementProps = {};
-  // Props for all elements
-  elementProps = { ...elementProps, isDisabled: buttonIsDisabled };
-  // Element-specific attributes
-  if (element === 'button') {
-    elementProps = { ...elementProps, disabled: buttonIsDisabled };
+  // If in the loading state, force disabled to true
+  isDisabled = isLoading ? true : isDisabled;
+
+  const classes = classNames(
+    'euiButton',
+    color ? colorToClassNameMap[color] : null,
+    size ? sizeToClassNameMap[size] : null,
+    iconSide ? iconSideToClassNameMap[iconSide] : null,
+    className,
+    {
+      'euiButton--fill': fill,
+      'euiButton--fullWidth': fullWidth,
+    }
+  );
+
+  const contentClassNames = classNames(
+    'euiButton__content',
+    contentProps && contentProps.className
+  );
+
+  const textClassNames = classNames(
+    'euiButton__text',
+    textProps && textProps.className
+  );
+
+  // Add an icon to the button if one exists.
+  let buttonIcon;
+
+  if (isLoading) {
+    buttonIcon = <EuiLoadingSpinner className="euiButton__spinner" size="m" />;
+  } else if (iconType) {
+    buttonIcon = (
+      <EuiIcon
+        className="euiButton__icon"
+        type={iconType}
+        size="m"
+        aria-hidden="true"
+      />
+    );
   }
 
+  const innerNode = (
+    <span {...contentProps} className={contentClassNames}>
+      {buttonIcon}
+      <span {...textProps} className={textClassNames}>
+        {children}
+      </span>
+    </span>
+  );
+
+  // <Element> elements don't respect the `disabled` attribute. So if we're disabled, we'll just pretend
+  // this is a button and piggyback off its disabled styles.
+  const Element = href && !isDisabled ? 'a' : 'button';
+
   const relObj: {
     rel?: string;
     href?: string;
@@ -230,7 +201,7 @@ export const EuiButton: FunctionComponent<Props> = ({
     target?: string;
   } = {};
 
-  if (href && !buttonIsDisabled) {
+  if (href && !isDisabled) {
     relObj.href = href;
     relObj.rel = getSecureRelForTarget({ href, target, rel });
     relObj.target = target;
@@ -239,12 +210,13 @@ export const EuiButton: FunctionComponent<Props> = ({
   }
 
   return (
-    <EuiButtonDisplay
-      element={element}
-      ref={buttonRef}
-      {...elementProps}
+    <Element
+      className={classes}
+      disabled={isDisabled}
       {...relObj}
-      {...rest}
-    />
+      ref={buttonRef as Ref<HTMLButtonElement & HTMLAnchorElement>}
+      {...rest as HTMLAttributes<HTMLAnchorElement | HTMLButtonElement>}>
+      {innerNode}
+    </Element>
   );
 };
diff --git a/src/components/button/button_content.test.tsx b/src/components/button/button_content.test.tsx
deleted file mode 100644
index 296c6960db1..00000000000
--- a/src/components/button/button_content.test.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { render } from 'enzyme';
-import { requiredProps } from '../../test/required_props';
-
-import { EuiButtonContent } from './button_content';
-
-describe('EuiButtonContent', () => {
-  test('is rendered', () => {
-    const component = render(<EuiButtonContent {...requiredProps} />);
-
-    expect(component).toMatchSnapshot();
-  });
-
-  describe('props', () => {
-    test('children is rendered', () => {
-      const component = render(<EuiButtonContent>Content</EuiButtonContent>);
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('iconType is rendered', () => {
-      const component = render(<EuiButtonContent iconType="bolt" />);
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('iconSide is rendered', () => {
-      const component = render(
-        <EuiButtonContent iconSide="right" iconType="bolt" />
-      );
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('isLoading is rendered', () => {
-      const component = render(<EuiButtonContent isLoading />);
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('isLoading replaces iconType with spinner', () => {
-      const component = render(<EuiButtonContent isLoading iconType="bolt" />);
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('textProps is rendered', () => {
-      const component = render(<EuiButtonContent textProps={requiredProps} />);
-
-      expect(component).toMatchSnapshot();
-    });
-  });
-});
diff --git a/src/components/button/button_content.tsx b/src/components/button/button_content.tsx
deleted file mode 100644
index 4f210b7fd48..00000000000
--- a/src/components/button/button_content.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { HTMLAttributes, FunctionComponent } from 'react';
-import classNames from 'classnames';
-import { CommonProps, keysOf } from '../common';
-import { EuiLoadingSpinner } from '../loading';
-import { EuiIcon, IconType } from '../icon';
-
-export type ButtonContentIconSide = 'left' | 'right';
-
-const iconSideToClassNameMap: {
-  [side in ButtonContentIconSide]: string | null
-} = {
-  left: null,
-  right: 'euiButtonContent--iconRight',
-};
-
-export const ICON_SIDES = keysOf(iconSideToClassNameMap);
-
-export type EuiButtonContentType = HTMLAttributes<HTMLSpanElement>;
-
-/**
- * *INTERNAL ONLY*
- * This component is simply a helper component for reuse within other button components
- */
-export interface EuiButtonContentProps extends CommonProps {
-  iconType?: IconType;
-  iconSide?: ButtonContentIconSide;
-  isLoading?: boolean;
-  /**
-   * Object of props passed to the <span/> wrapping the content's text/children only (not icon)
-   */
-  textProps?: HTMLAttributes<HTMLSpanElement> & CommonProps;
-}
-
-export const EuiButtonContent: FunctionComponent<
-  EuiButtonContentType & EuiButtonContentProps
-> = ({
-  children,
-  textProps,
-  isLoading = false,
-  iconType,
-  iconSide = 'left',
-  ...contentProps
-}) => {
-  // Add an icon to the button if one exists.
-  let buttonIcon;
-
-  if (isLoading) {
-    buttonIcon = (
-      <EuiLoadingSpinner className="euiButtonContent__spinner" size="m" />
-    );
-  } else if (iconType) {
-    buttonIcon = (
-      <EuiIcon className="euiButtonContent__icon" type={iconType} size="m" />
-    );
-  }
-
-  const contentClassNames = classNames(
-    'euiButtonContent',
-    iconSide ? iconSideToClassNameMap[iconSide] : null,
-    contentProps && contentProps.className
-  );
-
-  return (
-    <span {...contentProps} className={contentClassNames}>
-      {buttonIcon}
-      <span {...textProps}>{children}</span>
-    </span>
-  );
-};
diff --git a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
index d96ca7811cb..eec78f908f1 100644
--- a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
+++ b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`EuiButtonEmpty is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -25,7 +25,7 @@ exports[`EuiButtonEmpty props color danger is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -40,7 +40,7 @@ exports[`EuiButtonEmpty props color disabled is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -55,7 +55,7 @@ exports[`EuiButtonEmpty props color ghost is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -70,7 +70,7 @@ exports[`EuiButtonEmpty props color primary is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -85,7 +85,7 @@ exports[`EuiButtonEmpty props color text is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -94,32 +94,13 @@ exports[`EuiButtonEmpty props color text is rendered 1`] = `
 </button>
 `;
 
-exports[`EuiButtonEmpty props contentProps is rendered 1`] = `
-<button
-  class="euiButtonEmpty euiButtonEmpty--primary"
-  type="button"
->
-  <span
-    aria-label="aria-label"
-    class="euiButtonContent euiButtonEmpty__content testClass1 testClass2"
-    data-test-subj="test subject string"
-  >
-    <span
-      class="euiButtonEmpty__text"
-    >
-      Content
-    </span>
-  </span>
-</button>
-`;
-
 exports[`EuiButtonEmpty props flush left is rendered 1`] = `
 <button
   class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushLeft"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -134,7 +115,7 @@ exports[`EuiButtonEmpty props flush right is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -151,7 +132,7 @@ exports[`EuiButtonEmpty props href secures the rel attribute when the target is
   target="_blank"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -166,10 +147,11 @@ exports[`EuiButtonEmpty props iconSide left is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButtonEmpty__icon"
       data-euiicon-type="user"
     />
     <span
@@ -183,14 +165,15 @@ exports[`EuiButtonEmpty props iconSide left is rendered 1`] = `
 
 exports[`EuiButtonEmpty props iconSide right is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--primary"
+  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--iconRight"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButtonEmpty__icon"
       data-euiicon-type="user"
     />
     <span
@@ -208,10 +191,11 @@ exports[`EuiButtonEmpty props iconType is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButtonEmpty__icon"
       data-euiicon-type="user"
     />
     <span
@@ -223,12 +207,12 @@ exports[`EuiButtonEmpty props iconType is rendered 1`] = `
 
 exports[`EuiButtonEmpty props isDisabled is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty-isDisabled"
+  class="euiButtonEmpty euiButtonEmpty--primary"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -239,48 +223,13 @@ exports[`EuiButtonEmpty props isDisabled is rendered 1`] = `
 
 exports[`EuiButtonEmpty props isDisabled renders a button even when href is defined 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty-isDisabled"
-  disabled=""
-  type="button"
->
-  <span
-    class="euiButtonContent euiButtonEmpty__content"
-  >
-    <span
-      class="euiButtonEmpty__text"
-    />
-  </span>
-</button>
-`;
-
-exports[`EuiButtonEmpty props isDisabled renders if passed simply as disabled 1`] = `
-<button
-  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty-isDisabled"
-  disabled=""
-  type="button"
->
-  <span
-    class="euiButtonContent euiButtonEmpty__content"
-  >
-    <span
-      class="euiButtonEmpty__text"
-    />
-  </span>
-</button>
-`;
-
-exports[`EuiButtonEmpty props isLoading is rendered 1`] = `
-<button
-  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty-isDisabled"
+  class="euiButtonEmpty euiButtonEmpty--primary"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
-    <span
-      class="euiLoadingSpinner euiLoadingSpinner--medium euiButtonContent__spinner"
-    />
     <span
       class="euiButtonEmpty__text"
     />
@@ -294,7 +243,7 @@ exports[`EuiButtonEmpty props size l is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -309,7 +258,7 @@ exports[`EuiButtonEmpty props size s is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -324,7 +273,7 @@ exports[`EuiButtonEmpty props size xs is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -332,22 +281,3 @@ exports[`EuiButtonEmpty props size xs is rendered 1`] = `
   </span>
 </button>
 `;
-
-exports[`EuiButtonEmpty props textProps is rendered 1`] = `
-<button
-  class="euiButtonEmpty euiButtonEmpty--primary"
-  type="button"
->
-  <span
-    class="euiButtonContent euiButtonEmpty__content"
-  >
-    <span
-      aria-label="aria-label"
-      class="euiButtonEmpty__text testClass1 testClass2"
-      data-test-subj="test subject string"
-    >
-      Content
-    </span>
-  </span>
-</button>
-`;
diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss
index 79d9b9d8f9c..60097e1e2e3 100644
--- a/src/components/button/button_empty/_button_empty.scss
+++ b/src/components/button/button_empty/_button_empty.scss
@@ -16,6 +16,7 @@
   transition-duration: $euiAnimSpeedFast; /* 2 */
 
   .euiButtonEmpty__content {
+    @include euiButtonContent;
     padding: 0 $euiSizeS;
   }
 
@@ -33,12 +34,25 @@
     font-size: $euiFontSizeS;
   }
 
-  &:disabled {
-    @include euiButtonContentDisabled;
+  &.euiButtonEmpty--iconRight {
+    .euiButtonEmpty__content {
+      @include euiButtonContent($isReverse: true);
+    }
+  }
 
+  &:disabled {
     color: $euiButtonColorDisabledText;
     pointer-events: none;
 
+    .euiButtonEmpty__content {
+      pointer-events: auto;
+      cursor: not-allowed;
+    }
+
+    .euiButtonEmpty__icon {
+      fill: currentColor;
+    }
+
     &:focus {
       background-color: transparent;
     }
diff --git a/src/components/button/button_empty/button_empty.test.tsx b/src/components/button/button_empty/button_empty.test.tsx
index b885fadc683..00306c5d0b2 100644
--- a/src/components/button/button_empty/button_empty.test.tsx
+++ b/src/components/button/button_empty/button_empty.test.tsx
@@ -21,8 +21,13 @@ import React from 'react';
 import { render, mount } from 'enzyme';
 import { requiredProps } from '../../../test/required_props';
 
-import { EuiButtonEmpty, COLORS, SIZES, FLUSH_TYPES } from './button_empty';
-import { ICON_SIDES } from '../button_content';
+import {
+  EuiButtonEmpty,
+  COLORS,
+  SIZES,
+  ICON_SIDES,
+  FLUSH_TYPES,
+} from './button_empty';
 
 describe('EuiButtonEmpty', () => {
   test('is rendered', () => {
@@ -46,20 +51,6 @@ describe('EuiButtonEmpty', () => {
 
         expect(component).toMatchSnapshot();
       });
-
-      it('renders if passed simply as disabled', () => {
-        const component = render(<EuiButtonEmpty disabled />);
-
-        expect(component).toMatchSnapshot();
-      });
-    });
-
-    describe('isLoading', () => {
-      it('is rendered', () => {
-        const component = render(<EuiButtonEmpty isLoading />);
-
-        expect(component).toMatchSnapshot();
-      });
     });
 
     describe('iconType', () => {
@@ -137,21 +128,5 @@ describe('EuiButtonEmpty', () => {
         expect(handler.mock.calls.length).toEqual(1);
       });
     });
-
-    test('contentProps is rendered', () => {
-      const component = render(
-        <EuiButtonEmpty contentProps={requiredProps}>Content</EuiButtonEmpty>
-      );
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('textProps is rendered', () => {
-      const component = render(
-        <EuiButtonEmpty textProps={requiredProps}>Content</EuiButtonEmpty>
-      );
-
-      expect(component).toMatchSnapshot();
-    });
   });
 });
diff --git a/src/components/button/button_empty/button_empty.tsx b/src/components/button/button_empty/button_empty.tsx
index cc72e2caa59..88c7b2f616e 100644
--- a/src/components/button/button_empty/button_empty.tsx
+++ b/src/components/button/button_empty/button_empty.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, HTMLAttributes } from 'react';
 import classNames from 'classnames';
 
 import {
@@ -27,12 +27,10 @@ import {
   PropsForButton,
   keysOf,
 } from '../../common';
+import { EuiLoadingSpinner } from '../../loading';
 import { getSecureRelForTarget } from '../../../services';
-import {
-  EuiButtonContent,
-  EuiButtonContentProps,
-  EuiButtonContentType,
-} from '../button_content';
+import { IconType, EuiIcon } from '../../icon';
+import { ButtonIconSide } from '../button';
 
 export type EuiButtonEmptyColor =
   | 'primary'
@@ -61,6 +59,13 @@ export const SIZES = keysOf(sizeToClassNameMap);
 
 export type EuiButtonEmptySizes = keyof typeof sizeToClassNameMap;
 
+const iconSideToClassNameMap: { [side in ButtonIconSide]: string } = {
+  left: '',
+  right: 'euiButtonEmpty--iconRight',
+};
+
+export const ICON_SIDES = keysOf(iconSideToClassNameMap);
+
 const flushTypeToClassNameMap = {
   left: 'euiButtonEmpty--flushLeft',
   right: 'euiButtonEmpty--flushRight',
@@ -68,37 +73,33 @@ const flushTypeToClassNameMap = {
 
 export const FLUSH_TYPES = keysOf(flushTypeToClassNameMap);
 
-/**
- * Extends EuiButtonContentProps which provides
- * `iconType`, `iconSide`, and `textProps`
- */
-interface CommonEuiButtonEmptyProps extends EuiButtonContentProps, CommonProps {
-  /**
-   * Any of our named colors
-   */
+interface CommonEuiButtonEmptyProps extends CommonProps {
+  iconType?: IconType;
+  iconSide?: ButtonIconSide;
   color?: EuiButtonEmptyColor;
   size?: EuiButtonEmptySizes;
-  /**
-   * Ensure the text of the button sits flush to the left or right side of its container
-   */
   flush?: keyof typeof flushTypeToClassNameMap;
-  /**
-   * `disabled` is also allowed
-   */
   isDisabled?: boolean;
-  /**
-   * Force disables the button and changes the icon to a loading spinner
-   */
-  isLoading?: boolean;
   href?: string;
   target?: string;
   rel?: string;
+
+  /**
+   * Adds/swaps for loading spinner & disables
+   */
+  isLoading?: boolean;
+
   type?: 'button' | 'submit';
   buttonRef?: (ref: HTMLButtonElement | HTMLAnchorElement | null) => void;
   /**
-   * Object of props passed to the <span/> wrapping the button's content
+   * Passes props to `euiButtonEmpty__content` span
    */
-  contentProps?: EuiButtonContentType;
+  contentProps?: Partial<HTMLAttributes<HTMLSpanElement>>;
+
+  /**
+   * Passes props to `euiButtonEmpty__text` span
+   */
+  textProps?: Partial<HTMLAttributes<HTMLSpanElement>>;
 }
 
 type EuiButtonEmptyPropsForAnchor = PropsForAnchor<CommonEuiButtonEmptyProps>;
@@ -119,7 +120,6 @@ export const EuiButtonEmpty: FunctionComponent<EuiButtonEmptyProps> = ({
   size,
   flush,
   isDisabled,
-  disabled,
   isLoading,
   href,
   target,
@@ -131,16 +131,14 @@ export const EuiButtonEmpty: FunctionComponent<EuiButtonEmptyProps> = ({
   ...rest
 }) => {
   // If in the loading state, force disabled to true
-  const buttonIsDisabled = isLoading || isDisabled || disabled;
+  isDisabled = isLoading ? true : isDisabled;
 
   const classes = classNames(
     'euiButtonEmpty',
     colorToClassNameMap[color],
     size ? sizeToClassNameMap[size] : null,
+    iconSideToClassNameMap[iconSide],
     flush ? flushTypeToClassNameMap[flush] : null,
-    {
-      'euiButtonEmpty-isDisabled': buttonIsDisabled,
-    },
     className
   );
 
@@ -154,22 +152,34 @@ export const EuiButtonEmpty: FunctionComponent<EuiButtonEmptyProps> = ({
     textProps && textProps.className
   );
 
+  // Add an icon to the button if one exists.
+  let buttonIcon;
+
+  if (isLoading) {
+    buttonIcon = <EuiLoadingSpinner className="euiButton__spinner" size="m" />;
+  } else if (iconType) {
+    buttonIcon = (
+      <EuiIcon
+        className="euiButtonEmpty__icon"
+        type={iconType}
+        size="m"
+        aria-hidden="true"
+      />
+    );
+  }
+
   const innerNode = (
-    <EuiButtonContent
-      isLoading={isLoading}
-      iconType={iconType}
-      iconSide={iconSide}
-      textProps={{ ...textProps, className: textClassNames }}
-      {...contentProps}
-      // className has to come last to override contentProps.className
-      className={contentClassNames}>
-      {children}
-    </EuiButtonContent>
+    <span {...contentProps} className={contentClassNames}>
+      {buttonIcon}
+      <span {...textProps} className={textClassNames}>
+        {children}
+      </span>
+    </span>
   );
 
   // <a> elements don't respect the `disabled` attribute. So if we're disabled, we'll just pretend
   // this is a button and piggyback off its disabled styles.
-  if (href && !buttonIsDisabled) {
+  if (href && !isDisabled) {
     const secureRel = getSecureRelForTarget({ href, target, rel });
 
     return (
@@ -187,7 +197,7 @@ export const EuiButtonEmpty: FunctionComponent<EuiButtonEmptyProps> = ({
 
   return (
     <button
-      disabled={buttonIsDisabled}
+      disabled={isDisabled}
       className={classes}
       type={type}
       ref={buttonRef}
diff --git a/src/components/button/button_empty/index.ts b/src/components/button/button_empty/index.ts
index 5b206fc639d..e45c2267911 100644
--- a/src/components/button/button_empty/index.ts
+++ b/src/components/button/button_empty/index.ts
@@ -19,6 +19,7 @@
 
 export {
   COLORS,
+  ICON_SIDES,
   EuiButtonEmpty,
   EuiButtonEmptyColor,
   EuiButtonEmptyProps,
diff --git a/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap b/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
index c895ae057d4..50babe49c2d 100644
--- a/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
+++ b/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`EuiButtonGroup props buttonSize compressed is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -60,7 +60,7 @@ exports[`EuiButtonGroup props buttonSize compressed is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -86,7 +86,7 @@ exports[`EuiButtonGroup props buttonSize compressed is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -123,7 +123,7 @@ exports[`EuiButtonGroup props buttonSize m is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -149,7 +149,7 @@ exports[`EuiButtonGroup props buttonSize m is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -175,7 +175,7 @@ exports[`EuiButtonGroup props buttonSize m is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -212,7 +212,7 @@ exports[`EuiButtonGroup props buttonSize s is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -238,7 +238,7 @@ exports[`EuiButtonGroup props buttonSize s is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -264,7 +264,7 @@ exports[`EuiButtonGroup props buttonSize s is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -301,7 +301,7 @@ exports[`EuiButtonGroup props color danger is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -327,7 +327,7 @@ exports[`EuiButtonGroup props color danger is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -353,7 +353,7 @@ exports[`EuiButtonGroup props color danger is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -390,7 +390,7 @@ exports[`EuiButtonGroup props color ghost is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -416,7 +416,7 @@ exports[`EuiButtonGroup props color ghost is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -442,7 +442,7 @@ exports[`EuiButtonGroup props color ghost is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -479,7 +479,7 @@ exports[`EuiButtonGroup props color primary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -505,7 +505,7 @@ exports[`EuiButtonGroup props color primary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -531,7 +531,7 @@ exports[`EuiButtonGroup props color primary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -568,7 +568,7 @@ exports[`EuiButtonGroup props color secondary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -594,7 +594,7 @@ exports[`EuiButtonGroup props color secondary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -620,7 +620,7 @@ exports[`EuiButtonGroup props color secondary is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -657,7 +657,7 @@ exports[`EuiButtonGroup props color text is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -683,7 +683,7 @@ exports[`EuiButtonGroup props color text is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -709,7 +709,7 @@ exports[`EuiButtonGroup props color text is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -746,7 +746,7 @@ exports[`EuiButtonGroup props color warning is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -772,7 +772,7 @@ exports[`EuiButtonGroup props color warning is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -798,7 +798,7 @@ exports[`EuiButtonGroup props color warning is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -836,7 +836,7 @@ exports[`EuiButtonGroup props idSelected is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -862,7 +862,7 @@ exports[`EuiButtonGroup props idSelected is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -888,7 +888,7 @@ exports[`EuiButtonGroup props idSelected is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -920,14 +920,14 @@ exports[`EuiButtonGroup props isDisabled is rendered 1`] = `
         type="radio"
       />
       <button
-        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button euiButton-isDisabled"
+        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button"
         disabled=""
         id="button00"
         tabindex="-1"
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -948,14 +948,14 @@ exports[`EuiButtonGroup props isDisabled is rendered 1`] = `
         type="radio"
       />
       <button
-        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button euiButton-isDisabled"
+        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button"
         disabled=""
         id="button01"
         tabindex="-1"
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -976,14 +976,14 @@ exports[`EuiButtonGroup props isDisabled is rendered 1`] = `
         type="radio"
       />
       <button
-        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button euiButton-isDisabled"
+        class="euiButton euiButton--text euiButton--small euiButtonToggle euiButtonGroup__button"
         disabled=""
         id="button02"
         tabindex="-1"
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1020,7 +1020,7 @@ exports[`EuiButtonGroup props isFullWidth is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1046,7 +1046,7 @@ exports[`EuiButtonGroup props isFullWidth is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1072,7 +1072,7 @@ exports[`EuiButtonGroup props isFullWidth is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1109,7 +1109,7 @@ exports[`EuiButtonGroup props isIconOnly is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1133,7 +1133,7 @@ exports[`EuiButtonGroup props isIconOnly is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1157,7 +1157,7 @@ exports[`EuiButtonGroup props isIconOnly is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1197,7 +1197,7 @@ exports[`EuiButtonGroup props legend is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1223,7 +1223,7 @@ exports[`EuiButtonGroup props legend is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1249,7 +1249,7 @@ exports[`EuiButtonGroup props legend is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1287,7 +1287,7 @@ exports[`EuiButtonGroup props name is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1314,7 +1314,7 @@ exports[`EuiButtonGroup props name is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1341,7 +1341,7 @@ exports[`EuiButtonGroup props name is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1378,7 +1378,7 @@ exports[`EuiButtonGroup props options are rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1404,7 +1404,7 @@ exports[`EuiButtonGroup props options are rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1430,7 +1430,7 @@ exports[`EuiButtonGroup props options are rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1468,7 +1468,7 @@ exports[`EuiButtonGroup props options can pass down data-test-subj 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1506,7 +1506,7 @@ exports[`EuiButtonGroup props type of multi idToSelectedMap is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1533,7 +1533,7 @@ exports[`EuiButtonGroup props type of multi idToSelectedMap is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1559,7 +1559,7 @@ exports[`EuiButtonGroup props type of multi idToSelectedMap is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1596,7 +1596,7 @@ exports[`EuiButtonGroup props type of multi is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1622,7 +1622,7 @@ exports[`EuiButtonGroup props type of multi is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
@@ -1648,7 +1648,7 @@ exports[`EuiButtonGroup props type of multi is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButton__content"
+          class="euiButton__content"
         >
           <span
             class="euiButton__text"
diff --git a/src/components/button/button_group/button_group.tsx b/src/components/button/button_group/button_group.tsx
index 63750ccf3ce..80a6914cc78 100644
--- a/src/components/button/button_group/button_group.tsx
+++ b/src/components/button/button_group/button_group.tsx
@@ -26,8 +26,7 @@ import { ToggleType } from '../../toggle';
 import { EuiButtonToggle } from '../button_toggle';
 import { CommonProps } from '../../common';
 
-import { ButtonColor } from '../button';
-import { ButtonContentIconSide } from '../button_content';
+import { ButtonColor, ButtonIconSide } from '../button';
 import { IconType } from '../../icon';
 
 export interface EuiButtonGroupIdToSelectedMap {
@@ -42,7 +41,7 @@ export interface EuiButtonGroupOption extends CommonProps {
   name?: string;
   isDisabled?: boolean;
   value?: any;
-  iconSide?: ButtonContentIconSide;
+  iconSide?: ButtonIconSide;
   iconType?: IconType;
 }
 
diff --git a/src/components/button/button_toggle/__snapshots__/button_toggle.test.tsx.snap b/src/components/button/button_toggle/__snapshots__/button_toggle.test.tsx.snap
index 5293306c543..fa9fb03a9da 100644
--- a/src/components/button/button_toggle/__snapshots__/button_toggle.test.tsx.snap
+++ b/src/components/button/button_toggle/__snapshots__/button_toggle.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`EuiButtonToggle is rendered 1`] = `
     type="button"
   >
     <span
-      class="euiButtonContent euiButton__content"
+      class="euiButton__content"
     >
       <span
         class="euiButton__text"
diff --git a/src/components/button/index.ts b/src/components/button/index.ts
index 68189c28425..5d6297feee7 100644
--- a/src/components/button/index.ts
+++ b/src/components/button/index.ts
@@ -21,6 +21,7 @@ export {
   COLORS,
   ButtonColor,
   ButtonSize,
+  ButtonIconSide,
   EuiButton,
   EuiButtonProps,
 } from './button';
diff --git a/src/components/card/__snapshots__/card.test.tsx.snap b/src/components/card/__snapshots__/card.test.tsx.snap
index 60cb0c1fe33..e08ad399874 100644
--- a/src/components/card/__snapshots__/card.test.tsx.snap
+++ b/src/components/card/__snapshots__/card.test.tsx.snap
@@ -374,7 +374,7 @@ exports[`EuiCard props selectable 1`] = `
     type="button"
   >
     <span
-      class="euiButtonContent euiButtonEmpty__content"
+      class="euiButtonEmpty__content"
     >
       <span
         class="euiButtonEmpty__text"
diff --git a/src/components/card/__snapshots__/card_select.test.tsx.snap b/src/components/card/__snapshots__/card_select.test.tsx.snap
index 68e7b3ff67a..2cc5d5c655c 100644
--- a/src/components/card/__snapshots__/card_select.test.tsx.snap
+++ b/src/components/card/__snapshots__/card_select.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`EuiCardSelect is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -29,7 +29,7 @@ exports[`EuiCardSelect props can override color 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -48,7 +48,7 @@ exports[`EuiCardSelect props can override text 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -62,13 +62,13 @@ exports[`EuiCardSelect props can override text 1`] = `
 exports[`EuiCardSelect props isDisabled 1`] = `
 <button
   aria-checked="false"
-  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiCardSelect euiCardSelect--text"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiCardSelect euiCardSelect--text"
   disabled=""
   role="switch"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -87,10 +87,11 @@ exports[`EuiCardSelect props isSelected 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButtonEmpty__icon"
       data-euiicon-type="check"
     />
     <span
diff --git a/src/components/collapsible_nav/__snapshots__/collapsible_nav.test.tsx.snap b/src/components/collapsible_nav/__snapshots__/collapsible_nav.test.tsx.snap
index 84072d95094..43fabc7dfea 100644
--- a/src/components/collapsible_nav/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/components/collapsible_nav/__snapshots__/collapsible_nav.test.tsx.snap
@@ -58,10 +58,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -112,10 +113,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -168,10 +170,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -218,10 +221,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -268,10 +272,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -316,10 +321,11 @@ exports[`EuiCollapsibleNav props isDocked 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButtonEmpty__content"
+          class="euiButtonEmpty__content"
         >
           <div
-            class="euiButtonContent__icon"
+            aria-hidden="true"
+            class="euiButtonEmpty__icon"
             data-euiicon-type="cross"
           />
           <span
@@ -365,10 +371,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
@@ -420,10 +427,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="cross"
             />
             <span
diff --git a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
index aae4df037aa..f5507939664 100644
--- a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
+++ b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`EuiControlBar is rendered 1`] = `
       type="button"
     >
       <span
-        class="euiButtonContent euiButton__content"
+        class="euiButton__content"
       >
         <span
           class="euiButton__text"
@@ -180,7 +180,7 @@ exports[`EuiControlBar props leftOffset is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -299,42 +299,22 @@ exports[`EuiControlBar props leftOffset is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
@@ -495,7 +475,7 @@ exports[`EuiControlBar props maxHeight is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -614,42 +594,22 @@ exports[`EuiControlBar props maxHeight is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
@@ -809,7 +769,7 @@ exports[`EuiControlBar props mobile is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -928,42 +888,22 @@ exports[`EuiControlBar props mobile is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
@@ -1155,42 +1095,22 @@ exports[`EuiControlBar props position is rendered 1`] = `
           onClick={[Function]}
           size="s"
         >
-          <EuiButtonDisplay
-            className="euiControlBar__button"
-            color="ghost"
+          <button
+            className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
             data-test-subj="dts"
-            element="button"
             onClick={[Function]}
-            size="s"
             type="button"
           >
-            <button
-              className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-              data-test-subj="dts"
-              onClick={[Function]}
-              type="button"
+            <span
+              className="euiButton__content"
             >
-              <EuiButtonContent
-                className="euiButton__content"
-                iconSide="left"
-                textProps={
-                  Object {
-                    "className": "euiButton__text",
-                  }
-                }
+              <span
+                className="euiButton__text"
               >
-                <span
-                  className="euiButtonContent euiButton__content"
-                >
-                  <span
-                    className="euiButton__text"
-                  >
-                    Sound the Alarm
-                  </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonDisplay>
+                Sound the Alarm
+              </span>
+            </span>
+          </button>
         </EuiButton>
         <div
           className="euiControlBar__text"
@@ -1335,7 +1255,7 @@ exports[`EuiControlBar props rightOffset is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -1454,42 +1374,22 @@ exports[`EuiControlBar props rightOffset is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
@@ -1649,7 +1549,7 @@ exports[`EuiControlBar props showContent is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -1773,42 +1673,22 @@ exports[`EuiControlBar props showContent is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
@@ -1973,7 +1853,7 @@ exports[`EuiControlBar props size is rendered 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButton__content"
+                  class="euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -2092,42 +1972,22 @@ exports[`EuiControlBar props size is rendered 1`] = `
               onClick={[Function]}
               size="s"
             >
-              <EuiButtonDisplay
-                className="euiControlBar__button"
-                color="ghost"
+              <button
+                className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
                 data-test-subj="dts"
-                element="button"
                 onClick={[Function]}
-                size="s"
                 type="button"
               >
-                <button
-                  className="euiButton euiButton--ghost euiButton--small euiControlBar__button"
-                  data-test-subj="dts"
-                  onClick={[Function]}
-                  type="button"
+                <span
+                  className="euiButton__content"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
-                      Object {
-                        "className": "euiButton__text",
-                      }
-                    }
+                  <span
+                    className="euiButton__text"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        className="euiButton__text"
-                      >
-                        Sound the Alarm
-                      </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
+                    Sound the Alarm
+                  </span>
+                </span>
+              </button>
             </EuiButton>
             <div
               className="euiControlBar__text"
diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
index d6ce0c353e1..2e43c1c11e9 100644
--- a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
+++ b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
@@ -54,15 +54,16 @@ exports[`EuiDataGrid pagination renders 1`] = `
         class="euiPopover__anchor"
       >
         <button
-          class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
+          class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
           data-test-subj="tablePaginationPopoverButton"
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="arrowDown"
             />
             <span
@@ -112,7 +113,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
             rel="noreferrer"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -129,13 +130,13 @@ exports[`EuiDataGrid pagination renders 1`] = `
             aria-controls="htmlId"
             aria-current="true"
             aria-label="Page 2 of 2"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-1"
             disabled=""
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -203,10 +204,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="listAdd"
                 />
                 <span
@@ -231,10 +233,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="tableDensityExpanded"
                 />
                 <span
@@ -252,10 +255,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="fullScreen"
             />
             <span
@@ -741,10 +745,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="listAdd"
                 />
                 <span
@@ -769,10 +774,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="tableDensityExpanded"
                 />
                 <span
@@ -790,10 +796,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="fullScreen"
             />
             <span
@@ -1600,10 +1607,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="listAdd"
                 />
                 <span
@@ -1628,10 +1636,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="tableDensityExpanded"
                 />
                 <span
@@ -1649,10 +1658,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="fullScreen"
             />
             <span
@@ -2137,10 +2147,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="listAdd"
                 />
                 <span
@@ -2165,10 +2176,11 @@ Array [
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonEmpty__content"
+                class="euiButtonEmpty__content"
               >
                 <div
-                  class="euiButtonContent__icon"
+                  aria-hidden="true"
+                  class="euiButtonEmpty__icon"
                   data-euiicon-type="tableDensityExpanded"
                 />
                 <span
@@ -2186,10 +2198,11 @@ Array [
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="fullScreen"
             />
             <span
diff --git a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 407cccfed90..f8f8197e0ed 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -3,12 +3,12 @@
 exports[`EuiFilterButton is rendered 1`] = `
 <button
   aria-label="aria-label"
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton testClass1 testClass2"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton testClass1 testClass2"
   data-test-subj="test subject string"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -23,11 +23,11 @@ exports[`EuiFilterButton is rendered 1`] = `
 
 exports[`EuiFilterButton props grow can be turned off 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--noGrow"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton--noGrow"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -42,14 +42,15 @@ exports[`EuiFilterButton props grow can be turned off 1`] = `
 
 exports[`EuiFilterButton props iconType and iconSide is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--hasIcon"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton--hasIcon"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <div
-      class="euiButtonContent__icon"
+      aria-hidden="true"
+      class="euiButtonEmpty__icon"
       data-euiicon-type="user"
     />
     <span
@@ -65,12 +66,12 @@ exports[`EuiFilterButton props iconType and iconSide is rendered 1`] = `
 
 exports[`EuiFilterButton props isDisabled is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty-isDisabled euiFilterButton"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton"
   disabled=""
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -85,11 +86,11 @@ exports[`EuiFilterButton props isDisabled is rendered 1`] = `
 
 exports[`EuiFilterButton props isSelected is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-isSelected"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton-isSelected"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -104,11 +105,11 @@ exports[`EuiFilterButton props isSelected is rendered 1`] = `
 
 exports[`EuiFilterButton props numActiveFilters and hasActiveFilters is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-hasActiveFilters"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton-hasActiveFilters"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -123,11 +124,11 @@ exports[`EuiFilterButton props numActiveFilters and hasActiveFilters is rendered
 
 exports[`EuiFilterButton props numFilters is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-hasNotification"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton-hasNotification"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text euiFilterButton__text-hasNotification"
@@ -148,11 +149,11 @@ exports[`EuiFilterButton props numFilters is rendered 1`] = `
 
 exports[`EuiFilterButton props type is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -167,11 +168,11 @@ exports[`EuiFilterButton props type is rendered 1`] = `
 
 exports[`EuiFilterButton props withNext is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--withNext"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton--withNext"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -187,12 +188,12 @@ exports[`EuiFilterButton props withNext is rendered 1`] = `
 exports[`EuiFilterButton renders zero properly 1`] = `
 <button
   aria-label="aria-label"
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-hasNotification testClass1 testClass2"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton euiFilterButton-hasNotification testClass1 testClass2"
   data-test-subj="test subject string"
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text euiFilterButton__text-hasNotification"
diff --git a/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap b/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
index 1e94057b76f..eb44f88f7f2 100644
--- a/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
+++ b/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`EuiHeaderLink is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
@@ -23,7 +23,7 @@ exports[`EuiHeaderLink is rendered as active 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
diff --git a/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap b/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
index e2a2116bf26..1f40a73883a 100644
--- a/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
+++ b/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
@@ -70,7 +70,7 @@ Array [
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -85,7 +85,7 @@ Array [
             type="button"
           >
             <span
-              class="euiButtonContent euiButton__content"
+              class="euiButton__content"
             >
               <span
                 class="euiButton__text"
@@ -160,7 +160,7 @@ Array [
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -175,7 +175,7 @@ Array [
             type="button"
           >
             <span
-              class="euiButtonContent euiButton__content"
+              class="euiButton__content"
             >
               <span
                 class="euiButton__text"
diff --git a/src/components/pagination/__snapshots__/pagination.test.tsx.snap b/src/components/pagination/__snapshots__/pagination.test.tsx.snap
index f89a978ebe5..30e9aa17295 100644
--- a/src/components/pagination/__snapshots__/pagination.test.tsx.snap
+++ b/src/components/pagination/__snapshots__/pagination.test.tsx.snap
@@ -32,7 +32,7 @@ exports[`EuiPagination is rendered 1`] = `
         type="button"
       >
         <span
-          class="euiButtonContent euiButtonEmpty__content"
+          class="euiButtonEmpty__content"
         >
           <span
             class="euiButtonEmpty__text"
diff --git a/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap b/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
index 63148239f19..a10e6ca49f8 100644
--- a/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
+++ b/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`EuiPaginationButton is rendered 1`] = `
   type="button"
 >
   <span
-    class="euiButtonContent euiButtonEmpty__content"
+    class="euiButtonEmpty__content"
   >
     <span
       class="euiButtonEmpty__text"
diff --git a/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
index 88f3bc4bfb8..7797052cbea 100644
--- a/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
+++ b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
@@ -13,14 +13,15 @@ exports[`EuiTableSortMobile is rendered 1`] = `
       class="euiPopover__anchor"
     >
       <button
-        class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+        class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
         type="button"
       >
         <span
-          class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+          class="euiButtonEmpty__content"
         >
           <div
-            class="euiButtonContent__icon"
+            aria-hidden="true"
+            class="euiButtonEmpty__icon"
             data-euiicon-type="arrowDown"
           />
           <span
diff --git a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
index be2a5cbd66e..8cdddf8fc75 100644
--- a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
+++ b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
@@ -14,15 +14,16 @@ exports[`EuiTablePagination is rendered 1`] = `
         class="euiPopover__anchor"
       >
         <button
-          class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
+          class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
           data-test-subj="tablePaginationPopoverButton"
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+            class="euiButtonEmpty__content"
           >
             <div
-              class="euiButtonContent__icon"
+              aria-hidden="true"
+              class="euiButtonEmpty__icon"
               data-euiicon-type="arrowDown"
             />
             <span
@@ -69,7 +70,7 @@ exports[`EuiTablePagination is rendered 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -85,13 +86,13 @@ exports[`EuiTablePagination is rendered 1`] = `
           <button
             aria-current="true"
             aria-label="Page 2 of 5"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-1"
             disabled=""
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -111,7 +112,7 @@ exports[`EuiTablePagination is rendered 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -131,7 +132,7 @@ exports[`EuiTablePagination is rendered 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -151,7 +152,7 @@ exports[`EuiTablePagination is rendered 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -220,7 +221,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -236,13 +237,13 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
           <button
             aria-current="true"
             aria-label="Page 2 of 5"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-1"
             disabled=""
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -262,7 +263,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -282,7 +283,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -302,7 +303,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonEmpty__content"
+              class="euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
diff --git a/src/global_styling/mixins/_button.scss b/src/global_styling/mixins/_button.scss
index 673b6347c17..1ed23faebc2 100644
--- a/src/global_styling/mixins/_button.scss
+++ b/src/global_styling/mixins/_button.scss
@@ -63,8 +63,8 @@
   width: 100%;
   vertical-align: middle;
 
-  .euiButtonContent__icon,
-  .euiButtonContent__spinner {
+  .euiButton__icon,
+  .euiButton__spinner {
     flex-shrink: 0; // Ensures the icons/spinner don't scale down below their intended size
   }
 
@@ -86,18 +86,5 @@
   }
 }
 
-@mixin euiButtonContentDisabled {
-  pointer-events: auto;
-  cursor: not-allowed;
-
-  .euiButtonContent__icon {
-    fill: currentColor;
-  }
-
-  .euiButtonContent__spinner {
-    border-color: euiLoadingSpinnerBorderColors(currentColor);
-  }
-}
-
 // Keyframe animation declarations can be found in
 // utility/animations.scss