diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroup.md b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroup.md
index bf4d3411748..ce7001dcb5c 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroup.md
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroup.md
@@ -9,7 +9,7 @@ import './toggleGroup.css';
 
 import { useRef, useState } from 'react';
 import { ToggleGroup, ToggleGroupItem, Button, Stack, StackItem } from '@patternfly/react-core';
-import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
+import RhUiUndoIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-undo-icon';
 import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
 import ShareSquareIcon from '@patternfly/react-icons/dist/esm/icons/share-square-icon';
 
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
index ad8078c3059..e28aa7987be 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
-import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
+import RhUiUndoIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-undo-icon';
 import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
 import ShareSquareIcon from '@patternfly/react-icons/dist/esm/icons/share-square-icon';
 
@@ -24,7 +24,7 @@ export const ToggleGroupIcon: React.FunctionComponent = () => {
         onChange={handleItemClick}
       />
       <ToggleGroupItem
-        icon={<UndoIcon />}
+        icon={<RhUiUndoIcon />}
         aria-label="undo"
         buttonId="toggle-group-icons-2"
         isSelected={isSelected['toggle-group-icons-2']}
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
index e70a1304654..2c993990e70 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
-import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
+import RhUiUndoIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-undo-icon';
 import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
 import ShareSquareIcon from '@patternfly/react-icons/dist/esm/icons/share-square-icon';
 
@@ -25,7 +25,7 @@ export const ToggleGroupIcon: React.FunctionComponent = () => {
           onChange={handleItemClick}
         />
         <ToggleGroupItem
-          icon={<UndoIcon />}
+          icon={<RhUiUndoIcon />}
           text="Undo"
           buttonId="toggle-group-text-icons-2"
           isSelected={isSelected['toggle-group-text-icons-2']}
@@ -50,7 +50,7 @@ export const ToggleGroupIcon: React.FunctionComponent = () => {
           onChange={handleItemClick}
         />
         <ToggleGroupItem
-          icon={<UndoIcon />}
+          icon={<RhUiUndoIcon />}
           iconPosition="end"
           text="Undo"
           buttonId="toggle-group-text-icons-5"
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
index 0f3784780c3..bfe4b6fa6db 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
@@ -1,6 +1,6 @@
 import { Component } from 'react';
 import { ToggleGroup, ToggleGroupItem, ToggleGroupProps } from '@patternfly/react-core';
-import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
+import RhUiUndoIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-undo-icon';
 import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
 import ShareSquareIcon from '@patternfly/react-icons/dist/esm/icons/share-square-icon';
 
@@ -75,7 +75,7 @@ export class ToggleGroupDemo extends Component<ToggleGroupProps, ToggleGroupStat
             aria-label="copy icon button"
           />
           <ToggleGroupItem
-            icon={<UndoIcon />}
+            icon={<RhUiUndoIcon />}
             key={4}
             buttonId="fourth"
             isSelected={isSelected.fourth}