diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index 608af5bb005..1f8f10e10e1 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -85,7 +85,7 @@ export interface ButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'r
   iconPosition?: 'start' | 'end' | 'left' | 'right';
   /** Adds accessible text to the button. */
   'aria-label'?: string;
-  /** Icon for the button. Usable by all variants except for plain. */
+  /** Icon for the button. */
   icon?: React.ReactNode | null;
   /** Sets the button tabindex. */
   tabIndex?: number;
diff --git a/packages/react-core/src/components/DatePicker/DatePicker.tsx b/packages/react-core/src/components/DatePicker/DatePicker.tsx
index 8e510b2c1f0..2fb14b50944 100644
--- a/packages/react-core/src/components/DatePicker/DatePicker.tsx
+++ b/packages/react-core/src/components/DatePicker/DatePicker.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DatePicker/date-picker';
-import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 import calendarMonthStyles from '@patternfly/react-styles/css/components/CalendarMonth/calendar-month';
 import { TextInput, TextInputProps } from '../TextInput/TextInput';
+import { Button } from '../Button';
 import { Popover, PopoverProps } from '../Popover/Popover';
 import { InputGroup, InputGroupItem } from '../InputGroup';
 import OutlinedCalendarAltIcon from '@patternfly/react-icons/dist/esm/icons/outlined-calendar-alt-icon';
@@ -325,17 +325,15 @@ const DatePickerBase = (
               />
             </InputGroupItem>
             <InputGroupItem>
-              <button
+              <Button
                 ref={buttonRef}
-                // TODO: Removed style follow up work with issue #8457
-                className={css(buttonStyles.button, buttonStyles.modifiers.control)}
+                variant="control"
                 aria-label={buttonAriaLabel}
-                type="button"
                 onClick={() => setPopoverOpen(!popoverOpen)}
-                disabled={isDisabled}
-              >
-                <OutlinedCalendarAltIcon />
-              </button>
+                isDisabled={isDisabled}
+                icon={<OutlinedCalendarAltIcon />}
+                aria-haspopup="dialog"
+              />
             </InputGroupItem>
           </InputGroup>
         </div>
diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
index d88f3c24aeb..3ed0e038d24 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
+++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
@@ -34,23 +34,32 @@ exports[`With popover opened 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="false"
+            aria-haspopup="dialog"
             aria-label="Toggle date picker"
             class="pf-v6-c-button pf-m-control"
+            data-ouia-component-id="OUIA-Generated-Button-control-4"
+            data-ouia-component-type="PF6/Button"
+            data-ouia-safe="true"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="pf-v6-svg"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              viewBox="0 0 448 512"
-              width="1em"
+            <span
+              class="pf-v6-c-button__icon pf-m-start"
             >
-              <path
-                d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
-              />
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="pf-v6-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 448 512"
+                width="1em"
+              >
+                <path
+                  d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
+                />
+              </svg>
+            </span>
           </button>
         </div>
       </div>
@@ -820,24 +829,33 @@ exports[`disabled date picker 1`] = `
           class="pf-v6-c-input-group__item"
         >
           <button
+            aria-disabled="false"
+            aria-haspopup="dialog"
             aria-label="Toggle date picker"
             class="pf-v6-c-button pf-m-control"
+            data-ouia-component-id="OUIA-Generated-Button-control-1"
+            data-ouia-component-type="PF6/Button"
+            data-ouia-safe="true"
             disabled=""
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="pf-v6-svg"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              viewBox="0 0 448 512"
-              width="1em"
+            <span
+              class="pf-v6-c-button__icon pf-m-start"
             >
-              <path
-                d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
-              />
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="pf-v6-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 448 512"
+                width="1em"
+              >
+                <path
+                  d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
+                />
+              </svg>
+            </span>
           </button>
         </div>
       </div>
diff --git a/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx b/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
index 9ef2c99818d..abfaad1d646 100644
--- a/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
@@ -21,9 +21,7 @@ export const DrawerCloseButton: React.FunctionComponent<DrawerCloseButtonProps>
   ...props
 }: DrawerCloseButtonProps) => (
   <div className={css(styles.drawerClose, className)} {...props}>
-    <Button variant="plain" onClick={onClose} aria-label={ariaLabel}>
-      <TimesIcon />
-    </Button>
+    <Button variant="plain" onClick={onClose} aria-label={ariaLabel} icon={<TimesIcon />} />
   </div>
 );
 DrawerCloseButton.displayName = 'DrawerCloseButton';
