diff --git a/packages/code-studio/src/styleguide/Buttons.tsx b/packages/code-studio/src/styleguide/Buttons.tsx
index ad04aef6c1..52833b8d0e 100644
--- a/packages/code-studio/src/styleguide/Buttons.tsx
+++ b/packages/code-studio/src/styleguide/Buttons.tsx
@@ -1,8 +1,6 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React, { Component, ReactElement } from 'react';
-import classNames from 'classnames';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { ButtonOld, SocketedButton } from '@deephaven/components';
+import { Button, ButtonOld, SocketedButton } from '@deephaven/components';
 import { dhTruck } from '@deephaven/icons';
 import { sampleSectionIdAndClasses } from './utils';
 
@@ -95,37 +93,36 @@ class Buttons extends Component<Record<string, never>, ButtonsState> {
       >
         <h5>Inline Buttons</h5>
         Regular btn-inline:
-        <ButtonOld className="btn-inline mx-2">
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button className="mx-2" kind="inline" icon={dhTruck} tooltip="test" />
         Toggle button (class active):
-        <ButtonOld
-          className={classNames('btn-inline mx-2', { active: toggle })}
+        <Button
+          className="mx-2"
           onClick={() => {
             this.setState({ toggle: !toggle });
           }}
-        >
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+          active={toggle}
+          kind="inline"
+          icon={dhTruck}
+          tooltip="test"
+        />
         Disabled:
-        <ButtonOld className="btn-inline mx-2" disabled>
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button className="mx-2" kind="inline" disabled>
+          Disabled
+        </Button>
+        With Text:
+        <Button className="mx-2" kind="inline" icon={dhTruck}>
+          <span>Text Button</span>
+        </Button>
         <br />
         <br />
         <span>btn-link-icon (no text):</span>
-        <ButtonOld className="btn-link btn-link-icon px-2">
-          {/* pad and margin horizontally as appropriate for icon shape and spacing, 
-          needs btn-link and btn-link-icon classes. */}
-          <FontAwesomeIcon icon={dhTruck} />
-        </ButtonOld>
+        <Button kind="ghost" icon={dhTruck} tooltip="test" />
         <span className="mx-2">btn-link:</span>
-        <ButtonOld className="btn-link">Text Button</ButtonOld>
+        <Button kind="ghost">Text Button </Button>
         <span className="mx-2">btn-link (text w/ optional with icon):</span>
-        <ButtonOld className="btn-link">
-          <FontAwesomeIcon icon={dhTruck} />
-          Add Item
-        </ButtonOld>
+        <Button kind="ghost" icon={dhTruck}>
+          Text Button
+        </Button>
       </div>
     );
   }
diff --git a/packages/components/src/Button.tsx b/packages/components/src/Button.tsx
index 2bc454045d..9b7c8ffd7b 100644
--- a/packages/components/src/Button.tsx
+++ b/packages/components/src/Button.tsx
@@ -126,6 +126,30 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       );
     }
 
