From db5776efaf1d334fe420d01bcc34e130516da5fd Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 11:49:12 -0500
Subject: [PATCH 1/7] feat(Compass): add compass nav components

---
 packages/react-core/package.json              |   2 +-
 .../components/Compass/CompassNavContent.tsx  |  21 ++++
 .../src/components/Compass/CompassNavHome.tsx |  17 +++
 .../src/components/Compass/CompassNavMain.tsx |  17 +++
 .../components/Compass/CompassNavSearch.tsx   |  17 +++
 .../__tests__/CompassNavContent.test.tsx      |  32 ++++++
 .../Compass/__tests__/CompassNavHome.test.tsx |  32 ++++++
 .../Compass/__tests__/CompassNavMain.test.tsx |  32 ++++++
 .../__tests__/CompassNavSearch.test.tsx       |  32 ++++++
 .../Compass/examples/CompassDemo.tsx          | 100 +++++++++++-------
 .../src/components/Compass/index.ts           |   4 +
 packages/react-docs/package.json              |   2 +-
 packages/react-icons/package.json             |   2 +-
 packages/react-styles/package.json            |   2 +-
 packages/react-tokens/package.json            |   2 +-
 15 files changed, 270 insertions(+), 44 deletions(-)
 create mode 100644 packages/react-core/src/components/Compass/CompassNavContent.tsx
 create mode 100644 packages/react-core/src/components/Compass/CompassNavHome.tsx
 create mode 100644 packages/react-core/src/components/Compass/CompassNavMain.tsx
 create mode 100644 packages/react-core/src/components/Compass/CompassNavSearch.tsx
 create mode 100644 packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
 create mode 100644 packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
 create mode 100644 packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
 create mode 100644 packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index 18fe134ecce..5f356e2e75b 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -54,7 +54,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.19",
+    "@patternfly/patternfly": "6.5.0-prerelease.24",
     "case-anything": "^3.1.2",
     "css": "^3.0.0",
     "fs-extra": "^11.3.0"
