diff --git a/package.json b/package.json
index bb6e304..386bfef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-pagoda/ui",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "description": "A React component library that implements the official NEAR design system.",
   "license": "MIT",
   "repository": {
diff --git a/src/components/Button.module.scss b/src/components/Button.module.scss
index 3a13212..96a4a44 100644
--- a/src/components/Button.module.scss
+++ b/src/components/Button.module.scss
@@ -35,10 +35,6 @@
     --button-color-border: var(--violet-9) !important;
   }
 
-  &[data-icon='true'] {
-    --button-width: calc(var(--button-height) - 2px); // Subtract border width
-  }
-
   &[data-size='x-small'] {
     --button-font: var(--text-xs);
     --button-gap: 4px;
@@ -61,6 +57,11 @@
     --button-padding-x: 24px;
   }
 
+  &[data-icon='true'] {
+    --button-width: var(--button-height);
+    --button-padding-x: 0px;
+  }
+
   &[data-variant='primary'] {
     &[data-fill='ghost'],
     &[data-fill='outline'] {