diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
index ff74157220e..54b22ee96cb 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
+++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
@@ -2,13 +2,13 @@
  * This test was generated
  */
 import { render } from '@testing-library/react';
-import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
+import RhUiProfileFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-profile-fill-icon';
 import { EmptyStateIcon } from '../../EmptyStateIcon';
 // any missing imports can usually be resolved by adding them here
 import { Spinner } from '../../../Spinner/Spinner';
 
 it('EmptyStateIcon should match snapshot (auto-generated)', () => {
-  const { asFragment } = render(<EmptyStateIcon className={"''"} icon={UserIcon} />);
+  const { asFragment } = render(<EmptyStateIcon className={"''"} icon={RhUiProfileFillIcon} />);
   expect(asFragment()).toMatchSnapshot();
 });
 
diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap b/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap
index 93ced2acd39..5f461eabad3 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap
+++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/__snapshots__/EmptyStateIcon.test.tsx.snap
@@ -11,24 +11,12 @@ exports[`EmptyStateIcon 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 448 512"
-      >
-        <path
-          d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"
-        />
-      </svg>
-      <svg
-        class="pf-v6-icon-rh-ui"
-        viewBox="0 0 32 32"
-      >
-        <path
-          d="M20.354 15.702C22.545 14.273 24 11.805 24 9c0-4.411-3.589-8-8-8S8 4.589 8 9a7.995 7.995 0 0 0 3.646 6.702C6.053 17.538 2 22.801 2 29a1 1 0 0 0 1 1h26a1 1 0 0 0 1-1c0-6.199-4.053-11.462-9.646-13.298ZM10 9c0-3.309 2.691-6 6-6s6 2.691 6 6-2.691 6-6 6-6-2.691-6-6ZM4.041 28C4.551 21.85 9.72 17 16 17s11.449 4.85 11.959 11H4.041Z"
-        />
-      </svg>
+      <path
+        d="M29.75 29a.75.75 0 0 1-.75.75H3a.75.75 0 0 1-.75-.75c0-6.283 4.241-11.583 10.007-13.219A7.755 7.755 0 0 1 8.25 9c0-4.273 3.477-7.75 7.75-7.75S23.75 4.727 23.75 9a7.751 7.751 0 0 1-4.007 6.781C25.509 17.417 29.75 22.717 29.75 29Z"
+      />
     </svg>
   </div>
 </DocumentFragment>
diff --git a/packages/react-core/src/components/Nav/examples/Nav.md b/packages/react-core/src/components/Nav/examples/Nav.md
index 05d3ceb77d4..d3847cc93b5 100644
--- a/packages/react-core/src/components/Nav/examples/Nav.md
+++ b/packages/react-core/src/components/Nav/examples/Nav.md
@@ -9,7 +9,7 @@ ouia: true
 import { useState } from 'react';
 import './nav.css';
 import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
-import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
+import RhUiProfileFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-profile-fill-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
 import CloudIcon from '@patternfly/react-icons/dist/esm/icons/cloud-icon';
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
index 1067818727f..2350cecb8b3 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
@@ -1,6 +1,6 @@
 import { Component } from 'react';
 import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
-import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
+import RhUiProfileFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-profile-fill-icon';
 
 interface AlertDemoState {
   alertOneVisible: boolean;
@@ -59,7 +59,7 @@ export class AlertDemo extends Component<{}, AlertDemoState> {
           truncateTitle={3}
           tooltipPosition="bottom"
         />
-        <Alert id="custom-icon-alert" title="Custom icon alert title" customIcon={<UserIcon />}>
+        <Alert id="custom-icon-alert" title="Custom icon alert title" customIcon={<RhUiProfileFillIcon />}>
           Custom icon alert description
         </Alert>
         <Alert id="expandable-alert" title="Expandable alert title" isExpandable>