diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
index 0311481f349..67acf61d799 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
@@ -155,6 +155,8 @@ export interface CodeEditorProps extends Omit<React.HTMLProps<HTMLDivElement>, '
   isCopyEnabled?: boolean;
   /** Flag indicating the editor is styled using monaco's dark theme. */
   isDarkTheme?: boolean;
+  /** Flag indicating the editor has a plain header. */
+  isHeaderPlain?: boolean;
   /** Flag to add download button to code editor actions. */
   isDownloadEnabled?: boolean;
   /** Flag to include a label indicating the currently configured editor language. */
@@ -261,6 +263,7 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
     isUploadEnabled: false,
     isDownloadEnabled: false,
     isCopyEnabled: false,
+    isHeaderPlain: false,
     copyButtonAriaLabel: 'Copy code to clipboard',
     uploadButtonAriaLabel: 'Upload code',
     downloadButtonAriaLabel: 'Download code',
@@ -492,6 +495,7 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
       emptyStateLink,
       customControls,
       isMinimapVisible,
+      isHeaderPlain,
       headerMainContent,
       shortcutsPopoverButtonText,
       shortcutsPopoverProps: shortcutsPopoverPropsProp,
@@ -560,45 +564,50 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
             trigger: 'mouseenter focus'
           };
 