diff --git a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
index e89a27f3f39..0acf4225d20 100644
--- a/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
+++ b/packages/react-core/src/components/Drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`Drawer expands from bottom 1`] = `
                 type="button"
               >
                 <span
-                  class="pf-v6-c-button__text"
+                  class="pf-v6-c-button__icon pf-m-start"
                 >
                   <svg
                     aria-hidden="true"
@@ -136,7 +136,7 @@ exports[`Drawer has resizable callback and id 1`] = `
                   type="button"
                 >
                   <span
-                    class="pf-v6-c-button__text"
+                    class="pf-v6-c-button__icon pf-m-start"
                   >
                     <svg
                       aria-hidden="true"
@@ -231,7 +231,7 @@ exports[`Drawer has resizable css and color variants 1`] = `
                   type="button"
                 >
                   <span
-                    class="pf-v6-c-button__text"
+                    class="pf-v6-c-button__icon pf-m-start"
                   >
                     <svg
                       aria-hidden="true"
@@ -360,7 +360,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = false 1`]
                 type="button"
               >
                 <span
-                  class="pf-v6-c-button__text"
+                  class="pf-v6-c-button__icon pf-m-start"
                 >
                   <svg
                     aria-hidden="true"
@@ -434,7 +434,7 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = true 1`] =
                 type="button"
               >
                 <span
-                  class="pf-v6-c-button__text"
+                  class="pf-v6-c-button__icon pf-m-start"
                 >
                   <svg
                     aria-hidden="true"
@@ -508,7 +508,7 @@ exports[`Drawer isExpanded = true and isInline = true and isStatic = false 1`] =
                 type="button"
               >
                 <span
-                  class="pf-v6-c-button__text"
+                  class="pf-v6-c-button__icon pf-m-start"
                 >
                   <svg
                     aria-hidden="true"
diff --git a/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx b/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
index 5f8c1db0b39..5a860605e9b 100644
--- a/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
+++ b/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
@@ -73,11 +73,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
             <FormFieldGroupHeader
               titleText={{ text: 'Nested field group 1', id: 'nested-field-group1-titleText-id' }}
               titleDescription="Nested field group 1 description text."
-              actions={
-                <Button variant="plain" aria-label="Remove">
-                  <TrashIcon />
-                </Button>
-              }
+              actions={<Button variant="plain" aria-label="Remove" icon={<TrashIcon />} />}
             />
           }
         >
@@ -105,11 +101,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
           header={
             <FormFieldGroupHeader
               titleText={{ text: 'Nested field group 2', id: 'nested-field-group2-titleText-id' }}
-              actions={
-                <Button variant="plain" aria-label="Remove">
-                  <TrashIcon />
-                </Button>
-              }
+              actions={<Button variant="plain" aria-label="Remove" icon={<TrashIcon />} />}
             />
           }
         >
@@ -138,11 +130,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
             <FormFieldGroupHeader
               titleText={{ text: 'Nested field group 3', id: 'nested-field-group3-titleText-id' }}
               titleDescription="Field group 3 description text."
-              actions={
-                <Button variant="plain" aria-label="Remove">
-                  <TrashIcon />
-                </Button>
-              }
+              actions={<Button variant="plain" aria-label="Remove" icon={<TrashIcon />} />}
             />
           }
         >
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx b/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
index d73367e6cec..9c628d8cdfd 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
@@ -35,9 +35,7 @@ export const ModalWithHelp: React.FunctionComponent = () => {
               }
               footerContent="Popover Footer"
             >
-              <Button variant="plain" aria-label="Help">
-                <HelpIcon />
-              </Button>
+              <Button variant="plain" aria-label="Help" icon={<HelpIcon />} />
             </Popover>
           }
         />
diff --git a/packages/react-core/src/components/NumberInput/NumberInput.tsx b/packages/react-core/src/components/NumberInput/NumberInput.tsx
index da6ae754859..9b5ec84a0c4 100644
--- a/packages/react-core/src/components/NumberInput/NumberInput.tsx
+++ b/packages/react-core/src/components/NumberInput/NumberInput.tsx
@@ -124,12 +124,13 @@ export const NumberInput: React.FunctionComponent<NumberInputProps> = ({
             aria-label={minusBtnAriaLabel}
             isDisabled={isDisabled || (typeof value === 'number' ? value : DEFAULT_VALUE) <= min}
             onClick={(evt) => onMinus(evt, inputName)}
+            icon={
+              <span className={css(styles.numberInputIcon)}>
+                <MinusIcon aria-hidden="true" />
+              </span>
+            }
             {...minusBtnProps}
-          >
-            <span className={css(styles.numberInputIcon)}>
-              <MinusIcon aria-hidden="true" />
-            </span>
-          </Button>
+          />
         </InputGroupItem>
         <InputGroupItem>
           <TextInput
@@ -152,12 +153,13 @@ export const NumberInput: React.FunctionComponent<NumberInputProps> = ({
             aria-label={plusBtnAriaLabel}
             isDisabled={isDisabled || (typeof value === 'number' ? value : DEFAULT_VALUE) >= max}
             onClick={(evt) => onPlus(evt, inputName)}
+            icon={
+              <span className={css(styles.numberInputIcon)}>
+                <PlusIcon aria-hidden="true" />
+              </span>
+            }
             {...plusBtnProps}
-          >
-            <span className={css(styles.numberInputIcon)}>
-              <PlusIcon aria-hidden="true" />
-            </span>
-          </Button>
+          />
         </InputGroupItem>
       </InputGroup>
       {unit && unitPosition === 'after' && numberInputUnit}
diff --git a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
index 0920b154e7c..68314bd08f3 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
+++ b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
@@ -22,7 +22,7 @@ exports[`numberInput disables lower threshold 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -75,7 +75,7 @@ exports[`numberInput disables lower threshold 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -123,7 +123,7 @@ exports[`numberInput disables upper threshold 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -177,7 +177,7 @@ exports[`numberInput disables upper threshold 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -226,7 +226,7 @@ exports[`numberInput passes button props successfully 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -280,7 +280,7 @@ exports[`numberInput passes button props successfully 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -328,7 +328,7 @@ exports[`numberInput passes input props successfully 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -381,7 +381,7 @@ exports[`numberInput passes input props successfully 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -430,7 +430,7 @@ exports[`numberInput renders custom width 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -483,7 +483,7 @@ exports[`numberInput renders custom width 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -532,7 +532,7 @@ exports[`numberInput renders defaults & extra props 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -585,7 +585,7 @@ exports[`numberInput renders defaults & extra props 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -634,7 +634,7 @@ exports[`numberInput renders disabled 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -689,7 +689,7 @@ exports[`numberInput renders disabled 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -737,7 +737,7 @@ exports[`numberInput renders error validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -811,7 +811,7 @@ exports[`numberInput renders error validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -859,7 +859,7 @@ exports[`numberInput renders success validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -933,7 +933,7 @@ exports[`numberInput renders success validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -986,7 +986,7 @@ exports[`numberInput renders unit & position 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1039,7 +1039,7 @@ exports[`numberInput renders unit & position 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1087,7 +1087,7 @@ exports[`numberInput renders unit 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1140,7 +1140,7 @@ exports[`numberInput renders unit 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1193,7 +1193,7 @@ exports[`numberInput renders value 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1246,7 +1246,7 @@ exports[`numberInput renders value 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1294,7 +1294,7 @@ exports[`numberInput renders warning validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
@@ -1368,7 +1368,7 @@ exports[`numberInput renders warning validated 1`] = `
           type="button"
         >
           <span
-            class="pf-v6-c-button__text"
+            class="pf-v6-c-button__icon pf-m-start"
           >
             <span
               class="pf-v6-c-number-input__icon"
diff --git a/packages/react-core/src/components/Tabs/TabAction.tsx b/packages/react-core/src/components/Tabs/TabAction.tsx
index 2806767bd89..49ad1592789 100644
--- a/packages/react-core/src/components/Tabs/TabAction.tsx
+++ b/packages/react-core/src/components/Tabs/TabAction.tsx
@@ -39,11 +39,10 @@ const TabActionBase: React.FunctionComponent<TabActionProps> = ({
       aria-label={ariaLabel}
       onClick={onClick}
       isDisabled={isDisabled}
+      icon={<span className={css(styles.tabsItemActionIcon)}>{children}</span>}
       {...getOUIAProps(TabAction.displayName, ouiaId, ouiaSafe)}
       {...props}
-    >
-      <span className={css(styles.tabsItemActionIcon)}>{children}</span>
-    </Button>
+    />
   </span>
 );
 
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
index bd9356bac29..97001d56bb2 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tab.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`renders tab action 1`] = `
         type="button"
       >
         <span
-          class="pf-v6-c-button__text"
+          class="pf-v6-c-button__icon pf-m-start"
         >
           <span
             class="pf-v6-c-tabs__item-action-icon"
diff --git a/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
index 9e07d760466..89305c138f3 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
@@ -128,9 +128,8 @@ export const ContextSelectorDemo: React.FunctionComponent = () => {
                 aria-label="Search menu items"
                 id="pf-v6-context-selector-search-button-id-1"
                 onClick={onSearchButtonClick}
-              >
-                <SearchIcon aria-hidden="true" />
-              </Button>
+                icon={<SearchIcon aria-hidden="true" />}
+              />
             </InputGroupItem>
           </InputGroup>
         </MenuSearchInput>
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
index 9a79cdbfe2d..5171c82d90c 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
@@ -29,9 +29,7 @@ export const ModalWithHelp: React.FunctionComponent = () => {
             }
             footerContent="Popover Footer"
           >
-            <Button variant="plain" aria-label="Help">
-              <HelpIcon />
-            </Button>
+            <Button variant="plain" aria-label="Help" icon={<HelpIcon />} />
           </Popover>
         }
         isOpen={isModalOpen}
diff --git a/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx b/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
index c28fee20d31..def72dd2215 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
@@ -1,27 +1,39 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
+import { Button } from '@patternfly/react-core';
 import dragButtonStyles from '@patternfly/react-styles/css/components/DataList/data-list';
-import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 import GripVerticalIcon from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
 
-export interface DragButtonProps extends React.HTMLProps<HTMLButtonElement> {
+export interface DragButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'size'> {
   /** Additional classes added to the drag button */
   className?: string;
   /** Sets button type */
   type?: 'button' | 'submit' | 'reset';
   /** Flag indicating if drag is disabled for the item */
   isDisabled?: boolean;
+  /** Accessible name of the drag button. */
+  'aria-label'?: string;
+  /** Id or list of id's that label the drag button. */
+  'aria-labelledby'?: string;
 }
 
-export const DragButton: React.FunctionComponent<DragButtonProps> = ({ className, ...props }: DragButtonProps) => (
-  <button
-    className={css(className, buttonStyles.button, buttonStyles.modifiers.plain)}
-    aria-label="Drag button"
+export const DragButton: React.FunctionComponent<DragButtonProps> = ({
+  className,
+  'aria-label': ariaLabel = 'Drag button',
+  'aria-labelledby': ariaLabelledby,
+  ...props
+}: DragButtonProps) => (
+  <Button
+    variant="plain"
+    className={css(className)}
+    aria-label={ariaLabel}
+    aria-labelledby={ariaLabelledby}
+    icon={
+      <span className={css(dragButtonStyles.dataListItemDraggableIcon)}>
+        <GripVerticalIcon />
+      </span>
+    }
     {...props}
-  >
-    <span className={css(dragButtonStyles.dataListItemDraggableIcon)}>
-      <GripVerticalIcon />
-    </span>
-  </button>
+  />
 );
 DragButton.displayName = 'DragButton';
diff --git a/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap b/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
index 73d509e5671..a18c05a3ffa 100644
--- a/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
+++ b/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
@@ -15,25 +15,33 @@ exports[`renders some divs 1`] = `
           aria-label="Drag button"
           aria-roledescription="sortable"
           class="pf-v6-c-button pf-m-plain"
+          data-ouia-component-id="OUIA-Generated-Button-plain-1"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
           role="button"
           tabindex="0"
+          type="button"
         >
           <span
-            class="pf-v6-c-data-list__item-draggable-icon"
+            class="pf-v6-c-button__icon pf-m-start"
           >
-            <svg
-              aria-hidden="true"
-              class="pf-v6-svg"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              viewBox="0 0 320 512"
-              width="1em"
+            <span
+              class="pf-v6-c-data-list__item-draggable-icon"
             >
-              <path
-                d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
-              />
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="pf-v6-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 320 512"
+                width="1em"
+              >
+                <path
+                  d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
+                />
+              </svg>
+            </span>
           </span>
         </button>
         one
@@ -47,25 +55,33 @@ exports[`renders some divs 1`] = `
           aria-label="Drag button"
           aria-roledescription="sortable"
           class="pf-v6-c-button pf-m-plain"
+          data-ouia-component-id="OUIA-Generated-Button-plain-2"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
           role="button"
           tabindex="0"
+          type="button"
         >
           <span
-            class="pf-v6-c-data-list__item-draggable-icon"
+            class="pf-v6-c-button__icon pf-m-start"
           >
-            <svg
-              aria-hidden="true"
-              class="pf-v6-svg"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              viewBox="0 0 320 512"
-              width="1em"
+            <span
+              class="pf-v6-c-data-list__item-draggable-icon"
             >
-              <path
-                d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
-              />
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="pf-v6-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 320 512"
+                width="1em"
+              >
+                <path
+                  d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
+                />
+              </svg>
+            </span>
           </span>
         </button>
         two
@@ -79,25 +95,33 @@ exports[`renders some divs 1`] = `
           aria-label="Drag button"
           aria-roledescription="sortable"
           class="pf-v6-c-button pf-m-plain"
+          data-ouia-component-id="OUIA-Generated-Button-plain-3"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
           role="button"
           tabindex="0"
+          type="button"
         >
           <span
-            class="pf-v6-c-data-list__item-draggable-icon"
+            class="pf-v6-c-button__icon pf-m-start"
           >
-            <svg
-              aria-hidden="true"
-              class="pf-v6-svg"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              viewBox="0 0 320 512"
-              width="1em"
+            <span
+              class="pf-v6-c-data-list__item-draggable-icon"
             >
-              <path
-                d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
-              />
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="pf-v6-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 320 512"
+                width="1em"
+              >
+                <path
+                  d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"
+                />
+              </svg>
+            </span>
           </span>
         </button>
         three
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
index f400a400867..2c2de6ab37c 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
@@ -22,9 +22,7 @@ export class ClipboardCopyDemo extends React.Component {
             isBlock
             additionalActions={
               <ClipboardCopyAction>
-                <Button variant="plain" aria-label="Run in web terminal">
-                  <PlayIcon aria-hidden />
-                </Button>
+                <Button variant="plain" aria-label="Run in web terminal" icon={<PlayIcon aria-hidden />} />
               </ClipboardCopyAction>
             }
           >
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
index 95e18fb1d4e..4447bc1d896 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
@@ -126,9 +126,8 @@ class DualListSelectorDeprecatedWithActionsDemo extends React.Component<DLSProps
         onClick={() => this.onSort('available')}
         aria-label="Sort"
         key="availableSortButton"
-      >
-        {this.state.availableDescending ? <PficonSortCommonDescIcon /> : <PficonSortCommonAscIcon />}
-      </Button>,
+        icon={this.state.availableDescending ? <PficonSortCommonDescIcon /> : <PficonSortCommonAscIcon />}
+      />,
       <Dropdown
         key="availableDropdown"
         isOpen={this.state.isAvailableKebabOpen}
@@ -154,9 +153,8 @@ class DualListSelectorDeprecatedWithActionsDemo extends React.Component<DLSProps
         onClick={() => this.onSort('chosen')}
         aria-label="Sort"
         key="chosenSortButton"
-      >
-        {this.state.chosenDescending ? <PficonSortCommonDescIcon /> : <PficonSortCommonAscIcon />}
-      </Button>,
+        icon={this.state.chosenDescending ? <PficonSortCommonDescIcon /> : <PficonSortCommonAscIcon />}
+      />,
       <Dropdown
         isOpen={this.state.isChosenKebabOpen}
         onOpenChange={(isOpen) => this.setState({ isChosenKebabOpen: isOpen })}
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
index 45e24556079..8bda8622753 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
@@ -176,9 +176,7 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
             <TextInput name="textInput11" id="textInput11" type="search" aria-label="search input example" />
           </InputGroupItem>
           <InputGroupItem>
-            <Button variant={ButtonVariant.control} aria-label="search button for search input">
-              <SearchIcon />
-            </Button>
+            <Button variant={ButtonVariant.control} aria-label="search button for search input" icon={<SearchIcon />} />
           </InputGroupItem>
         </InputGroup>
         <br />
@@ -193,9 +191,7 @@ export class InputGroupDemo extends React.Component<{}, InputGroupState> {
               position={PopoverPosition.top}
               bodyContent="This field is an example of input group with popover"
             >
-              <Button variant={ButtonVariant.control} aria-label="popover for input">
-                <QuestionCircleIcon />
-              </Button>
+              <Button variant={ButtonVariant.control} aria-label="popover for input" icon={<QuestionCircleIcon />} />
             </Popover>
           </InputGroupItem>
         </InputGroup>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
index 7d98c08630b..1e216d22c33 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
@@ -117,9 +117,7 @@ export class MastheadDemo extends Component<MastheadProps> {
       <Masthead id="basic">
         <MastheadMain>
           <MastheadToggle>
-            <Button variant="plain" onClick={() => {}} aria-label="Global navigation">
-              <BarsIcon />
-            </Button>
+            <Button variant="plain" onClick={() => {}} aria-label="Global navigation" icon={<BarsIcon />} />
           </MastheadToggle>
           <MastheadBrand>
             <MastheadLogo>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
index 68433dc8682..3927619fcd0 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
@@ -156,19 +156,13 @@ export class OverflowMenuDemo extends React.Component {
           </OverflowMenuGroup>
           <OverflowMenuGroup groupType="icon">
             <OverflowMenuItem>
-              <Button variant="link" aria-label="Align left">
-                <AlignLeftIcon />
-              </Button>
+              <Button variant="link" aria-label="Align left" icon={<AlignLeftIcon />} />
             </OverflowMenuItem>
             <OverflowMenuItem>
-              <Button variant="link" aria-label="Align center">
-                <AlignCenterIcon />
-              </Button>
+              <Button variant="link" aria-label="Align center" icon={<AlignCenterIcon />} />
             </OverflowMenuItem>
             <OverflowMenuItem>
-              <Button variant="link" aria-label="Align right">
-                <AlignRightIcon />
-              </Button>
+              <Button variant="link" aria-label="Align right" icon={<AlignRightIcon />} />
             </OverflowMenuItem>
           </OverflowMenuGroup>
         </OverflowMenuContent>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
index 4ab8aa8fb00..49232673441 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
@@ -185,9 +185,11 @@ class ToolbarDemo extends React.Component<ToolbarProps, ToolbarState> {
               />
             </InputGroupItem>
             <InputGroupItem>
-              <Button variant={ButtonVariant.tertiary} aria-label="search button for search input">
-                <SearchIcon />
-              </Button>
+              <Button
+                variant={ButtonVariant.tertiary}
+                aria-label="search button for search input"
+                icon={<SearchIcon />}
+              />
             </InputGroupItem>
           </InputGroup>
         </ToolbarItem>
@@ -252,19 +254,13 @@ class ToolbarDemo extends React.Component<ToolbarProps, ToolbarState> {
         </ToolbarToggleGroup>
         <ToolbarGroup variant="action-group-plain">
           <ToolbarItem>
-            <Button variant="plain">
-              <EditIcon />
-            </Button>
+            <Button variant="plain" icon={<EditIcon />} />
           </ToolbarItem>
           <ToolbarItem>
-            <Button variant="plain">
-              <CloneIcon />
-            </Button>
+            <Button variant="plain" icon={<CloneIcon />} />
           </ToolbarItem>
           <ToolbarItem>
-            <Button variant="plain">
-              <SyncIcon />
-            </Button>
+            <Button variant="plain" icon={<SyncIcon />} />
           </ToolbarItem>
         </ToolbarGroup>
         <ToolbarItem>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
index b006ef5e0a3..6fbb91d8dfc 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
@@ -225,11 +225,7 @@ export class TreeViewDemo extends Component {
         id: 'FCost',
         hasBadge: true,
         customBadgeContent: 'custom badge',
-        action: (
-          <Button variant="plain" aria-label="Folder action">
-            <FolderIcon />
-          </Button>
-        ),
+        action: <Button variant="plain" aria-label="Folder action" icon={<FolderIcon />} />,
         children: [
           {
             name: 'Application 3',
diff --git a/packages/react-table/src/components/Table/CollapseColumn.tsx b/packages/react-table/src/components/Table/CollapseColumn.tsx
index 1a8b01fdcab..1ace597f517 100644
--- a/packages/react-table/src/components/Table/CollapseColumn.tsx
+++ b/packages/react-table/src/components/Table/CollapseColumn.tsx
@@ -29,11 +29,12 @@ export const CollapseColumn: React.FunctionComponent<CollapseColumnProps> = ({
         aria-label={props['aria-label'] || 'Details'}
         onClick={onToggle}
         aria-expanded={isOpen}
-      >
-        <div className={css(styles.tableToggleIcon)}>
-          <AngleDownIcon />
-        </div>
-      </Button>
+        icon={
+          <div className={css(styles.tableToggleIcon)}>
+            <AngleDownIcon />
+          </div>
+        }
+      />
     )}
     {children}
   </React.Fragment>
diff --git a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
index c20c3f68f42..ede991634c0 100644
--- a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
@@ -53,11 +53,12 @@ export const treeRow =
                   className={css(isExpanded && styles.modifiers.expanded)}
                   aria-expanded={isExpanded}
                   aria-label={toggleAriaLabel || `${isExpanded ? 'Collapse' : 'Expand'} row ${rowIndex}`}
-                >
-                  <div className={css(stylesTreeView.tableToggleIcon)}>
-                    <AngleDownIcon aria-hidden="true" />
-                  </div>
-                </Button>
+                  icon={
+                    <div className={css(stylesTreeView.tableToggleIcon)}>
+                      <AngleDownIcon aria-hidden="true" />
+                    </div>
+                  }
+                />
               </span>
             )}
             {!!onCheckChange && (
@@ -82,11 +83,12 @@ export const treeRow =
                   onClick={(event) =>
                     onToggleRowDetails && onToggleRowDetails(event, rowIndex, content as React.ReactNode, rowData)
                   }
-                >
-                  <span className={`${styles.table}__details-toggle-icon`}>
-                    <EllipsisHIcon aria-hidden />
-                  </span>
-                </Button>
+                  icon={
+                    <span className={`${styles.table}__details-toggle-icon`}>
+                      <EllipsisHIcon aria-hidden />
+                    </span>
+                  }
+                />
               </span>
             )}
           </div>
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
index 350187be62f..2c1ed757436 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
@@ -1538,7 +1538,7 @@ exports[`Table Collapsible nested table 1`] = `
             type="button"
           >
             <span
-              class="pf-v6-c-button__text"
+              class="pf-v6-c-button__icon pf-m-start"
             >
               <div
                 class="pf-v6-c-table__toggle-icon"
@@ -1630,7 +1630,7 @@ exports[`Table Collapsible nested table 1`] = `
             type="button"
           >
             <span
-              class="pf-v6-c-button__text"
+              class="pf-v6-c-button__icon pf-m-start"
             >
               <div
                 class="pf-v6-c-table__toggle-icon"
@@ -1793,7 +1793,7 @@ exports[`Table Collapsible nested table 1`] = `
             type="button"
           >
             <span
-              class="pf-v6-c-button__text"
+              class="pf-v6-c-button__icon pf-m-start"
             >
               <div
                 class="pf-v6-c-table__toggle-icon"
@@ -2303,7 +2303,7 @@ exports[`Table Collapsible table 1`] = `
             type="button"
           >
             <span
-              class="pf-v6-c-button__text"
+              class="pf-v6-c-button__icon pf-m-start"
             >
               <div
                 class="pf-v6-c-table__toggle-icon"
@@ -2521,7 +2521,7 @@ exports[`Table Collapsible table 1`] = `
             type="button"
           >
             <span
-              class="pf-v6-c-button__text"
+              class="pf-v6-c-button__icon pf-m-start"
             >
               <div
                 class="pf-v6-c-table__toggle-icon"