diff --git a/packages/react-core/src/components/Compass/CompassNavContent.tsx b/packages/react-core/src/components/Compass/CompassNavContent.tsx
new file mode 100644
index 00000000000..e188652c146
--- /dev/null
+++ b/packages/react-core/src/components/Compass/CompassNavContent.tsx
@@ -0,0 +1,21 @@
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+import { css } from '@patternfly/react-styles';
+
+interface CompassNavContentProps extends React.HTMLProps<HTMLDivElement> {
+  /** Content of the nav content wrapper. */
+  children: React.ReactNode;
+  /** Additional classes added to the nav content. */
+  className?: string;
+}
+
+export const CompassNavContent: React.FunctionComponent<CompassNavContentProps> = ({
+  children,
+  className,
+  ...props
+}) => (
+  <div className={css(styles.compassNavContent, className)} {...props}>
+    {children}
+  </div>
+);
+
+CompassNavContent.displayName = 'CompassNavContent';
diff --git a/packages/react-core/src/components/Compass/CompassNavHome.tsx b/packages/react-core/src/components/Compass/CompassNavHome.tsx
new file mode 100644
index 00000000000..1c47b0b549c
--- /dev/null
+++ b/packages/react-core/src/components/Compass/CompassNavHome.tsx
@@ -0,0 +1,17 @@
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+import { css } from '@patternfly/react-styles';
+
+interface CompassNavHomeProps extends React.HTMLProps<HTMLDivElement> {
+  /** Content of the nav home section (typically a home button/icon). */
+  children: React.ReactNode;
+  /** Additional classes added to the nav home section. */
+  className?: string;
+}
+
+export const CompassNavHome: React.FunctionComponent<CompassNavHomeProps> = ({ children, className, ...props }) => (
+  <div className={css(styles.compassNavHome, className)} {...props}>
+    {children}
+  </div>
+);
+
+CompassNavHome.displayName = 'CompassNavHome';
diff --git a/packages/react-core/src/components/Compass/CompassNavMain.tsx b/packages/react-core/src/components/Compass/CompassNavMain.tsx
new file mode 100644
index 00000000000..7f4f56d24f0
--- /dev/null
+++ b/packages/react-core/src/components/Compass/CompassNavMain.tsx
@@ -0,0 +1,17 @@
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+import { css } from '@patternfly/react-styles';
+
+interface CompassNavMainProps extends React.HTMLProps<HTMLDivElement> {
+  /** Content of the nav main section (typically tabs). */
+  children: React.ReactNode;
+  /** Additional classes added to the nav main section. */
+  className?: string;
+}
+
+export const CompassNavMain: React.FunctionComponent<CompassNavMainProps> = ({ children, className, ...props }) => (
+  <div className={css(styles.compassNavMain, className)} {...props}>
+    {children}
+  </div>
+);
+
+CompassNavMain.displayName = 'CompassNavMain';
diff --git a/packages/react-core/src/components/Compass/CompassNavSearch.tsx b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
new file mode 100644
index 00000000000..d83bc394357
--- /dev/null
+++ b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
@@ -0,0 +1,17 @@
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+import { css } from '@patternfly/react-styles';
+
+interface CompassNavSearchProps extends React.HTMLProps<HTMLDivElement> {
+  /** Content of the nav search section (typically a search button/icon). */
+  children: React.ReactNode;
+  /** Additional classes added to the nav search section. */
+  className?: string;
+}
+
+export const CompassNavSearch: React.FunctionComponent<CompassNavSearchProps> = ({ children, className, ...props }) => (
+  <div className={css(styles.compassNavSearch, className)} {...props}>
+    {children}
+  </div>
+);
+
+CompassNavSearch.displayName = 'CompassNavSearch';
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
new file mode 100644
index 00000000000..7672261680f
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react';
+import { CompassNavContent } from '../CompassNavContent';
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+
+test('Renders with children', () => {
+  render(<CompassNavContent>Test content</CompassNavContent>);
+  expect(screen.getByText('Test content')).toBeVisible();
+});
+
+test('Renders with custom class name when className prop is provided', () => {
+  render(<CompassNavContent className="custom-class">Test</CompassNavContent>);
+  expect(screen.getByText('Test')).toHaveClass('custom-class');
+});
+
+test(`Renders with default ${styles.compassNavContent} class`, () => {
+  render(<CompassNavContent>Test</CompassNavContent>);
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavContent);
+});
+
+test('Renders with additional props spread to the component', () => {
+  render(<CompassNavContent aria-label="Test label">Test</CompassNavContent>);
+  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+});
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(
+    <CompassNavContent>
+      <div>Nav content wrapper</div>
+    </CompassNavContent>
+  );
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
new file mode 100644
index 00000000000..2b04a24ba5b
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react';
+import { CompassNavHome } from '../CompassNavHome';
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+
+test('Renders with children', () => {
+  render(<CompassNavHome>Test content</CompassNavHome>);
+  expect(screen.getByText('Test content')).toBeVisible();
+});
+
+test('Renders with custom class name when className prop is provided', () => {
+  render(<CompassNavHome className="custom-class">Test</CompassNavHome>);
+  expect(screen.getByText('Test')).toHaveClass('custom-class');
+});
+
+test(`Renders with default ${styles.compassNavHome} class`, () => {
+  render(<CompassNavHome>Test</CompassNavHome>);
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavHome);
+});
+
+test('Renders with additional props spread to the component', () => {
+  render(<CompassNavHome aria-label="Test label">Test</CompassNavHome>);
+  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+});
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(
+    <CompassNavHome>
+      <div>Home button</div>
+    </CompassNavHome>
+  );
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
new file mode 100644
index 00000000000..76f0c309f28
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react';
+import { CompassNavMain } from '../CompassNavMain';
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+
+test('Renders with children', () => {
+  render(<CompassNavMain>Test content</CompassNavMain>);
+  expect(screen.getByText('Test content')).toBeVisible();
+});
+
+test('Renders with custom class name when className prop is provided', () => {
+  render(<CompassNavMain className="custom-class">Test</CompassNavMain>);
+  expect(screen.getByText('Test')).toHaveClass('custom-class');
+});
+
+test(`Renders with default ${styles.compassNavMain} class`, () => {
+  render(<CompassNavMain>Test</CompassNavMain>);
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavMain);
+});
+
+test('Renders with additional props spread to the component', () => {
+  render(<CompassNavMain aria-label="Test label">Test</CompassNavMain>);
+  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+});
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(
+    <CompassNavMain>
+      <div>Main tabs content</div>
+    </CompassNavMain>
+  );
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
new file mode 100644
index 00000000000..ed159203d65
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react';
+import { CompassNavSearch } from '../CompassNavSearch';
+import styles from '@patternfly/react-styles/css/components/Compass/compass';
+
+test('Renders with children', () => {
+  render(<CompassNavSearch>Test content</CompassNavSearch>);
+  expect(screen.getByText('Test content')).toBeVisible();
+});
+
+test('Renders with custom class name when className prop is provided', () => {
+  render(<CompassNavSearch className="custom-class">Test</CompassNavSearch>);
+  expect(screen.getByText('Test')).toHaveClass('custom-class');
+});
+
+test(`Renders with default ${styles.compassNavSearch} class`, () => {
+  render(<CompassNavSearch>Test</CompassNavSearch>);
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavSearch);
+});
+
+test('Renders with additional props spread to the component', () => {
+  render(<CompassNavSearch aria-label="Test label">Test</CompassNavSearch>);
+  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+});
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(
+    <CompassNavSearch>
+      <div>Search button</div>
+    </CompassNavSearch>
+  );
+  expect(asFragment()).toMatchSnapshot();
+});
diff --git a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
index 735cbdf0e3f..049c1ffb59d 100644
--- a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
+++ b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
@@ -7,6 +7,10 @@ import {
   CompassMainHeader,
   CompassPanel,
   CompassMessageBar,
+  CompassNavContent,
+  CompassNavHome,
+  CompassNavMain,
+  CompassNavSearch,
   Tabs,
   TabsComponent,
   Tab,
@@ -23,6 +27,8 @@ import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 import OutlinedPlusSquare from '@patternfly/react-icons/dist/esm/icons/outlined-plus-square-icon';
 import OutlinedCopy from '@patternfly/react-icons/dist/esm/icons/outlined-copy-icon';
 import OutlinedQuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon';
+import HomeIcon from '@patternfly/react-icons/dist/esm/icons/home-icon';
+import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 
 export const CompassBasic: React.FunctionComponent = () => {
   const [activeTab, setActiveTab] = useState<number>(0);
@@ -32,48 +38,64 @@ export const CompassBasic: React.FunctionComponent = () => {
   const navContent = (
     <>
       <CompassPanel isPill hasNoPadding>
-        <Tabs
-          activeKey={activeTab}
-          isNav
-          onSelect={(_event, tabIndex) => setActiveTab(tabIndex as number)}
-          component={TabsComponent.nav}
-          aria-label="Compass navigation tabs"
-          inset={{ default: 'insetXl' }}
-        >
-          <Tab
-            tabContentId="subtabs"
-            tabContentRef={subTabsRef}
-            eventKey={0}
-            title={<TabTitleText>Tab 1</TabTitleText>}
-            aria-label="Compass tab with subtabs"
-          />
-          <Tab eventKey={1} title={<TabTitleText>Tab 2</TabTitleText>} />
-          <Tab eventKey={2} title={<TabTitleText>Tab 3</TabTitleText>} />
-          <Tab eventKey={3} title={<TabTitleText>Disabled Tab 4</TabTitleText>} isDisabled />
-        </Tabs>
+        <CompassNavContent>
+          <CompassNavHome>
+            <Tooltip content="Home">
+              <Button isCircle variant="plain" icon={<HomeIcon />} aria-label="Home" />
+            </Tooltip>
+          </CompassNavHome>
+          <CompassNavMain>
+            <Tabs
+              activeKey={activeTab}
+              isNav
+              onSelect={(_event, tabIndex) => setActiveTab(tabIndex as number)}
+              component={TabsComponent.nav}
+              aria-label="Compass navigation tabs"
+            >
+              <Tab
+                tabContentId="subtabs"
+                tabContentRef={subTabsRef}
+                eventKey={0}
+                title={<TabTitleText>Tab 1</TabTitleText>}
+                aria-label="Compass tab with subtabs"
+              />
+              <Tab eventKey={1} title={<TabTitleText>Tab 2</TabTitleText>} />
+              <Tab eventKey={2} title={<TabTitleText>Tab 3</TabTitleText>} />
+              <Tab eventKey={3} title={<TabTitleText>Disabled Tab 4</TabTitleText>} isDisabled />
+            </Tabs>
+          </CompassNavMain>
+          <CompassNavSearch>
+            <Tooltip content="Search">
+              <Button isCircle variant="plain" icon={<SearchIcon />} aria-label="Search" />
+            </Tooltip>
+          </CompassNavSearch>
+        </CompassNavContent>
       </CompassPanel>
       <CompassPanel isPill hasNoPadding>
         <TabContent id="subtabs" ref={subTabsRef}>
-          <Tabs
-            activeKey={activeSubtab}
-            isSubtab
-            isNav
-            onSelect={(_event, tabIndex) => setActiveSubtab(tabIndex as number)}
-            aria-label="Compass navigation subtabs"
-            inset={{ default: 'insetXl' }}
-          >
-            <Tab
-              tabContentId="subtab-1"
-              eventKey={0}
-              title={
-                <TabTitleText>
-                  <div id="subtab-1">Subtab 1</div>
-                </TabTitleText>
-              }
-            />
-            <Tab eventKey={1} title={<TabTitleText>Subtab 2</TabTitleText>} />
-            <Tab eventKey={2} title={<TabTitleText>Disabled Subtab 3</TabTitleText>} isDisabled />
-          </Tabs>
+          <CompassNavContent>
+            <CompassNavMain>
+              <Tabs
+                activeKey={activeSubtab}
+                isSubtab
+                isNav
+                onSelect={(_event, tabIndex) => setActiveSubtab(tabIndex as number)}
+                aria-label="Compass navigation subtabs"
+              >
+                <Tab
+                  tabContentId="subtab-1"
+                  eventKey={0}
+                  title={
+                    <TabTitleText>
+                      <div id="subtab-1">Subtab 1</div>
+                    </TabTitleText>
+                  }
+                />
+                <Tab eventKey={1} title={<TabTitleText>Subtab 2</TabTitleText>} />
+                <Tab eventKey={2} title={<TabTitleText>Disabled Subtab 3</TabTitleText>} isDisabled />
+              </Tabs>
+            </CompassNavMain>
+          </CompassNavContent>
         </TabContent>
       </CompassPanel>
     </>
diff --git a/packages/react-core/src/components/Compass/index.ts b/packages/react-core/src/components/Compass/index.ts
index c27bc7678f1..63c8d24adb6 100644
--- a/packages/react-core/src/components/Compass/index.ts
+++ b/packages/react-core/src/components/Compass/index.ts
@@ -4,4 +4,8 @@ export * from './CompassHeader';
 export * from './CompassHero';
 export * from './CompassMainHeader';
 export * from './CompassMessageBar';
+export * from './CompassNavContent';
+export * from './CompassNavHome';
+export * from './CompassNavMain';
+export * from './CompassNavSearch';
 export * from './CompassPanel';
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 42d38b92727..d0eddc02001 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -23,7 +23,7 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.19",
+    "@patternfly/patternfly": "6.5.0-prerelease.24",
     "@patternfly/react-charts": "workspace:^",
     "@patternfly/react-code-editor": "workspace:^",
     "@patternfly/react-core": "workspace:^",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index 3a8262e1e9d..3cbd3ab5bbc 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.19",
+    "@patternfly/patternfly": "6.5.0-prerelease.24",
     "fs-extra": "^11.3.0",
     "tslib": "^2.8.1"
   },
diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
index dcf24bcdcc5..d63dee1e54e 100644
--- a/packages/react-styles/package.json
+++ b/packages/react-styles/package.json
@@ -19,7 +19,7 @@
     "clean": "rimraf dist css"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.19",
+    "@patternfly/patternfly": "6.5.0-prerelease.24",
     "change-case": "^5.4.4",
     "fs-extra": "^11.3.0"
   },
diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
index 504ab80fe60..6446711b2ef 100644
--- a/packages/react-tokens/package.json
+++ b/packages/react-tokens/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@adobe/css-tools": "^4.4.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.19",
+    "@patternfly/patternfly": "6.5.0-prerelease.24",
     "fs-extra": "^11.3.0"
   }
 }

