diff --git a/src/components/base/breadcrumb/breadcrumb.scss b/src/components/base/breadcrumb/breadcrumb.scss
index 44caa9a8f9681292596cabb73a8259560bf9ee5e..27623c3d17792342fadcc22e8b2f597ba9848ae3 100755
--- a/src/components/base/breadcrumb/breadcrumb.scss
+++ b/src/components/base/breadcrumb/breadcrumb.scss
@@ -48,6 +48,12 @@ $breadcrumb-max-width: $grid-size * 16;
       @apply gl-focus;
     }
   }
+
+  @if $feature-button-border {
+    .gl-new-dropdown-icon-only.gl-button.btn-icon {
+      min-height: auto;
+    }
+  }
 }
 
 .gl-breadcrumb-item:last-child > a {
diff --git a/src/components/base/breadcrumb/breadcrumb.vue b/src/components/base/breadcrumb/breadcrumb.vue
index 69a66f1642f528fc57ba79e965d8f6782a1e2c3d..60dfe466875001c7d503e6d689bf4a9324093e31 100644
--- a/src/components/base/breadcrumb/breadcrumb.vue
+++ b/src/components/base/breadcrumb/breadcrumb.vue
@@ -202,7 +202,6 @@ export default {
           no-caret
           icon="ellipsis_h"
           size="small"
-          style="height: 16px"
         />
       </li>
 
diff --git a/src/components/base/button/button.scss b/src/components/base/button/button.scss
index d676f0b7ae5c655ef830505638a70539bfd7a8d2..d65cefbfd434033d8e2d6585a82322bedc0a35fc 100644
--- a/src/components/base/button/button.scss
+++ b/src/components/base/button/button.scss
@@ -33,28 +33,51 @@
 ) {
   color: $color;
   background-color: $background-color;
-  @include gl-button-border($border-color);
+  @if $feature-button-border {
+    border-color: $border-color;
+  } @else {
+    @include gl-button-border($border-color);
+  }
 
   &:hover {
     color: $hover-color;
     background-color: $hover-background-color;
-    @include gl-button-hover-border($hover-border-color);
+    @if $feature-button-border {
+      border-color: $hover-border-color;
+    } @else {
+      @include gl-button-hover-border($hover-border-color);
+    }
   }
 
   &:focus {
     color: $focus-color;
     background-color: $focus-background-color;
-    @include gl-focus($color: $focus-border-color);
+    @if $feature-button-border {
+      border-color: $focus-border-color;
+    } @else {
+      @include gl-focus($color: $focus-border-color);
+    }
   }
 
   &:active,
   &.active {
     color: $active-color;
     background-color: $active-background-color;
-    @include gl-focus($color: $active-border-color);
+    @if $feature-button-border {
+      border-color: $active-border-color;
+    } @else {
+      @include gl-focus($color: $focus-border-color);
+    }
 
-    &:focus {
-      @include gl-focus($color: $active-border-color);
+    @if $feature-button-border {
+      :focus,
+      &:focus:active {
+        @include gl-focus;
+      }
+    } @else {
+      &:focus {
+        @include gl-focus($color: $active-border-color);
+      }
     }
   }
 }
@@ -72,23 +95,43 @@
   }
 }
 