-          const editorHeader = (
-            <div className={css(styles.codeEditorHeader)}>
-              {
-                <div className={css(styles.codeEditorControls)}>
-                  <CodeEditorContext.Provider value={{ code: value }}>
-                    {isCopyEnabled && (!showEmptyState || !!value) && (
-                      <CodeEditorControl
-                        icon={<CopyIcon />}
-                        aria-label={copyButtonAriaLabel}
-                        tooltipProps={{
-                          ...tooltipProps,
-                          'aria-live': 'polite',
-                          content: <div>{copied ? copyButtonSuccessTooltipText : copyButtonToolTipText}</div>,
-                          exitDelay: copied ? toolTipCopyExitDelay : toolTipDelay,
-                          onTooltipHidden: () => this.setState({ copied: false })
-                        }}
-                        onClick={this.copyCode}
-                      />
-                    )}
-                    {isUploadEnabled && (
-                      <CodeEditorControl
-                        icon={<UploadIcon />}
-                        aria-label={uploadButtonAriaLabel}
-                        tooltipProps={{ content: <div>{uploadButtonToolTipText}</div>, ...tooltipProps }}
-                        onClick={open}
-                      />
-                    )}
-                    {isDownloadEnabled && (!showEmptyState || !!value) && (
-                      <CodeEditorControl
-                        icon={<DownloadIcon />}
-                        aria-label={downloadButtonAriaLabel}
-                        tooltipProps={{ content: <div>{downloadButtonToolTipText}</div>, ...tooltipProps }}
-                        onClick={this.download}
-                      />
-                    )}
-                    {customControls && customControls}
-                  </CodeEditorContext.Provider>
-                </div>
-              }
+          const hasEditorHeaderContent =
+            ((isCopyEnabled || isDownloadEnabled) && (!showEmptyState || !!value)) ||
+            isUploadEnabled ||
+            customControls ||
+            headerMainContent ||
+            !!shortcutsPopoverProps.bodyContent;
+
+          const editorHeaderContent = (
+            <React.Fragment>
+              <div className={css(styles.codeEditorControls)}>
+                <CodeEditorContext.Provider value={{ code: value }}>
+                  {isCopyEnabled && (!showEmptyState || !!value) && (
+                    <CodeEditorControl
+                      icon={<CopyIcon />}
+                      aria-label={copyButtonAriaLabel}
+                      tooltipProps={{
+                        ...tooltipProps,
+                        'aria-live': 'polite',
+                        content: <div>{copied ? copyButtonSuccessTooltipText : copyButtonToolTipText}</div>,
+                        exitDelay: copied ? toolTipCopyExitDelay : toolTipDelay,
+                        onTooltipHidden: () => this.setState({ copied: false })
+                      }}
+                      onClick={this.copyCode}
+                    />
+                  )}
+                  {isUploadEnabled && (
+                    <CodeEditorControl
+                      icon={<UploadIcon />}
+                      aria-label={uploadButtonAriaLabel}
+                      tooltipProps={{ content: <div>{uploadButtonToolTipText}</div>, ...tooltipProps }}
+                      onClick={open}
+                    />
+                  )}
+                  {isDownloadEnabled && (!showEmptyState || !!value) && (
+                    <CodeEditorControl
+                      icon={<DownloadIcon />}
+                      aria-label={downloadButtonAriaLabel}
+                      tooltipProps={{ content: <div>{downloadButtonToolTipText}</div>, ...tooltipProps }}
+                      onClick={this.download}
+                    />
+                  )}
+                  {customControls && customControls}
+                </CodeEditorContext.Provider>
+              </div>
               {<div className={css(styles.codeEditorHeaderMain)}>{headerMainContent}</div>}
               {!!shortcutsPopoverProps.bodyContent && (
                 <div className={`${styles.codeEditor}__keyboard-shortcuts`}>
@@ -609,6 +618,14 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
                   </Popover>
                 </div>
               )}
+            </React.Fragment>
+          );
+
+          const editorHeader = (
+            <div className={css(styles.codeEditorHeader, isHeaderPlain && styles.modifiers.plain)}>
+              {hasEditorHeaderContent && (
+                <div className={css(styles.codeEditorHeaderContent)}>{editorHeaderContent}</div>
+              )}
               {isLanguageLabelVisible && (
                 <div className={css(styles.codeEditorTab)}>
                   <span className={css(styles.codeEditorTabIcon)}>
@@ -643,14 +660,14 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
                   {...getRootProps({
                     onClick: (event) => event.stopPropagation() // Prevents clicking TextArea from opening file dialog
                   })}
-                  className={`${fileUploadStyles.fileUpload} ${isDragActive && fileUploadStyles.modifiers.dragHover} ${
-                    isLoading && fileUploadStyles.modifiers.loading
-                  }`}
+                  className={css(isLoading && fileUploadStyles.modifiers.loading)}
                 >
                   {editorHeader}
-                  <div className={css(styles.codeEditorMain)}>
-                    <input {...getInputProps()} /* hidden, necessary for react-dropzone */ />
-                    {(showEmptyState || providedEmptyState) && !value ? emptyState : editor}
+                  <div className={css(styles.codeEditorMain, isDragActive && styles.modifiers.dragHover)}>
+                    <div className={css(styles.codeEditorUpload)}>
+                      <input {...getInputProps()} /* hidden, necessary for react-dropzone */ />
+                      {(showEmptyState || providedEmptyState) && !value ? emptyState : editor}
+                    </div>
                   </div>
                 </div>
               ) : (
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
index 132448c50ad..d4872e711a5 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
@@ -38,7 +38,7 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
 
   return isVisible ? (
     <Tooltip {...tooltipProps}>
-      <Button className={className} onClick={onCustomClick} variant="control" aria-label={ariaLabel} {...props}>
+      <Button className={className} onClick={onCustomClick} variant="plain" aria-label={ariaLabel} {...props}>
         {icon}
       </Button>
     </Tooltip>
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
index 78e403d5fec..ebdfe4c053c 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { render, screen, act } from '@testing-library/react';
 import { CodeEditor, Language } from '../CodeEditor';
 import styles from '@patternfly/react-styles/css/components/CodeEditor/code-editor';
-import fileUploadStyles from '@patternfly/react-styles/css/components/FileUpload/file-upload';
 
 jest.mock('@monaco-editor/react', () => jest.fn(() => <div data-testid="mock-editor"></div>));
 
@@ -35,11 +34,9 @@ test(`Renders with ${styles.modifiers.readOnly} when isReadOnly = true`, () => {
   );
 });
 
-test(`Renders with ${fileUploadStyles.fileUpload} when isUploadEnabled = true`, () => {
+test(`Renders with ${styles.codeEditorUpload} when isUploadEnabled = true`, () => {
   render(<CodeEditor isUploadEnabled code="test" />);
-  expect(screen.getByTestId('mock-editor').parentElement?.parentElement?.parentElement).toHaveClass(
-    fileUploadStyles.fileUpload
-  );
+  expect(screen.getByTestId('mock-editor').parentElement?.parentElement).toHaveClass(styles.codeEditorUpload);
 });
 
 test(`Renders with empty state when code = undefined`, () => {
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
index 2dfcbd78dd7..999965dd104 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
     class="pf-v5-c-code-editor"
   >
     <div
-      class="pf-v5-c-file-upload false false"
+      class=""
       role="presentation"
       tabindex="0"
     >
@@ -14,110 +14,118 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
         class="pf-v5-c-code-editor__header"
       >
         <div
-          class="pf-v5-c-code-editor__controls"
+          class="pf-v5-c-code-editor__header-content"
         >
           <div
-            style="display: contents;"
+            class="pf-v5-c-code-editor__controls"
           >
-            <button
-              aria-disabled="false"
-              aria-label="Copy code to clipboard"
-              class="pf-v5-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-1"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                class="pf-v5-svg"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                viewBox="0 0 448 512"
-                width="1em"
+              <button
+                aria-disabled="false"
+                aria-label="Copy code to clipboard"
+                class="pf-v5-c-button pf-m-plain"
+                data-ouia-component-id="OUIA-Generated-Button-plain-1"
+                data-ouia-component-type="PF5/Button"
+                data-ouia-safe="true"
+                type="button"
               >
-                <path
-                  d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
-                />
-              </svg>
-            </button>
-          </div>
-          <div
-            style="display: contents;"
-          >
-            <button
-              aria-disabled="false"
-              aria-label="Upload code"
-              class="pf-v5-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-2"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
-              type="button"
+                <svg
+                  aria-hidden="true"
+                  class="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 448 512"
+                  width="1em"
+                >
+                  <path
+                    d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
+                  />
+                </svg>
+              </button>
+            </div>
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                class="pf-v5-svg"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                viewBox="0 0 512 512"
-                width="1em"
+              <button
+                aria-disabled="false"
+                aria-label="Upload code"
+                class="pf-v5-c-button pf-m-plain"
+                data-ouia-component-id="OUIA-Generated-Button-plain-2"
+                data-ouia-component-type="PF5/Button"
+                data-ouia-safe="true"
+                type="button"
               >
-                <path
-                  d="M296 384h-80c-13.3 0-24-10.7-24-24V192h-87.7c-17.8 0-26.7-21.5-14.1-34.1L242.3 5.7c7.5-7.5 19.8-7.5 27.3 0l152.2 152.2c12.6 12.6 3.7 34.1-14.1 34.1H320v168c0 13.3-10.7 24-24 24zm216-8v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h136v8c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56v-8h136c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
-                />
-              </svg>
-            </button>
-          </div>
-          <div
-            style="display: contents;"
-          >
-            <button
-              aria-disabled="false"
-              aria-label="Download code"
-              class="pf-v5-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-3"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe="true"
-              type="button"
+                <svg
+                  aria-hidden="true"
+                  class="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M296 384h-80c-13.3 0-24-10.7-24-24V192h-87.7c-17.8 0-26.7-21.5-14.1-34.1L242.3 5.7c7.5-7.5 19.8-7.5 27.3 0l152.2 152.2c12.6 12.6 3.7 34.1-14.1 34.1H320v168c0 13.3-10.7 24-24 24zm216-8v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h136v8c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56v-8h136c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
+                  />
+                </svg>
+              </button>
+            </div>
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                class="pf-v5-svg"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                viewBox="0 0 512 512"
-                width="1em"
+              <button
+                aria-disabled="false"
+                aria-label="Download code"
+                class="pf-v5-c-button pf-m-plain"
+                data-ouia-component-id="OUIA-Generated-Button-plain-3"
+                data-ouia-component-type="PF5/Button"
+                data-ouia-safe="true"
+                type="button"
               >
-                <path
-                  d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
-                />
-              </svg>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  class="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
+                  />
+                </svg>
+              </button>
+            </div>
           </div>
+          <div
+            class="pf-v5-c-code-editor__header-main"
+          />
         </div>
-        <div
-          class="pf-v5-c-code-editor__header-main"
-        />
       </div>
       <div
         class="pf-v5-c-code-editor__main"
       >
-        <input
-          style="display: none;"
-          tabindex="-1"
-          type="file"
-        />
         <div
-          class="pf-v5-c-code-editor__code"
-          dir="ltr"
-          tabindex="0"
+          class="pf-v5-c-code-editor__upload"
         >
-          <div
-            data-testid="mock-editor"
+          <input
+            style="display: none;"
+            tabindex="-1"
+            type="file"
           />
+          <div
+            class="pf-v5-c-code-editor__code"
+            dir="ltr"
+            tabindex="0"
+          >
+            <div
+              data-testid="mock-editor"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -132,14 +140,7 @@ exports[`Matches snapshot without props 1`] = `
   >
     <div
       class="pf-v5-c-code-editor__header"
-    >
-      <div
-        class="pf-v5-c-code-editor__controls"
-      />
-      <div
-        class="pf-v5-c-code-editor__header-main"
-      />
-    </div>
+    />
     <div
       class="pf-v5-c-code-editor__main"
     >
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
index c32199902a2..12610b090ae 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap
@@ -7,8 +7,8 @@ exports[`Matches snapshot 1`] = `
   >
     <button
       aria-disabled="false"
-      class="pf-v5-c-button pf-m-control"
-      data-ouia-component-id="OUIA-Generated-Button-control-1"
+      class="pf-v5-c-button pf-m-plain"
+      data-ouia-component-id="OUIA-Generated-Button-plain-1"
       data-ouia-component-type="PF5/Button"
       data-ouia-safe="true"
       type="button"
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
index 0d9b1368410..e72a7c19668 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
@@ -3,7 +3,7 @@ import { CodeEditor, CodeEditorControl } from '@patternfly/react-code-editor';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 export const CodeEditorCustomControl: React.FunctionComponent = () => {
-  const [code, setCode] = React.useState('');
+  const [code, setCode] = React.useState('Some example content');
 
   const onChange = (code) => {
     setCode(code);
@@ -32,6 +32,7 @@ export const CodeEditorCustomControl: React.FunctionComponent = () => {
       customControls={customControl}
       code={code}
       onChange={onChange}
+      isHeaderPlain={code === ''}
     />
   );
 };
diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index 761b63f3895..1481a339d3d 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -54,7 +54,7 @@
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.69",
+    "@patternfly/patternfly": "6.0.0-alpha.84",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-replace": "^5.0.2",
diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
index 583824c3a37..81a8b3709b1 100644
--- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
+++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
@@ -259,7 +259,7 @@ export const CalendarMonth = ({
   const calendarToRender = (
     <div className={css(styles.calendarMonth, className)} {...props}>
       <div className={styles.calendarMonthHeader}>
-        <div className={css(styles.calendarMonthHeaderNavControl, styles.modifiers.prevMonth)}>
+        <div className={css(styles.calendarMonthHeaderNavControl, 'pf-m-prev-month')}>
           <Button
             variant="plain"
             aria-label={prevMonthAriaLabel}
@@ -334,7 +334,7 @@ export const CalendarMonth = ({
             </div>
           </InputGroupItem>
         </InputGroup>
-        <div className={css(styles.calendarMonthHeaderNavControl, styles.modifiers.nextMonth)}>
+        <div className={css(styles.calendarMonthHeaderNavControl, 'pf-m-next-month')}>
           <Button
             variant="plain"
             aria-label={nextMonthAriaLabel}
diff --git a/packages/react-core/src/components/Divider/examples/Divider.md b/packages/react-core/src/components/Divider/examples/Divider.md
index d9d10f7ee82..1f5aed2416d 100644
--- a/packages/react-core/src/components/Divider/examples/Divider.md
+++ b/packages/react-core/src/components/Divider/examples/Divider.md
@@ -10,45 +10,53 @@ propComponents: ['Divider']
 ### Using hr
 
 ```ts file='./DividerUsingHr.tsx'
+
 ```
 
 ### Using li
 
 ```ts file='./DividerUsingLi.tsx'
+
 ```
 
 ### Using div
 
 ```ts file='./DividerUsingDiv.tsx'
+
 ```
 
 ### Inset medium
 
 ```ts file='./DividerInsetMedium.tsx'
+
 ```
 
 ### Inset at various breakpoints
 
 ```ts file='./DividerInsetVariousBreakpoints.tsx'
+
 ```
 
 ### Vertical in flex layout
 
 ```ts file='./DividerVerticalFlex.tsx'
+
 ```
 
-### Vertical in flex layout, inset medium
+### Vertical in flex layout, inset small
+
+```ts file='./DividerVerticalFlexInsetSmall.tsx'
 
-```ts file='./DividerVerticalFlexInsetMedium.tsx'
 ```
 
 ### Vertical in flex layout, inset at various breakpoints
 
 ```ts file='./DividerVerticalFlexInsetVariousBreakpoints.tsx'
+
 ```
 
 ### Switch orientation at various breakpoints
 
 ```ts file='./DividerOrientationVariousBreakpoints.tsx'
-```
 
+```
diff --git a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetMedium.tsx b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
similarity index 69%
rename from packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetMedium.tsx
rename to packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
index 18e9f27e54a..95e93d151c1 100644
--- a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetMedium.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import { Divider, Flex, FlexItem } from '@patternfly/react-core';
 
-export const DividerVerticalFlexInsetMedium: React.FunctionComponent = () => (
+export const DividerVerticalFlexInsetSmall: React.FunctionComponent = () => (
   <Flex>
     <FlexItem>first item</FlexItem>
     <Divider
       orientation={{
         default: 'vertical'
       }}
-      inset={{ default: 'insetMd' }}
+      inset={{ default: 'insetSm' }}
     />
     <FlexItem>second item</FlexItem>
   </Flex>
diff --git a/packages/react-core/src/components/Menu/Menu.tsx b/packages/react-core/src/components/Menu/Menu.tsx
index 18c084449bf..df4989d4009 100644
--- a/packages/react-core/src/components/Menu/Menu.tsx
+++ b/packages/react-core/src/components/Menu/Menu.tsx
@@ -248,7 +248,6 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
       ouiaId,
       ouiaSafe,
       containsFlyout,
-      isNavFlyout,
       containsDrilldown,
       isMenuDrilledIn,
       isPlain,
@@ -265,6 +264,7 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
       isRootMenu,
       activeMenu,
       role,
+      isNavFlyout,
       /* eslint-enable @typescript-eslint/no-unused-vars */
       ...props
     } = this.props;
@@ -325,7 +325,7 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
             isPlain && styles.modifiers.plain,
             isScrollable && styles.modifiers.scrollable,
             containsFlyout && styles.modifiers.flyout,
-            isNavFlyout && styles.modifiers.nav,
+            isNavFlyout && 'pf-m-nav',
             containsDrilldown && styles.modifiers.drilldown,
             _isMenuDrilledIn && styles.modifiers.drilledIn,
             className
diff --git a/packages/react-core/src/components/Menu/MenuItem.tsx b/packages/react-core/src/components/Menu/MenuItem.tsx
index b5110dec4d2..d30f4121e93 100644
--- a/packages/react-core/src/components/Menu/MenuItem.tsx
+++ b/packages/react-core/src/components/Menu/MenuItem.tsx
@@ -441,7 +441,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
         _isOnPath && styles.modifiers.currentPath,
         isLoadButton && styles.modifiers.load,
         isLoading && styles.modifiers.loading,
-        isFocused && styles.modifiers.focus,
+        isFocused && 'pf-m-focus',
         isDanger && styles.modifiers.danger,
         className
       )}
diff --git a/packages/react-core/src/components/Menu/MenuItemAction.tsx b/packages/react-core/src/components/Menu/MenuItemAction.tsx
index 2117f0583a9..a86a02c91a6 100644
--- a/packages/react-core/src/components/Menu/MenuItemAction.tsx
+++ b/packages/react-core/src/components/Menu/MenuItemAction.tsx
@@ -48,7 +48,7 @@ const MenuItemActionBase: React.FunctionComponent<MenuItemActionProps> = ({
             <button
               className={css(
                 styles.menuItemAction,
-                isFavorited !== null && styles.modifiers.favorite,
+                isFavorited !== null && 'pf-m-favorite',
                 isFavorited && styles.modifiers.favorited,
                 className
               )}
diff --git a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
index b230896c249..8a96e9d6c82 100644
--- a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
+++ b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
@@ -40,17 +40,6 @@ describe('Menu', () => {
     });
   });
 
-  describe('with isNavFlyout', () => {
-    test('should render Menu with nav flyout styles applied', () => {
-      render(
-        <Menu activeItemId={0} onSelect={jest.fn()} isNavFlyout>
-          content
-        </Menu>
-      );
-      expect(screen.getByText('content')).toHaveClass('pf-m-nav');
-    });
-  });
-
   describe('with hasCheckbox', () => {
     test('should render Menu with checkbox items', () => {
       render(
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index d9ebb9913d9..78a5b1ab907 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -112,7 +112,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
       variant === 'primary' && styles.modifiers.primary,
       variant === 'secondary' && styles.modifiers.secondary,
       (isPlain || isPlainText) && styles.modifiers.plain,
-      isPlainText && styles.modifiers.text,
+      isPlainText && 'pf-m-text',
       isFullHeight && styles.modifiers.fullHeight,
       isFullWidth && styles.modifiers.fullWidth,
       isDisabled && styles.modifiers.disabled,
diff --git a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
index 53c3775fe8f..2934f8b5acd 100644
--- a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
+++ b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
@@ -208,7 +208,7 @@ const TreeViewListItemBase: React.FunctionComponent<TreeViewListItemProps> = ({
             <Component
               className={css(
                 styles.treeViewNode,
-                children && (isSelectable || hasCheckbox) && styles.modifiers.selectable,
+                children && (isSelectable || hasCheckbox) && 'pf-m-selectable',
                 (!children || isSelectable) &&
                   activeItems &&
                   activeItems.length > 0 &&
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
index 2451c90c041..03acce445c2 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
@@ -371,7 +371,7 @@ test(`Does not render ${styles.treeViewNode} element with additional classes by
   expect(treeViewNode).toHaveClass(styles.treeViewNode, { exact: true });
 });
 
-test(`Renders ${styles.treeViewNode} element with ${styles.modifiers.selectable} class when hasCheckbox and children are passed`, () => {
+test(`Renders ${styles.treeViewNode} element with pf-m-selectable class when hasCheckbox and children are passed`, () => {
   render(
     <TreeViewListItem hasCheckbox {...requiredProps}>
       Content
@@ -380,10 +380,10 @@ test(`Renders ${styles.treeViewNode} element with ${styles.modifiers.selectable}
 
   const treeViewNode = screen.getByRole('treeitem').querySelector(`.${styles.treeViewNode}`);
 
-  expect(treeViewNode).toHaveClass(styles.modifiers.selectable);
+  expect(treeViewNode).toHaveClass('pf-m-selectable');
 });
 
-test(`Renders ${styles.treeViewNode} element with ${styles.modifiers.selectable} class when isSelectable and children are passed`, () => {
+test(`Renders ${styles.treeViewNode} element with pf-m-selectable class when isSelectable and children are passed`, () => {
   render(
     <TreeViewListItem isSelectable {...requiredProps}>
       Content
@@ -392,15 +392,15 @@ test(`Renders ${styles.treeViewNode} element with ${styles.modifiers.selectable}
 
   const treeViewNode = screen.getByRole('treeitem').querySelector(`.${styles.treeViewNode}`);
 
-  expect(treeViewNode).toHaveClass(styles.modifiers.selectable);
+  expect(treeViewNode).toHaveClass('pf-m-selectable');
 });
 
-test(`Does not render ${styles.treeViewNode} element with ${styles.modifiers.selectable} if children are not passed`, () => {
+test(`Does not render ${styles.treeViewNode} element with pf-m-selectable if children are not passed`, () => {
   render(<TreeViewListItem hasCheckbox isSelectable {...requiredProps} />);
 
   const treeViewNode = screen.getByRole('treeitem').querySelector(`.${styles.treeViewNode}`);
 
-  expect(treeViewNode).not.toHaveClass(styles.modifiers.selectable);
+  expect(treeViewNode).not.toHaveClass('pf-m-selectable');
 });
 
 test(`Renders ${styles.treeViewNode} element with ${styles.modifiers.current} class when isSelectable and activeItems are passed`, () => {
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 7e11052e43e..26284e78737 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.0.0-alpha.69",
+    "@patternfly/patternfly": "6.0.0-alpha.84",
     "@patternfly/react-charts": "^8.0.0-alpha.11",
     "@patternfly/react-code-editor": "^6.0.0-alpha.29",
     "@patternfly/react-core": "^6.0.0-alpha.29",
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index e4b2c0e4439..53c0878d2e4 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.14.0",
     "@fortawesome/free-regular-svg-icons": "^5.14.0",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",
-    "@patternfly/patternfly": "6.0.0-alpha.69",
+    "@patternfly/patternfly": "6.0.0-alpha.84",
     "fs-extra": "^11.1.1",
     "glob": "^7.1.2",
     "rimraf": "^2.6.2",
diff --git a/packages/react-integration/cypress/integration/menu.spec.ts b/packages/react-integration/cypress/integration/menu.spec.ts
index 4eaeffe1b84..802f5540f49 100644
--- a/packages/react-integration/cypress/integration/menu.spec.ts
+++ b/packages/react-integration/cypress/integration/menu.spec.ts
@@ -61,7 +61,7 @@ describe('Menu Test', () => {
   });
 
   it('Verify Menu with Favorites', () => {
-    cy.get('.pf-v5-c-menu__item-action.pf-m-favorite').first().click();
+    cy.get('#favorites-menu .pf-v5-c-menu__item-action[aria-label="not starred"]').first().click();
 
     cy.get('#favorites-menu.pf-v5-c-menu > section').first().should('contain', 'Favorites');
   });
diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json
index 5b4bd0aaadf..f2d22b57141 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.0.0-alpha.69",
+    "@patternfly/patternfly": "6.0.0-alpha.84",
     "camel-case": "^3.0.0",
     "css": "^2.2.3",
     "fs-extra": "^11.1.1",
diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json
index c3ac5ca5bfc..0eb7bbad88a 100644
--- a/packages/react-tokens/package.json
+++ b/packages/react-tokens/package.json
@@ -29,7 +29,7 @@
     "clean": "rimraf dist"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.69",
+    "@patternfly/patternfly": "6.0.0-alpha.84",
     "css": "^2.2.3",
     "fs-extra": "^11.1.1",
     "glob": "^7.1.2",
diff --git a/yarn.lock b/yarn.lock
index 279441c7781..7f21e6dd1ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3988,10 +3988,10 @@
     puppeteer-cluster "^0.23.0"
     xmldoc "^1.1.2"
 
-"@patternfly/patternfly@6.0.0-alpha.69":
-  version "6.0.0-alpha.69"
-  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.69.tgz#26a2c474048b54fb592de1c8b245cf365e335bd5"
-  integrity sha512-05Dj2EkaaCKR3OjkcZnIHZ9YMYibQxsFoj6n5PDI/tjwI2lSPsgr07N/cVe3pQFZ4l8cLnXROThOfdYXTVoxhQ==
+"@patternfly/patternfly@6.0.0-alpha.84":
+  version "6.0.0-alpha.84"
+  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.84.tgz#e6d6317eb6c72441c2ea4f14ee0695cac953fbd1"
+  integrity sha512-iL6BTOCk/yzE5jAfIxp4n2qLTUv9qs650sl6XA9tAYCNAq7djfMmOmJA4+YuQZtlRYz7iToReaVK7HuRXLOnTg==
 
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"