diff --git a/src/__snapshots__/storybook.test.js.snap b/src/__snapshots__/storybook.test.js.snap
index 4a43eef0b..a557c0fb3 100644
--- a/src/__snapshots__/storybook.test.js.snap
+++ b/src/__snapshots__/storybook.test.js.snap
@@ -781,7 +781,7 @@ exports[`Storyshots Button Default 1`] = `
   <span>
     <span
       aria-hidden={true}
-      className="icon iconWrapper"
+      className="icon my-btn-icon iconWrapper"
       data-test-id="myButtonIconTestId"
       id="myButtonIcon"
       role="presentation"
@@ -830,7 +830,7 @@ exports[`Storyshots Button Neutral 1`] = `
   <span>
     <span
       aria-hidden={true}
-      className="icon iconWrapper"
+      className="icon my-btn-icon iconWrapper"
       data-test-id="myButtonIconTestId"
       id="myButtonIcon"
       role="presentation"
@@ -879,7 +879,7 @@ exports[`Storyshots Button Primary 1`] = `
   <span>
     <span
       aria-hidden={true}
-      className="icon iconWrapper"
+      className="icon my-btn-icon iconWrapper"
       data-test-id="myButtonIconTestId"
       id="myButtonIcon"
       role="presentation"
@@ -928,7 +928,7 @@ exports[`Storyshots Button Secondary 1`] = `
   <span>
     <span
       aria-hidden={true}
-      className="icon iconWrapper"
+      className="icon my-btn-icon iconWrapper"
       data-test-id="myButtonIconTestId"
       id="myButtonIcon"
       role="presentation"
@@ -1040,7 +1040,7 @@ exports[`Storyshots Button Toggle 1`] = `
   <span>
     <span
       aria-hidden={true}
-      className="icon iconWrapper"
+      className="icon my-btn-icon iconWrapper"
       data-test-id="myButtonIconTestId"
       id="myButtonIcon"
       role="presentation"
diff --git a/src/components/Button/BaseButton.tsx b/src/components/Button/BaseButton.tsx
index 12a409b2e..34f108d5e 100644
--- a/src/components/Button/BaseButton.tsx
+++ b/src/components/Button/BaseButton.tsx
@@ -144,7 +144,7 @@ export const BaseButton: FC<InternalButtonProps> = React.forwardRef(
         const getButtonIcon = (): JSX.Element => (
             <Icon
                 {...iconProps}
-                classNames={styles.icon}
+                classNames={mergeClasses([styles.icon, iconProps.classNames])}
                 size={getButtonIconSize()}
             />
         );