diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss
index 0d560ba257a7..66e8270c5cb0 100644
--- a/packages/components/src/components/button/_button.scss
+++ b/packages/components/src/components/button/_button.scss
@@ -203,11 +203,15 @@
     @include tooltip--placement('icon', 'bottom', 'center');
   }
 
-  .#{$prefix}--btn--icon-only,
-  .#{$prefix}--btn--sm.#{$prefix}--btn--icon-only,
-  .#{$prefix}--btn--field.#{$prefix}--btn--icon-only {
+  .#{$prefix}--btn--icon-only {
+    padding-left: rem(13px);
     padding-right: rem(13px);
 
+    &.#{$prefix}--btn--tertiary {
+      padding-left: rem(15px);
+      padding-right: rem(15px);
+    }
+
     .#{$prefix}--btn__icon {
       position: static;
     }
@@ -217,6 +221,26 @@
     }
   }
 
+  .#{$prefix}--btn--field.#{$prefix}--btn--icon-only {
+    padding-left: rem(9px);
+    padding-right: rem(9px);
+
+    &.#{$prefix}--btn--tertiary {
+      padding-left: rem(11px);
+      padding-right: rem(11px);
+    }
+  }
+
+  .#{$prefix}--btn--sm.#{$prefix}--btn--icon-only {
+    padding-left: rem(5px);
+    padding-right: rem(5px);
+
+    &.#{$prefix}--btn--tertiary {
+      padding-left: rem(7px);
+      padding-right: rem(7px);
+    }
+  }
+
   .#{$prefix}--btn--danger {
     @include button-theme(
       $danger,