diff --git a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
index 0e523c3f9d1..d137b7becd9 100644
--- a/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
+++ b/packages/react-core/src/components/Alert/__tests__/__snapshots__/Alert.test.tsx.snap
@@ -245,9 +245,7 @@ exports[`Alert - danger Action Link 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -353,9 +351,7 @@ exports[`Alert - danger Action and Title 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -462,9 +458,7 @@ exports[`Alert - danger Custom aria label 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -1030,9 +1024,7 @@ exports[`Alert - default Action Link 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -1138,9 +1130,7 @@ exports[`Alert - default Action and Title 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -1247,9 +1237,7 @@ exports[`Alert - default Custom aria label 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -1815,9 +1803,7 @@ exports[`Alert - info Action Link 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -1923,9 +1909,7 @@ exports[`Alert - info Action and Title 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -2032,9 +2016,7 @@ exports[`Alert - info Custom aria label 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -2600,9 +2582,7 @@ exports[`Alert - success Action Link 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -2708,9 +2688,7 @@ exports[`Alert - success Action and Title 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -2817,9 +2795,7 @@ exports[`Alert - success Custom aria label 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -3385,9 +3361,7 @@ exports[`Alert - warning Action Link 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -3493,9 +3467,7 @@ exports[`Alert - warning Action and Title 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
@@ -3602,9 +3574,7 @@ exports[`Alert - warning Custom aria label 1`] = `
             tabIndex={null}
             type="button"
           >
-            <span>
-              test
-            </span>
+            test
           </button>
         </Button>
       </AlertActionLink>
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index ebbea39353b..15219bbf8de 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -46,7 +46,7 @@ export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   iconPosition?: 'left' | 'right';
   /** Adds accessible text to the button. */
   'aria-label'?: string;
-  /** Icon for the button if variant is a link */
+  /** Icon for the button. Usable by all variants except for plain. */
   icon?: React.ReactNode | null;
   /** Set button tab index unless component is not a button and is disabled */
   tabIndex?: number;
@@ -94,13 +94,12 @@ export const Button: React.FunctionComponent<ButtonProps & OUIAProps> = ({
       type={isButtonElement ? type : null}
       {...getOUIAProps('Button', ouiaId)}
     >
-      {icon && variant === ButtonVariant.link && iconPosition === 'left' && (
-        <span className={styles.buttonIcon}>{icon}</span>
+      {variant !== ButtonVariant.plain && icon && iconPosition === 'left' && (
+        <span className={css(styles.buttonIcon, styles.modifiers.start)}>{icon}</span>
       )}
-      {variant === ButtonVariant.link && <span>{children}</span>}
-      {variant !== ButtonVariant.link && children}
-      {icon && variant === ButtonVariant.link && iconPosition === 'right' && (
-        <span className={styles.buttonIcon}>{icon}</span>
+      {children}
+      {variant !== ButtonVariant.plain && icon && iconPosition === 'right' && (
+        <span className={css(styles.buttonIcon, styles.modifiers.end)}>{icon}</span>
       )}
     </Component>
   );
diff --git a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
index 9f3942c2f85..60c75482c38 100644
--- a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
+++ b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
@@ -161,9 +161,7 @@ exports[`isInline 1`] = `
     tabIndex={null}
     type="button"
   >
-    <span>
-      Hovered Button
-    </span>
+    Hovered Button
   </button>
 </Button>
 `;
@@ -184,10 +182,8 @@ exports[`link button 1`] = `
     tabIndex={null}
     type="button"
   >
-    <span>
-      link
-       Button
-    </span>
+    link
+     Button
   </button>
 </Button>
 `;
@@ -209,7 +205,7 @@ exports[`link with icon 1`] = `
     type="button"
   >
     <span
-      className="pf-c-button__icon"
+      className="pf-c-button__icon pf-m-start"
     >
       <CartArrowDownIcon>
         <SVGIcon
@@ -250,9 +246,7 @@ exports[`link with icon 1`] = `
         </SVGIcon>
       </CartArrowDownIcon>
     </span>
-    <span>
-      Block Button
-    </span>
+    Block Button
   </button>
 </Button>
 `;
diff --git a/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap b/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
index 4b203f80115..4c49d3a998d 100644
--- a/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
+++ b/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
@@ -1264,9 +1264,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                       data-ouia-safe="true"
                       type="button"
                     >
-                      <span>
-                        Clear all filters
-                      </span>
+                      Clear all filters
                     </button>
                   </div>
                 </div>
@@ -1339,9 +1337,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                           tabIndex={null}
                           type="button"
                         >
-                          <span>
-                            Clear all filters
-                          </span>
+                          Clear all filters
                         </button>
                       </Button>
                     </div>
@@ -1523,9 +1519,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                 data-ouia-safe="true"
                 type="button"
               >
-                <span>
-                  Clear all filters
-                </span>
+                Clear all filters
               </button>
             </div>
           </div>,
@@ -1575,9 +1569,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                 tabIndex={null}
                 type="button"
               >
-                <span>
-                  Clear all filters
-                </span>
+                Clear all filters
               </button>
             </Button>
           </div>
diff --git a/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap b/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
index 04c62d16325..d25e971c7f6 100644
--- a/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
+++ b/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
@@ -347,9 +347,7 @@ exports[`Wizard should match snapshot 1`] = `
                     data-ouia-safe="true"
                     type="button"
                   >
-                    <span>
-                      Cancel
-                    </span>
+                    Cancel
                   </button>
                 </footer>
               </div>
@@ -568,9 +566,7 @@ exports[`Wizard should match snapshot 1`] = `
                     data-ouia-safe="true"
                     type="button"
                   >
-                    <span>
-                      Cancel
-                    </span>
+                    Cancel
                   </button>
                 </footer>
               </div>
diff --git a/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
index 6f8202bcb10..e5e46383f8c 100644
--- a/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
@@ -37886,9 +37886,7 @@ exports[`Compound Expandable table 1`] = `
                                 tabIndex={null}
                                 type="button"
                               >
-                                <span>
-                                  1
-                                </span>
+                                1
                               </button>
                             </Button>
                           </td>
@@ -37924,9 +37922,7 @@ exports[`Compound Expandable table 1`] = `
                                 tabIndex={null}
                                 type="button"
                               >
-                                <span>
-                                  2
-                                </span>
+                                2
                               </button>
                             </Button>
                           </td>
@@ -38377,9 +38373,7 @@ exports[`Compound Expandable table 1`] = `
                                 tabIndex={null}
                                 type="button"
                               >
-                                <span>
-                                  3
-                                </span>
+                                3
                               </button>
                             </Button>
                           </td>
@@ -38415,9 +38409,7 @@ exports[`Compound Expandable table 1`] = `
                                 tabIndex={null}
                                 type="button"
                               >
-                                <span>
-                                  4
-                                </span>
+                                4
                               </button>
                             </Button>
                           </td>