diff --git a/assets/js/src/common/button/_stories/button.tsx b/assets/js/src/common/button/_stories/button.tsx
index 987796789c..95903234af 100644
--- a/assets/js/src/common/button/_stories/button.tsx
+++ b/assets/js/src/common/button/_stories/button.tsx
@@ -13,20 +13,20 @@ export const WithoutIcons = () => (
     <Heading level={3}>Small buttons</Heading>
     <p>
       <Button
-        onClick={action('light small')}
+        onClick={action('primary small')}
+        dimension="small"
+      >
+        Primary button
+      </Button>
+      <Button
+        onClick={action('secondary small')}
         dimension="small"
         variant="secondary"
       >
         Secondary button
       </Button>
       <Button
-        onClick={action('regular small')}
-        dimension="small"
-      >
-        Primary button
-      </Button>
-      <Button
-        onClick={action('link small')}
+        onClick={action('tertiary small')}
         dimension="small"
         variant="tertiary"
       >
@@ -38,18 +38,18 @@ export const WithoutIcons = () => (
     <Heading level={3}>Regular buttons</Heading>
     <p>
       <Button
-        onClick={action('light regular')}
+        onClick={action('primary regular')}
+      >
+        Primary button
+      </Button>
+      <Button
+        onClick={action('secondary regular')}
         variant="secondary"
       >
         Secondary button
       </Button>
       <Button
-        onClick={action('regular regular')}
-      >
-        Primary button
-      </Button>
-      <Button
-        onClick={action('link regular')}
+        onClick={action('tertiary regular')}
         variant="tertiary"
       >
         Tertiary button
@@ -59,21 +59,16 @@ export const WithoutIcons = () => (
 
     <Heading level={3}>Disabled buttons</Heading>
     <p>
+      <Button isDisabled>
+        Primary button
+      </Button>
       <Button
-        onClick={action('light disabled')}
         isDisabled
         variant="secondary"
       >
         Secondary button
       </Button>
       <Button
-        onClick={action('regular disabled')}
-        isDisabled
-      >
-        Primary button
-      </Button>
-      <Button
-        onClick={action('link disabled')}
         isDisabled
         variant="tertiary"
       >
@@ -84,21 +79,16 @@ export const WithoutIcons = () => (
 
     <Heading level={3}>Buttons with spinner</Heading>
     <p>
+      <Button withSpinner>
+        Primary button
+      </Button>
       <Button
-        onClick={action('light spinner')}
         withSpinner
         variant="secondary"
       >
         Secondary button
       </Button>
       <Button
-        onClick={action('regular spinner')}
-        withSpinner
-      >
-        Primary button
-      </Button>
-      <Button
-        onClick={action('link spinner')}
         withSpinner
         variant="tertiary"
       >
@@ -110,20 +100,20 @@ export const WithoutIcons = () => (
     <Heading level={3}>Full width buttons</Heading>
     <p>
       <Button
-        onClick={action('light full-width ')}
+        onClick={action('primary full-width')}
+        isFullWidth
+      >
+        Primary button
+      </Button>
+      <Button
+        onClick={action('secondary full-width')}
         isFullWidth
         variant="secondary"
       >
         Secondary button
       </Button>
       <Button
-        onClick={action('regular full-width ')}
-        isFullWidth
-      >
-        Primary button
-      </Button>
-      <Button
-        onClick={action('link full-width ')}
+        onClick={action('tertiary full-width')}
         isFullWidth
         variant="tertiary"
       >
diff --git a/assets/js/src/common/button/_stories/button_icons.tsx b/assets/js/src/common/button/_stories/button_icons.tsx
index 4fb06c93f6..8de40c773c 100644
--- a/assets/js/src/common/button/_stories/button_icons.tsx
+++ b/assets/js/src/common/button/_stories/button_icons.tsx
@@ -14,20 +14,14 @@ export const WithIcons = () => (
     <Heading level={3}>Small buttons</Heading>
     <p>
       <Button
-        onClick={action('only icon small')}
-        dimension="small"
-        variant="secondary"
-        iconStart={icon}
-      />
-      <Button
-        onClick={action('icon start small')}
+        onClick={action('icon start primary small')}
         dimension="small"
         iconStart={icon}
       >
         Icon start
       </Button>
       <Button
-        onClick={action('both icons small')}
+        onClick={action('both icons secondary small')}
         dimension="small"
         variant="secondary"
         iconStart={icon}
@@ -36,7 +30,13 @@ export const WithIcons = () => (
         Both icons
       </Button>
       <Button
-        onClick={action('only icon link small')}
+        onClick={action('only icon secondary small')}
+        dimension="small"
+        variant="secondary"
+        iconStart={icon}
+      />
+      <Button
+        onClick={action('only icon tertiary small')}
         dimension="small"
         variant="tertiary"
         iconStart={icon}
@@ -46,20 +46,14 @@ export const WithIcons = () => (
 
     <Heading level={3}>Regular buttons</Heading>
     <p>
-
       <Button
-        onClick={action('only icon regular')}
-        variant="secondary"
-        iconStart={icon}
-      />
-      <Button
-        onClick={action('icon start regular')}
+        onClick={action('icon start primary regular')}
         iconStart={icon}
       >
         Icon start
       </Button>
       <Button
-        onClick={action('both icons regular')}
+        onClick={action('both icons secondary regular')}
         variant="secondary"
         iconStart={icon}
         iconEnd={icon}
@@ -67,7 +61,12 @@ export const WithIcons = () => (
         Both icons
       </Button>
       <Button
-        onClick={action('only icon link regular')}
+        onClick={action('only icon secondary regular')}
+        variant="secondary"
+        iconStart={icon}
+      />
+      <Button
+        onClick={action('only icon tertiary regular')}
         variant="tertiary"
         iconStart={icon}
       />
@@ -77,20 +76,12 @@ export const WithIcons = () => (
     <Heading level={3}>Disabled buttons</Heading>
     <p>
       <Button
-        onClick={action('only icon disabled')}
-        isDisabled
-        variant="secondary"
-        iconStart={icon}
-      />
-      <Button
-        onClick={action('icon start disabled')}
         isDisabled
         iconStart={icon}
       >
         Icon start
       </Button>
       <Button
-        onClick={action('both icons disabled')}
         isDisabled
         variant="secondary"
         iconStart={icon}
@@ -99,7 +90,11 @@ export const WithIcons = () => (
         Both icons
       </Button>
       <Button
-        onClick={action('only icon link disabled')}
+        isDisabled
+        variant="secondary"
+        iconStart={icon}
+      />
+      <Button
         isDisabled
         variant="tertiary"
         iconStart={icon}
@@ -110,20 +105,12 @@ export const WithIcons = () => (
     <Heading level={3}>Buttons with spinner</Heading>
     <p>
       <Button
-        onClick={action('only icon spinner')}
-        withSpinner
-        variant="secondary"
-        iconStart={icon}
-      />
-      <Button
-        onClick={action('icon start spinner')}
         withSpinner
         iconStart={icon}
       >
         Icon start
       </Button>
       <Button
-        onClick={action('both icons spinner')}
         withSpinner
         variant="secondary"
         iconStart={icon}
@@ -132,7 +119,11 @@ export const WithIcons = () => (
         Both icons
       </Button>
       <Button
-        onClick={action('only icon link spinner')}
+        withSpinner
+        variant="secondary"
+        iconStart={icon}
+      />
+      <Button
         withSpinner
         variant="tertiary"
         iconStart={icon}
@@ -143,20 +134,14 @@ export const WithIcons = () => (
     <Heading level={3}>Full width buttons</Heading>
     <p>
       <Button
-        onClick={action('only icon full-width')}
-        isFullWidth
-        variant="secondary"
-        iconStart={icon}
-      />
-      <Button
-        onClick={action('icon start full-width')}
+        onClick={action('icon start primary full-width')}
         isFullWidth
         iconStart={icon}
       >
         Icon start
       </Button>
       <Button
-        onClick={action('both icons full-width')}
+        onClick={action('both icons secondary full-width')}
         isFullWidth
         variant="secondary"
         iconStart={icon}
@@ -165,7 +150,13 @@ export const WithIcons = () => (
         Both icons
       </Button>
       <Button
-        onClick={action('only icon link full-width')}
+        onClick={action('only icon secondary full-width')}
+        isFullWidth
+        variant="secondary"
+        iconStart={icon}
+      />
+      <Button
+        onClick={action('only icon tertiary full-width')}
         isFullWidth
         variant="tertiary"
         iconStart={icon}