@patternfly/react-core 6.5.0-prerelease.46 → 6.5.0-prerelease.48

package/helpers/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.5.0-prerelease.45","private":true}
+{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.5.0-prerelease.47","private":true}

package/layouts/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.5.0-prerelease.45","private":true}
+{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.5.0-prerelease.47","private":true}

package/next/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.5.0-prerelease.45","private":true}
+{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.5.0-prerelease.47","private":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "6.5.0-prerelease.46",
+  "version": "6.5.0-prerelease.48",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -46,7 +46,7 @@
     "subpaths": "node ../../scripts/exportSubpaths.mjs --config subpaths.config.json"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^6.5.0-prerelease.18",
+    "@patternfly/react-icons": "^6.5.0-prerelease.19",
     "@patternfly/react-styles": "^6.5.0-prerelease.15",
     "@patternfly/react-tokens": "^6.5.0-prerelease.14",
     "focus-trap": "7.6.6",
@@ -63,5 +63,5 @@
     "react": "^17 || ^18 || ^19",
     "react-dom": "^17 || ^18 || ^19"
   },
-  "gitHead": "88447932726124eab07413b447d8bad641ec3ce9"
+  "gitHead": "d12d240eb2218407d455c9b06478e1a38357d3f7"
 }

package/src/components/Alert/AlertIcon.tsx

@@ -1,17 +1,17 @@
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Alert/alert';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
-import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
+import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
+import RhUiInformationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-information-fill-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 export const variantIcons = {
-  success: CheckCircleIcon,
-  danger: ExclamationCircleIcon,
-  warning: ExclamationTriangleIcon,
-  info: InfoCircleIcon,
-  custom: BellIcon
+  success: RhUiCheckCircleFillIcon,
+  danger: RhUiErrorFillIcon,
+  warning: RhUiWarningFillIcon,
+  info: RhUiInformationFillIcon,
+  custom: RhUiNotificationFillIcon
 };
 
 export interface AlertIconProps extends React.HTMLProps<HTMLDivElement> {

package/src/components/Alert/__tests__/AlertIcon.test.tsx

@@ -3,14 +3,14 @@ import { render, screen } from '@testing-library/react';
 import { AlertIcon } from '../AlertIcon';
 import styles from '@patternfly/react-styles/css/components/Alert/alert';
 
-jest.mock('@patternfly/react-icons/dist/esm/icons/check-circle-icon', () => () => 'Check circle icon mock');
-jest.mock('@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon', () => () => 'Exclamation circle icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon', () => () => 'Check circle icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon', () => () => 'Exclamation circle icon mock');
 jest.mock(
-  '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon',
+  '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon',
   () => () => 'Exclamation triangle icon mock'
 );
-jest.mock('@patternfly/react-icons/dist/esm/icons/info-circle-icon', () => () => 'Info circle icon mock');
-jest.mock('@patternfly/react-icons/dist/esm/icons/bell-icon', () => () => 'Bell icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-information-fill-icon', () => () => 'Info circle icon mock');
+jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon', () => () => 'Bell icon mock');
 
 test('Renders without children', () => {
   render(

package/src/components/Alert/__tests__/Generated/__snapshots__/AlertIcon.test.tsx.snap

@@ -11,24 +11,12 @@ exports[`AlertIcon should match snapshot (auto-generated) 1`] = `
       fill="currentColor"
       height="1em"
       role="img"
+      viewBox="0 0 32 32"
       width="1em"
     >
-      <svg
-        class="pf-v6-icon-default"
-        viewBox="0 0 512 512"
-      >
-        <path
-          d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"
-        />
-      </svg>
-      <svg
-        class="pf-v6-icon-rh-ui"
-        viewBox="0 0 32 32"
-      >
-        <path
-          d="M16 1C7.729 1 1 7.729 1 16s6.729 15 15 15 15-6.729 15-15S24.271 1 16 1Zm0 28C8.832 29 3 23.168 3 16S8.832 3 16 3s13 5.832 13 13-5.832 13-13 13Zm7.707-17.707a.999.999 0 0 1 0 1.414l-8.646 8.646c-.292.292-.676.438-1.061.438s-.768-.146-1.061-.438l-4.646-4.646a.999.999 0 1 1 1.414-1.414L14 19.586l8.293-8.293a.999.999 0 0 1 1.414 0Z"
-        />
-      </svg>
+      <path
+        d="M16 1C7.729 1 1 7.729 1 16s6.729 15 15 15 15-6.729 15-15S24.271 1 16 1Zm7.795 11.795-8.646 8.646c-.317.317-.733.475-1.149.475s-.832-.158-1.149-.475l-4.646-4.646a1.126 1.126 0 0 1 1.591-1.591l4.205 4.205 8.205-8.205a1.126 1.126 0 0 1 1.591 1.591Z"
+      />
     </svg>
   </div>
 </DocumentFragment>

package/src/components/Banner/examples/Banner.md

@@ -5,11 +5,11 @@ cssPrefix: pf-v6-c-banner
 propComponents: ['Banner']
 ---
 
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
-import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
+import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
+import RhUiInformationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-information-fill-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 ## Examples
 

package/src/components/Banner/examples/BannerStatus.tsx

@@ -1,16 +1,16 @@
 import { Banner, Flex, FlexItem } from '@patternfly/react-core';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
-import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
+import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
+import RhUiInformationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-information-fill-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 export const BannerStatus: React.FunctionComponent = () => (
   <>
     <Banner screenReaderText="Success banner" status="success">
       <Flex spaceItems={{ default: 'spaceItemsSm' }}>
         <FlexItem>
-          <CheckCircleIcon />
+          <RhUiCheckCircleFillIcon />
         </FlexItem>
         <FlexItem>Success banner</FlexItem>
       </Flex>
@@ -19,7 +19,7 @@ export const BannerStatus: React.FunctionComponent = () => (
     <Banner screenReaderText="Warning banner" status="warning">
       <Flex spaceItems={{ default: 'spaceItemsSm' }}>
         <FlexItem>
-          <ExclamationTriangleIcon />
+          <RhUiWarningFillIcon />
         </FlexItem>
         <FlexItem>Warning banner</FlexItem>
       </Flex>
@@ -28,7 +28,7 @@ export const BannerStatus: React.FunctionComponent = () => (
     <Banner screenReaderText="Danger banner" status="danger">
       <Flex spaceItems={{ default: 'spaceItemsSm' }}>
         <FlexItem>
-          <ExclamationCircleIcon />
+          <RhUiErrorFillIcon />
         </FlexItem>
         <FlexItem>Danger banner</FlexItem>
       </Flex>
@@ -37,7 +37,7 @@ export const BannerStatus: React.FunctionComponent = () => (
     <Banner screenReaderText="Info banner" status="info">
       <Flex spaceItems={{ default: 'spaceItemsSm' }}>
         <FlexItem>
-          <InfoCircleIcon />
+          <RhUiInformationFillIcon />
         </FlexItem>
         <FlexItem>Info banner</FlexItem>
       </Flex>
@@ -46,7 +46,7 @@ export const BannerStatus: React.FunctionComponent = () => (
     <Banner screenReaderText="Custom banner" status="custom">
       <Flex spaceItems={{ default: 'spaceItemsSm' }}>
         <FlexItem>
-          <BellIcon />
+          <RhUiNotificationFillIcon />
         </FlexItem>
         <FlexItem>Custom banner</FlexItem>
       </Flex>

package/src/components/Button/examples/Button.md

@@ -13,7 +13,7 @@ import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/ex
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
 import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
 import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-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';
 
 ## Examples

package/src/components/Button/examples/ButtonCircle.tsx

@@ -2,7 +2,7 @@ import { Button, Flex } from '@patternfly/react-core';
 import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
 
 interface LoadingPropsType {
@@ -35,19 +35,24 @@ export const ButtonCircle: React.FunctionComponent = () => {
       <Button variant="link" isCircle icon={<PlusCircleIcon />} aria-label="Add link circle variant example" />
       <Button variant="control" isCircle icon={<CopyIcon />} aria-label="Copy control circle variant example" />
       <Button variant="plain" isCircle icon={<RhMicronsCloseIcon />} aria-label="Remove plain circle variant example" />
-      <Button variant="stateful" isCircle icon={<BellIcon />} aria-label="Stateful unread circle variant example" />
+      <Button
+        variant="stateful"
+        isCircle
+        icon={<RhUiNotificationFillIcon />}
+        aria-label="Stateful unread circle variant example"
+      />
       <Button
         variant="stateful"
         state="read"
         isCircle
-        icon={<BellIcon />}
+        icon={<RhUiNotificationFillIcon />}
         aria-label="Stateful read circle variant example"
       />
       <Button
         variant="stateful"
         state="attention"
         isCircle
-        icon={<BellIcon />}
+        icon={<RhUiNotificationFillIcon />}
         aria-label="Stateful attention circle variant example"
       />
       <Button

package/src/components/Button/examples/ButtonStateful.tsx

@@ -1,5 +1,5 @@
 import { Button, Flex } from '@patternfly/react-core';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 export const ButtonStateful: React.FunctionComponent = () => (
   <Flex>
@@ -7,7 +7,7 @@ export const ButtonStateful: React.FunctionComponent = () => (
       <div>
         <strong>Read</strong>
       </div>
-      <Button variant="stateful" state="read" icon={<BellIcon />}>
+      <Button variant="stateful" state="read" icon={<RhUiNotificationFillIcon />}>
         10 <span className="pf-v6-screen-reader">items</span>
       </Button>
     </div>
@@ -15,7 +15,7 @@ export const ButtonStateful: React.FunctionComponent = () => (
       <div>
         <strong>Unread</strong>
       </div>
-      <Button variant="stateful" state="unread" icon={<BellIcon />}>
+      <Button variant="stateful" state="unread" icon={<RhUiNotificationFillIcon />}>
         10 <span className="pf-v6-screen-reader">unread items</span>
       </Button>
     </div>
@@ -23,7 +23,7 @@ export const ButtonStateful: React.FunctionComponent = () => (
       <div>
         <strong>Attention</strong>
       </div>
-      <Button variant="stateful" state="attention" icon={<BellIcon />}>
+      <Button variant="stateful" state="attention" icon={<RhUiNotificationFillIcon />}>
         10 <span className="pf-v6-screen-reader">unread items, needs attention</span>
       </Button>
     </div>

package/src/components/Button/examples/ButtonVariations.tsx

@@ -3,7 +3,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 BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 export const ButtonVariations: React.FunctionComponent = () => (
   <>
@@ -50,13 +50,13 @@ export const ButtonVariations: React.FunctionComponent = () => (
     </Flex>
     <br />
     <Flex columnGap={{ default: 'columnGapSm' }}>
-      <Button variant="stateful" icon={<BellIcon />} state="read">
+      <Button variant="stateful" icon={<RhUiNotificationFillIcon />} state="read">
         Stateful read
       </Button>
-      <Button variant="stateful" icon={<BellIcon />} state="unread">
+      <Button variant="stateful" icon={<RhUiNotificationFillIcon />} state="unread">
         Stateful unread
       </Button>
-      <Button variant="stateful" icon={<BellIcon />} state="attention">
+      <Button variant="stateful" icon={<RhUiNotificationFillIcon />} state="attention">
         Stateful attention
       </Button>
     </Flex>

package/src/components/EmptyState/examples/EmptyState.md

@@ -8,7 +8,6 @@ propComponents: ['EmptyState', 'EmptyStateBody', 'EmptyStateFooter', 'EmptyState
 import { useState } from 'react';
 import CubesIcon from '@patternfly/react-icons/dist/esm/icons/cubes-icon';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
 ## Examples
 ### Basic

package/src/components/ExpandableSection/__tests__/ExpandableSection.test.tsx

@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 
 import { ExpandableSection, ExpandableSectionVariant } from '../ExpandableSection';
 import styles from '@patternfly/react-styles/css/components/ExpandableSection/expandable-section';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 
 const props = { contentId: 'content-id', toggleId: 'toggle-id' };
 
@@ -274,7 +274,11 @@ test('Renders with div wrapper when toggleWrapper="div"', () => {
 });
 
 test('Can render custom toggle icon', () => {
-  render(<ExpandableSection toggleIcon={<BellIcon data-testid="bell-icon" />}>Test content</ExpandableSection>);
+  render(
+    <ExpandableSection toggleIcon={<RhUiNotificationFillIcon data-testid="bell-icon" />}>
+      Test content
+    </ExpandableSection>
+  );
 
   expect(screen.getByTestId('bell-icon')).toBeInTheDocument();
 });
@@ -288,7 +292,7 @@ test('Does not render toggle icon when hasToggleIcon is false', () => {
 
 test('Does not render custom toggle icon when hasToggleIcon is false', () => {
   render(
-    <ExpandableSection toggleIcon={<BellIcon data-testid="bell-icon" />} hasToggleIcon={false}>
+    <ExpandableSection toggleIcon={<RhUiNotificationFillIcon data-testid="bell-icon" />} hasToggleIcon={false}>
       Test content
     </ExpandableSection>
   );

package/src/components/ExpandableSection/examples/ExpandableSection.md

@@ -6,7 +6,7 @@ propComponents: ['ExpandableSection', 'ExpandableSectionToggle']
 ---
 
 import { useState } from 'react';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
 
 ## Examples
 

package/src/components/ExpandableSection/examples/ExpandableSectionCustomToggle.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { ExpandableSection, Badge, Stack, StackItem } from '@patternfly/react-core';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
 
 export const ExpandableSectionCustomToggle: React.FunctionComponent = () => {
   const [isExpanded, setIsExpanded] = useState(false);
@@ -18,7 +18,7 @@ export const ExpandableSectionCustomToggle: React.FunctionComponent = () => {
           toggleContent={
             <div>
               <span>You can also use icons </span>
-              <CheckCircleIcon />
+              <RhUiCheckCircleFillIcon />
               <span> or badges </span>
               <Badge isRead={true}>4</Badge>
               <span> !</span>

package/src/components/ExpandableSection/examples/ExpandableSectionWithHeading.tsx

@@ -1,6 +1,6 @@
 import { useState, MouseEvent } from 'react';
 import { ExpandableSection, ExpandableSectionToggle, Stack, StackItem } from '@patternfly/react-core';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
 
 export const ExpandableSectionWithHeading = () => {
   const [isExpanded1, setIsExpanded1] = useState(false);
@@ -75,7 +75,7 @@ export const ExpandableSectionWithHeading = () => {
           toggleWrapper="h5"
           toggleContent={
             <span>
-              <CheckCircleIcon /> Custom Heading Content with Icon
+              <RhUiCheckCircleFillIcon /> Custom Heading Content with Icon
             </span>
           }
           onToggle={onToggle2}

package/src/components/FileUpload/examples/FileUpload.md

@@ -8,7 +8,6 @@ subsection: file-upload
 
 import { useState } from 'react';
 import FileUploadIcon from '@patternfly/react-icons/dist/esm/icons/file-upload-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 
 ## Examples
 

package/src/components/Form/examples/Form.md

@@ -23,7 +23,7 @@ propComponents:
 ---
 
 import { useRef, useEffect, useState } from 'react';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import TrashIcon from '@patternfly/react-icons/dist/esm/icons/trash-icon';
 import styles from '@patternfly/react-styles/css/components/Form/form';

package/src/components/Form/examples/FormInvalid.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Form, FormGroup, TextInput, HelperText, HelperTextItem, FormHelperText } from '@patternfly/react-core';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
 
 export const FormInvalid: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
@@ -32,7 +32,7 @@ export const FormInvalid: React.FunctionComponent = () => {
         {validated !== 'success' && (
           <FormHelperText>
             <HelperText>
-              <HelperTextItem icon={<ExclamationCircleIcon />} variant={validated}>
+              <HelperTextItem icon={<RhUiErrorFillIcon />} variant={validated}>
                 {validated === 'error' ? 'Must be a number' : 'Please enter your age'}
               </HelperTextItem>
             </HelperText>

package/src/components/Form/examples/FormInvalidWithFormAlert.tsx

@@ -9,7 +9,7 @@ import {
   HelperTextItem,
   FormHelperText
 } from '@patternfly/react-core';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
 
 export const FormInvalidWithAlert: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
@@ -46,7 +46,7 @@ export const FormInvalidWithAlert: React.FunctionComponent = () => {
         {validated !== 'success' && (
           <FormHelperText>
             <HelperText>
-              <HelperTextItem icon={<ExclamationCircleIcon />} variant={validated}>
+              <HelperTextItem icon={<RhUiErrorFillIcon />} variant={validated}>
                 {validated === 'error' ? 'Must be a number' : 'Please enter your age'}
               </HelperTextItem>
             </HelperText>

package/src/components/Form/examples/FormState.tsx

@@ -18,7 +18,7 @@ import {
   TextArea,
   TextInput
 } from '@patternfly/react-core';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
 
 export const FormState = () => {
   const [isSelectOpen, setIsSelectOpen] = useState(false);
@@ -42,7 +42,7 @@ export const FormState = () => {
               <HelperText>
                 <HelperTextItem
                   variant={errors['input-id'] ? 'error' : 'default'}
-                  {...(errors['input-id'] && { icon: <ExclamationCircleIcon /> })}
+                  {...(errors['input-id'] && { icon: <RhUiErrorFillIcon /> })}
                 >
                   {errors['input-id']}
                 </HelperTextItem>

package/src/components/Form/examples/FormValidated.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Form, FormGroup, FormHelperText, HelperText, HelperTextItem, TextInput } from '@patternfly/react-core';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
 
 export const FormValidated: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
@@ -47,7 +47,7 @@ export const FormValidated: React.FunctionComponent = () => {
         />
         <FormHelperText>
           <HelperText>
-            <HelperTextItem variant={validated} {...(validated === 'error' && { icon: <ExclamationCircleIcon /> })}>
+            <HelperTextItem variant={validated} {...(validated === 'error' && { icon: <RhUiErrorFillIcon /> })}>
               {helperText}
             </HelperTextItem>
           </HelperText>

package/src/components/FormControl/FormControlIcon.tsx

@@ -1,13 +1,13 @@
 import styles from '@patternfly/react-styles/css/components/FormControl/form-control';
 import { css } from '@patternfly/react-styles';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
+import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
+import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
 
 export const statusIcons = {
-  success: CheckCircleIcon,
-  error: ExclamationCircleIcon,
-  warning: ExclamationTriangleIcon
+  success: RhUiCheckCircleFillIcon,
+  error: RhUiErrorFillIcon,
+  warning: RhUiWarningFillIcon
 };
 
 export interface FormControlIconProps extends React.HTMLProps<HTMLDivElement> {

package/src/components/FormSelect/__tests__/__snapshots__/FormSelect.test.tsx.snap

@@ -452,24 +452,12 @@ exports[`FormSelect invalid FormSelect input 1`] = `
           fill="currentColor"
           height="1em"
           role="img"
+          viewBox="0 0 32 32"
           width="1em"
         >
-          <svg
-            class="pf-v6-icon-default"
-            viewBox="0 0 512 512"
-          >
-            <path
-              d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
-            />
-          </svg>
-          <svg
-            class="pf-v6-icon-rh-ui"
-            viewBox="0 0 32 32"
-          >
-            <path
-              d="M14.75 16V9a1.25 1.25 0 0 1 2.5 0v7a1.25 1.25 0 0 1-2.5 0ZM31 16c0 8.271-6.729 15-15 15S1 24.271 1 16 7.729 1 16 1s15 6.729 15 15Zm-2 0c0-7.168-5.832-13-13-13S3 8.832 3 16s5.832 13 13 13 13-5.832 13-13Zm-13 4.261a1.75 1.75 0 1 0 .001 3.501A1.75 1.75 0 0 0 16 20.261Z"
-            />
-          </svg>
+          <path
+            d="M16 1C7.729 1 1 7.729 1 16s6.729 15 15 15 15-6.729 15-15S24.271 1 16 1Zm-1.5 8a1.5 1.5 0 1 1 3 0v7a1.5 1.5 0 1 1-3 0V9ZM16 25.001a2 2 0 1 1-.001-3.999A2 2 0 0 1 16 25.001Z"
+          />
         </svg>
       </span>
       <span
@@ -537,24 +525,12 @@ exports[`FormSelect validated success FormSelect input 1`] = `
           fill="currentColor"
           height="1em"
           role="img"
+          viewBox="0 0 32 32"
           width="1em"
         >
-          <svg
-            class="pf-v6-icon-default"
-            viewBox="0 0 512 512"
-          >
-            <path
-              d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"
-            />
-          </svg>
-          <svg
-            class="pf-v6-icon-rh-ui"
-            viewBox="0 0 32 32"
-          >
-            <path
-              d="M16 1C7.729 1 1 7.729 1 16s6.729 15 15 15 15-6.729 15-15S24.271 1 16 1Zm0 28C8.832 29 3 23.168 3 16S8.832 3 16 3s13 5.832 13 13-5.832 13-13 13Zm7.707-17.707a.999.999 0 0 1 0 1.414l-8.646 8.646c-.292.292-.676.438-1.061.438s-.768-.146-1.061-.438l-4.646-4.646a.999.999 0 1 1 1.414-1.414L14 19.586l8.293-8.293a.999.999 0 0 1 1.414 0Z"
-            />
-          </svg>
+          <path
+            d="M16 1C7.729 1 1 7.729 1 16s6.729 15 15 15 15-6.729 15-15S24.271 1 16 1Zm7.795 11.795-8.646 8.646c-.317.317-.733.475-1.149.475s-.832-.158-1.149-.475l-4.646-4.646a1.126 1.126 0 0 1 1.591-1.591l4.205 4.205 8.205-8.205a1.126 1.126 0 0 1 1.591 1.591Z"
+          />
         </svg>
       </span>
       <span
@@ -622,24 +598,12 @@ exports[`FormSelect validated warning FormSelect input 1`] = `
           fill="currentColor"
           height="1em"
           role="img"
+          viewBox="0 0 32 32"
           width="1em"
         >
-          <svg
-            class="pf-v6-icon-default"
-            viewBox="0 0 576 512"
-          >
-            <path
-              d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
-            />
-          </svg>
-          <svg
-            class="pf-v6-icon-rh-ui"
-            viewBox="0 0 32 32"
-          >
-            <path
-              d="M31.461 27.771 17.3 2.301a1.499 1.499 0 0 0-2.623 0L.517 27.771c-.261.469-.255 1.025.018 1.489s.756.74 1.294.74h28.322c.537 0 1.021-.276 1.293-.74a1.49 1.49 0 0 0 .018-1.489ZM2.678 28l13.31-23.942L29.3 28H2.678ZM16 11.75c.69 0 1.25.56 1.25 1.25v5a1.25 1.25 0 0 1-2.5 0v-5c0-.69.56-1.25 1.25-1.25Zm1.75 12.261a1.75 1.75 0 1 1-3.501-.001 1.75 1.75 0 0 1 3.501.001Z"
-            />
-          </svg>
+          <path
+            d="m31.874 28.514-15.011-27a1.001 1.001 0 0 0-1.748 0l-15.011 27A1 1 0 0 0 .978 30H31a1 1 0 0 0 .874-1.486ZM14.5 12a1.5 1.5 0 0 1 3 0v5a1.5 1.5 0 0 1-3 0v-5ZM16 26.001a2 2 0 1 1-.001-3.999A2 2 0 0 1 16 26.001Z"
+          />
         </svg>
       </span>
       <span