diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6f0160803..e919dd1fb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -98,6 +98,7 @@ jobs:
         with:
             component: true
             install-command: npm i
+            browser: chrome
   # build job
   build:
     needs: [install]
diff --git a/.gitignore b/.gitignore
index 3e2e12f3f..7bdc64848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ yalc.lock
 cypress/**/*.diff.png
 cypress/videos
 cypress/screenshots
+cypress/downloads
 
 # cache
 .cache
diff --git a/cypress.config.ts b/cypress.config.ts
index f90523287..38464d49b 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -10,17 +10,32 @@ export default defineConfig({
       addMatchImageSnapshotPlugin(on, config);
       on('before:browser:launch', (browser, launchOptions) => {
         if (browser.name === 'chrome' && browser.isHeadless) {
-          launchOptions.args.push('--window-size=1280,720');
+          launchOptions.args = launchOptions.args.map((arg) => {
+            if (arg === '--headless=new') {
+              return '--headless';
+            }
 
+            return arg;
+          });
+          // Needs the extra 139 because of the cypress toolbar, this is the size of the window! not size of the viewport
+          launchOptions.args.push(`--window-size=1280,${720 + 139}`);
           // force screen to be non-retina
           launchOptions.args.push('--force-device-scale-factor=1');
+          // force screen to be retina (2800x2400 size)
+          // launchOptions.args.push('--force-device-scale-factor=2')
         }
 
         if (browser.name === 'electron' && browser.isHeadless) {
-          // fullPage screenshot size is 1280x720
           launchOptions.preferences.width = 1280;
           launchOptions.preferences.height = 720;
         }
+
+        if (browser.name === 'firefox' && browser.isHeadless) {
+          launchOptions.args.push('--width=1280');
+          launchOptions.args.push('--height=720');
+        }
+
+        return launchOptions;
       });
       require('@cypress/code-coverage/task')(on, config);
       return config;
diff --git a/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx b/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx
index 41ba90ac7..b8948c2c7 100644
--- a/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx
+++ b/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx
@@ -23,6 +23,8 @@ describe('NonEntitledModal', () => {
       if (image) {
         cy.get(`[src="${image}"]`).should('be.visible');
       }
+      // make sure the scrollbar is hidden to ensure valid snapshot
+      cy.get('.pf-v5-c-modal-box__body').invoke('attr', 'style', 'overflow: hidden');
       elem.matchImageSnapshot();
     });
   });
diff --git a/cypress/run-test.js b/cypress/run-test.js
index 6e9c56e7b..a62f63b37 100644
--- a/cypress/run-test.js
+++ b/cypress/run-test.js
@@ -9,7 +9,7 @@ const defaultOptions = {
   updateSnapshots: false,
 };
 
-const defaultCommand = 'npm run cypress run -- --component --browser electron';
+const defaultCommand = 'npm run cypress run -- --component --browser chrome';
 
 if (argv.u || argv.update) {
   defaultOptions.updateSnapshots = true;
diff --git a/cypress/snapshots/cypress/component/Banner.cy.tsx/Banner/ -- mounts.snap.png b/cypress/snapshots/cypress/component/Banner.cy.tsx/Banner/ -- mounts.snap.png
index e771b9f29..35995f13d 100644
Binary files a/cypress/snapshots/cypress/component/Banner.cy.tsx/Banner/ -- mounts.snap.png and b/cypress/snapshots/cypress/component/Banner.cy.tsx/Banner/ -- mounts.snap.png differ
diff --git a/cypress/snapshots/cypress/component/ContextSwitcher/ContextSwitcher.cy.js/ContextSwithcer/ -- should fire cross account request for internal user and render component.snap.png b/cypress/snapshots/cypress/component/ContextSwitcher/ContextSwitcher.cy.js/ContextSwithcer/ -- should fire cross account request for internal user and render component.snap.png
index 51d9c14d4..afc38c732 100644
Binary files a/cypress/snapshots/cypress/component/ContextSwitcher/ContextSwitcher.cy.js/ContextSwithcer/ -- should fire cross account request for internal user and render component.snap.png and b/cypress/snapshots/cypress/component/ContextSwitcher/ContextSwitcher.cy.js/ContextSwithcer/ -- should fire cross account request for internal user and render component.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with few nav items.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with few nav items.snap.png
index 3d8214719..aec4d232d 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with few nav items.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with few nav items.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with many nav items.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with many nav items.snap.png
index be4707682..dff8e0f3e 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with many nav items.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render correctly with many nav items.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render with footer at the screen bottom.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render with footer at the screen bottom.snap.png
index 3d8214719..912b34173 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render with footer at the screen bottom.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout -- render with footer at the screen bottom.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with few nav items.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with few nav items.snap.png
index d8920bb8a..6fca330f2 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with few nav items.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with few nav items.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with many nav items.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with many nav items.snap.png
index 64e699b7a..6fca330f2 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with many nav items.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render correctly with many nav items.snap.png differ
diff --git a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render with footer at the screen bottom.snap.png b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render with footer at the screen bottom.snap.png
index d8920bb8a..6fca330f2 100644
Binary files a/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render with footer at the screen bottom.snap.png and b/cypress/snapshots/cypress/component/DefaultLayout.cy.js/Default layout/ -- render with footer at the screen bottom.snap.png differ
diff --git a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should not render modal for unknown entitlement.snap.png b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should not render modal for unknown entitlement.snap.png
index 1c16ced6e..ba31ec162 100644
Binary files a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should not render modal for unknown entitlement.snap.png and b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should not render modal for unknown entitlement.snap.png differ
diff --git a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for ansible.snap.png b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for ansible.snap.png
index 1e8a4f644..f9c584335 100644
Binary files a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for ansible.snap.png and b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for ansible.snap.png differ
diff --git a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for cost_management.snap.png b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for cost_management.snap.png
index 71cd3fecb..99dc8b7b6 100644
Binary files a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for cost_management.snap.png and b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for cost_management.snap.png differ
diff --git a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for insights.snap.png b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for insights.snap.png
index 50d8047cc..f5176433a 100644
Binary files a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for insights.snap.png and b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for insights.snap.png differ
diff --git a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for subscriptions.snap.png b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for subscriptions.snap.png
index 4681ddd6d..486cf6825 100644
Binary files a/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for subscriptions.snap.png and b/cypress/snapshots/cypress/component/NotEntitledModal/NotEntitledModal.cy.tsx/NonEntitledModal -- should render modal for subscriptions.snap.png differ
diff --git a/cypress/snapshots/cypress/component/UserToggle.cy.js/UserToggle/ -- render correctly.snap.png b/cypress/snapshots/cypress/component/UserToggle.cy.js/UserToggle/ -- render correctly.snap.png
index ea221e674..1ee9731af 100644
Binary files a/cypress/snapshots/cypress/component/UserToggle.cy.js/UserToggle/ -- render correctly.snap.png and b/cypress/snapshots/cypress/component/UserToggle.cy.js/UserToggle/ -- render correctly.snap.png differ
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
index dd8a0ff85..e999620d7 100644
--- a/cypress/support/component.ts
+++ b/cypress/support/component.ts
@@ -54,6 +54,5 @@ declare global {
 }
 
 Cypress.Commands.add('mount', mount)
-
 // Example use:
 // cy.mount(<MyComponent />)
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index ce8731344..b8ea97be1 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -112,13 +112,13 @@ const MemoizedHeader = memo(
                   </ToolbarItem>
                 )}
               </ToolbarGroup>
