diff --git a/packages/components/src/core/SegmentedControl/__tests__/__snapshots__/index.test.tsx.snap b/packages/components/src/core/SegmentedControl/__tests__/__snapshots__/index.test.tsx.snap
index 52bba6105..b1b423bf9 100644
--- a/packages/components/src/core/SegmentedControl/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/components/src/core/SegmentedControl/__tests__/__snapshots__/index.test.tsx.snap
@@ -34,6 +34,9 @@ exports[`<SegmentedControl /> Default story renders snapshot 1`] = `
         />
       </div>
     </span>
+    <span
+      class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+    />
   </button>
   <button
     aria-label="List B"
@@ -63,6 +66,9 @@ exports[`<SegmentedControl /> Default story renders snapshot 1`] = `
         />
       </div>
     </span>
+    <span
+      class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+    />
   </button>
   <button
     aria-label="List C"
@@ -92,6 +98,9 @@ exports[`<SegmentedControl /> Default story renders snapshot 1`] = `
         />
       </div>
     </span>
+    <span
+      class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+    />
   </button>
   <button
     aria-label="List D"
@@ -121,6 +130,9 @@ exports[`<SegmentedControl /> Default story renders snapshot 1`] = `
         />
       </div>
     </span>
+    <span
+      class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+    />
   </button>
 </div>
 `;
diff --git a/packages/components/src/core/SegmentedControl/index.tsx b/packages/components/src/core/SegmentedControl/index.tsx
index 7c8f90228..7e4d3511c 100644
--- a/packages/components/src/core/SegmentedControl/index.tsx
+++ b/packages/components/src/core/SegmentedControl/index.tsx
@@ -64,7 +64,7 @@ const SegmentedControl = (props: SegmentedControlProps) => {
             arrow
             key={value}
           >
-            <ToggleButton aria-label={tooltipText} disableRipple value={value}>
+            <ToggleButton aria-label={tooltipText} value={value}>
               <span tabIndex={-1}>{iconItem()}</span>
             </ToggleButton>
           </Tooltip>
diff --git a/packages/components/src/core/Tooltip/__storybook__/stories/default.tsx b/packages/components/src/core/Tooltip/__storybook__/stories/default.tsx
index f7c9582fb..c4ebd6b47 100644
--- a/packages/components/src/core/Tooltip/__storybook__/stories/default.tsx
+++ b/packages/components/src/core/Tooltip/__storybook__/stories/default.tsx
@@ -1,6 +1,5 @@
 import { Args } from "@storybook/react";
 import Button from "src/core/Button";
-import Icon from "src/core/Icon";
 import RawTooltip from "src/core/Tooltip";
 
 export const Tooltip = (props: Args): JSX.Element => {
@@ -23,13 +22,7 @@ export const Tooltip = (props: Args): JSX.Element => {
             aria-label="tooltip test button"
             sdsStyle="icon"
             sdsSize="large"
-            icon={
-              <Icon
-                sdsIcon="ExclamationMarkCircle"
-                sdsSize="xl"
-                sdsType="interactive"
-              />
-            }
+            icon="ExclamationMarkCircle"
           />
         </RawTooltip>
       </div>
diff --git a/packages/components/src/core/Tooltip/__tests__/__snapshots__/index.test.tsx.snap b/packages/components/src/core/Tooltip/__tests__/__snapshots__/index.test.tsx.snap
index ba3808597..ed3f81b3f 100644
--- a/packages/components/src/core/Tooltip/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/components/src/core/Tooltip/__tests__/__snapshots__/index.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`<Tooltip /> Default story renders snapshot 1`] = `
       aria-label="tooltip test button"
       class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium  css-1ha43wd-MuiButtonBase-root-MuiIconButton-root"
       data-mui-internal-clone-element="true"
-      icon="[object Object]"
+      icon="ExclamationMarkCircle"
       tabindex="0"
       type="button"
     >
@@ -22,7 +22,7 @@ exports[`<Tooltip /> Default story renders snapshot 1`] = `
       >
         <svg
           aria-hidden="true"
-          class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-tr2xv3-MuiSvgIcon-root"
+          class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1q6hio5-MuiSvgIcon-root"
           data-file-name="IconExclamationMarkCircleLarge"
           data-testid="IconExclamationMarkCircleLarge"
           fillcontrast="white"