+    // Best effort backwards-compatible attempt to auto add margin to icon if text is also present
+    // We would need to audit our usage of Buttons to remove margins by classname to just add the margin to every icon button with children
+    if (iconElem != null && children != null) {
+      // check if react children contains a text node to a depth of 2
+      // to exlude poppers/menus, but not button text nested in spans
+      let containsTextNode = false;
+      React.Children.forEach(children, child => {
+        if (typeof child === 'string') {
+          containsTextNode = true;
+        } else if (React.isValidElement(child)) {
+          React.Children.forEach(child.props.children, grandchild => {
+            if (typeof grandchild === 'string') {
+              containsTextNode = true;
+            }
+          });
+        }
+      });
+      if (containsTextNode) {
+        iconElem = React.cloneElement(iconElem, {
+          className: classNames('mr-1', iconElem.props.className),
+        });
+      }
+    }
+
     let tooltipElem: JSX.Element | undefined;
     if (tooltip !== undefined) {
       tooltipElem =
@@ -180,10 +204,10 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     // disabled buttons tooltips need a wrapped element to receive pointer events
     // https://jakearchibald.com/2017/events-and-disabled-form-fields/
 
-    return disabled ? (
+    return disabled && tooltip != null ? (
       <span className="btn-disabled-wrapper">
         {button}
-        {tooltip !== undefined && tooltipElem}
+        {tooltipElem}
       </span>
     ) : (
       button
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-chromium-linux.png
index 53ca8a0b16..ce46cea979 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-firefox-linux.png
index ad4ecb243f..2378f8d77b 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-webkit-linux.png
index 864a7ccdd3..82765331b9 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-0-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-chromium-linux.png
index 691a90ec3d..43c54e3d1c 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-firefox-linux.png
index b92947bebb..3d00e4224e 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-webkit-linux.png
index 4937d33c33..65b7a3a17a 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-1-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-chromium-linux.png
index 1c04281e58..f5767d2e1f 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-firefox-linux.png
index dff0a252b1..86b68b82d7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-webkit-linux.png
index 111db26719..41af073de6 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-2-disabled-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-chromium-linux.png
index 0d8c1daf18..14c5090ae8 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-firefox-linux.png
index 2a3a96c715..5d1deac2a8 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-webkit-linux.png
index 53074d375c..6937746a36 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-3-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-chromium-linux.png
index bd988517d9..c371f62fd1 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-firefox-linux.png
index 66483e92f9..91ae44bfd4 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-webkit-linux.png
index d68d9d8bdb..d15f7f24cb 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-4-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-chromium-linux.png
index fabbcfc0ed..2c6f22cbe8 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-firefox-linux.png
index c9b9c31a8e..a39eba32e8 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-webkit-linux.png
index bbacb1939f..c6e85b2fb7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-5-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-chromium-linux.png
new file mode 100644
index 0000000000..d6fe363729
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-firefox-linux.png
new file mode 100644
index 0000000000..d4c2b1692c
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-webkit-linux.png
new file mode 100644
index 0000000000..501a8efdee
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-focus-section-2-6-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-chromium-linux.png
index 76c5bf8000..882396cbe1 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-firefox-linux.png
index 784e391583..d5e109a3f0 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-webkit-linux.png
index 8dcb47db73..07224d634d 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-0-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-chromium-linux.png
index fa454943e3..f6cc5a7fa9 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-firefox-linux.png
index 076b8f114f..2a56e89aab 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-webkit-linux.png
index 9f31ca16a2..02471345ba 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-1-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-chromium-linux.png
index 1c04281e58..f5767d2e1f 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-firefox-linux.png
index dff0a252b1..86b68b82d7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-webkit-linux.png
index 111db26719..41af073de6 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-2-disabled-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-chromium-linux.png
index 51e2be8fc6..a04962099d 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-firefox-linux.png
index 26536be8f7..d90050b2db 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-webkit-linux.png
index ce1ce4b49b..61679e39e9 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-3-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-chromium-linux.png
index 732cdae75b..7dd95d46ba 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-firefox-linux.png
index a8b6a8cde0..da7a4cf2a9 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-webkit-linux.png
index 966338487a..6373e14ca9 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-4-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-chromium-linux.png
index 0c4aa680ff..99315d21ad 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-firefox-linux.png
index 34ac6acb12..1124fe66c8 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-webkit-linux.png
index 54777a24f9..00612cc2e5 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-5-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-chromium-linux.png
new file mode 100644
index 0000000000..5447f22738
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-firefox-linux.png
new file mode 100644
index 0000000000..b44d727eb5
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-webkit-linux.png
new file mode 100644
index 0000000000..60774d70d7
Binary files /dev/null and b/tests/styleguide.spec.ts-snapshots/buttons-hover-section-2-6-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-inline-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-inline-chromium-linux.png
index 1c04281e58..f5767d2e1f 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-inline-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-inline-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-inline-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-inline-firefox-linux.png
index dff0a252b1..86b68b82d7 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-inline-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-inline-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/buttons-inline-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/buttons-inline-webkit-linux.png
index 111db26719..41af073de6 100644
Binary files a/tests/styleguide.spec.ts-snapshots/buttons-inline-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/buttons-inline-webkit-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png b/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png
index 3aa8e4b2df..0c1637d281 100644
Binary files a/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png b/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png
index 60b6ce26f9..f2a7dae444 100644
Binary files a/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png differ
diff --git a/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png b/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png
index 8700a457b1..448acdf957 100644
Binary files a/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png and b/tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png differ