diff --git a/webui/src/features/forms/FormInstancePage.tsx b/webui/src/features/forms/FormInstancePage.tsx
index 5310842..cde0aa8 100644
--- a/webui/src/features/forms/FormInstancePage.tsx
+++ b/webui/src/features/forms/FormInstancePage.tsx
@@ -1,8 +1,7 @@
 import { Archive, ArrowLeft, BadgeCheck, ClipboardCheck, ExternalLink, RefreshCw, Save, Send, Trash2 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useParams } from "react-router";
-import { ActionToolbar,
-  ActionBlockerHint,
+import { ActionBlockerHint,
   Button,
   ConfirmDialog,
   DescriptionItem,
@@ -23,6 +22,7 @@ import { ActionToolbar,
   usePlatformModuleInstalled,
   usePlatformLanguage,
   useUnsavedDraftGuard,
+  WorkspaceActionBar,
   WorkspaceFrame,
   type PlatformRouteContext
 } from "@govoplan/core-webui";
@@ -379,21 +379,28 @@ export default function FormInstancePage({ settings, auth }: PlatformRouteContex
   return (
     <main className="forms-runtime-page">
       <WorkspaceFrame className="form-instance-shell" label="Form instance" interfaceId="forms-runtime.instance" helpContextId="forms-runtime.page.instance" helpModuleId="forms-runtime">
-        <ActionToolbar surface="panel-header" className="form-instance-toolbar">
-          <Button onClick={() => navigate("/forms-runtime")}>
+        <WorkspaceActionBar
+          scope="workspace"
+          variant="detail"
+          refreshable
+          reloadAction={{ onReload: () => void load(), loading }}
+          className="form-instance-toolbar"
+          contextActions={<>
+            <Button onClick={() => navigate("/forms-runtime")}>
             <ArrowLeft size={16} aria-hidden="true" />
             Forms
-          </Button>
-          {definition && <strong>{localized.title}</strong>}
-          {instance && <StatusBadge status={editableLifecycle ? "active" : "inactive"} label={stateLabel(instance.status)} />}
-          {instance && recordsAvailable && !editableLifecycle &&
+            </Button>
+            {definition && <strong>{localized.title}</strong>}
+            {instance && <StatusBadge status={editableLifecycle ? "active" : "inactive"} label={stateLabel(instance.status)} />}
+          </>}
+          primaryActions={instance && recordsAvailable && !editableLifecycle ?
             <Button onClick={() => navigate(recordFilingPath(instance))}>
               <Archive size={16} aria-hidden="true" />
               File in eAkte
             </Button>
-          }
-          <DocumentationHelpLink reference={FORMS_RUNTIME_DOCUMENTATION} />
-        </ActionToolbar>
+          : undefined}
+          helpAction={<DocumentationHelpLink reference={FORMS_RUNTIME_DOCUMENTATION} />}
+        />
         <PageScrollViewport className="form-instance-viewport">
           {error &&
             <DismissibleAlert tone="danger" resetKey={error}>
diff --git a/webui/src/features/forms/FormsRuntimePage.tsx b/webui/src/features/forms/FormsRuntimePage.tsx
index 1bb5ecb..ca4dc83 100644
--- a/webui/src/features/forms/FormsRuntimePage.tsx
+++ b/webui/src/features/forms/FormsRuntimePage.tsx
@@ -1,7 +1,6 @@
-import { Link2, RefreshCw, ShieldCheck, UserRoundPlus } from "lucide-react";
+import { Link2, ShieldCheck, UserRoundPlus } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
-import { ActionToolbar,
-  Button,
+import { Button,
   DocumentationHelpLink,
   DismissibleAlert,
   LoadingIndicator,
@@ -15,6 +14,7 @@ import { ActionToolbar,
   i18nMessage,
   useGuardedNavigate,
   usePlatformLanguage,
+  WorkspaceActionBar,
   WorkspaceFrame,
   type PlatformRouteContext
 } from "@govoplan/core-webui";
@@ -69,46 +69,49 @@ export default function FormsRuntimePage({ settings, auth }: PlatformRouteContex
   return (
     <main className="forms-runtime-page">
       <WorkspaceFrame className="forms-runtime-shell" label="Forms runtime" interfaceId="forms-runtime.workspace" helpContextId="forms-runtime.page.workspace" helpModuleId="forms-runtime">
-        <ActionToolbar surface="panel-header" className="forms-runtime-toolbar">
-          <Button onClick={() => void load()} disabled={loading} disabledReason={loading ? FORMS_RUNTIME_I18N.loading : undefined}>
-            <RefreshCw size={16} aria-hidden="true" />
-            Refresh
-          </Button>
-          {canAdmin &&
+        <WorkspaceActionBar
+          scope="workspace"
+          variant="collection"
+          refreshable
+          reloadAction={{ onReload: () => void load(), loading }}
+          className="forms-runtime-toolbar"
+          contextActions={<>
+            {canAdmin &&
             <Button onClick={() => setIntakeOpen(true)}>
               <Link2 size={16} aria-hidden="true" />
               Public intake
             </Button>
-          }
-          {canAdmin &&
+            }
+            {canAdmin &&
             <Button onClick={() => setStatusAccessOpen(true)}>
               <ShieldCheck size={16} aria-hidden="true" />
               Status access
             </Button>
-          }
-          {canAssist &&
+            }
+            <label>
+              <span>Status</span>
+              <select value={status} onChange={(event) => setStatus(event.target.value)}>
+                <option value="open">Open</option>
+                <option value="">All</option>
+                <option value="draft">Draft</option>
+                <option value="submitted">Submitted</option>
+                <option value="needs_review">Needs review</option>
+                <option value="accepted">Accepted</option>
+                <option value="rejected">Rejected</option>
+                <option value="handed_off">Handed off</option>
+                <option value="archived">Archived</option>
+              </select>
+            </label>
+            <span className="forms-runtime-count">{i18nMessage("i18n:govoplan-forms-runtime.form_count", { total })}</span>
+          </>}
+          createAction={canAssist ?
             <Button onClick={() => setAssistedOpen(true)}>
               <UserRoundPlus size={16} aria-hidden="true" />
               Assisted intake
             </Button>
-          }
-          <label>
-            <span>Status</span>
-            <select value={status} onChange={(event) => setStatus(event.target.value)}>
-              <option value="open">Open</option>
-              <option value="">All</option>
-              <option value="draft">Draft</option>
-              <option value="submitted">Submitted</option>
-              <option value="needs_review">Needs review</option>
-              <option value="accepted">Accepted</option>
-              <option value="rejected">Rejected</option>
-              <option value="handed_off">Handed off</option>
-              <option value="archived">Archived</option>
-            </select>
-          </label>
-          <span className="forms-runtime-count">{i18nMessage("i18n:govoplan-forms-runtime.form_count", { total })}</span>
-          <DocumentationHelpLink reference={FORMS_RUNTIME_DOCUMENTATION} />
-        </ActionToolbar>
+          : undefined}
+          helpAction={<DocumentationHelpLink reference={FORMS_RUNTIME_DOCUMENTATION} />}
+        />
         <PageScrollViewport className="forms-runtime-list-viewport">
           {error &&
             <DismissibleAlert tone="danger" resetKey={error}>