diff --git a/packages/react-core/src/components/Accordion/examples/Accordion.md b/packages/react-core/src/components/Accordion/examples/Accordion.md
index 56fe2e7231d..08ec10f0799 100644
--- a/packages/react-core/src/components/Accordion/examples/Accordion.md
+++ b/packages/react-core/src/components/Accordion/examples/Accordion.md
@@ -6,7 +6,7 @@ propComponents: ['Accordion', 'AccordionItem', 'AccordionContent', 'AccordionTog
---
import { useState } from 'react';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
## Examples
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
index 45b4c6a4272..ee17ed1f83d 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
@@ -8,7 +8,7 @@ import {
Button,
Checkbox
} from '@patternfly/react-core';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
export const AccordionBordered: React.FunctionComponent = () => {
const [expanded, setExpanded] = useState('bordered-toggle4');
@@ -95,7 +95,7 @@ export const AccordionBordered: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md
index 4d2e3705351..6ee3eeecb77 100644
--- a/packages/react-core/src/components/Button/examples/Button.md
+++ b/packages/react-core/src/components/Button/examples/Button.md
@@ -11,7 +11,7 @@ import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-micron
import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-square-alt-icon';
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon';
diff --git a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
index c46056cbafc..af7e338ddc7 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
@@ -1,5 +1,5 @@
import { Button, Flex } from '@patternfly/react-core';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
export const ButtonCallToAction: React.FunctionComponent = () => (
@@ -12,7 +12,7 @@ export const ButtonCallToAction: React.FunctionComponent = () => (
- } iconPosition="end">
+ } iconPosition="end">
Call to action
diff --git a/packages/react-core/src/components/Nav/examples/Nav.md b/packages/react-core/src/components/Nav/examples/Nav.md
index df18298f17b..b7934c7b294 100644
--- a/packages/react-core/src/components/Nav/examples/Nav.md
+++ b/packages/react-core/src/components/Nav/examples/Nav.md
@@ -8,7 +8,7 @@ ouia: true
import { useState } from 'react';
import './nav.css';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index eb7bd376df3..fa85cc0f1c1 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -8,7 +8,7 @@ import AngleUpIcon from '@patternfly/react-icons/dist/esm/icons/angle-up-icon';
import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
import { AdvancedSearchMenu } from './AdvancedSearchMenu';
import { TextInputGroup, TextInputGroupMain, TextInputGroupUtilities } from '../TextInputGroup';
import { InputGroup, InputGroupItem } from '../InputGroup';
@@ -479,7 +479,7 @@ const SearchInputBase: React.FunctionComponent = ({
isDisabled={isDisabled}
icon={
-
+
}
/>
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index ff0ba7a35e2..57721194802 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -149,24 +149,12 @@ exports[`SearchInput advanced search 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -328,24 +316,12 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -697,24 +673,12 @@ exports[`SearchInput renders search input in strict mode 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -913,24 +877,12 @@ exports[`SearchInput search input with hint 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1121,24 +1073,12 @@ exports[`SearchInput simple search input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
diff --git a/packages/react-core/src/demos/CardDemos.md b/packages/react-core/src/demos/CardDemos.md
index f8d7b88ccd0..666063d546e 100644
--- a/packages/react-core/src/demos/CardDemos.md
+++ b/packages/react-core/src/demos/CardDemos.md
@@ -6,7 +6,7 @@ section: components
import { Fragment, useState } from 'react';
import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
import RhUiInformationFillIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-information-fill-icon';
-import ArrowRightIcon from '@patternfly/react-icons/dist/js/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-caret-right-icon';
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
import { RhUiCheckCircleFillIcon, RhUiErrorFillIcon, RhUiWarningFillIcon, RhUiNotificationFillIcon } from '@patternfly/react-icons';
import { Table, Thead, Tbody, Tr, Th, Td, ExpandableRowContent } from '@patternfly/react-table';
diff --git a/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx b/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
index 702e87588a5..6d38175b102 100644
--- a/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
@@ -20,7 +20,7 @@ import {
MenuToggleElement
} from '@patternfly/react-core';
import RhUiInformationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-information-fill-icon';
-import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
+import RhUiCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-right-icon';
import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
@@ -134,7 +134,7 @@ export const CardHorizontalGrid: React.FunctionComponent = () => {
- } iconPosition="right">
+ } iconPosition="right">
View all set up cluster steps
@@ -162,7 +162,7 @@ export const CardHorizontalGrid: React.FunctionComponent = () => {
- } iconPosition="right">
+ } iconPosition="right">
View all guided tours
@@ -193,7 +193,7 @@ export const CardHorizontalGrid: React.FunctionComponent = () => {
- } iconPosition="right">
+ } iconPosition="right">
View all quick starts
@@ -227,7 +227,7 @@ export const CardHorizontalGrid: React.FunctionComponent = () => {
- } iconPosition="right">
+ } iconPosition="right">
View all learning resources