From 838b6c5e2ab23c6c1a4813aaae0f2e5e030ef205 Mon Sep 17 00:00:00 2001
From: Rebecca Alpert <ralpert@redhat.com>
Date: Wed, 15 Jul 2026 12:52:45 -0400
Subject: [PATCH] fix(Messages): Update icons

Replace with RH UI icons.
---
 .../MessageWithCustomResponseActions.tsx      |  7 +-
 .../MessageWithMarkdownToolResponse.tsx       |  6 +-
 .../Messages/MessageWithQuickResponses.tsx    |  6 +-
 .../Messages/MessageWithToolResponse.tsx      | 10 +--
 .../chatbot/examples/Messages/Messages.md     |  2 +-
 .../Messages/UserMessageWithExtraContent.tsx  | 38 ++---------
 .../chatbot/examples/demos/Chatbot.md         |  3 +-
 .../LoadingMessage/LoadingMessage.test.tsx    | 15 -----
 .../src/LoadingMessage/LoadingMessage.tsx     | 27 --------
 .../LoadingMessage.test.tsx.snap              | 64 -------------------
 packages/module/src/LoadingMessage/index.ts   |  3 -
 .../CodeBlockMessage/CodeBlockMessage.tsx     |  4 +-
 packages/module/src/Message/Message.test.tsx  |  1 +
 .../QuickStarts/QuickStartTileDescription.tsx |  4 +-
 .../ResponseActionButton.test.tsx             | 14 ++--
 .../ResponseActions/ResponseActions.test.tsx  | 15 ++---
 16 files changed, 42 insertions(+), 177 deletions(-)
 delete mode 100644 packages/module/src/LoadingMessage/LoadingMessage.test.tsx
 delete mode 100644 packages/module/src/LoadingMessage/LoadingMessage.tsx
 delete mode 100644 packages/module/src/LoadingMessage/__snapshots__/LoadingMessage.test.tsx.snap
 delete mode 100644 packages/module/src/LoadingMessage/index.ts

diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithCustomResponseActions.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithCustomResponseActions.tsx
index 35a828762..c1bb81943 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithCustomResponseActions.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithCustomResponseActions.tsx
@@ -1,8 +1,7 @@
 import { FunctionComponent } from 'react';
 
 import Message from '@patternfly/chatbot/dist/dynamic/Message';
-import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
-import RedoIcon from '@patternfly/react-icons/dist/esm/icons/redo-icon';
+import { RhMicronsInformationFillIcon, RhUiRedoIcon } from '@patternfly/react-icons';
 
 export const CustomActionExample: FunctionComponent = () => (
   <Message
@@ -18,14 +17,14 @@ export const CustomActionExample: FunctionComponent = () => (
         onClick: () => console.log('Clicked regenerate'),
         tooltipContent: 'Regenerate',
         clickedTooltipContent: 'Regenerated',
-        icon: <RedoIcon />
+        icon: <RhUiRedoIcon />
       },
       info: {
         ariaLabel: 'Info',
         // eslint-disable-next-line no-console
         onClick: () => console.log('Clicked info'),
         tooltipContent: 'Info',
-        icon: <InfoCircleIcon />
+        icon: <RhMicronsInformationFillIcon />
       }
     }}
   />
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithMarkdownToolResponse.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithMarkdownToolResponse.tsx
index 862153bf4..54e5b894c 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithMarkdownToolResponse.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithMarkdownToolResponse.tsx
@@ -1,6 +1,6 @@
 import { useState, FunctionComponent, MouseEvent as ReactMouseEvent } from 'react';
 import Message from '@patternfly/chatbot/dist/dynamic/Message';
-import { CopyIcon, WrenchIcon } from '@patternfly/react-icons';
+import { RhUiBuildFillIcon, RhUiCopyFillIcon } from '@patternfly/react-icons';
 import {
   Button,
   DescriptionList,
@@ -72,7 +72,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                     }}
                   >
                     <FlexItem>
-                      <WrenchIcon
+                      <RhUiBuildFillIcon
                         style={{
                           color: 'var(--pf-t--global--icon--color--brand--default'
                         }}