-              <ToolbarGroup className="pf-v5-u-flex-grow-1 pf-v5-u-mr-0 pf-v5-u-mr-md-on-2xl" variant="filter-group">
+              <ToolbarGroup className="pf-v5-u-flex-grow-1 pf-v5-u-mr-0 pf-v5-u-mr-0-on-2xl" variant="filter-group">
                 <Suspense fallback={null}>
                   <SearchInput onStateChange={hideAllServices} />
                 </Suspense>
               </ToolbarGroup>
               <ToolbarGroup
-                className="pf-v5-m-icon-button-group pf-v5-u-ml-auto"
+                className="pf-v5-m-icon-button-group pf-v5-u-ml-auto pf-v5-u-mr-0"
                 visibility={{ default: 'hidden', '2xl': 'visible' }}
                 widget-type="InsightsToolbar"
               >
diff --git a/src/components/Header/HeaderTests/__snapshots__/Tools.test.js.snap b/src/components/Header/HeaderTests/__snapshots__/Tools.test.js.snap
index d40c38317..5e05ae6dc 100644
--- a/src/components/Header/HeaderTests/__snapshots__/Tools.test.js.snap
+++ b/src/components/Header/HeaderTests/__snapshots__/Tools.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Tools should render correctly 1`] = `
 <div
-  class="pf-v5-c-toolbar__item pf-v5-u-mr-0 pf-v5-u-ml-sm"
+  class="pf-v5-c-toolbar__item pf-v5-u-mx-0"
 >
   <div
     style="display: contents;"
diff --git a/src/components/Header/Tools.tsx b/src/components/Header/Tools.tsx
index bc82e707e..9dab37f40 100644
--- a/src/components/Header/Tools.tsx
+++ b/src/components/Header/Tools.tsx
@@ -240,7 +240,7 @@ const Tools = () => {
   return (
     <>
       {isNotificationsEnabled && (
-        <ToolbarItem className="pf-v5-u-mr-0 pf-v5-u-ml-sm">
+        <ToolbarItem className="pf-v5-u-mx-0">
           <Tooltip aria="none" aria-live="polite" content={'Notifications'} flipBehavior={['bottom']} className="tooltip-inner-settings-cy">
             <NotificationBadge
               className="chr-c-notification-badge"
diff --git a/src/components/Search/SearchInput.tsx b/src/components/Search/SearchInput.tsx
index 10156f01d..356809fe3 100644
--- a/src/components/Search/SearchInput.tsx
+++ b/src/components/Search/SearchInput.tsx
@@ -186,13 +186,13 @@ const SearchInput = ({ onStateChange }: SearchInputListener) => {
         setIsOpen(false);
         onStateChange(false);
       }}
-      {...(!md && {
+      {...{
         expandableInput: {
           isExpanded: willExpand(),
           onToggleExpand,
           toggleAriaLabel: 'Expandable search input toggle',
         },
-      })}
+      }}
       onClick={onInputClick}
       ref={toggleRef}
       onKeyDown={onToggleKeyDown}