From c55a7a2f4c156757a2e7e64bb7a7f29ff68a38f5 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 14:19:44 -0500
Subject: [PATCH 2/7] refactor to bundle children into CompassNavSearch/Home
 components

---
 .../src/components/Compass/CompassNavHome.tsx | 27 +++++--
 .../src/components/Compass/CompassNavMain.tsx |  2 +-
 .../components/Compass/CompassNavSearch.tsx   | 27 +++++--
 .../Compass/__tests__/CompassNavHome.test.tsx | 57 +++++++++----
 .../__tests__/CompassNavSearch.test.tsx       | 57 +++++++++----
 .../CompassNavContent.test.tsx.snap           | 13 +++
 .../CompassNavHome.test.tsx.snap              | 79 +++++++++++++++++++
 .../CompassNavMain.test.tsx.snap              | 13 +++
 .../CompassNavSearch.test.tsx.snap            | 79 +++++++++++++++++++
 .../Compass/examples/CompassDemo.tsx          | 16 +---
 yarn.lock                                     | 18 ++---
 11 files changed, 322 insertions(+), 66 deletions(-)
 create mode 100644 packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavContent.test.tsx.snap
 create mode 100644 packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
 create mode 100644 packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavMain.test.tsx.snap
 create mode 100644 packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap

diff --git a/packages/react-core/src/components/Compass/CompassNavHome.tsx b/packages/react-core/src/components/Compass/CompassNavHome.tsx
index 1c47b0b549c..fa7785f5523 100644
--- a/packages/react-core/src/components/Compass/CompassNavHome.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavHome.tsx
@@ -1,16 +1,27 @@
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
+import { Button } from '../Button';
+import { Tooltip } from '../Tooltip';
+import HomeIcon from '@patternfly/react-icons/dist/esm/icons/home-icon';
 