@@ -102,7 +102,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                 variant="plain"
                 aria-label="Copy tool response to clipboard"
                 icon={
-                  <CopyIcon
+                  <RhUiCopyFillIcon
                     style={{
                       color: 'var(--pf-t--global--icon--color--subtle)'
                     }}
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithQuickResponses.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithQuickResponses.tsx
index 6e77e2cc6..9dd1cc99d 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithQuickResponses.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithQuickResponses.tsx
@@ -1,6 +1,6 @@
 import { FunctionComponent } from 'react';
 import Message from '@patternfly/chatbot/dist/dynamic/Message';
-import { CopyIcon, WrenchIcon } from '@patternfly/react-icons';
+import { RhUiBuildFillIcon, RhUiCopyFillIcon } from '@patternfly/react-icons';
 
 export const MessageWithQuickResponsesExample: FunctionComponent = () => (
   <>
@@ -73,8 +73,8 @@ export const MessageWithQuickResponsesExample: FunctionComponent = () => (
       role="bot"
       content="Example with icons"
       quickResponses={[
-        { id: '1', content: 'Update your settings', onClick: () => alert('Clicked yes'), icon: <WrenchIcon /> },
-        { id: '2', content: 'Copy', onClick: () => alert('Clicked no'), icon: <CopyIcon /> }
+        { id: '1', content: 'Update your settings', onClick: () => alert('Clicked yes'), icon: <RhUiBuildFillIcon /> },
+        { id: '2', content: 'Copy', onClick: () => alert('Clicked no'), icon: <RhUiCopyFillIcon /> }
       ]}
     />
   </>
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithToolResponse.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithToolResponse.tsx
index 5335fcce3..a821319b8 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithToolResponse.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/MessageWithToolResponse.tsx
@@ -1,6 +1,6 @@
 import { useState, FunctionComponent, MouseEvent as ReactMouseEvent } from 'react';
 import Message from '@patternfly/chatbot/dist/dynamic/Message';
-import { CopyIcon, WrenchIcon } from '@patternfly/react-icons';
+import { RhUiBuildFillIcon, RhUiCopyFillIcon } from '@patternfly/react-icons';
 import {
   Button,
   DescriptionList,
@@ -41,7 +41,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                   <FlexItem grow={{ default: 'grow' }}>
                     <Flex gap={{ default: 'gapXs' }}>
                       <FlexItem>
-                        <WrenchIcon style={{ color: 'var(--pf-t--global--icon--color--brand--default' }} />
+                        <RhUiBuildFillIcon style={{ color: 'var(--pf-t--global--icon--color--brand--default' }} />
                       </FlexItem>
                       <FlexItem>toolName</FlexItem>
                     </Flex>
@@ -58,7 +58,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                 <Button
                   variant="plain"
                   aria-label="Copy tool response to clipboard"
-                  icon={<CopyIcon style={{ color: 'var(--pf-t--global--icon--color--subtle)' }} />}
+                  icon={<RhUiCopyFillIcon style={{ color: 'var(--pf-t--global--icon--color--subtle)' }} />}
                 ></Button>
               </FlexItem>
             </Flex>
@@ -152,7 +152,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                   <FlexItem grow={{ default: 'grow' }}>
                     <Flex gap={{ default: 'gapXs' }}>
                       <FlexItem>
-                        <WrenchIcon style={{ color: 'var(--pf-t--global--icon--color--brand--default' }} />
+                        <RhUiBuildFillIcon style={{ color: 'var(--pf-t--global--icon--color--brand--default' }} />
                       </FlexItem>
                       <FlexItem>toolName</FlexItem>
                     </Flex>
@@ -169,7 +169,7 @@ export const MessageWithToolResponseExample: FunctionComponent = () => {
                 <Button
                   variant="plain"
                   aria-label="Copy tool response to clipboard"
-                  icon={<CopyIcon style={{ color: 'var(--pf-t--global--icon--color--subtle)' }} />}
+                  icon={<RhUiCopyFillIcon style={{ color: 'var(--pf-t--global--icon--color--subtle)' }} />}
                 ></Button>
               </FlexItem>
             </Flex>
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
index bb329c046..56598a1b7 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
@@ -50,7 +50,7 @@ import ResponseActions, { ResponseActionsGroups } from '@patternfly/chatbot/dist
 import ToolResponse from '@patternfly/chatbot/dist/dynamic/ToolResponse';
 import { rehypeCodeBlockToggle } from '@patternfly/chatbot/dist/esm/Message/Plugins/rehypeCodeBlockToggle';
 import SourcesCard from '@patternfly/chatbot/dist/dynamic/SourcesCard';
-import { ArrowCircleDownIcon, ArrowRightIcon, CheckCircleIcon, CopyIcon, CubeIcon, CubesIcon, DownloadIcon, InfoCircleIcon, OutlinedQuestionCircleIcon, RedoIcon, RobotIcon, WrenchIcon } from '@patternfly/react-icons';
+import { RhUiArrowCircleDownFillIcon, RhUiArrowRightIcon, RhUiCheckCircleFillIcon, RhUiCopyFillIcon, RhUiExportIcon, RhMicronsInformationFillIcon, OutlinedQuestionCircleIcon, RhUiRedoIcon, RhUiBuildFillIcon } from '@patternfly/react-icons';
 import patternflyAvatar from './patternfly_avatar.jpg';
 import AttachmentEdit from '@patternfly/chatbot/dist/dynamic/AttachmentEdit';
 import FileDetails from '@patternfly/chatbot/dist/dynamic/FileDetails';
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
index c632e725d..ab4ae02f2 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
@@ -39,7 +39,7 @@ import {
   TabTitleText,
   Spinner
 } from '@patternfly/react-core';
-import { ArrowCircleDownIcon, ArrowRightIcon, CheckCircleIcon, CubeIcon, CubesIcon } from '@patternfly/react-icons';
+import { RhUiArrowCircleDownFillIcon, RhUiArrowRightIcon, RhUiCheckCircleFillIcon } from '@patternfly/react-icons';
 
 const UserActionEndContent = () => {
   // eslint-disable-next-line no-console
@@ -143,7 +143,7 @@ const LiveProgressSummaryCard = () => {
     const status = getStageStatus(stage);
 
     if (status === 'completed') {
-      return <CheckCircleIcon color="green" aria-label="Complete" />;
+      return <RhUiCheckCircleFillIcon color="green" aria-label="Complete" />;
     } else if (status === 'in-progress') {
       return <Spinner size="sm" aria-valuetext="In progress" />;
     } else {
@@ -374,7 +374,7 @@ Setting up cluster console...`;
           </CardBody>
         </CardExpandableContent>
         <CardFooter>
-          <Button isBlock variant="tertiary" icon={<ArrowRightIcon />} iconPosition="end">
+          <Button isBlock variant="tertiary" icon={<RhUiArrowRightIcon />} iconPosition="end">
             Open in console
           </Button>
         </CardFooter>
@@ -536,34 +536,10 @@ const VersionSelectorCard = () => {
         style={{ '--pf-v6-c-card--child--PaddingBlockEnd': 'var(--pf-t--global--spacer--md)' } as React.CSSProperties}
       >
         <Tabs activeKey={activeTabKey} onSelect={handleTabClick} aria-label="Architecture" role="region" isFilled>
-          <Tab
-            eventKey={0}
-            title={
-              <TabTitleText>
-                <Flex spaceItems={{ default: 'spaceItemsXs' }}>
-                  <FlexItem>
-                    <CubeIcon />
-                  </FlexItem>
-                  <FlexItem>Single arch</FlexItem>
-                </Flex>
-              </TabTitleText>
-            }
-          >
+          <Tab eventKey={0} title={<TabTitleText>Single arch</TabTitleText>}>
             {generateTabContent('x86_64 Intel/AMD only', 'Standard deployments • Most common choice')}
           </Tab>
-          <Tab
-            eventKey={1}
-            title={
-              <TabTitleText>
-                <Flex spaceItems={{ default: 'spaceItemsXs' }}>
-                  <FlexItem>
-                    <CubesIcon />
-                  </FlexItem>
-                  <FlexItem>Multi arch</FlexItem>
-                </Flex>
-              </TabTitleText>
-            }
-          >
+          <Tab eventKey={1} title={<TabTitleText>Multi arch</TabTitleText>}>
             {generateTabContent('Multi arch', 'Standard deployments')}
           </Tab>
         </Tabs>
@@ -584,7 +560,7 @@ const DownloadCard = () => (
         <Flex spaceItems={{ default: 'spaceItemsSm' }}>
           <FlexItem>
             <Icon size="lg" status="success">
-              <CheckCircleIcon />
+              <RhUiCheckCircleFillIcon />
             </Icon>
           </FlexItem>
           <FlexItem>Your discovery ISO is ready</FlexItem>
@@ -602,7 +578,7 @@ const DownloadCard = () => (
 
         <Flex direction={{ default: 'column' }} spaceItems={{ default: 'spaceItemsSm' }}>
           <FlexItem>
-            <Button variant={ButtonVariant.primary} icon={<ArrowCircleDownIcon />} isBlock>
+            <Button variant={ButtonVariant.primary} icon={<RhUiArrowCircleDownFillIcon />} isBlock>
               Download Discovery ISO
             </Button>
           </FlexItem>
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/demos/Chatbot.md b/packages/module/patternfly-docs/content/extensions/chatbot/examples/demos/Chatbot.md
index a47d413cf..7c7a19c9a 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/demos/Chatbot.md
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/demos/Chatbot.md
@@ -52,8 +52,7 @@ import ExpandIcon from '@patternfly/react-icons/dist/esm/icons/expand-icon';
 import OpenDrawerRightIcon from '@patternfly/react-icons/dist/esm/icons/open-drawer-right-icon';
 import OutlinedWindowRestoreIcon from '@patternfly/react-icons/dist/esm/icons/outlined-window-restore-icon';
 import { BarsIcon } from '@patternfly/react-icons/dist/esm/icons/bars-icon';
-import { CopyIcon } from '@patternfly/react-icons/dist/esm/icons/copy-icon';
-import { WrenchIcon } from '@patternfly/react-icons/dist/esm/icons/wrench-icon';
+import { RhUiBuildFillIcon, RhUiCopyFillIcon } from '@patternfly/react-icons';
 import {
 Button,
 DescriptionList,
diff --git a/packages/module/src/LoadingMessage/LoadingMessage.test.tsx b/packages/module/src/LoadingMessage/LoadingMessage.test.tsx
deleted file mode 100644
index a76cc60df..000000000
--- a/packages/module/src/LoadingMessage/LoadingMessage.test.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import LoadingMessage from './LoadingMessage';
-
-describe('LoadingMessage', () => {
-  it('should render loading message', () => {
-    const { container } = render(<LoadingMessage />);
-    expect(container).toMatchSnapshot();
-  });
-  it('should render loading message correctly', () => {
-    render(<LoadingMessage />);
-    expect(screen.getAllByText('.')).toBeTruthy();
-    expect(screen.getAllByText('.')).toHaveLength(3);
-  });
-});
diff --git a/packages/module/src/LoadingMessage/LoadingMessage.tsx b/packages/module/src/LoadingMessage/LoadingMessage.tsx
deleted file mode 100644
index 6d1d9b114..000000000
--- a/packages/module/src/LoadingMessage/LoadingMessage.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { FunctionComponent } from 'react';
-import { Icon, Split, SplitItem } from '@patternfly/react-core';
-
-import RobotIcon from '@patternfly/react-icons/dist/js/icons/robot-icon';
-
-export interface LoadingMessageProps {
-  icon?: React.ComponentType;
-}
-
-export const LoadingMessage: FunctionComponent<LoadingMessageProps> = ({ icon: IconComponent = RobotIcon }) => (
-  <Split>
-    <SplitItem>
-      <Icon size="lg" className="pf-v6-u-mr-sm pf-v6-u-pt-md">
-        <IconComponent />
-      </Icon>
-    </SplitItem>
-    <SplitItem className="pf-u-background-color-200">
-      <div className="pf-v6-u-display-flex pf-u-align-items-center">
-        <div>.</div>
-        <div>.</div>
-        <div>.</div>
-      </div>
-    </SplitItem>
-  </Split>
-);
-
-export default LoadingMessage;
diff --git a/packages/module/src/LoadingMessage/__snapshots__/LoadingMessage.test.tsx.snap b/packages/module/src/LoadingMessage/__snapshots__/LoadingMessage.test.tsx.snap
deleted file mode 100644
index 5cf1de58a..000000000
--- a/packages/module/src/LoadingMessage/__snapshots__/LoadingMessage.test.tsx.snap
+++ /dev/null
@@ -1,64 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LoadingMessage should render loading message 1`] = `
-<div>
-  <div
-    class="pf-v6-l-split"
-  >
-    <div
-      class="pf-v6-l-split__item"
-    >
-      <span
-        class="pf-v6-c-icon pf-m-lg pf-v6-u-mr-sm pf-v6-u-pt-md"
-      >
-        <span
-          class="pf-v6-c-icon__content"
-        >
-          <svg
-            aria-hidden="true"
-            class="pf-v6-svg"
-            fill="currentColor"
-            height="1em"
-            role="img"
-            width="1em"
-          >
-            <svg
-              class="pf-v6-icon-default"
-              viewBox="0 0 640 512"
-            >
-              <path
-                d="M32,224H64V416H32A31.96166,31.96166,0,0,1,0,384V256A31.96166,31.96166,0,0,1,32,224Zm512-48V448a64.06328,64.06328,0,0,1-64,64H160a64.06328,64.06328,0,0,1-64-64V176a79.974,79.974,0,0,1,80-80H288V32a32,32,0,0,1,64,0V96H464A79.974,79.974,0,0,1,544,176ZM264,256a40,40,0,1,0-40,40A39.997,39.997,0,0,0,264,256Zm-8,128H192v32h64Zm96,0H288v32h64ZM456,256a40,40,0,1,0-40,40A39.997,39.997,0,0,0,456,256Zm-8,128H384v32h64ZM640,256V384a31.96166,31.96166,0,0,1-32,32H576V224h32A31.96166,31.96166,0,0,1,640,256Z"
-              />
-            </svg>
-            <svg
-              class="pf-v6-icon-rh-ui"
-              viewBox="0 0 32 32"
-            >
-              <path
-                d="M29 22.5V29a1 1 0 1 1-2 0v-6H5v6a1 1 0 1 1-2 0v-6.5c0-.827.673-1.5 1.5-1.5h23c.827 0 1.5.673 1.5 1.5ZM3 11a1 1 0 0 1 1-1h2V5.5C6 4.673 6.673 4 7.5 4H12V2a1 1 0 1 1 2 0v2h4V2a1 1 0 1 1 2 0v2h4.5c.827 0 1.5.673 1.5 1.5V10h2a1 1 0 1 1 0 2h-2v4.5c0 .827-.673 1.5-1.5 1.5h-17c-.827 0-1.5-.673-1.5-1.5V12H4a1 1 0 0 1-1-1Zm5 5h16V6H8v10Zm5-6.612a1.626 1.626 0 1 0 .001 3.251A1.626 1.626 0 0 0 13 9.388Zm6-.01a1.626 1.626 0 1 0 .001 3.251A1.626 1.626 0 0 0 19 9.378Z"
-              />
-            </svg>
-          </svg>
-        </span>
-      </span>
-    </div>
-    <div
-      class="pf-v6-l-split__item pf-u-background-color-200"
-    >
-      <div
-        class="pf-v6-u-display-flex pf-u-align-items-center"
-      >
-        <div>
-          .
-        </div>
-        <div>
-          .
-        </div>
-        <div>
-          .
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/packages/module/src/LoadingMessage/index.ts b/packages/module/src/LoadingMessage/index.ts
deleted file mode 100644
index 80ca4af7e..000000000
--- a/packages/module/src/LoadingMessage/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default } from './LoadingMessage';
-
-export * from './LoadingMessage';
diff --git a/packages/module/src/Message/CodeBlockMessage/CodeBlockMessage.tsx b/packages/module/src/Message/CodeBlockMessage/CodeBlockMessage.tsx
index ca38e2e12..bd83fa315 100644
--- a/packages/module/src/Message/CodeBlockMessage/CodeBlockMessage.tsx
+++ b/packages/module/src/Message/CodeBlockMessage/CodeBlockMessage.tsx
@@ -18,8 +18,8 @@ import {
 } from '@patternfly/react-core';
 
 import { CheckIcon } from '@patternfly/react-icons/dist/esm/icons/check-icon';
-import { CopyIcon } from '@patternfly/react-icons/dist/esm/icons/copy-icon';
 import { css } from '@patternfly/react-styles';
+import { RhUiCopyFillIcon } from '@patternfly/react-icons';
 
 export interface CodeBlockMessageProps {
   /** Content rendered in code block */
@@ -142,7 +142,7 @@ const CodeBlockMessage = ({
           className="pf-chatbot__button--copy"
           onClick={(event) => handleCopy(event, children)}
         >
-          {copied ? <CheckIcon /> : <CopyIcon />}
+          {copied ? <CheckIcon /> : <RhUiCopyFillIcon />}
         </Button>
         <Tooltip id={tooltipID} content="Copy" position="top" triggerRef={buttonRef} />
       </CodeBlockAction>
diff --git a/packages/module/src/Message/Message.test.tsx b/packages/module/src/Message/Message.test.tsx
index 4054d4370..28a75735a 100644
--- a/packages/module/src/Message/Message.test.tsx
+++ b/packages/module/src/Message/Message.test.tsx
@@ -23,6 +23,7 @@ jest.mock('@patternfly/react-icons', () => ({
   RhUiVolumeUpFillIcon: () => <div>RhUiVolumeUpFillIcon</div>,
   RhUiExportIcon: () => <div>RhUiExportIcon</div>,
   RhUiExportFillIcon: () => <div>RhUiExportFillIcon</div>,
+  RhMicronsInformationFillIcon: () => <div>RhMicronsInformationFillIcon</div>,
   CheckIcon: () => <div>CheckIcon</div>,
   CloseIcon: () => <div>CloseIcon</div>,
   ExternalLinkSquareAltIcon: () => <div>ExternalLinkSquareAltIcon</div>,
diff --git a/packages/module/src/Message/QuickStarts/QuickStartTileDescription.tsx b/packages/module/src/Message/QuickStarts/QuickStartTileDescription.tsx
index dd4e90283..2d42d1fcb 100644
--- a/packages/module/src/Message/QuickStarts/QuickStartTileDescription.tsx
+++ b/packages/module/src/Message/QuickStarts/QuickStartTileDescription.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { useRef } from 'react';
 import { Button, Flex, pluralize, Popover } from '@patternfly/react-core';
-import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
+import { RhMicronsInformationFillIcon } from '@patternfly/react-icons';
 
 interface QuickStartTileDescriptionProps {
   /** QuickStart description */
@@ -57,7 +57,7 @@ const QuickStartTileDescription: FC<QuickStartTileDescriptionProps> = ({
             }}
             aria-label={quickStartButtonAriaLabel}
           >
-            <InfoCircleIcon />
+            <RhMicronsInformationFillIcon />
           </Button>
           <Popover
             aria-label={pluralizedPrereq}
diff --git a/packages/module/src/ResponseActions/ResponseActionButton.test.tsx b/packages/module/src/ResponseActions/ResponseActionButton.test.tsx
index 49011ef01..f87ba850d 100644
--- a/packages/module/src/ResponseActions/ResponseActionButton.test.tsx
+++ b/packages/module/src/ResponseActions/ResponseActionButton.test.tsx
@@ -1,23 +1,23 @@
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
-import { DownloadIcon } from '@patternfly/react-icons';
+import { RhUiExportIcon } from '@patternfly/react-icons';
 import ResponseActionButton from './ResponseActionButton';
 
 describe('ResponseActionButton', () => {
   it('renders aria-label correctly if not clicked', () => {
-    render(<ResponseActionButton icon={<DownloadIcon />} ariaLabel="Download" clickedAriaLabel="Downloaded" />);
+    render(<ResponseActionButton icon={<RhUiExportIcon />} ariaLabel="Download" clickedAriaLabel="Downloaded" />);
     expect(screen.getByRole('button', { name: 'Download' })).toBeTruthy();
   });
   it('renders aria-label correctly if clicked', () => {
     render(
-      <ResponseActionButton icon={<DownloadIcon />} ariaLabel="Download" clickedAriaLabel="Downloaded" isClicked />
+      <ResponseActionButton icon={<RhUiExportIcon />} ariaLabel="Download" clickedAriaLabel="Downloaded" isClicked />
     );
     expect(screen.getByRole('button', { name: 'Downloaded' })).toBeTruthy();
   });
   it('renders tooltip correctly if not clicked', async () => {
     render(
-      <ResponseActionButton icon={<DownloadIcon />} tooltipContent="Download" clickedTooltipContent="Downloaded" />
+      <ResponseActionButton icon={<RhUiExportIcon />} tooltipContent="Download" clickedTooltipContent="Downloaded" />
     );
     expect(screen.getByRole('button', { name: 'Download' })).toBeTruthy();
     // clicking here just triggers the tooltip; in this button, the logic is divorced from whether it is actually clicked
@@ -27,7 +27,7 @@ describe('ResponseActionButton', () => {
   it('renders tooltip correctly if clicked', async () => {
     render(
       <ResponseActionButton
-        icon={<DownloadIcon />}
+        icon={<RhUiExportIcon />}
         tooltipContent="Download"
         clickedTooltipContent="Downloaded"
         isClicked
@@ -39,13 +39,13 @@ describe('ResponseActionButton', () => {
     expect(screen.getByRole('tooltip', { name: 'Downloaded' })).toBeTruthy();
   });
   it('if clicked variant for tooltip is not supplied, it uses the default', async () => {
-    render(<ResponseActionButton icon={<DownloadIcon />} tooltipContent="Download" isClicked />);
+    render(<ResponseActionButton icon={<RhUiExportIcon />} tooltipContent="Download" isClicked />);
     // clicking here just triggers the tooltip; in this button, the logic is divorced from whether it is actually clicked
     await userEvent.click(screen.getByRole('button', { name: 'Download' }));
     expect(screen.getByRole('button', { name: 'Download' })).toBeTruthy();
   });
   it('if clicked variant for aria label is not supplied, it uses the default', async () => {
-    render(<ResponseActionButton icon={<DownloadIcon />} ariaLabel="Download" isClicked />);
+    render(<ResponseActionButton icon={<RhUiExportIcon />} ariaLabel="Download" isClicked />);
     expect(screen.getByRole('button', { name: 'Download' })).toBeTruthy();
   });
 });
diff --git a/packages/module/src/ResponseActions/ResponseActions.test.tsx b/packages/module/src/ResponseActions/ResponseActions.test.tsx
index 14ef958ea..fc698fbfc 100644
--- a/packages/module/src/ResponseActions/ResponseActions.test.tsx
+++ b/packages/module/src/ResponseActions/ResponseActions.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import ResponseActions, { ActionProps } from './ResponseActions';
 import userEvent from '@testing-library/user-event';
-import { DownloadIcon, InfoCircleIcon, RedoIcon } from '@patternfly/react-icons';
+import { RhUiExportIcon, RhMicronsInformationFillIcon, RhUiRedoIcon } from '@patternfly/react-icons';
 import Message from '../Message';
 
 // Mock the icon components
@@ -19,9 +19,8 @@ jest.mock('@patternfly/react-icons', () => ({
   RhUiVolumeUpFillIcon: () => <div>RhUiVolumeUpFillIcon</div>,
   RhUiExportIcon: () => <div>RhUiExportIcon</div>,
   RhUiExportFillIcon: () => <div>RhUiExportFillIcon</div>,
-  DownloadIcon: () => <div>DownloadIcon</div>,
-  InfoCircleIcon: () => <div>InfoCircleIcon</div>,
-  RedoIcon: () => <div>RedoIcon</div>
+  RhMicronsInformationFillIcon: () => <div>RhMicronsInformationFillIcon</div>,
+  RhUiRedoIcon: () => <div>RhUiRedoIcon</div>
 }));
 
 const ALL_ACTIONS = [
@@ -41,7 +40,7 @@ const CUSTOM_ACTIONS = [
       onClick: jest.fn(),
       tooltipContent: 'Regenerate',
       clickedTooltipContent: 'Regenerated',
-      icon: <RedoIcon />
+      icon: <RhUiRedoIcon />
     },
     download: {
       ariaLabel: 'Download',
@@ -49,13 +48,13 @@ const CUSTOM_ACTIONS = [
       onClick: jest.fn(),
       tooltipContent: 'Download',
       clickedTooltipContent: 'Downloaded',
-      icon: <DownloadIcon />
+      icon: <RhUiExportIcon />
     },
     info: {
       ariaLabel: 'Info',
       onClick: jest.fn(),
       tooltipContent: 'Info',
-      icon: <InfoCircleIcon />
+      icon: <RhMicronsInformationFillIcon />
     }
   }
 ];
@@ -428,7 +427,7 @@ describe('ResponseActions', () => {
         onClick: jest.fn(),
         ariaLabel: 'Custom',
         tooltipContent: 'Custom action',
-        icon: <DownloadIcon />
+        icon: <RhUiExportIcon />
       }
     };
     render(<ResponseActions actions={actions} persistActionSelection />);