diff --git a/frontend-modern/src/components/Storage/Storage.tsx b/frontend-modern/src/components/Storage/Storage.tsx
index c5bb85bfc..bb2f0153b 100644
--- a/frontend-modern/src/components/Storage/Storage.tsx
+++ b/frontend-modern/src/components/Storage/Storage.tsx
@@ -1,7 +1,6 @@
 import { Component, createEffect } from 'solid-js';
 import StorageContentCard from '@/components/Storage/StorageContentCard';
 import StoragePageControls from '@/components/Storage/StoragePageControls';
-import { StorageViewSegmentedControl } from '@/components/Storage/StorageViewSegmentedControl';
 import { DEFAULT_STORAGE_SELECTED_NODE_ID } from './storagePageState';
 import { useStoragePageModel } from './useStoragePageModel';
 
@@ -116,6 +115,7 @@ const Storage: Component<StorageProps> = (props) => {
             savedViewsKey={savedViewsKey}
             view={view}
             setView={setView}
+            showViewTabs={!props.forcedView}
             search={search}
             setSearch={setSearch}
             filterAriaLabel={props.filterAriaLabel}
@@ -186,11 +186,6 @@ const Storage: Component<StorageProps> = (props) => {
           setHoveredStorageResourceId={setHoveredStorageResourceId}
           selectedDiskId={selectedDiskId}
           setSelectedDiskId={setSelectedDiskId}
-          actions={
-            !props.forcedView && !kioskMode() ? (
-              <StorageViewSegmentedControl value={view()} onChange={setView} />
-            ) : undefined
-          }
         />
       </div>
     </div>
diff --git a/frontend-modern/src/components/Storage/StoragePageControls.tsx b/frontend-modern/src/components/Storage/StoragePageControls.tsx
index 35105f8d4..f9ffed18d 100644
--- a/frontend-modern/src/components/Storage/StoragePageControls.tsx
+++ b/frontend-modern/src/components/Storage/StoragePageControls.tsx
@@ -1,5 +1,8 @@
 import { Component, JSX, Show, createMemo } from 'solid-js';
+import DatabaseIcon from 'lucide-solid/icons/database';
+import HardDriveIcon from 'lucide-solid/icons/hard-drive';
 import { FilterBar, type FilterDef } from '@/components/shared/FilterBar';
+import { Subtabs } from '@/components/shared/Subtabs';
 import { useBreakpoint } from '@/hooks/useBreakpoint';
 import { STORAGE_KEYS } from '@/utils/localStorage';
 import {
@@ -38,6 +41,7 @@ type StoragePageControlsProps = {
   kioskMode: () => boolean;
   view: () => StorageView;
   setView: (value: StorageView) => void;
+  showViewTabs?: boolean;
   search: () => string;
   setSearch: (value: string) => void;
   filterAriaLabel?: string;
@@ -132,6 +136,27 @@ export const StoragePageControls: Component<StoragePageControlsProps> = (props)
     }
   };
 
+  const storageViewTabs = [
+    {
+      value: 'pools',
+      label: (
+        <span class="inline-flex items-center gap-1.5">
+          <DatabaseIcon aria-hidden="true" class="h-3.5 w-3.5" />
+          Storage
+        </span>
+      ),
+    },
+    {
+      value: 'disks',
+      label: (
+        <span class="inline-flex items-center gap-1.5">
+          <HardDriveIcon aria-hidden="true" class="h-3.5 w-3.5" />
+          Physical Disks
+        </span>
+      ),
+    },
+  ];
+
   const buildFilters = (): FilterDef[] => {
     const filters: FilterDef[] = [];
 
@@ -268,6 +293,14 @@ export const StoragePageControls: Component<StoragePageControlsProps> = (props)
   return (
     <Show when={!props.kioskMode()}>
       <div class="flex flex-col gap-2">
+        <Show when={props.showViewTabs !== false}>
+          <Subtabs
+            value={props.view()}
+            onChange={(value) => props.setView(value as StorageView)}
+            tabs={storageViewTabs}
+            ariaLabel="Storage view"
+          />
+        </Show>
         <FilterBar
           role="group"
           ariaLabel={props.filterAriaLabel ?? 'Storage filters'}
diff --git a/frontend-modern/src/components/Storage/StorageViewSegmentedControl.tsx b/frontend-modern/src/components/Storage/StorageViewSegmentedControl.tsx
deleted file mode 100644
index 8dbf8eae7..000000000
--- a/frontend-modern/src/components/Storage/StorageViewSegmentedControl.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { splitProps, type Component, type JSX } from 'solid-js';
-import DatabaseIcon from 'lucide-solid/icons/database';
-import HardDriveIcon from 'lucide-solid/icons/hard-drive';
-import { FilterSegmentedControl } from '@/components/shared/FilterToolbar';
-import type { StorageView } from './storagePageState';
-
-interface StorageViewSegmentedControlProps extends Omit<
-  JSX.HTMLAttributes<HTMLDivElement>,
-  'onChange'
-> {
-  value: StorageView;
-  onChange: (value: StorageView) => void;
-}
-
-export const StorageViewSegmentedControl: Component<StorageViewSegmentedControlProps> = (props) => {
-  const [local, divProps] = splitProps(props, ['value', 'onChange']);
-
-  return (
-    <FilterSegmentedControl
-      {...divProps}
-      role={divProps.role ?? 'group'}
-      aria-label={divProps['aria-label'] ?? 'Storage table view'}
-      value={local.value}
-      onChange={(value) => local.onChange(value as StorageView)}
-      options={[
-        {
-          value: 'pools',
-          title: 'Show storage pools and backup targets',
-          label: (
-            <>
-              <DatabaseIcon aria-hidden="true" class="h-3 w-3" />
-              Storage
-            </>
-          ),
-        },
-        {
-          value: 'disks',
-          title: 'Show physical disks',
-          label: (
-            <>
-              <HardDriveIcon aria-hidden="true" class="h-3 w-3" />
-              Physical Disks
-            </>
-          ),
-        },
-      ]}
-    />
-  );
-};
-
-export default StorageViewSegmentedControl;
diff --git a/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx b/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
index 52932ee43..9d027b605 100644
--- a/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
+++ b/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
@@ -1283,20 +1283,20 @@ describe('Storage', () => {
 
     render(() => <Storage forcedSourceFilter="proxmox-pve" />);
 
-    const viewOptions = screen.getByRole('group', { name: 'Storage table view' });
-    expect(within(viewOptions).getByRole('button', { name: 'Storage' })).toHaveAttribute(
-      'aria-pressed',
+    const viewTabs = screen.getByRole('tablist', { name: 'Storage view' });
+    expect(within(viewTabs).getByRole('tab', { name: 'Storage' })).toHaveAttribute(
+      'aria-selected',
       'true',
     );
     expect(screen.queryByTestId('storage-summary')).not.toBeInTheDocument();
 
-    fireEvent.click(within(viewOptions).getByRole('button', { name: 'Physical Disks' }));
+    fireEvent.click(within(viewTabs).getByRole('tab', { name: 'Physical Disks' }));
 
     await waitFor(() => {
       expect(screen.getByTestId('disk-list')).toHaveTextContent('disk-view:all:');
     });
-    expect(within(viewOptions).getByRole('button', { name: 'Physical Disks' })).toHaveAttribute(
-      'aria-pressed',
+    expect(within(viewTabs).getByRole('tab', { name: 'Physical Disks' })).toHaveAttribute(
+      'aria-selected',
       'true',
     );
   });
diff --git a/frontend-modern/src/components/Workloads/NodeDrawer.test.tsx b/frontend-modern/src/components/Workloads/NodeDrawer.test.tsx
index f901a9bef..fb317f84c 100644
--- a/frontend-modern/src/components/Workloads/NodeDrawer.test.tsx
+++ b/frontend-modern/src/components/Workloads/NodeDrawer.test.tsx
@@ -109,7 +109,7 @@ describe('NodeDrawer', () => {
     expect(screen.getByText('6.8.0')).toBeInTheDocument();
     expect(screen.getByText('8')).toBeInTheDocument();
     expect(screen.getByText('PVE 9.1.9')).toBeInTheDocument();
-    expect(screen.getByText('65°C')).toBeInTheDocument();
+    expect(screen.getAllByText('65°C').length).toBeGreaterThan(0);
     expect(screen.getByText('Temp monitor')).toBeInTheDocument();
   });
 
diff --git a/frontend-modern/src/utils/__tests__/docsLinks.test.ts b/frontend-modern/src/utils/__tests__/docsLinks.test.ts
index e3c849fc7..722f84043 100644
--- a/frontend-modern/src/utils/__tests__/docsLinks.test.ts
+++ b/frontend-modern/src/utils/__tests__/docsLinks.test.ts
@@ -25,6 +25,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const frontendRoot = path.resolve(__dirname, '..', '..', '..');
 const repoRoot = path.resolve(frontendRoot, '..');
+const runtimeDocsLinkScanTimeoutMs = 15_000;
 
 function getRuntimeSourceFiles(dir: string): string[] {
   const entries = readdirSync(dir, { withFileTypes: true });
@@ -128,5 +129,5 @@ describe('docsLinks', () => {
         `${path.relative(frontendRoot, filePath)} should use shipped/local docs owners`,
       ).not.toContain('https://github.com/rcourtman/Pulse/blob/main/');
     }
-  });
+  }, runtimeDocsLinkScanTimeoutMs);
 });
diff --git a/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts b/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
index 3d103eacf..0672ab870 100644
--- a/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
+++ b/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
@@ -1461,11 +1461,11 @@ describe('frontend resource type boundaries', () => {
     expect(storagePageControlsSource).not.toContain('StorageControls');
     expect(storagePageControlsSource).not.toContain('useStoragePageControlsModel');
     expect(storagePageControlsSource).not.toContain('focus:ring-blue-500');
-    // StoragePageControls used to render a Subtabs strip for "Storage /
-    // Physical Disks" alongside the segmented control inside the
-    // StorageContentCard header, producing two switches bound to the same
-    // view state. The view switch lives only on the table card now.
-    expect(storagePageControlsSource).not.toContain('Subtabs');
+    // StoragePageControls owns the single "Storage / Physical Disks" view
+    // switch as canonical Subtabs above the FilterBar. StorageContentCard does
+    // not host a duplicate segmented control.
+    expect(storagePageControlsSource).toContain('Subtabs');
+    expect(storagePageSource).not.toContain('StorageViewSegmentedControl');
     expect(storagePageControlsSource).not.toContain('StorageViewSwitcher');
     expect(storageFilterPresentationSource).toContain('export const getStorageSortDirectionTitle');
     expect(storageFilterPresentationSource).toContain(