-interface CompassNavHomeProps extends React.HTMLProps<HTMLDivElement> {
-  /** Content of the nav home section (typically a home button/icon). */
-  children: React.ReactNode;
-  /** Additional classes added to the nav home section. */
-  className?: string;
+export interface CompassNavHomeProps extends Omit<React.HTMLProps<HTMLDivElement>, 'onClick'> {
+  /** Content to display in the tooltip. Defaults to "Home". */
+  tooltipContent?: React.ReactNode;
+  /** Click handler for the home button. */
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
 }
 
-export const CompassNavHome: React.FunctionComponent<CompassNavHomeProps> = ({ children, className, ...props }) => (
-  <div className={css(styles.compassNavHome, className)} {...props}>
-    {children}
+export const CompassNavHome: React.FunctionComponent<CompassNavHomeProps> = ({
+  'aria-label': ariaLabel = 'Home',
+  tooltipContent = 'Home',
+  className,
+  onClick,
+  ...props
+}) => (
+  <div className={css(styles.compassNav + '-home', className)} {...props}>
+    <Tooltip content={tooltipContent}>
+      <Button isCircle variant="plain" icon={<HomeIcon />} aria-label={ariaLabel} onClick={onClick} />
+    </Tooltip>
   </div>
 );
 
diff --git a/packages/react-core/src/components/Compass/CompassNavMain.tsx b/packages/react-core/src/components/Compass/CompassNavMain.tsx
index 7f4f56d24f0..b50e132e37d 100644
--- a/packages/react-core/src/components/Compass/CompassNavMain.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavMain.tsx
@@ -1,7 +1,7 @@
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
 
-interface CompassNavMainProps extends React.HTMLProps<HTMLDivElement> {
+export interface CompassNavMainProps extends React.HTMLProps<HTMLDivElement> {
   /** Content of the nav main section (typically tabs). */
   children: React.ReactNode;
   /** Additional classes added to the nav main section. */
diff --git a/packages/react-core/src/components/Compass/CompassNavSearch.tsx b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
index d83bc394357..5d042403905 100644
--- a/packages/react-core/src/components/Compass/CompassNavSearch.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
@@ -1,16 +1,27 @@
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
+import { Button } from '../Button';
+import { Tooltip } from '../Tooltip';
+import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 
-interface CompassNavSearchProps extends React.HTMLProps<HTMLDivElement> {
-  /** Content of the nav search section (typically a search button/icon). */
-  children: React.ReactNode;
-  /** Additional classes added to the nav search section. */
-  className?: string;
+export interface CompassNavSearchProps extends Omit<React.HTMLProps<HTMLDivElement>, 'onClick'> {
+  /** Content to display in the tooltip. Defaults to "Search". */
+  tooltipContent?: React.ReactNode;
+  /** Click handler for the search button. */
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
 }
 
-export const CompassNavSearch: React.FunctionComponent<CompassNavSearchProps> = ({ children, className, ...props }) => (
-  <div className={css(styles.compassNavSearch, className)} {...props}>
-    {children}
+export const CompassNavSearch: React.FunctionComponent<CompassNavSearchProps> = ({
+  'aria-label': ariaLabel = 'Search',
+  tooltipContent = 'Search',
+  className,
+  onClick,
+  ...props
+}) => (
+  <div className={css(styles.compassNav + '-search', className)} {...props}>
+    <Tooltip content={tooltipContent}>
+      <Button isCircle variant="plain" icon={<SearchIcon />} aria-label={ariaLabel} onClick={onClick} />
+    </Tooltip>
   </div>
 );
 
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
index 2b04a24ba5b..43cde8363e0 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
@@ -1,32 +1,61 @@
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { CompassNavHome } from '../CompassNavHome';
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 
-test('Renders with children', () => {
-  render(<CompassNavHome>Test content</CompassNavHome>);
-  expect(screen.getByText('Test content')).toBeVisible();
+test('Renders with default aria-label', () => {
+  render(<CompassNavHome />);
+  expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
+});
+
+test('Renders with custom aria-label when provided', () => {
+  render(<CompassNavHome aria-label="Custom home" />);
+  expect(screen.getByRole('button', { name: 'Custom home' })).toBeVisible();
+});
+
+test('Renders with default tooltip content', () => {
+  render(<CompassNavHome />);
+  expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
+});
+
+test('Renders with custom tooltip content when provided', () => {
+  render(<CompassNavHome tooltipContent="Custom tooltip" />);
+  expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
 });
 
 test('Renders with custom class name when className prop is provided', () => {
-  render(<CompassNavHome className="custom-class">Test</CompassNavHome>);
-  expect(screen.getByText('Test')).toHaveClass('custom-class');
+  const { container } = render(<CompassNavHome className="custom-class" />);
+  expect(container.firstChild).toHaveClass('custom-class');
 });
 
-test(`Renders with default ${styles.compassNavHome} class`, () => {
-  render(<CompassNavHome>Test</CompassNavHome>);
-  expect(screen.getByText('Test')).toHaveClass(styles.compassNavHome);
+test(`Renders with default class`, () => {
+  const { container } = render(<CompassNavHome />);
+  expect(container.firstChild).toHaveClass(styles.compassNav + '-home');
 });
 
-test('Renders with additional props spread to the component', () => {
-  render(<CompassNavHome aria-label="Test label">Test</CompassNavHome>);
-  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+test('Calls onClick handler when button is clicked', async () => {
+  const onClick = jest.fn();
+  const user = userEvent.setup();
+  render(<CompassNavHome onClick={onClick} />);
+
+  await user.click(screen.getByRole('button', { name: 'Home' }));
+  expect(onClick).toHaveBeenCalledTimes(1);
+});
+
+test('Renders button with plain variant and circle shape', () => {
+  render(<CompassNavHome />);
+  const button = screen.getByRole('button', { name: 'Home' });
+  expect(button).toHaveClass('pf-m-plain');
 });
 
 test('Matches the snapshot', () => {
+  const { asFragment } = render(<CompassNavHome />);
+  expect(asFragment()).toMatchSnapshot();
+});
+
+test('Matches the snapshot with custom props', () => {
   const { asFragment } = render(
-    <CompassNavHome>
-      <div>Home button</div>
-    </CompassNavHome>
+    <CompassNavHome aria-label="Custom home" tooltipContent="Go home" className="custom-class" />
   );
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
index ed159203d65..d155f061d75 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
@@ -1,32 +1,61 @@
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { CompassNavSearch } from '../CompassNavSearch';
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 
-test('Renders with children', () => {
-  render(<CompassNavSearch>Test content</CompassNavSearch>);
-  expect(screen.getByText('Test content')).toBeVisible();
+test('Renders with default aria-label', () => {
+  render(<CompassNavSearch />);
+  expect(screen.getByRole('button', { name: 'Search' })).toBeVisible();
+});
+
+test('Renders with custom aria-label when provided', () => {
+  render(<CompassNavSearch aria-label="Custom search" />);
+  expect(screen.getByRole('button', { name: 'Custom search' })).toBeVisible();
+});
+
+test('Renders with default tooltip content', () => {
+  render(<CompassNavSearch />);
+  expect(screen.getByRole('button', { name: 'Search' })).toBeVisible();
+});
+
+test('Renders with custom tooltip content when provided', () => {
+  render(<CompassNavSearch tooltipContent="Custom tooltip" />);
+  expect(screen.getByRole('button', { name: 'Search' })).toBeVisible();
 });
 
 test('Renders with custom class name when className prop is provided', () => {
-  render(<CompassNavSearch className="custom-class">Test</CompassNavSearch>);
-  expect(screen.getByText('Test')).toHaveClass('custom-class');
+  const { container } = render(<CompassNavSearch className="custom-class" />);
+  expect(container.firstChild).toHaveClass('custom-class');
 });
 
-test(`Renders with default ${styles.compassNavSearch} class`, () => {
-  render(<CompassNavSearch>Test</CompassNavSearch>);
-  expect(screen.getByText('Test')).toHaveClass(styles.compassNavSearch);
+test(`Renders with default class`, () => {
+  const { container } = render(<CompassNavSearch />);
+  expect(container.firstChild).toHaveClass(styles.compassNav + '-search');
 });
 
-test('Renders with additional props spread to the component', () => {
-  render(<CompassNavSearch aria-label="Test label">Test</CompassNavSearch>);
-  expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
+test('Calls onClick handler when button is clicked', async () => {
+  const onClick = jest.fn();
+  const user = userEvent.setup();
+  render(<CompassNavSearch onClick={onClick} />);
+
+  await user.click(screen.getByRole('button', { name: 'Search' }));
+  expect(onClick).toHaveBeenCalledTimes(1);
+});
+
+test('Renders button with plain variant and circle shape', () => {
+  render(<CompassNavSearch />);
+  const button = screen.getByRole('button', { name: 'Search' });
+  expect(button).toHaveClass('pf-m-plain');
 });
 
 test('Matches the snapshot', () => {
+  const { asFragment } = render(<CompassNavSearch />);
+  expect(asFragment()).toMatchSnapshot();
+});
+
+test('Matches the snapshot with custom props', () => {
   const { asFragment } = render(
-    <CompassNavSearch>
-      <div>Search button</div>
-    </CompassNavSearch>
+    <CompassNavSearch aria-label="Custom search" tooltipContent="Search content" className="custom-class" />
   );
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavContent.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavContent.test.tsx.snap
new file mode 100644
index 00000000000..df1e9a2ddea
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavContent.test.tsx.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches the snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-content"
+  >
+    <div>
+      Nav content wrapper
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
new file mode 100644
index 00000000000..1755c6f2aaf
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
@@ -0,0 +1,79 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches the snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-home"
+  >
+    <div
+      style="display: contents;"
+    >
+      <button
+        aria-label="Home"
+        class="pf-v6-c-button pf-m-plain pf-m-circle"
+        data-ouia-component-id="OUIA-Generated-Button-plain-9"
+        data-ouia-component-type="PF6/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-v6-c-button__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class="pf-v6-svg"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            viewBox="0 0 576 512"
+            width="1em"
+          >
+            <path
+              d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`Matches the snapshot with custom props 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-home custom-class"
+  >
+    <div
+      style="display: contents;"
+    >
+      <button
+        aria-label="Custom home"
+        class="pf-v6-c-button pf-m-plain pf-m-circle"
+        data-ouia-component-id="OUIA-Generated-Button-plain-10"
+        data-ouia-component-type="PF6/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-v6-c-button__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class="pf-v6-svg"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            viewBox="0 0 576 512"
+            width="1em"
+          >
+            <path
+              d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavMain.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavMain.test.tsx.snap
new file mode 100644
index 00000000000..53987fbf559
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavMain.test.tsx.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches the snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-main"
+  >
+    <div>
+      Main tabs content
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap
new file mode 100644
index 00000000000..d70bc7861fc
--- /dev/null
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap
@@ -0,0 +1,79 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches the snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-search"
+  >
+    <div
+      style="display: contents;"
+    >
+      <button
+        aria-label="Search"
+        class="pf-v6-c-button pf-m-plain pf-m-circle"
+        data-ouia-component-id="OUIA-Generated-Button-plain-9"
+        data-ouia-component-type="PF6/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-v6-c-button__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class="pf-v6-svg"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            viewBox="0 0 512 512"
+            width="1em"
+          >
+            <path
+              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`Matches the snapshot with custom props 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v6-c-compass__nav-search custom-class"
+  >
+    <div
+      style="display: contents;"
+    >
+      <button
+        aria-label="Custom search"
+        class="pf-v6-c-button pf-m-plain pf-m-circle"
+        data-ouia-component-id="OUIA-Generated-Button-plain-10"
+        data-ouia-component-type="PF6/Button"
+        data-ouia-safe="true"
+        type="button"
+      >
+        <span
+          class="pf-v6-c-button__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class="pf-v6-svg"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            viewBox="0 0 512 512"
+            width="1em"
+          >
+            <path
+              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+            />
+          </svg>
+        </span>
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
index d0e87aae837..ca22b8e712d 100644
--- a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
+++ b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 import { useRef, useState } from 'react';
 import {
   Compass,
@@ -28,8 +30,6 @@ import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 import OutlinedPlusSquare from '@patternfly/react-icons/dist/esm/icons/outlined-plus-square-icon';
 import OutlinedCopy from '@patternfly/react-icons/dist/esm/icons/outlined-copy-icon';
 import OutlinedQuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon';
-import HomeIcon from '@patternfly/react-icons/dist/esm/icons/home-icon';
-import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 
 export const CompassBasic: React.FunctionComponent = () => {
   const [activeTab, setActiveTab] = useState<number>(0);
@@ -40,11 +40,7 @@ export const CompassBasic: React.FunctionComponent = () => {
     <>
       <CompassPanel isPill hasNoPadding>
         <CompassNavContent>
-          <CompassNavHome>
-            <Tooltip content="Home">
-              <Button isCircle variant="plain" icon={<HomeIcon />} aria-label="Home" />
-            </Tooltip>
-          </CompassNavHome>
+          <CompassNavHome onClick={() => console.log('Home')} />
           <CompassNavMain>
             <Tabs
               activeKey={activeTab}
@@ -65,11 +61,7 @@ export const CompassBasic: React.FunctionComponent = () => {
               <Tab eventKey={3} title={<TabTitleText>Disabled Tab 4</TabTitleText>} isDisabled />
             </Tabs>
           </CompassNavMain>
-          <CompassNavSearch>
-            <Tooltip content="Search">
-              <Button isCircle variant="plain" icon={<SearchIcon />} aria-label="Search" />
-            </Tooltip>
-          </CompassNavSearch>
+          <CompassNavSearch onClick={() => console.log('Search')} />
         </CompassNavContent>
       </CompassPanel>
       <CompassPanel isPill hasNoPadding>
diff --git a/yarn.lock b/yarn.lock
index 56d41d9096e..c57e5bfa5bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4516,10 +4516,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:6.5.0-prerelease.22":
-  version: 6.5.0-prerelease.22
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.22"
-  checksum: 10c0/664920b21d28e25a57ac45f21896db5077d065138273bed146bde22b8925091984401575579b679f7ec66fa660d2d913119d913a9daefeec41cbb15624d10140
+"@patternfly/patternfly@npm:6.5.0-prerelease.24":
+  version: 6.5.0-prerelease.24
+  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.24"
+  checksum: 10c0/21dcd825a1a1d5ee6a2154fcc6084de7bedb12df6c953f51c795b3119343bfdd8b90ed527f5d16c5ef2f3acf5ad942e0f820762cf085cc91ce49904d179bb486
   languageName: node
   linkType: hard
 
@@ -4617,7 +4617,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-core@workspace:packages/react-core"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.22"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
     "@patternfly/react-icons": "workspace:^"
     "@patternfly/react-styles": "workspace:^"
     "@patternfly/react-tokens": "workspace:^"
@@ -4638,7 +4638,7 @@ __metadata:
   resolution: "@patternfly/react-docs@workspace:packages/react-docs"
   dependencies:
     "@patternfly/documentation-framework": "npm:^6.28.9"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.22"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
     "@patternfly/patternfly-a11y": "npm:5.1.0"
     "@patternfly/react-charts": "workspace:^"
     "@patternfly/react-code-editor": "workspace:^"
@@ -4678,7 +4678,7 @@ __metadata:
     "@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.22"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
     fs-extra: "npm:^11.3.0"
     tslib: "npm:^2.8.1"
   peerDependencies:
@@ -4763,7 +4763,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-styles@workspace:packages/react-styles"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.22"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
     change-case: "npm:^5.4.4"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
@@ -4805,7 +4805,7 @@ __metadata:
   resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.22"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
   linkType: soft

From 4b5f5eb9d2b77168c229b884b3abe149ef99a3c6 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 14:26:26 -0500
Subject: [PATCH 3/7] Tweak interfaces to not duplicate props from
 HTMLDivElement

---
 .../react-core/src/components/Compass/CompassNavContent.tsx  | 5 +----
 .../react-core/src/components/Compass/CompassNavMain.tsx     | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/react-core/src/components/Compass/CompassNavContent.tsx b/packages/react-core/src/components/Compass/CompassNavContent.tsx
index e188652c146..3d962976fff 100644
--- a/packages/react-core/src/components/Compass/CompassNavContent.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavContent.tsx
@@ -1,11 +1,8 @@
 import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
-
-interface CompassNavContentProps extends React.HTMLProps<HTMLDivElement> {
+export interface CompassNavContentProps extends React.HTMLProps<HTMLDivElement> {
   /** Content of the nav content wrapper. */
   children: React.ReactNode;
-  /** Additional classes added to the nav content. */
-  className?: string;
 }
 
 export const CompassNavContent: React.FunctionComponent<CompassNavContentProps> = ({
diff --git a/packages/react-core/src/components/Compass/CompassNavMain.tsx b/packages/react-core/src/components/Compass/CompassNavMain.tsx
index b50e132e37d..1dfde77e721 100644
--- a/packages/react-core/src/components/Compass/CompassNavMain.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavMain.tsx
@@ -4,8 +4,6 @@ import { css } from '@patternfly/react-styles';
 export interface CompassNavMainProps extends React.HTMLProps<HTMLDivElement> {
   /** Content of the nav main section (typically tabs). */
   children: React.ReactNode;
-  /** Additional classes added to the nav main section. */
-  className?: string;
 }
 
 export const CompassNavMain: React.FunctionComponent<CompassNavMainProps> = ({ children, className, ...props }) => (

From 40d34e79784ab56cd819f050dd3b7ad49c74138b Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 14:39:46 -0500
Subject: [PATCH 4/7] update tests

---
 .../__tests__/CompassNavContent.test.tsx      |  7 +++-
 .../Compass/__tests__/CompassNavHome.test.tsx | 40 ++++++++++++++++---
 .../Compass/__tests__/CompassNavMain.test.tsx |  7 +++-
 .../__tests__/CompassNavSearch.test.tsx       | 38 +++++++++++++++---
 4 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
index 7672261680f..eb176b5ccae 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavContent.test.tsx
@@ -4,21 +4,25 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
 
 test('Renders with children', () => {
   render(<CompassNavContent>Test content</CompassNavContent>);
+
   expect(screen.getByText('Test content')).toBeVisible();
 });
 
 test('Renders with custom class name when className prop is provided', () => {
   render(<CompassNavContent className="custom-class">Test</CompassNavContent>);
+
   expect(screen.getByText('Test')).toHaveClass('custom-class');
 });
 
 test(`Renders with default ${styles.compassNavContent} class`, () => {
   render(<CompassNavContent>Test</CompassNavContent>);
-  expect(screen.getByText('Test')).toHaveClass(styles.compassNavContent);
+
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavContent, { exact: true });
 });
 
 test('Renders with additional props spread to the component', () => {
   render(<CompassNavContent aria-label="Test label">Test</CompassNavContent>);
+
   expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
 });
 
@@ -28,5 +32,6 @@ test('Matches the snapshot', () => {
       <div>Nav content wrapper</div>
     </CompassNavContent>
   );
+
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
index 43cde8363e0..020d154cfd5 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavHome.test.tsx
@@ -5,51 +5,78 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
 
 test('Renders with default aria-label', () => {
   render(<CompassNavHome />);
+
   expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
 });
 
 test('Renders with custom aria-label when provided', () => {
   render(<CompassNavHome aria-label="Custom home" />);
+
   expect(screen.getByRole('button', { name: 'Custom home' })).toBeVisible();
 });
 
-test('Renders with default tooltip content', () => {
+test('Renders with default tooltip content', async () => {
+  const user = userEvent.setup();
+
   render(<CompassNavHome />);
-  expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
+
+  const button = screen.getByRole('button');
+
+  user.hover(button);
+
+  await screen.findByRole('tooltip');
+
+  expect(screen.getByRole('tooltip')).toHaveTextContent('Home');
 });
 
-test('Renders with custom tooltip content when provided', () => {
+test('Renders with custom tooltip content when provided', async () => {
+  const user = userEvent.setup();
+
   render(<CompassNavHome tooltipContent="Custom tooltip" />);
-  expect(screen.getByRole('button', { name: 'Home' })).toBeVisible();
+
+  const button = screen.getByRole('button');
+
+  user.hover(button);
+
+  await screen.findByRole('tooltip');
+  expect(screen.getByRole('tooltip')).toHaveTextContent('Custom tooltip');
 });
 
 test('Renders with custom class name when className prop is provided', () => {
   const { container } = render(<CompassNavHome className="custom-class" />);
+
   expect(container.firstChild).toHaveClass('custom-class');
 });
 
 test(`Renders with default class`, () => {
   const { container } = render(<CompassNavHome />);
-  expect(container.firstChild).toHaveClass(styles.compassNav + '-home');
+
+  expect(container.firstChild).toHaveClass(styles.compassNav + '-home', { exact: true });
 });
 
 test('Calls onClick handler when button is clicked', async () => {
-  const onClick = jest.fn();
   const user = userEvent.setup();
+  const onClick = jest.fn();
+
   render(<CompassNavHome onClick={onClick} />);
 
   await user.click(screen.getByRole('button', { name: 'Home' }));
+
   expect(onClick).toHaveBeenCalledTimes(1);
 });
 
 test('Renders button with plain variant and circle shape', () => {
   render(<CompassNavHome />);
+
   const button = screen.getByRole('button', { name: 'Home' });
+
   expect(button).toHaveClass('pf-m-plain');
+  expect(button).toHaveClass('pf-m-circle');
 });
 
 test('Matches the snapshot', () => {
   const { asFragment } = render(<CompassNavHome />);
+
   expect(asFragment()).toMatchSnapshot();
 });
 
@@ -57,5 +84,6 @@ test('Matches the snapshot with custom props', () => {
   const { asFragment } = render(
     <CompassNavHome aria-label="Custom home" tooltipContent="Go home" className="custom-class" />
   );
+
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
index 76f0c309f28..0242f9ef64c 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavMain.test.tsx
@@ -4,21 +4,25 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
 
 test('Renders with children', () => {
   render(<CompassNavMain>Test content</CompassNavMain>);
+
   expect(screen.getByText('Test content')).toBeVisible();
 });
 
 test('Renders with custom class name when className prop is provided', () => {
   render(<CompassNavMain className="custom-class">Test</CompassNavMain>);
+
   expect(screen.getByText('Test')).toHaveClass('custom-class');
 });
 
 test(`Renders with default ${styles.compassNavMain} class`, () => {
   render(<CompassNavMain>Test</CompassNavMain>);
-  expect(screen.getByText('Test')).toHaveClass(styles.compassNavMain);
+
+  expect(screen.getByText('Test')).toHaveClass(styles.compassNavMain, { exact: true });
 });
 
 test('Renders with additional props spread to the component', () => {
   render(<CompassNavMain aria-label="Test label">Test</CompassNavMain>);
+
   expect(screen.getByText('Test')).toHaveAccessibleName('Test label');
 });
 
@@ -28,5 +32,6 @@ test('Matches the snapshot', () => {
       <div>Main tabs content</div>
     </CompassNavMain>
   );
+
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
index d155f061d75..2c5432c9bb2 100644
--- a/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
+++ b/packages/react-core/src/components/Compass/__tests__/CompassNavSearch.test.tsx
@@ -13,43 +13,68 @@ test('Renders with custom aria-label when provided', () => {
   expect(screen.getByRole('button', { name: 'Custom search' })).toBeVisible();
 });
 
-test('Renders with default tooltip content', () => {
+test('Renders with default tooltip content', async () => {
+  const user = userEvent.setup();
+
   render(<CompassNavSearch />);
-  expect(screen.getByRole('button', { name: 'Search' })).toBeVisible();
+
+  const button = screen.getByRole('button');
+
+  user.hover(button);
+
+  await screen.findByRole('tooltip');
+
+  expect(screen.getByRole('tooltip')).toHaveTextContent('Search');
 });
 
-test('Renders with custom tooltip content when provided', () => {
+test('Renders with custom tooltip content when provided', async () => {
+  const user = userEvent.setup();
+
   render(<CompassNavSearch tooltipContent="Custom tooltip" />);
-  expect(screen.getByRole('button', { name: 'Search' })).toBeVisible();
+
+  const button = screen.getByRole('button');
+
+  user.hover(button);
+
+  await screen.findByRole('tooltip');
+
+  expect(screen.getByRole('tooltip')).toHaveTextContent('Custom tooltip');
 });
 
 test('Renders with custom class name when className prop is provided', () => {
   const { container } = render(<CompassNavSearch className="custom-class" />);
+
   expect(container.firstChild).toHaveClass('custom-class');
 });
 
 test(`Renders with default class`, () => {
   const { container } = render(<CompassNavSearch />);
-  expect(container.firstChild).toHaveClass(styles.compassNav + '-search');
+
+  expect(container.firstChild).toHaveClass(styles.compassNav + '-search', { exact: true });
 });
 
 test('Calls onClick handler when button is clicked', async () => {
-  const onClick = jest.fn();
   const user = userEvent.setup();
+  const onClick = jest.fn();
+
   render(<CompassNavSearch onClick={onClick} />);
 
   await user.click(screen.getByRole('button', { name: 'Search' }));
+
   expect(onClick).toHaveBeenCalledTimes(1);
 });
 
 test('Renders button with plain variant and circle shape', () => {
   render(<CompassNavSearch />);
+
   const button = screen.getByRole('button', { name: 'Search' });
+
   expect(button).toHaveClass('pf-m-plain');
 });
 
 test('Matches the snapshot', () => {
   const { asFragment } = render(<CompassNavSearch />);
+
   expect(asFragment()).toMatchSnapshot();
 });
 
@@ -57,5 +82,6 @@ test('Matches the snapshot with custom props', () => {
   const { asFragment } = render(
     <CompassNavSearch aria-label="Custom search" tooltipContent="Search content" className="custom-class" />
   );
+
   expect(asFragment()).toMatchSnapshot();
 });

From b8e308839d79eaa7480ba0208ad19819fefe9f03 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 15:20:43 -0500
Subject: [PATCH 5/7] Add padding to compass demo nav

---
 .../react-core/src/components/Compass/examples/CompassDemo.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
index ca22b8e712d..e70a9b15873 100644
--- a/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
+++ b/packages/react-core/src/components/Compass/examples/CompassDemo.tsx
@@ -38,7 +38,7 @@ export const CompassBasic: React.FunctionComponent = () => {
 
   const navContent = (
     <>
-      <CompassPanel isPill hasNoPadding>
+      <CompassPanel isPill>
         <CompassNavContent>
           <CompassNavHome onClick={() => console.log('Home')} />
           <CompassNavMain>

From 90e6e2b1089d528460a1a988b03cea3380231d85 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 15:23:49 -0500
Subject: [PATCH 6/7] Update icons

---
 .../src/components/Compass/CompassNavHome.tsx | 37 ++++++++++++-
 .../components/Compass/CompassNavSearch.tsx   | 30 ++++++++++-
 .../CompassNavHome.test.tsx.snap              | 52 ++++++++++++++++---
 .../CompassNavSearch.test.tsx.snap            | 38 +++++++++++---
 4 files changed, 137 insertions(+), 20 deletions(-)

diff --git a/packages/react-core/src/components/Compass/CompassNavHome.tsx b/packages/react-core/src/components/Compass/CompassNavHome.tsx
index fa7785f5523..1ecd73736d4 100644
--- a/packages/react-core/src/components/Compass/CompassNavHome.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavHome.tsx
@@ -2,7 +2,40 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../Button';
 import { Tooltip } from '../Tooltip';
-import HomeIcon from '@patternfly/react-icons/dist/esm/icons/home-icon';
+
+const CompassHomeIcon = () => (
+  <svg
+    width="1em"
+    height="1em"
+    className="pf-v6-svg"
+    viewBox="0 0 20 20"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-hidden="true"
+  >
+    <path
+      d="M8.33268 13.334H11.666"
+      stroke="currentcolor"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <path
+      d="M1.66602 6.66602L9.73102 2.63351C9.89994 2.54905 10.0988 2.54905 10.2677 2.63351L18.3327 6.66602"
+      stroke="currentcolor"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <path
+      d="M16.6673 9.16602V15.4993C16.6673 16.6039 15.7719 17.4993 14.6673 17.4993H5.33398C4.22941 17.4993 3.33398 16.6039 3.33398 15.4993V9.16602"
+      stroke="currentcolor"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </svg>
+);
 
 export interface CompassNavHomeProps extends Omit<React.HTMLProps<HTMLDivElement>, 'onClick'> {
   /** Content to display in the tooltip. Defaults to "Home". */
@@ -20,7 +53,7 @@ export const CompassNavHome: React.FunctionComponent<CompassNavHomeProps> = ({
 }) => (
   <div className={css(styles.compassNav + '-home', className)} {...props}>
     <Tooltip content={tooltipContent}>
-      <Button isCircle variant="plain" icon={<HomeIcon />} aria-label={ariaLabel} onClick={onClick} />
+      <Button isCircle variant="plain" icon={<CompassHomeIcon />} aria-label={ariaLabel} onClick={onClick} />
     </Tooltip>
   </div>
 );
diff --git a/packages/react-core/src/components/Compass/CompassNavSearch.tsx b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
index 5d042403905..8e6ad1998a6 100644
--- a/packages/react-core/src/components/Compass/CompassNavSearch.tsx
+++ b/packages/react-core/src/components/Compass/CompassNavSearch.tsx
@@ -2,7 +2,33 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../Button';
 import { Tooltip } from '../Tooltip';
-import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
+
+const CompassSearchIcon = () => (
+  <svg
+    width="1em"
+    height="1em"
+    className="pf-v6-svg"
+    viewBox="0 0 20 20"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-hidden="true"
+  >
+    <path
+      d="M14.166 14.166L17.4993 17.4993"
+      stroke="currentcolor"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <path
+      d="M2.5 9.16667C2.5 12.8486 5.48477 15.8333 9.16667 15.8333C11.0108 15.8333 12.6801 15.0846 13.887 13.8744C15.0897 12.6685 15.8333 11.0044 15.8333 9.16667C15.8333 5.48477 12.8486 2.5 9.16667 2.5C5.48477 2.5 2.5 5.48477 2.5 9.16667Z"
+      stroke="currentcolor"
+      strokeWidth="1.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </svg>
+);
 
 export interface CompassNavSearchProps extends Omit<React.HTMLProps<HTMLDivElement>, 'onClick'> {
   /** Content to display in the tooltip. Defaults to "Search". */
@@ -20,7 +46,7 @@ export const CompassNavSearch: React.FunctionComponent<CompassNavSearchProps> =
 }) => (
   <div className={css(styles.compassNav + '-search', className)} {...props}>
     <Tooltip content={tooltipContent}>
-      <Button isCircle variant="plain" icon={<SearchIcon />} aria-label={ariaLabel} onClick={onClick} />
+      <Button isCircle variant="plain" icon={<CompassSearchIcon />} aria-label={ariaLabel} onClick={onClick} />
     </Tooltip>
   </div>
 );
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
index 1755c6f2aaf..552af070bb2 100644
--- a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavHome.test.tsx.snap
@@ -22,14 +22,32 @@ exports[`Matches the snapshot 1`] = `
           <svg
             aria-hidden="true"
             class="pf-v6-svg"
-            fill="currentColor"
+            fill="none"
             height="1em"
-            role="img"
-            viewBox="0 0 576 512"
+            viewBox="0 0 20 20"
             width="1em"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"
+              d="M8.33268 13.334H11.666"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M1.66602 6.66602L9.73102 2.63351C9.89994 2.54905 10.0988 2.54905 10.2677 2.63351L18.3327 6.66602"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M16.6673 9.16602V15.4993C16.6673 16.6039 15.7719 17.4993 14.6673 17.4993H5.33398C4.22941 17.4993 3.33398 16.6039 3.33398 15.4993V9.16602"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
             />
           </svg>
         </span>
@@ -61,14 +79,32 @@ exports[`Matches the snapshot with custom props 1`] = `
           <svg
             aria-hidden="true"
             class="pf-v6-svg"
-            fill="currentColor"
+            fill="none"
             height="1em"
-            role="img"
-            viewBox="0 0 576 512"
+            viewBox="0 0 20 20"
             width="1em"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"
+              d="M8.33268 13.334H11.666"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M1.66602 6.66602L9.73102 2.63351C9.89994 2.54905 10.0988 2.54905 10.2677 2.63351L18.3327 6.66602"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M16.6673 9.16602V15.4993C16.6673 16.6039 15.7719 17.4993 14.6673 17.4993H5.33398C4.22941 17.4993 3.33398 16.6039 3.33398 15.4993V9.16602"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
             />
           </svg>
         </span>
diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap
index d70bc7861fc..5a775d0967d 100644
--- a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassNavSearch.test.tsx.snap
@@ -22,14 +22,25 @@ exports[`Matches the snapshot 1`] = `
           <svg
             aria-hidden="true"
             class="pf-v6-svg"
-            fill="currentColor"
+            fill="none"
             height="1em"
-            role="img"
-            viewBox="0 0 512 512"
+            viewBox="0 0 20 20"
             width="1em"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+              d="M14.166 14.166L17.4993 17.4993"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M2.5 9.16667C2.5 12.8486 5.48477 15.8333 9.16667 15.8333C11.0108 15.8333 12.6801 15.0846 13.887 13.8744C15.0897 12.6685 15.8333 11.0044 15.8333 9.16667C15.8333 5.48477 12.8486 2.5 9.16667 2.5C5.48477 2.5 2.5 5.48477 2.5 9.16667Z"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
             />
           </svg>
         </span>
@@ -61,14 +72,25 @@ exports[`Matches the snapshot with custom props 1`] = `
           <svg
             aria-hidden="true"
             class="pf-v6-svg"
-            fill="currentColor"
+            fill="none"
             height="1em"
-            role="img"
-            viewBox="0 0 512 512"
+            viewBox="0 0 20 20"
             width="1em"
+            xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+              d="M14.166 14.166L17.4993 17.4993"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
+            />
+            <path
+              d="M2.5 9.16667C2.5 12.8486 5.48477 15.8333 9.16667 15.8333C11.0108 15.8333 12.6801 15.0846 13.887 13.8744C15.0897 12.6685 15.8333 11.0044 15.8333 9.16667C15.8333 5.48477 12.8486 2.5 9.16667 2.5C5.48477 2.5 2.5 5.48477 2.5 9.16667Z"
+              stroke="currentcolor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="1.5"
             />
           </svg>
         </span>

From 2b0d6fa04d6acc421c3eb25e4ac025a3cd255bc4 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Thu, 13 Nov 2025 17:28:06 -0500
Subject: [PATCH 7/7] Core bump

---
 packages/react-core/package.json   |  2 +-
 packages/react-docs/package.json   |  2 +-
 packages/react-icons/package.json  |  2 +-
 packages/react-styles/package.json |  2 +-
 packages/react-tokens/package.json |  2 +-
 yarn.lock                          | 18 +++++++++---------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index 03e06cf8e7e..319018a7942 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -54,7 +54,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.24",
+    "@patternfly/patternfly": "6.5.0-prerelease.26",
     "case-anything": "^3.1.2",
     "css": "^3.0.0",
     "fs-extra": "^11.3.0"
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 3589bc6c947..b1afc4cdd48 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -23,7 +23,7 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.24",
+    "@patternfly/patternfly": "6.5.0-prerelease.26",
     "@patternfly/react-charts": "workspace:^",
     "@patternfly/react-code-editor": "workspace:^",
     "@patternfly/react-core": "workspace:^",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index 0fffbdc8485..d5b42ebc603 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.24",
+    "@patternfly/patternfly": "6.5.0-prerelease.26",
     "fs-extra": "^11.3.0",
     "tslib": "^2.8.1"
   },
diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
index 72dcb38b525..b644b8299d9 100644
--- a/packages/react-styles/package.json
+++ b/packages/react-styles/package.json
@@ -19,7 +19,7 @@
     "clean": "rimraf dist css"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.5.0-prerelease.24",
+    "@patternfly/patternfly": "6.5.0-prerelease.26",
     "change-case": "^5.4.4",
     "fs-extra": "^11.3.0"
   },
diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
index c68a5378361..3ae19bde72d 100644
--- a/packages/react-tokens/package.json
+++ b/packages/react-tokens/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@adobe/css-tools": "^4.4.4",
-    "@patternfly/patternfly": "6.5.0-prerelease.24",
+    "@patternfly/patternfly": "6.5.0-prerelease.26",
     "fs-extra": "^11.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c57e5bfa5bb..8db1106b8e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4516,10 +4516,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@patternfly/patternfly@npm:6.5.0-prerelease.24":
-  version: 6.5.0-prerelease.24
-  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.24"
-  checksum: 10c0/21dcd825a1a1d5ee6a2154fcc6084de7bedb12df6c953f51c795b3119343bfdd8b90ed527f5d16c5ef2f3acf5ad942e0f820762cf085cc91ce49904d179bb486
+"@patternfly/patternfly@npm:6.5.0-prerelease.26":
+  version: 6.5.0-prerelease.26
+  resolution: "@patternfly/patternfly@npm:6.5.0-prerelease.26"
+  checksum: 10c0/052ea96553532dae97cfc2275dc3fcc86615bf2526781300555e097574c2983d0869cf9523a9076ff8eba1c8be808525afef75d0ac99059391e82d2007aa18f1
   languageName: node
   linkType: hard
 
@@ -4617,7 +4617,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-core@workspace:packages/react-core"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.26"
     "@patternfly/react-icons": "workspace:^"
     "@patternfly/react-styles": "workspace:^"
     "@patternfly/react-tokens": "workspace:^"
@@ -4638,7 +4638,7 @@ __metadata:
   resolution: "@patternfly/react-docs@workspace:packages/react-docs"
   dependencies:
     "@patternfly/documentation-framework": "npm:^6.28.9"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.26"
     "@patternfly/patternfly-a11y": "npm:5.1.0"
     "@patternfly/react-charts": "workspace:^"
     "@patternfly/react-code-editor": "workspace:^"
@@ -4678,7 +4678,7 @@ __metadata:
     "@fortawesome/free-brands-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-regular-svg-icons": "npm:^5.15.4"
     "@fortawesome/free-solid-svg-icons": "npm:^5.15.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.26"
     fs-extra: "npm:^11.3.0"
     tslib: "npm:^2.8.1"
   peerDependencies:
@@ -4763,7 +4763,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@patternfly/react-styles@workspace:packages/react-styles"
   dependencies:
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.26"
     change-case: "npm:^5.4.4"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
@@ -4805,7 +4805,7 @@ __metadata:
   resolution: "@patternfly/react-tokens@workspace:packages/react-tokens"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.4"
-    "@patternfly/patternfly": "npm:6.5.0-prerelease.24"
+    "@patternfly/patternfly": "npm:6.5.0-prerelease.26"
     fs-extra: "npm:^11.3.0"
   languageName: unknown
   linkType: soft