diff --git a/webui/src/features/reporting/ProviderReportWorkspace.tsx b/webui/src/features/reporting/ProviderReportWorkspace.tsx
index 7092310..b128508 100644
--- a/webui/src/features/reporting/ProviderReportWorkspace.tsx
+++ b/webui/src/features/reporting/ProviderReportWorkspace.tsx
@@ -1,7 +1,7 @@
 import { DescriptionList } from "@govoplan/core-webui";
 import { Download, FileJson, Play, ShieldCheck } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
-import { ContentGrid, ActionToolbar,
+import { ContentGrid,
   Button,
   Card,
   DismissibleAlert,
@@ -9,6 +9,7 @@ import { ContentGrid, ActionToolbar,
   MetricCard,
   StatePanel,
   StatusBadge,
+  WorkspaceActionBar,
   hasScope,
   type ApiSettings,
   type AuthInfo
@@ -176,15 +177,20 @@ export function ProviderReportWorkspace({ settings, auth, report }: {
       </div>
       {execution ?
         <>
-          <ActionToolbar surface="panel-header" className="reporting-output-toolbar">
-            <span>Generated {formatDateTime(execution.generated_at)}</span>
-            {report.export_formats.includes("csv") &&
+          <WorkspaceActionBar
+            scope="detail-pane"
+            variant="detail"
+            className="reporting-output-toolbar"
+            contextActions={<span>Generated {formatDateTime(execution.generated_at)}</span>}
+            primaryActions={<>
+              {report.export_formats.includes("csv") &&
               <IconButton label="Download CSV" icon={<Download size={17} />} variant="ghost" onClick={() => void download("csv")} />
-            }
-            {report.export_formats.includes("json") &&
+              }
+              {report.export_formats.includes("json") &&
               <IconButton label="Download JSON" icon={<FileJson size={17} />} variant="ghost" onClick={() => void download("json")} />
-            }
-          </ActionToolbar>
+              }
+            </>}
+          />
           <div className="reporting-provider-output">
             <ProviderResult execution={execution} />
           </div>
diff --git a/webui/src/features/reporting/ReportingPage.tsx b/webui/src/features/reporting/ReportingPage.tsx
index 8f55d64..7af6593 100644
--- a/webui/src/features/reporting/ReportingPage.tsx
+++ b/webui/src/features/reporting/ReportingPage.tsx
@@ -7,7 +7,6 @@ import {
   FolderOutput,
   History,
   Play,
-  RefreshCw,
   Save,
   Search,
   SlidersHorizontal,
@@ -19,7 +18,7 @@ import {
   useState,
   type FormEvent
 } from "react";
-import { FormGrid, ActionToolbar,
+import { FormGrid,
   Button,
   DataGrid,
   Dialog,
@@ -37,6 +36,7 @@ import { FormGrid, ActionToolbar,
   StatusBadge,
   ToggleSwitch,
   hasScope,
+  WorkspaceActionBar,
   WorkspaceFrame,
   type DataGridColumn,
   type PlatformRouteContext
@@ -256,8 +256,14 @@ export default function ReportingPage({ settings, auth }: PlatformRouteContext)
   return (
     <main className="reporting-page">
       <WorkspaceFrame className="reporting-shell" label="Reporting workspace" interfaceId="reporting.workspace" helpContextId="reporting.page.workspace" helpModuleId="reporting">
-        <ActionToolbar surface="panel-header" className="reporting-toolbar">
-          <FilterBar as="form" surface="control" wrap="never" width="compact" className="reporting-search" onSubmit={submitSearch}>
+        <WorkspaceActionBar
+          scope="workspace"
+          variant="collection"
+          refreshable
+          reloadAction={{ onReload: () => void reload(), loading, label: "Reload reports" }}
+          className="reporting-toolbar"
+          contextActions={<>
+            <FilterBar as="form" surface="control" wrap="never" width="compact" className="reporting-search" onSubmit={submitSearch}>
             <Search size={17} aria-hidden="true" />
             <input
               value={search}
@@ -265,19 +271,14 @@ export default function ReportingPage({ settings, auth }: PlatformRouteContext)
               aria-label="Search reports"
               placeholder="Search reports"
             />
-          </FilterBar>
-          <span className="reporting-count">{reports.length + providerReports.length} reports</span>
-          <DocumentationHelpLink
+            </FilterBar>
+            <span className="reporting-count">{reports.length + providerReports.length} reports</span>
+          </>}
+          helpAction={<DocumentationHelpLink
             reference={{ topicId: "reporting.governed-bi", documentationType: "user" }}
             label="Open reporting documentation"
-          />
-          <IconButton
-            label="Reload reports"
-            icon={<RefreshCw size={17} />}
-            variant="ghost"
-            onClick={() => void reload()}
-          />
-        </ActionToolbar>
+          />}
+        />
         {error &&
           <DismissibleAlert tone="danger" resetKey={error}>
             {error}
@@ -345,8 +346,11 @@ export default function ReportingPage({ settings, auth }: PlatformRouteContext)
                   onQueryChange={setQuery}
                   onParametersChange={setParameters}
                 />
-                <ActionToolbar surface="panel-header" className="reporting-output-toolbar">
-                  <SegmentedControl
+                <WorkspaceActionBar
+                  scope="detail-pane"
+                  variant="detail"
+                  className="reporting-output-toolbar"
+                  contextActions={<SegmentedControl
                     ariaLabel="Report output"
                     value={outputMode}
                     onChange={setOutputMode}
@@ -354,8 +358,8 @@ export default function ReportingPage({ settings, auth }: PlatformRouteContext)
                       { id: "visual", label: <><BarChart3 size={15} /> Visual</> },
                       { id: "table", label: <><Table2 size={15} /> Table</> }
                     ]}
-                  />
-                  {execution &&
+                  />}
+                  primaryActions={execution ?
                     <>
                       <span>{execution.total_rows} rows{execution.truncated ? " (truncated)" : ""}</span>
                       <IconButton label="Download CSV" icon={<Download size={17} />} variant="ghost" onClick={() => void downloadExecution(settings, execution.execution_id, "csv").catch((reason) => setError(message(reason)))} />
@@ -364,8 +368,8 @@ export default function ReportingPage({ settings, auth }: PlatformRouteContext)
                         <IconButton label="Publish report" icon={<FolderOutput size={17} />} variant="ghost" onClick={() => setPublishDialogOpen(true)} />
                       }
                     </>
-                  }
-                </ActionToolbar>
+                  : undefined}
+                />
                 <div className="reporting-output">
                   {!execution && <StatePanel size="fill" description="Run the report or select a previous execution." />}
                   {execution && outputMode === "visual" && <ReportVisual execution={execution} onDrill={execution.query.mode === "detail" ? undefined : drill} />}