diff --git a/e2e/screenshots/button-thin--leading-icon.png b/e2e/screenshots/button-thin--leading-icon.png
index c0e9242b5..c70a9e7fd 100644
Binary files a/e2e/screenshots/button-thin--leading-icon.png and b/e2e/screenshots/button-thin--leading-icon.png differ
diff --git a/e2e/screenshots/button-thin--trailing-icon.png b/e2e/screenshots/button-thin--trailing-icon.png
index 313932d3f..58701da31 100644
Binary files a/e2e/screenshots/button-thin--trailing-icon.png and b/e2e/screenshots/button-thin--trailing-icon.png differ
diff --git a/e2e/screenshots/button-thin-secondary-.png b/e2e/screenshots/button-thin-secondary-.png
index 2257ff4b6..3b7de51cc 100644
Binary files a/e2e/screenshots/button-thin-secondary-.png and b/e2e/screenshots/button-thin-secondary-.png differ
diff --git a/e2e/screenshots/button-thin-tertiary-.png b/e2e/screenshots/button-thin-tertiary-.png
index f0a5ef6b2..18dc60ebb 100644
Binary files a/e2e/screenshots/button-thin-tertiary-.png and b/e2e/screenshots/button-thin-tertiary-.png differ
diff --git a/e2e/screenshots/button-thin-variant-danger-.png b/e2e/screenshots/button-thin-variant-danger-.png
index c77672b77..e0d3674b2 100644
Binary files a/e2e/screenshots/button-thin-variant-danger-.png and b/e2e/screenshots/button-thin-variant-danger-.png differ
diff --git a/e2e/screenshots/button-thin-variant-danger-secondary-.png b/e2e/screenshots/button-thin-variant-danger-secondary-.png
index fa0975b29..c1c942d48 100644
Binary files a/e2e/screenshots/button-thin-variant-danger-secondary-.png and b/e2e/screenshots/button-thin-variant-danger-secondary-.png differ
diff --git a/e2e/screenshots/button-thin-variant-error-.png b/e2e/screenshots/button-thin-variant-error-.png
index 8373186c8..629f6b24c 100644
Binary files a/e2e/screenshots/button-thin-variant-error-.png and b/e2e/screenshots/button-thin-variant-error-.png differ
diff --git a/e2e/screenshots/button-thin-variant-primary-.png b/e2e/screenshots/button-thin-variant-primary-.png
index 7751acd09..4d19564ce 100644
Binary files a/e2e/screenshots/button-thin-variant-primary-.png and b/e2e/screenshots/button-thin-variant-primary-.png differ
diff --git a/e2e/screenshots/button-variant-danger-.png b/e2e/screenshots/button-variant-danger-.png
index 54bcdff77..82859e30f 100644
Binary files a/e2e/screenshots/button-variant-danger-.png and b/e2e/screenshots/button-variant-danger-.png differ
diff --git a/e2e/screenshots/button-variant-danger-secondary-.png b/e2e/screenshots/button-variant-danger-secondary-.png
index c85102249..3d0db6bfb 100644
Binary files a/e2e/screenshots/button-variant-danger-secondary-.png and b/e2e/screenshots/button-variant-danger-secondary-.png differ
diff --git a/e2e/screenshots/button-variant-error-.png b/e2e/screenshots/button-variant-error-.png
index 9a9d15421..a5bfd8014 100644
Binary files a/e2e/screenshots/button-variant-error-.png and b/e2e/screenshots/button-variant-error-.png differ
diff --git a/e2e/screenshots/button-variant-primary-.png b/e2e/screenshots/button-variant-primary-.png
index 5186ca49a..38a62c2ea 100644
Binary files a/e2e/screenshots/button-variant-primary-.png and b/e2e/screenshots/button-variant-primary-.png differ
diff --git a/e2e/screenshots/button-variant-secondary-.png b/e2e/screenshots/button-variant-secondary-.png
index 5e1631acf..6e702b1ab 100644
Binary files a/e2e/screenshots/button-variant-secondary-.png and b/e2e/screenshots/button-variant-secondary-.png differ
diff --git a/e2e/screenshots/button-variant-tertiary-.png b/e2e/screenshots/button-variant-tertiary-.png
index 4cd1e9db2..c73d6e30c 100644
Binary files a/e2e/screenshots/button-variant-tertiary-.png and b/e2e/screenshots/button-variant-tertiary-.png differ
diff --git a/e2e/screenshots/button-wrap.png b/e2e/screenshots/button-wrap.png
new file mode 100644
index 000000000..ffba3ea1e
Binary files /dev/null and b/e2e/screenshots/button-wrap.png differ
diff --git a/e2e/screenshots/copybutton-thin-.png b/e2e/screenshots/copybutton-thin-.png
index 6609854e8..37552baf2 100644
Binary files a/e2e/screenshots/copybutton-thin-.png and b/e2e/screenshots/copybutton-thin-.png differ
diff --git a/e2e/screenshots/dark--button-thin--leading-icon.png b/e2e/screenshots/dark--button-thin--leading-icon.png
index dfcef33fc..6a46ceda7 100644
Binary files a/e2e/screenshots/dark--button-thin--leading-icon.png and b/e2e/screenshots/dark--button-thin--leading-icon.png differ
diff --git a/e2e/screenshots/dark--button-thin--trailing-icon.png b/e2e/screenshots/dark--button-thin--trailing-icon.png
index 1ef058bb7..f2ec45bc5 100644
Binary files a/e2e/screenshots/dark--button-thin--trailing-icon.png and b/e2e/screenshots/dark--button-thin--trailing-icon.png differ
diff --git a/e2e/screenshots/dark--button-thin-secondary-.png b/e2e/screenshots/dark--button-thin-secondary-.png
index bc1e47ca7..930d0d4ee 100644
Binary files a/e2e/screenshots/dark--button-thin-secondary-.png and b/e2e/screenshots/dark--button-thin-secondary-.png differ
diff --git a/e2e/screenshots/dark--button-thin-tertiary-.png b/e2e/screenshots/dark--button-thin-tertiary-.png
index f7baaa324..b21930735 100644
Binary files a/e2e/screenshots/dark--button-thin-tertiary-.png and b/e2e/screenshots/dark--button-thin-tertiary-.png differ
diff --git a/e2e/screenshots/dark--button-thin-variant-danger-.png b/e2e/screenshots/dark--button-thin-variant-danger-.png
index f4d101276..843103964 100644
Binary files a/e2e/screenshots/dark--button-thin-variant-danger-.png and b/e2e/screenshots/dark--button-thin-variant-danger-.png differ
diff --git a/e2e/screenshots/dark--button-thin-variant-danger-secondary-.png b/e2e/screenshots/dark--button-thin-variant-danger-secondary-.png
index a4c30a05e..4b2beca92 100644
Binary files a/e2e/screenshots/dark--button-thin-variant-danger-secondary-.png and b/e2e/screenshots/dark--button-thin-variant-danger-secondary-.png differ
diff --git a/e2e/screenshots/dark--button-thin-variant-error-.png b/e2e/screenshots/dark--button-thin-variant-error-.png
index 269cc3863..869fcc44e 100644
Binary files a/e2e/screenshots/dark--button-thin-variant-error-.png and b/e2e/screenshots/dark--button-thin-variant-error-.png differ
diff --git a/e2e/screenshots/dark--button-thin-variant-primary-.png b/e2e/screenshots/dark--button-thin-variant-primary-.png
index d63196121..d3a4cd946 100644
Binary files a/e2e/screenshots/dark--button-thin-variant-primary-.png and b/e2e/screenshots/dark--button-thin-variant-primary-.png differ
diff --git a/e2e/screenshots/dark--button-variant-danger-.png b/e2e/screenshots/dark--button-variant-danger-.png
index b6fc93f51..89e989d5a 100644
Binary files a/e2e/screenshots/dark--button-variant-danger-.png and b/e2e/screenshots/dark--button-variant-danger-.png differ
diff --git a/e2e/screenshots/dark--button-variant-danger-secondary-.png b/e2e/screenshots/dark--button-variant-danger-secondary-.png
index bf5b4abc7..9b9b357cc 100644
Binary files a/e2e/screenshots/dark--button-variant-danger-secondary-.png and b/e2e/screenshots/dark--button-variant-danger-secondary-.png differ
diff --git a/e2e/screenshots/dark--button-variant-error-.png b/e2e/screenshots/dark--button-variant-error-.png
index 95e1a49d7..42f5d6510 100644
Binary files a/e2e/screenshots/dark--button-variant-error-.png and b/e2e/screenshots/dark--button-variant-error-.png differ
diff --git a/e2e/screenshots/dark--button-variant-primary-.png b/e2e/screenshots/dark--button-variant-primary-.png
index 77b798040..d72d6ad25 100644
Binary files a/e2e/screenshots/dark--button-variant-primary-.png and b/e2e/screenshots/dark--button-variant-primary-.png differ
diff --git a/e2e/screenshots/dark--button-variant-secondary-.png b/e2e/screenshots/dark--button-variant-secondary-.png
index ad39561e2..4cf8eef65 100644
Binary files a/e2e/screenshots/dark--button-variant-secondary-.png and b/e2e/screenshots/dark--button-variant-secondary-.png differ
diff --git a/e2e/screenshots/dark--button-variant-tertiary-.png b/e2e/screenshots/dark--button-variant-tertiary-.png
index e170cf65d..f88277e9d 100644
Binary files a/e2e/screenshots/dark--button-variant-tertiary-.png and b/e2e/screenshots/dark--button-variant-tertiary-.png differ
diff --git a/e2e/screenshots/dark--copybutton-thin-.png b/e2e/screenshots/dark--copybutton-thin-.png
index 003a9cad4..ccd6694ae 100644
Binary files a/e2e/screenshots/dark--copybutton-thin-.png and b/e2e/screenshots/dark--copybutton-thin-.png differ
diff --git a/e2e/screenshots/dark--link-variant-button-.png b/e2e/screenshots/dark--link-variant-button-.png
index 25c5c176e..a127d9430 100644
Binary files a/e2e/screenshots/dark--link-variant-button-.png and b/e2e/screenshots/dark--link-variant-button-.png differ
diff --git a/e2e/screenshots/dark--link-variant-button-secondary-.png b/e2e/screenshots/dark--link-variant-button-secondary-.png
index 9e777af47..bc886fa6e 100644
Binary files a/e2e/screenshots/dark--link-variant-button-secondary-.png and b/e2e/screenshots/dark--link-variant-button-secondary-.png differ
diff --git a/e2e/screenshots/link-variant-button-.png b/e2e/screenshots/link-variant-button-.png
index 35f9c7135..8feb7a65a 100644
Binary files a/e2e/screenshots/link-variant-button-.png and b/e2e/screenshots/link-variant-button-.png differ
diff --git a/e2e/screenshots/link-variant-button-secondary-.png b/e2e/screenshots/link-variant-button-secondary-.png
index 9148c6307..ebf7f3607 100644
Binary files a/e2e/screenshots/link-variant-button-secondary-.png and b/e2e/screenshots/link-variant-button-secondary-.png differ
diff --git a/packages/react/src/components/Button/screenshots.e2e.tsx b/packages/react/src/components/Button/screenshots.e2e.tsx
index 0be727a02..c3da10d82 100644
--- a/packages/react/src/components/Button/screenshots.e2e.tsx
+++ b/packages/react/src/components/Button/screenshots.e2e.tsx
@@ -591,3 +591,28 @@ test('should have screenshot for Button[variant="badge"]', async ({
   await setTheme(page, 'dark');
   await expect(component).toHaveScreenshot('dark--button[variant=badge]');
 });
+test('should not wrap button contents by default', async ({ mount, page }) => {
+  await page.setViewportSize({ height: 600, width: 320 });
+  const internalText =
+    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum';
+
+  const component = await mount(
+    <div
+      className="Button-wrap"
+      style={{ display: 'flex', flexDirection: 'column', width: '320px' }}
+    >
+      <Button variant="primary">{internalText}</Button>
+      <Button variant="primary" style={{ minWidth: '10px' }}>
+        {internalText}
+      </Button>
+    </div>
+  );
+  await expect(component).toHaveScreenshot('button-wrap');
+  const buttons = component.getByRole('button');
+  const firstButton = buttons.first();
+  const firstButtonBoundingBox = await firstButton.boundingBox();
+  expect(firstButtonBoundingBox?.height).toBe(36);
+  const lastButton = buttons.last();
+  const lastButtonBoundingBox = await lastButton.boundingBox();
+  expect(lastButtonBoundingBox?.height).toBeGreaterThan(36);
+});
diff --git a/packages/styles/button.css b/packages/styles/button.css
index 900a96d80..117c8d8d7 100644
--- a/packages/styles/button.css
+++ b/packages/styles/button.css
@@ -48,13 +48,13 @@
   position: relative;
   text-align: center;
   min-height: var(--button-height);
-  min-width: 6.25rem;
   display: inline-grid;
   grid-auto-flow: column;
   align-items: center;
   justify-items: center;
   justify-content: center;
   gap: var(--space-smallest);
+  min-width: max-content;
 }
 
 .Button--tag,
@@ -268,7 +268,7 @@ button.Link {
 
 .Button--thin {
   min-height: var(--button-thin-height);
-  min-width: 6.25rem;
+  min-width: max-content;
   font-size: var(--button-thin-text-size);
   padding: 0 var(--space-small);
 }