-// double specificity to override bootstrap and reboot styling
 .gl-button.gl-button {
-  @apply gl-border-0;
   @apply gl-rounded-base;
-  @apply gl-py-3;
   @apply gl-px-4;
   background-color: var(--gl-button-default-primary-background-color-default);
   @apply gl-leading-normal;
   color: var(--gl-button-default-primary-foreground-color-default);
   @include gl-fill-current-color;
-  @include gl-button-border(var(--gl-button-default-primary-border-color-default));
   @apply gl-justify-center;
   @apply gl-items-center;
   @apply gl-text-base;
 
-  @media (forced-colors: active) {
-    border: 1px solid;
+  @if $feature-button-border {
+    @apply gl-py-0;
+    border: $gl-border-size-1 solid var(--gl-button-default-primary-border-color-default);
+    min-height: $gl-button-medium-size;
+    min-width: $gl-button-medium-size;
+    @include gl-prefers-reduced-motion-transition;
+    transition: color $gl-transition-duration-medium $gl-easing-out-cubic,
+                background-color $gl-transition-duration-medium $gl-easing-out-cubic,
+                border-color $gl-transition-duration-medium $gl-easing-out-cubic,
+                box-shadow $gl-transition-duration-medium $gl-easing-out-cubic,
+                text-decoration-color $gl-transition-duration-medium $gl-easing-out-cubic;
+  } @else {
+    @apply gl-border-0;
+    @apply gl-py-3;
+    @include gl-button-border(var(--gl-button-default-primary-border-color-default));
+  }
+
+  @if $feature-button-border {
+    &:focus,
+    &:focus:active {
+      @include gl-focus;
+    }
+  } @else {
+    @media (forced-colors: active) {
+      border: 1px solid;
+    }
   }
 
   .gl-button-text {
@@ -136,28 +179,45 @@
     &.selected {
       color: var(--gl-button-selected-foreground-color-default);
       background-color: var(--gl-button-selected-background-color-default);
-      @include gl-button-selected-border(var(--gl-button-selected-border-color-default));
+      @if $feature-button-border {
+        border-width: $gl-border-size-2;
+        border-color: var(--gl-button-selected-border-color-default);
+      } @else {
+        @include gl-button-selected-border(var(--gl-button-selected-border-color-default));
+      }
 
       &:hover {
         color: var(--gl-button-selected-foreground-color-hover);
         background-color: var(--gl-button-selected-background-color-hover);
-        @include gl-button-selected-border(var(--gl-button-selected-border-color-hover));
+        @if $feature-button-border {
+          border-color: var(--gl-button-selected-border-color-hover);
+        } @else {
+          @include gl-button-selected-border(var(--gl-button-selected-border-color-hover));
+        }
       }
 
       &:focus {
         color: var(--gl-button-selected-foreground-color-focus);
         background-color: var(--gl-button-selected-background-color-focus);
-        @include gl-button-selected-border(var(--gl-button-selected-border-color-focus), $focus-ring);
+        @if $feature-button-border {
+          border-color: var(--gl-button-selected-border-color-focus);
+        } @else {
+          @include gl-button-selected-border(var(--gl-button-selected-border-color-focus), $focus-ring);
+        }
       }
 
       &:active,
       &.active {
         color: var(--gl-button-selected-foreground-color-active);
         background-color: var(--gl-button-selected-background-color-active);
-        @include gl-button-selected-border(var(--gl-button-selected-border-color-active), $focus-ring);
-
-        &:focus {
+        @if $feature-button-border {
+          border-color: var(--gl-button-selected-border-color-active);
+        } @else {
           @include gl-button-selected-border(var(--gl-button-selected-border-color-active), $focus-ring);
+
+          &:focus {
+            @include gl-button-selected-border(var(--gl-button-selected-border-color-active), $focus-ring);
+          }
         }
       }
     }
@@ -307,7 +367,9 @@
   &.btn-success,
   &.btn-danger {
     &-tertiary {
-      @apply gl-shadow-none;
+      @if not $feature-button-border {
+        @apply gl-shadow-none;
+      }
 
       @media (forced-colors: active) {
         color: LinkText; // stylelint-disable-line scale-unlimited/declaration-strict-value
@@ -315,14 +377,16 @@
         border: 0;
       }
 
-      &:hover {
-        @apply gl-shadow-none;
-      }
+      @if not $feature-button-border {
+        &:hover {
+          @apply gl-shadow-none;
+        }
 
-      &:active,
-      &:focus,
-      &:focus:active {
-        @apply gl-focus;
+        &:active,
+        &:focus,
+        &:focus:active {
+          @apply gl-focus;
+        }
       }
     }
   }
@@ -339,25 +403,44 @@
   &.btn-success {
     color: var(--gl-color-neutral-0); // The text is white in light and dark mode
     @apply gl-bg-green-500;
-    @include gl-inset-border-1-green-600;
+    @if $feature-button-border {
+      border-color: $green-600;
+    } @else {
+      @include gl-inset-border-1-green-600;
+    }
 
     &:hover {
-      @include gl-button-hover-border($green-800);
-      background-color: $green-600;
+      @if $feature-button-border {
+        border-color: $green-800;
+        background-color: $green-600;
+      } @else {
+        @include gl-button-hover-border($green-800);
+        background-color: $green-600;
+      }
     }
 
     &:focus {
-      @include gl-focus($color: $green-800);
-      @apply gl-bg-green-600;
+      @if $feature-button-border {
+        border-color: $green-800;
+        background-color: $green-600;
+      } @else {
+        @include gl-focus($color: $green-800);
+        @apply gl-bg-green-600;
+      }
     }
 
     &:active,
     &.active {
-      @include gl-focus($color: $green-900);
       @apply gl-bg-green-700;
 
-      &:focus {
+      @if $feature-button-border {
+        border-color: $green-900;
+      } @else {
         @include gl-focus($color: $green-900);
+
+        &:focus {
+          @include gl-focus($color: $green-900);
+        }
       }
     }
   }
@@ -371,37 +454,61 @@
     @apply gl-bg-transparent;
     @apply gl-text-green-500;
     @apply gl-font-normal;
-    @include gl-inset-border-1-green-500;
+    @if $feature-button-border {
+      border-color: $green-500;
+    } @else {
+      @include gl-inset-border-1-green-500;
+    }
 
     &:hover {
-      @apply gl-text-green-700;
-      @include gl-button-hover-border($green-700);
-      background-color: $green-50;
+      @if $feature-button-border {
+        @include gl-text-green-700;
+        border-color: $green-700;
+        background-color: $green-50;
+      } @else {
+        @apply gl-text-green-700;
+        @include gl-button-hover-border($green-700);
+        background-color: $green-50;
+      }
     }
 
     &:focus {
       @apply gl-text-green-700;
-      @include gl-focus($color: $green-700);
-      @apply gl-bg-green-50;
+      @if $feature-button-border {
+        border-color: $green-700;
+        background-color: $green-50;
+      } @else {
+        @include gl-focus($color: $green-700);
+        @apply gl-bg-green-50;
+      }
     }
 
     &:active,
     &.active {
       @apply gl-text-green-900;
-      @include gl-focus($color: $green-900);
       @apply gl-bg-green-100;
-
-      &:focus {
+      @if $feature-button-border {
+        border-color: $green-900;
+      } @else {
         @include gl-focus($color: $green-900);
+
+        &:focus {
+          @include gl-focus($color: $green-900);
+        }
       }
     }
   }
 
   &.btn-sm {
-    @apply gl-py-2;
     @apply gl-px-3;
     @apply gl-leading-normal;
     @apply gl-text-base;
+    @if $feature-button-border {
+      min-height: $gl-button-small-size;
+      min-width: $gl-button-small-size;
+    } @else {
+      @apply gl-py-2;
+    }
 
     gl-emoji {
       @apply gl-text-sm;
@@ -410,53 +517,81 @@
 
   &.btn-dashed,
   &.btn-dashed-tertiary {
-    @include gl-button-border(var(--gl-button-dashed-border-color-default));
-    outline: 3px dotted var(--gl-background-color-default);
-    outline-offset: (-$gl-border-size-1);
-
-    &:hover {
-      @include gl-button-border($color: var(--gl-button-dashed-border-color-hover));
+    @if $feature-button-border {
+      border-style: dashed;
+      border-color: var(--gl-button-dashed-border-color-default);
+    } @else {
+      @include gl-button-border(var(--gl-button-dashed-border-color-default));
       outline: 3px dotted var(--gl-background-color-default);
       outline-offset: (-$gl-border-size-1);
     }
 
+    &:hover {
+      @if $feature-button-border {
+        border-color: var(--gl-button-dashed-border-color-hover);
+      } @else {
+        @include gl-button-border($color: var(--gl-button-dashed-border-color-hover));
+        outline: 3px dotted var(--gl-background-color-default);
+        outline-offset: (-$gl-border-size-1);
+      }
+    }
+
     &:focus {
-      @include gl-focus($color: var(--gl-button-dashed-border-color-focus));
-      outline: 3px dotted var(--gl-background-color-default);
-      outline-offset: (-$gl-border-size-1);
+      @if $feature-button-border {
+        border-color: var(--gl-button-dashed-border-color-focus);
+      } @else {
+        @include gl-focus($color: var(--gl-button-dashed-border-color-focus));
+        outline: 3px dotted var(--gl-background-color-default);
+        outline-offset: (-$gl-border-size-1);
+      }
     }
 
     &:active,
     &.active {
-      @include gl-focus($color: var(--gl-button-dashed-border-color-active));
-      outline: 3px dotted var(--gl-background-color-default);
-      outline-offset: (-$gl-border-size-1);
-
-      &:focus {
+      @if $feature-button-border {
+        border-color: var(--gl-button-dashed-border-color-active);
+      } @else {
         @include gl-focus($color: var(--gl-button-dashed-border-color-active));
         outline: 3px dotted var(--gl-background-color-default);
         outline-offset: (-$gl-border-size-1);
+
+        &:focus {
+          @include gl-focus($color: var(--gl-button-dashed-border-color-active));
+          outline: 3px dotted var(--gl-background-color-default);
+          outline-offset: (-$gl-border-size-1);
+        }
       }
     }
   }
 
   &.btn-icon {
-    @apply gl-p-3;
     @apply gl-leading-normal;
+    @if $feature-button-border {
+      @apply gl-p-0;
+    } @else {
+      @apply gl-p-3;
+    }
 
     .gl-button-icon {
       @apply gl-mr-0;
     }
 
-    &.btn-sm {
-      @apply gl-p-2;
+    @if not $feature-button-border {
+      &.btn-sm {
+        @apply gl-p-2;
+      }
     }
   }
 
   &.button-ellipsis-horizontal,
   &.button-ellipsis-horizontal.btn-sm {
-    @apply gl-py-0;
     @apply gl-px-2;
+    @if $feature-button-border {
+      min-height: auto;
+      min-width: auto;
+    } @else {
+      @apply gl-py-0;
+    }
 
     svg {
       @apply gl-h-5;
@@ -480,25 +615,43 @@
     @apply gl-text-base;
     @apply gl-leading-normal;
     color: var(--gl-button-link-text-color-default);
-    @apply gl-py-0;
-    @apply gl-px-0;
-    @apply gl-shadow-none;
+    @if $feature-button-border {
+      @include gl-px-0;
+      min-height: auto;
+      min-width: auto;
+      text-decoration-thickness: auto;
+      text-decoration-style: solid;
+      text-decoration-color: transparent;
+    } @else {
+      @apply gl-py-0;
+      @apply gl-px-0;
+      @apply gl-shadow-none;
+    }
 
     &:hover {
       @apply gl-bg-transparent;
       color: var(--gl-button-link-text-color-hover);
+      @if $feature-button-border {
+        text-decoration-color: var(--gl-button-link-text-color-hover);
+      }
     }
 
     &:active {
       color: var(--gl-button-link-text-color-active);
-      @apply gl-underline;
+      @if $feature-button-border {
+        text-decoration-color: var(--gl-button-link-text-color-active);
+      } @else {
+        @apply gl-underline;
+      }
     }
 
     &:active,
     &:focus,
     &:focus:active {
       @apply gl-bg-transparent;
-      @apply gl-focus;
+      @if not $feature-button-border {
+        @apply gl-focus;
+      }
     }
 
     &.disabled,
@@ -529,9 +682,13 @@
   &[disabled].selected {
     background-color: var(--gl-button-disabled-background-color);
     color: var(--gl-button-disabled-foreground-color);
-    @include gl-button-border(var(--gl-button-disabled-border-color));
     opacity: 1;
     cursor: not-allowed !important;
+    @if $feature-button-border {
+      border-color: var(--gl-button-disabled-border-color);
+    } @else {
+      @include gl-button-border(var(--gl-button-disabled-border-color));
+    }
   }
 
   &.disabled[class*='-tertiary'],
diff --git a/src/components/base/dropdown/dropdown.scss b/src/components/base/dropdown/dropdown.scss
index 78464cc005ade16dc81e78f13c1013b1e88bb270..bd4ae27a88c4dad16e34371f718a0abb9752723f 100644
--- a/src/components/base/dropdown/dropdown.scss
+++ b/src/components/base/dropdown/dropdown.scss
@@ -109,11 +109,21 @@
       margin-left: -1px;
     }
 
-    &.gl-button {
-      @apply gl-px-3;
+    @if $feature-button-border {
+      &.gl-button {
+        @apply gl-px-0;
 
-      &.btn-sm {
-        @apply gl-px-2;
+        &.btn-sm {
+          @apply gl-px-0;
+        }
+      }
+    } @else {
+      &.gl-button {
+        @apply gl-px-3;
+
+        &.btn-sm {
+          @apply gl-px-2;
+        }
       }
     }
   }
@@ -170,6 +180,12 @@
   }
 
   .dropdown-icon-only {
+    @if $feature-button-border {
+      &.dropdown-toggle-no-caret {
+        padding: 0 !important;
+      }
+    }
+
     .dropdown-icon,
     .gl-button-icon.gl-button-icon {
       @apply gl-mr-0;
diff --git a/src/components/base/label/label.scss b/src/components/base/label/label.scss
index d3f093628d793ea4f603b7b13ab4629995931ab8..4c8ae3fa75ccd10545d1c990efc26a29e8613851 100644
--- a/src/components/base/label/label.scss
+++ b/src/components/base/label/label.scss
@@ -74,6 +74,11 @@ $label-padding-horizontal-half: 0.375 * $grid-size;
     @apply gl-rounded-full;
     @apply gl-shadow-none;
 
+    @if $feature-button-border {
+      min-height: auto !important;
+      min-width: auto !important;
+    }
+
     &:focus,
     &:active {
       @apply gl-focus;
diff --git a/src/components/base/new_dropdowns/base_dropdown/base_dropdown.spec.js b/src/components/base/new_dropdowns/base_dropdown/base_dropdown.spec.js
index d35437377e55fda87e7c33841a35f2b134487bb2..5cf33f3fabbfe43f9de4d31c4f4b698e5e926439 100644
--- a/src/components/base/new_dropdowns/base_dropdown/base_dropdown.spec.js
+++ b/src/components/base/new_dropdowns/base_dropdown/base_dropdown.spec.js
@@ -257,7 +257,7 @@ describe('base dropdown', () => {
 
   describe.each`
     props                                                            | toggleClasses
-    ${{}}                                                            | ${['gl-new-dropdown-caret-only']}
+    ${{}}                                                            | ${['gl-new-dropdown-caret-only', 'btn-icon']}
     ${{ toggleText: 'toggleText' }}                                  | ${[]}
     ${{ icon: 'close' }}                                             | ${['gl-new-dropdown-icon-only', 'btn-icon']}
     ${{ icon: 'close', toggleText: 'toggleText', textSrOnly: true }} | ${['gl-new-dropdown-icon-only', 'btn-icon']}
diff --git a/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue b/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue
index c3c443aed16e2ba67b7f0931de8a72e3a0ffb225..08f5a925f8f18b742dd96f5cccdadfd0e137ee2d 100644
--- a/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue
+++ b/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue
@@ -174,6 +174,9 @@ export default {
     isIconOnly() {
       return Boolean(this.icon && this.hasNoVisibleToggleText);
     },
+    isEllipsisButton() {
+      return this.isIconOnly && this.icon === 'ellipsis_h';
+    },
     isCaretOnly() {
       return !this.noCaret && !this.icon && this.hasNoVisibleToggleText;
     },
@@ -190,9 +193,10 @@ export default {
         this.toggleClass,
         {
           'gl-new-dropdown-toggle': true,
-          'gl-new-dropdown-icon-only btn-icon': this.isIconOnly,
+          'button-ellipsis-horizontal': this.isEllipsisButton,
+          'gl-new-dropdown-icon-only btn-icon': this.isIconOnly && !this.isEllipsisButton,
           'gl-new-dropdown-toggle-no-caret': this.noCaret,
-          'gl-new-dropdown-caret-only': this.isCaretOnly,
+          'gl-new-dropdown-caret-only btn-icon': this.isCaretOnly,
         },
       ];
     },
diff --git a/src/components/base/new_dropdowns/dropdown.scss b/src/components/base/new_dropdowns/dropdown.scss
index 5d29b6e4cdc22e4a2d65ebc68f764be77ffb4841..428581dcb25993f7cbaf49182c56f7bd647a3ec5 100644
--- a/src/components/base/new_dropdowns/dropdown.scss
+++ b/src/components/base/new_dropdowns/dropdown.scss
@@ -51,7 +51,7 @@
 
   .gl-new-dropdown-toggle {
     // optically align the caret
-    &.gl-button:not(.gl-new-dropdown-toggle-no-caret) {
+    &.gl-button:not(.gl-new-dropdown-toggle-no-caret, .btn-icon) {
       @apply gl-pr-3;
 
       &.btn-sm {
@@ -67,6 +67,10 @@
   .gl-new-dropdown-toggle {
     .gl-button-text {
       @apply gl-inline-flex;
+
+      &:has(.gl-sr-only) {
+        width: auto;
+      }
     }
   }
 
@@ -85,7 +89,7 @@
     }
   }
 
-  .gl-button .gl-button-icon.gl-new-dropdown-chevron {
+  .gl-button:not(.gl-new-dropdown-caret-only) .gl-button-icon.gl-new-dropdown-chevron {
     @apply gl-ml-2;
     @apply gl-mr-0;
   }
@@ -94,6 +98,7 @@
     // optically align the caret
     &.gl-button:not(.gl-new-dropdown-toggle-no-caret) {
       @apply gl-pr-2;
+      @apply gl-pl-3;
 
       &.btn-sm {
         @apply gl-pr-0;
diff --git a/src/components/base/new_dropdowns/listbox/listbox.vue b/src/components/base/new_dropdowns/listbox/listbox.vue
index 34e8a55f4285eac2151ebe162b95a4af986ac6c4..ca0a3ab7fd6958bb664583a46bfdd934a1fb09e5 100644
--- a/src/components/base/new_dropdowns/listbox/listbox.vue
+++ b/src/components/base/new_dropdowns/listbox/listbox.vue
@@ -793,7 +793,8 @@ export default {
       <gl-button
         v-if="showResetButton"
         category="tertiary"
-        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-shrink-0 gl-text-ellipsis !gl-px-2 !gl-py-2 !gl-text-sm focus:!gl-shadow-inner-2-blue-400"
+        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-shadow-inner-2-blue-400"
+        size="small"
         data-testid="listbox-reset-button"
         @click="onResetButtonClicked"
       >
@@ -802,7 +803,8 @@ export default {
       <gl-button
         v-if="showSelectAllButton"
         category="tertiary"
-        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-shrink-0 gl-text-ellipsis !gl-px-2 !gl-py-2 !gl-text-sm focus:!gl-shadow-inner-2-blue-400"
+        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-shadow-inner-2-blue-400"
+        size="small"
         data-testid="listbox-select-all-button"
         @click="onSelectAllButtonClicked"
       >
diff --git a/src/components/base/search_box_by_click/search_box_by_click.scss b/src/components/base/search_box_by_click/search_box_by_click.scss
index 4d679667b710277dc14d7ea37ddd5ffc8ae6a980..4fda36e58ddfb8609e93d2b7c347beb866adf055 100644
--- a/src/components/base/search_box_by_click/search_box_by_click.scss
+++ b/src/components/base/search_box_by_click/search_box_by_click.scss
@@ -4,14 +4,23 @@
   .gl-search-box-by-click-history > .gl-button {
     padding-left: $gl-spacing-scale-4 !important;
     padding-right: $gl-spacing-scale-3 !important;
-    @apply gl-border-none;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    @apply gl-shadow-inner-1-gray-400;
+
+    @if $feature-button-border {
+      border-color: var(--gl-border-color-strong);
+    } @else {
+      @apply gl-border-none;
+      @include gl-inset-border-1-gray-400;
+    }
   }
 
   .gl-search-box-by-click-search-button.gl-button:not(:disabled) {
-    @apply gl-shadow-inner-1-gray-400;
+    @if $feature-button-border {
+      border-color: var(--gl-border-color-strong);
+    } @else {
+      @include gl-inset-border-1-gray-400;
+    }
   }
 
   .gl-search-box-by-click-input {
diff --git a/src/components/base/segmented_control/segmented_control.scss b/src/components/base/segmented_control/segmented_control.scss
index 2b136c46be6bfa6aa74f08036c3a1a6ae441be2d..5a351e675039aa46ca7d8c0b5093e96b3e9a467d 100644
--- a/src/components/base/segmented_control/segmented_control.scss
+++ b/src/components/base/segmented_control/segmented_control.scss
@@ -27,67 +27,95 @@
   }
 }
 
-.gl-segmented-control {
-  label:not(.disabled) {
-    @apply gl-cursor-pointer;
-  }
+@if $feature-button-border {
+  .gl-segmented-control {
+    label:not(.disabled) {
+      @apply gl-cursor-pointer;
+    }
 
   .btn-gl-segmented-button {
     @apply gl-text-base;
     @apply gl-leading-normal;
     @apply gl-text-gray-900;
     @include gl-fill-current-color;
-    @apply gl-bg-gray-10;
-    @include gl-inset-border-y-1-gray-200;
+    @include gl-bg-gray-10;
+    border-color: $gray-200;
 
-    &:first-child {
-      @include gl-btn-gl-segmented-button-first;
-    }
-
-    &:last-child {
-      @include gl-btn-gl-segmented-button-last;
-    }
-
-    &:hover {
-      @include gl-inset-border-2-gray-400;
-      @apply gl-bg-gray-50;
-    }
-
-    &.focus {
-      @apply gl-z-1;
-      @include gl-btn-gl-segmented-button-focus($gray-400);
-      @apply gl-bg-gray-50;
-    }
+      &:not(:first-child) {
+        border-left-color: transparent;
+      }
 
-    &.active {
-      @apply gl-z-2;
-      @include gl-inset-border-2-gray-300;
-      @apply gl-bg-white;
+      &:not(:last-child) {
+        border-right-color: transparent;
+      }
 
       &:hover {
-        @include gl-inset-border-2-gray-400;
-        @apply gl-bg-gray-50;
+        border-color: $gray-400;
+        @include gl-bg-gray-50;
       }
 
-      &.focus,
-      &.focus:hover {
-        @include gl-btn-gl-segmented-button-focus($gray-400);
-        @apply gl-bg-gray-50;
+      &.focus {
+        @include gl-z-index-1;
+        border-color: $gray-400;
+        @include gl-focus;
+        @include gl-bg-gray-50;
+      }
+
+      &.active {
+        @include gl-z-index-2;
+        border-color: $gray-400;
+        @include gl-inset-border-1-gray-400;
+        @include gl-bg-white;
+
+        &:hover {
+          @include gl-inset-border-1-gray-400;
+          @include gl-bg-gray-50;
+        }
+
+        &.focus,
+        &.focus:hover {
+          border-color: $gray-400;
+          @include gl-focus;
+          @include gl-bg-gray-50;
+        }
       }
-    }
 
     &:focus-within {
       @apply gl-focus;
     }
 
-    &.disabled,
-    &[disabled],
-    &.disabled:hover,
-    &[disabled]:hover {
-      @apply gl-text-gray-400;
+      &.disabled,
+      &[disabled],
+      &.disabled:hover,
+      &[disabled]:hover {
+        @include gl-text-gray-400;
+        border-color: $gray-200;
+        @include gl-z-index-0;
+        @include gl-cursor-not-allowed;
+
+        &:first-child {
+          border-right-color: transparent;
+        }
+
+        &:last-child {
+          border-left-color: transparent;
+        }
+      }
+    }
+  }
+} @else {
+  .gl-segmented-control {
+    label:not(.disabled) {
+      @include gl-cursor-pointer;
+    }
+
+    .btn-gl-segmented-button {
+      @include gl-font-base;
+      @include gl-line-height-normal;
+      @include gl-text-gray-900;
+      @include gl-fill-current-color;
+      @include gl-bg-gray-10;
       @include gl-inset-border-y-1-gray-200;
-      @apply gl-z-0;
-      @apply gl-cursor-not-allowed;
 
       &:first-child {
         @include gl-btn-gl-segmented-button-first;
@@ -96,6 +124,56 @@
       &:last-child {
         @include gl-btn-gl-segmented-button-last;
       }
+
+      &:hover {
+        @include gl-inset-border-2-gray-400;
+        @include gl-bg-gray-50;
+      }
+
+      &.focus {
+        @include gl-z-index-1;
+        @include gl-btn-gl-segmented-button-focus($gray-400);
+        @include gl-bg-gray-50;
+      }
+
+      &.active {
+        @include gl-z-index-2;
+        @include gl-inset-border-2-gray-300;
+        @include gl-bg-white;
+
+        &:hover {
+          @include gl-inset-border-2-gray-400;
+          @include gl-bg-gray-50;
+        }
+
+        &.focus,
+        &.focus:hover {
+          @include gl-btn-gl-segmented-button-focus($gray-400);
+          @include gl-bg-gray-50;
+        }
+      }
+
+      &:focus-within {
+        @include gl-focus;
+      }
+
+      &.disabled,
+      &[disabled],
+      &.disabled:hover,
+      &[disabled]:hover {
+        @apply gl-text-gray-400;
+        @include gl-inset-border-y-1-gray-200;
+        @apply gl-z-0;
+        @apply gl-cursor-not-allowed;
+
+        &:first-child {
+          @include gl-btn-gl-segmented-button-first;
+        }
+
+        &:last-child {
+          @include gl-btn-gl-segmented-button-last;
+        }
+      }
     }
   }
 }
diff --git a/src/scss/storybook.scss b/src/scss/storybook.scss
index 7b866b7758b8ea15484ee1cfe59f4af431cd4d91..c619f113746eb3948e85f48678c06aac1f8a6172 100644
--- a/src/scss/storybook.scss
+++ b/src/scss/storybook.scss
@@ -1,3 +1,7 @@
+// Enables feature flag for GlButton border migration
+// to see in Storybook the expected new styles
+$feature-button-border: true;
+
 @import 'tokens';
 
 @import 'functions';
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index 844e81645424f1244765c76b80ea6d14f81f94fe..7bd1e5d6db33693dc791a947921fad1f60e9dd16 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -207,6 +207,10 @@ $gl-border-radius-6: $gl-spacing-scale-6;
 $gl-border-radius-7: $gl-spacing-scale-7;
 $gl-border-radius-full: 50%;
 
+// component height
+$gl-button-small-size: px-to-rem(24px);
+$gl-button-medium-size: px-to-rem(32px);
+
 // transition parameters
 $gl-transition-duration-slow: 0.4s;
 $gl-transition-duration-medium: 0.2s;
@@ -328,3 +332,6 @@ $popover-arrow-color: $popover-bg;
 $popover-arrow-outer-color: $gray-100;
 
 $tooltip-opacity: 1;
+
+// Feature flag for GlButton border migration
+$feature-button-border: false !default;
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-alert-undismissible-danger-with-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-alert-undismissible-danger-with-actions-1-snap.png
index fff12339e9d98106dcc66c3e106088586f6b6371..69b71b48385eed7ad0d38c5f1986361c7cf85b3c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-alert-undismissible-danger-with-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-alert-undismissible-danger-with-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-avatar-labeled-with-default-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-avatar-labeled-with-default-slot-1-snap.png
index e07f461327c7da6f056d4aa3b0c20aded5066136..dda80c7865e0487067bfa3363bdc634e8ea31c9c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-avatar-labeled-with-default-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-avatar-labeled-with-default-slot-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-default-1-snap.png
index c26168cf7aa0327c929b6070d95d035aa8547183..f4211314bc4e5f57086e12e16af23c0405d0b9c9 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-introduction-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-introduction-1-snap.png
index 77eb8e2bd0da4cfe01f9425a54aa1a0735938689..5123dc1764c9dc0c7f3eaa972da01822bcddce10 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-introduction-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-introduction-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-no-image-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-no-image-1-snap.png
index 5a724296d7f0e4dd4463df5780d5aa95f17f9f95..ba5a04b9387f5501692551ea02cb81849c4ae98f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-no-image-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-no-image-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-with-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-with-actions-1-snap.png
index 5dfd5cad62a9654c4482821a2e173e58906d9456..20f8e5501da957864f7a610501352ca9b6b84a7d 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-with-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-banner-with-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-breadcrumb-collapsed-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-breadcrumb-collapsed-items-1-snap.png
index 4ceb07e170a3d8a0acea934571a7b76af7eb2942..65384831900360bd193fce6937df57ac8eb77871 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-breadcrumb-collapsed-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-breadcrumb-collapsed-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-all-variants-and-categories-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-all-variants-and-categories-1-snap.png
index a70fdf491f1c9ee2cbfb72d364e44fcaa813f842..d160ca230a5005afa69e47e5259f7493b4bcd788 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-all-variants-and-categories-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-all-variants-and-categories-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badge-with-sr-only-text-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badge-with-sr-only-text-1-snap.png
index 6754b186f5123d01a5b0ade40ac0f5d3e3a614d0..27d092c3df82379fc3b8ab2f7f247dd92d00590b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badge-with-sr-only-text-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badge-with-sr-only-text-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badges-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badges-1-snap.png
index 9c034f72c0a877774223f4a0e0f68df76df5c642..71a580488ee61e1692a0128740101bb425553271 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badges-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-badges-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-borderless-tertiary-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-borderless-tertiary-1-snap.png
index 5ee924298fbaf5712b72d51e88d38427c10de16d..0b77611c7e5d79e5b8a5897834a6c8589c0bf4b1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-borderless-tertiary-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-borderless-tertiary-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-default-1-snap.png
index 099fe098a9581f1fa84aa1d40e5b9f5c3e85e318..9d3f209b75f0f52e7719597b6667d2fd4220c47f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-button-1-snap.png
index 990d0d97c915edfef0987ed28f97625fcaaabdd7..a5e07ca59e6c0596e054e6f860aa768a102e0561 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-button-1-snap.png
index a73c8debfee77149d53efbc6ee58316faaf2600f..a2d9517a97a10254d5dcf0c79a9aa1ed56fb0134 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-only-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-only-button-1-snap.png
index 8761f14649ed6cf4ba1bb4785b7f4e0032741be6..5fc744fd60d8ef71ded2b39108934160b9c95ccf 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-only-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-only-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-split-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-split-button-1-snap.png
index 31461d82b362c3162e15c8ccdd484bf8839a3d91..9a401a4ebd4d2e37943e1b5621f7ea789895992c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-split-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-split-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-text-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-text-button-1-snap.png
index 756d5fe200472c46e3f1c569b822197230bf4525..c604c6dc7f4d4e592f8a3d35d40bdd367bd69d3c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-text-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-icon-text-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-loading-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-loading-button-1-snap.png
index 412450ccd1af925c5a37baa1c7e1585dcc69ddd6..86b470e910e96b4c51d2764e15a442bceca07aa2 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-loading-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-loading-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-split-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-split-button-1-snap.png
index 59e3358333938792764a1e00c929c7041f4228c5..15941fc2c6d0eb8a1bcab286bcef7e2eec89dbb2 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-split-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-dropdown-split-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-ellipsis-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-ellipsis-1-snap.png
index ea23b699ead6397f34caaba0a8280bbb7bebdebc..2a34b2f013f327c1b53c403c26d2b19cf5f0b579 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-ellipsis-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-ellipsis-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-emojis-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-emojis-1-snap.png
index ba47ca3e23959202cabf4bc400f1367ffac2b9ad..e03e84c4ee0f09f8d33c73179e690c6bd667352a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-emojis-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-emojis-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-default-1-snap.png
index 34e7c6937d139b0d8c717f5b1b8ed0850e175490..ffe52af42b286893278a3b72487d419a0be7acad 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-split-dropdowns-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-split-dropdowns-1-snap.png
index f57f90f89dd318c0ae30b9d69dfd57d2d3ef8355..f52e4f875e563929fd2950bf6bbedf68f2ba4da9 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-split-dropdowns-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-group-split-dropdowns-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-1-snap.png
index 1730ed6cf013edd94397b0657783cad466f6f771..42b7bc38b13dd34a1a5ebe36ee0d270faba55327 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-with-overflowed-text-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-with-overflowed-text-1-snap.png
index 16347360259cddb89263ff8dc3fb01002693187e..8f26f25005e07237981215b971c8d54aec2b6926 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-with-overflowed-text-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-icon-button-with-overflowed-text-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-label-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-label-button-1-snap.png
index 01c55c92b42719d82a9cfcf1e2d2bf656d3b0266..e85e1cb720101767f046af25bb7f10dbdba06091 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-label-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-label-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-link-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-link-button-1-snap.png
index a4b2c8e6948dc490a14aaddce941092ad35a1b7f..9768932cb56f237fb1f09599603091c945a64d9b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-link-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-link-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-loading-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-loading-button-1-snap.png
index 0294881bbb3e5573fd27548d84661a1c5d2b9a78..0fc239fa5af49463c797aa07b44b13706189793a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-loading-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-loading-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-sizes-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-sizes-1-snap.png
index fbe7ea078b933f35640090c3606119821f7b6b97..bcfa491a69f276d143b9147a9adf7bdf7fc19a20 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-sizes-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-button-sizes-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-collapse-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-collapse-default-1-snap.png
index 914b3df6e6a9aede785b69b907095d35e8fca839..d1931062c2bb8a70f96ae5db339bce6ed6ef8108 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-collapse-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-collapse-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-default-1-snap.png
index 5115aa630050bc28448c03b14ae253b7bf6d64aa..f64a14244085f0f4aabf5b06e9d4fbbe2109debf 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sidebar-variant-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sidebar-variant-1-snap.png
index cd590cedaf160a6e1e40fa217a43b0a81dd9ba48..fcf1e7181356bc5e03fc7655e173a7b2b6018e1e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sidebar-variant-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sidebar-variant-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sticky-header-footer-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sticky-header-footer-1-snap.png
index 3f1559d5db063af8bed3f3af300b79640d9a5072..2adb38fab6cc53a5c3b21f69d9f1372cf4f08f3a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sticky-header-footer-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-sticky-header-footer-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-actions-1-snap.png
index 8855d5f0ec773f0df97490bab0ae957b857f1650..aca53c676fd85686c99993b2803cd4ac3c1c5d7f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-scrim-and-static-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-scrim-and-static-content-1-snap.png
index 1a8b39a02596edf329fa4782087ac2106aef9c45..36540f94617a06b8b163fab1c39a231d74f8a88f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-scrim-and-static-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-scrim-and-static-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-1-snap.png
index 3f1559d5db063af8bed3f3af300b79640d9a5072..2adb38fab6cc53a5c3b21f69d9f1372cf4f08f3a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-short-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-short-content-1-snap.png
index 7323afb2ea496719f5b4c456318bce23f57c4f3d..1e9e23582d87738943e28db70eb5b3fb09985ae1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-short-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-drawer-with-sticky-footer-short-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-groups-and-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-groups-and-items-1-snap.png
index ad997eb9bc41e8b38975db0323fa289a6b006ce4..517b19166f269babe1e86d5267667aa380ca763e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-groups-and-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-groups-and-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-list-item-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-list-item-1-snap.png
index 583e497129759c550902d1c6b82f398636c1ee45..0db8e9d68724f7eee5ee3ea7936c4640c382d8c1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-list-item-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-custom-list-item-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-default-1-snap.png
index 951f7264994baa22e437d47c6021f2d0b1319894..f0a25ea2545651829bcc2102954dbfbfe63fe86b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-group-without-label-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-group-without-label-1-snap.png
index 1645719e6cf9fa1db73e723782f5005464d84842..adf393e6b010f70afbd682f3cfaeddb2cf7fd554 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-group-without-label-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-group-without-label-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-groups-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-groups-1-snap.png
index 581648cdd815869855393898701929ae422f4b25..faae090279b3e12700724f289f5d69fff58c2165 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-groups-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-groups-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-actions-1-snap.png
index 7f25a5caf2edfbff78ca417d7a105c8703ba75a7..341109dc597d062424dc1483fdc537556008c3d3 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-and-footer-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-and-footer-1-snap.png
index eff1dec271fd3a6c23f62f93f7eb2846ea5f87f1..76c2650989f3496f163a3867b7c9ba60603038f5 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-and-footer-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-header-and-footer-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-1-snap.png
index 1959af7560cb4550a30ff7c601a0752dd83bac7a..03924cc6a9f8369994b4f8ae9be1e570d697326d 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-groups-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-groups-1-snap.png
index d319e50dff8cf574b60410df2422d320cfaf225d..2c3ba2d086ceb9f5af2a6b787781e77171cc1f35 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-groups-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-searchable-groups-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-with-long-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-with-long-content-1-snap.png
index ec6764ee94d54c5a3864588782d6dd39cc8a74d0..a22bcdc0761438f1596c8e4dca39eb6c27a777c0 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-with-long-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-collapsible-listbox-with-long-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-default-1-snap.png
index 5dfc702f9488cc98bf3b38d7126767bef63f82da..5e02ee8233cbcf43e6a67b5d0be745917c132a07 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-full-width-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-full-width-1-snap.png
index c03148ebd3fba1daade2d18aa41345a2d5e389b8..02879c52ad9dce7d6b972ede2338d306dca60750 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-full-width-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-full-width-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-icon-only-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-icon-only-1-snap.png
index 2bb3b7c868cdcf22e57ef60865747ca83afbfc5e..9faa9e7af6fa95e8394a995ce47d5c3edd4439b6 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-icon-only-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-icon-only-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-on-right-edge-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-on-right-edge-1-snap.png
index 6b13eb1c37e9fccc1dfcdae5032af77e6e1cdb45..d31ad9a1772f62e43714950b8be3151800a35651 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-on-right-edge-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-on-right-edge-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-secondary-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-secondary-1-snap.png
index f7cabfb89912c256a31e0a211213b52085dce759..68354abcb8a28d20793b40b9692cb8d76d3ac58b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-secondary-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-secondary-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-avatar-and-secondary-text-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-avatar-and-secondary-text-1-snap.png
index a59c77bbb9fe93e282748de2424ca4ad4444474d..9a1feddd8e25cb8897be29a33e14a7efe39390a1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-avatar-and-secondary-text-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-avatar-and-secondary-text-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-checked-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-checked-items-1-snap.png
index 4ce9b6d06a13bc389f5d555f4363c5540ba5eb2b..a03b08e3e8e7f73fb0be6ed723b4f063773d2c23 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-checked-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-checked-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-clear-all-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-clear-all-1-snap.png
index 4069fc9b1a6ab09ba5af46a1d5b49bb27c97f5e9..370b4a754d9f34e70f1b885420cf283d47625a1d 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-clear-all-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-clear-all-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-divider-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-divider-1-snap.png
index 8df11d1137ff587640b473957ad64f8b026ea605..ece30abd95636b1c41f927b73bd025e500715f0d 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-divider-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-divider-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-form-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-form-1-snap.png
index 54fada05da9a8af102a61de5247432a0e49539d4..68e481520dad169a1285a61afd402044b960b12f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-form-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-form-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-header-and-footer-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-header-and-footer-1-snap.png
index 915681871c3339e695e0b15c1797980e3ae84dea..6e9fd70aed84c3186dd66bcb4a04474b6cb4b205 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-header-and-footer-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-header-and-footer-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-highlighted-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-highlighted-items-1-snap.png
index fc8a1b7d51b552d1ba13a79e143642a3e1149cfa..01acdd3579ebdf16b99c36142577e53c1ecff267 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-highlighted-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-highlighted-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-icons-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-icons-1-snap.png
index 2dcc9f1e5315d5519576c89c59389eb5eaa51fa7..76edc2ca78c63ce792fd30c6cd149b8247e8e607 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-icons-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-icons-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-item-text-that-does-not-wrap-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-item-text-that-does-not-wrap-1-snap.png
index 35e0dfeae5c4795c8a037c08a83cffcfc943ec0e..e61d4b149d723e01ef46e89563590eba7e5040c1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-item-text-that-does-not-wrap-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-item-text-that-does-not-wrap-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-loading-state-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-loading-state-1-snap.png
index 412450ccd1af925c5a37baa1c7e1585dcc69ddd6..86b470e910e96b4c51d2764e15a442bceca07aa2 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-loading-state-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-loading-state-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-long-text-and-narrow-width-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-long-text-and-narrow-width-1-snap.png
index 0940ab5c1af90b176a47ff69a9c1add071c7f0e0..7ff7535a5d6d41426c58f330f6d64f0746f88da0 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-long-text-and-narrow-width-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-long-text-and-narrow-width-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-section-header-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-section-header-1-snap.png
index c73c047747eb98bce692e1a05846cf21e84fd461..d7bb8918040950f27890642698043dd25ba772e5 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-section-header-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-section-header-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-short-text-and-wide-width-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-short-text-and-wide-width-1-snap.png
index 1eebafabcd7f2683561dfad6fd12045cd4dcc7f2..8b30bf30a30802fef5a19ce68702cbd8a24c7242 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-short-text-and-wide-width-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-deprecated-with-short-text-and-wide-width-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-groups-and-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-groups-and-items-1-snap.png
index c4afca7bc2126c1619d40b08c4555a2ea58fab5b..145939541a0378e14328f17d86ab39e1605746f5 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-groups-and-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-groups-and-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-list-item-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-list-item-1-snap.png
index 9a83fb2ee6fcc3dad6f8a0787112bd3b2f6ebd82..b76cf99a2c227f1c36ac3d9e1f4822833edcaf2c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-list-item-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-custom-list-item-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-groups-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-groups-1-snap.png
index da47e80636ecade5a162917f4cbf56f6fcbbb93c..8abb7100754fd06819e3f26600f9aed0ede97d71 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-groups-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-groups-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-miscellaneous-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-miscellaneous-content-1-snap.png
index cbadc9b28c05a3e60f370d1439bc5a52ece6d497..b419855301c78af15e37e565e60d10c6080dd75e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-miscellaneous-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-dropdown-disclosure-dropdown-miscellaneous-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-filtered-search-with-history-items-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-filtered-search-with-history-items-1-snap.png
index 518d58f13731303e8643deefb25d9c135663c107..04551c51f1adecdaab5b71c0e5c6e9f6351ab082 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-filtered-search-with-history-items-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-filtered-search-with-history-items-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-default-1-snap.png
index ef766f72920a03e6bae3f87d622512671096c963..7a2a3d97ccd6255ae452e85f60a4a04b0c8b1af6 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-fields-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-fields-default-1-snap.png
index 658eb3e969c1bf61246df16694531691fea60df7..13039c46f46799f0e5c0590435c45a3672675a1e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-fields-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-fields-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-input-group-predefined-options-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-input-group-predefined-options-1-snap.png
index c86ba6a31f39c18b49d795e77d3a96ffcd03bea2..5b8b1d4b6659b1c4dcdc4911d5b96f867b5b7b1e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-input-group-predefined-options-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-form-form-input-group-predefined-options-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-default-1-snap.png
index e2e102f3160701caff14dc97790d7bac2c0ab380..15f364a5c888d0899e77ec9172d75eedbf6445eb 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-events-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-events-1-snap.png
index cecdf3957d2a02a3a3538a6357feadf4d2c97730..19d6ae8c2a033dab3a0d0a10143d41ba00fd8a82 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-events-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-keyset-pagination-events-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-default-1-snap.png
index 0c72cd11cbbaa1216f194df20b909e28bba96e0d..43adda8c5eecca56b48fb0aa271efedca4547e69 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-a-header-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-a-header-1-snap.png
index 1b1810e538f75b526ee2e50a51d8ea5409234760..de98a541d6d2735774ada53a1cbc1e1bfea8a432 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-a-header-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-a-header-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-scrolling-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-scrolling-content-1-snap.png
index 264f326dfdcd423a43655608aa804c8085dba020..44b1f1c4fd240c7f77aac6b8998b158eef9ebc0a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-scrolling-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-with-scrolling-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-a-footer-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-a-footer-1-snap.png
index ed81159271d3551eca2a3d0db9ac5ae945dae60f..41a34d6b1982dd6318b8584f86b6ed95da0eb2c1 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-a-footer-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-a-footer-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-focus-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-focus-1-snap.png
index 8280cd74ea4261918991539e232e76fc16b55850..5bb35388b13864f5062e265a253e9cd258aa6629 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-focus-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-modal-without-focus-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png
index d8927fc6550ec5c3d848e21430da62e394a303c3..34b0d6ac8d2501e6398328e20053e4a11346428d 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-header-slot-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png
index 7f85a08f8833e15d3c788d9f06efb166acd52ce5..0cda2e7d503158ba90bead74f1c3abdd75253b1e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-paginated-list-with-row-slot-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-default-1-snap.png
index 4511fc0e05db9a1046f47e8b798c68a2d7aa2396..6c6ea251f1d67bb7dd386fc4a1fe7c9ba476d291 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-text-links-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-text-links-1-snap.png
index efc581d616dfaadd9e9d9c18382d1858d1f626a6..1a82035e7b17b3f1d5ee1e57fd66acf635fd1731 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-text-links-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-text-links-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-with-close-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-with-close-button-1-snap.png
index 62d3193cedfc9db740697cd7ec2b6f92381323b6..b44df086569868d07a1f066d99d2a838c48be865 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-with-close-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-popover-with-close-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-search-box-by-click-history-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-search-box-by-click-history-1-snap.png
index 6b1594e53431ca613b8dbc9febf88c428070241d..32fd996484c11212017cbcf5ea25ff395214a367 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-search-box-by-click-history-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-search-box-by-click-history-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-segmented-control-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-segmented-control-default-1-snap.png
index 21f098aacdf5c0ab34770bfb29247045f2329e33..ae30cc65618457f0a3a976aaada37154ff40227e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-segmented-control-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-segmented-control-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-sorting-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-sorting-default-1-snap.png
index 5847dd77d129ec009079e75ece93e2f78fae5aa4..c343f7cc35e8646bbb105c8111a2129a8ea3975f 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-sorting-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-sorting-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-default-1-snap.png
index 870cb50e9017a84ca801e2aadf283a2b51946db0..a85b92ea217e4459b53aa5007c8fead45d83c7f4 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-actions-1-snap.png
index cb8c7e523a695c95d212fb73915007bf6d718bb4..d3713a7a56ad412e3ffdce626c169285aee43835 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-long-content-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-long-content-1-snap.png
index 593a64c5cde99bc74ed9891cd416f33a8fdd4271..a0b110c299764020e6e612435d4c644079ecd579 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-long-content-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-toast-with-long-content-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-bottom-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-bottom-1-snap.png
index 8a89e84a3cb6296d7ae41f1ccc3094b5be79d465..00eed78b3bd330229f663d826a8eca6660e38ced 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-bottom-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-bottom-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-left-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-left-1-snap.png
index 35b69a8872d7c7f453e44d9d709d13941b63981b..45de569896166356b4c8617dc8f1341f0593a240 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-left-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-left-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-right-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-right-1-snap.png
index b8eae73b4a6ae3a6de35c9b9e4bc1370d83bf975..eb292f3ef468ca8a4e8f2f830d8314dd370415ed 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-right-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-right-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-top-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-top-default-1-snap.png
index badbe98eb9c5662179b407f8495d1b5eca5e99fc..ff75db5ee0e9f36dacb62626632a3cdd2825bfda 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-top-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-tooltip-top-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-interactive-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-interactive-1-snap.png
index d083043940d0e348c0286fa63bad897e23e7edaf..337b7276b57a66ed7655a0030bd4d3d1b4f9e75b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-interactive-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-interactive-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-predefined-prompts-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-predefined-prompts-default-1-snap.png
index 6cc088386c40b4349ae29ed532e3c5cef53ecb48..9f70a4cb588e5a456d084dbcf21e568007cddafd 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-predefined-prompts-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-predefined-prompts-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-slots-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-slots-1-snap.png
index ae5a5e17f831e85c35de07a13129d4bb8f71985f..055dfa50c63f86deda3fff8540a6aeff38da2a83 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-slots-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-chat-duo-chat-slots-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-workflow-duo-workflow-prompt-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-workflow-duo-workflow-prompt-default-1-snap.png
index 2975129046fe10b5fa83327898a989a354b47739..8413aef143a1b1f27a97c82877b2b453e245d30c 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-workflow-duo-workflow-prompt-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-experimental-duo-workflow-duo-workflow-prompt-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-custom-actions-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-custom-actions-1-snap.png
index ce3555ca32f811b0bed1bc7a4700ff616f4db607..9f6f07a32802f6b6188582b21c2abe8e713e183a 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-custom-actions-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-custom-actions-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-default-1-snap.png
index dd0c3f9618999c460303abe25ebafe16d48cf938..ea87d5860f6d265ba39cac846bd6c6eff98ac31e 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-default-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-no-illustration-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-no-illustration-1-snap.png
index a8d395bbe4a06608fd0eddcfe761fd0d1a8fb7d2..53f9cd54d110d0a66a9588832df0ad9c28dc1027 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-no-illustration-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-no-illustration-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-not-fullscreen-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-not-fullscreen-1-snap.png
index cbe834bf73e8d567d4db9fdf820f217086c2ee95..2fe2ef756755a7664434eec0ad2dc7eea771aacf 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-not-fullscreen-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-not-fullscreen-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-single-button-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-single-button-1-snap.png
index c0065775793c93fcc6290df8f0f16ba9622ba391..3568ef196f3880677d785598bcc5a278735298e7 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-single-button-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-single-button-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-slotted-description-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-slotted-description-1-snap.png
index 3537cfe8f8893a27fa5d85813e65cc9303d8ff54..58f70e2f0c7e0a803c899994a1a3aa77f7fb04e6 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-slotted-description-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-regions-empty-state-slotted-description-1-snap.png differ
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-utilities-sprintf-basic-button-placeholder-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-utilities-sprintf-basic-button-placeholder-1-snap.png
index 95fabf3114f72a0ff2a78936826eaa59ceeb5e73..165cf0be7ffc16cdc94cd039d123c702a4301e43 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-utilities-sprintf-basic-button-placeholder-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-utilities-sprintf-basic-button-placeholder-1-snap.png differ