diff --git a/frontend/src/components/assistant/IncidentHeader.tsx b/frontend/src/components/assistant/IncidentHeader.tsx
index 023ffd55..0bf67a2c 100644
--- a/frontend/src/components/assistant/IncidentHeader.tsx
+++ b/frontend/src/components/assistant/IncidentHeader.tsx
@@ -12,6 +12,8 @@ interface IncidentHeaderProps {
   onStatusUpdate?: () => void
   onPause?: () => void
   onClose?: () => void
+  /** Extra elements rendered in the action group (e.g. ViewToggle) */
+  extraActions?: React.ReactNode
 }
 
 interface EditPopoverProps {
@@ -168,6 +170,7 @@ export function IncidentHeader({
   onStatusUpdate,
   onPause,
   onClose,
+  extraActions,
 }: IncidentHeaderProps) {
   return (
     <div className="bg-card border-b border-default px-4 py-2 flex items-center gap-4 flex-wrap">
@@ -223,6 +226,7 @@ export function IncidentHeader({
           </button>
         )}
         <OverflowMenu onPause={onPause} onClose={onClose} />
+        {extraActions}
       </div>
     </div>
   )
diff --git a/frontend/src/components/assistant/ViewToggle.tsx b/frontend/src/components/assistant/ViewToggle.tsx
index f497891d..fc88bfb6 100644
--- a/frontend/src/components/assistant/ViewToggle.tsx
+++ b/frontend/src/components/assistant/ViewToggle.tsx
@@ -6,9 +6,9 @@ import { useUserPreferencesStore } from '@/store/userPreferencesStore'
 
 type FlowPilotView = 'flowpilot' | 'cockpit'
 
-const VIEW_OPTIONS: { key: FlowPilotView; label: string; icon: typeof MessageSquare; subtitle: string }[] = [
-  { key: 'flowpilot', label: 'FlowPilot', icon: MessageSquare, subtitle: 'Chat-first AI troubleshooting' },
-  { key: 'cockpit', label: 'Cockpit', icon: LayoutDashboard, subtitle: 'Steps, evidence & triage board' },
+const VIEW_OPTIONS: { key: FlowPilotView; label: string; icon: typeof MessageSquare }[] = [
+  { key: 'flowpilot', label: 'FlowPilot', icon: MessageSquare },
+  { key: 'cockpit', label: 'Cockpit', icon: LayoutDashboard },
 ]
 
 interface ViewToggleProps {
@@ -16,19 +16,15 @@ interface ViewToggleProps {
   currentView: FlowPilotView
   /** Session ID for navigation (session pages only). Omit for preference-only mode (dashboard). */
   sessionId?: string
-  /** Show the subtitle below the toggle. Default true for standalone, false for inline. */
-  showSubtitle?: boolean
 }
 
-export function ViewToggle({ currentView, sessionId, showSubtitle = true }: ViewToggleProps) {
+export function ViewToggle({ currentView, sessionId }: ViewToggleProps) {
   const navigate = useNavigate()
   const hasCockpit = useFeatureFlag('flowpilot_cockpit')
   const setPreferredView = useUserPreferencesStore(s => s.setPreferredFlowPilotView)
 
   if (!hasCockpit) return null
 
-  const activeOption = VIEW_OPTIONS.find(o => o.key === currentView) ?? VIEW_OPTIONS[0]
-
   const handleSwitch = (view: FlowPilotView) => {
     if (view === currentView) return
     setPreferredView(view)
@@ -41,29 +37,22 @@ export function ViewToggle({ currentView, sessionId, showSubtitle = true }: View
   }
 
   return (
-    <div className="flex flex-col items-start gap-1">
-      <div className="flex items-center rounded-lg border border-border bg-card p-0.5 text-xs">
-        {VIEW_OPTIONS.map(({ key, label, icon: Icon }) => (
-          <button
-            key={key}
-            onClick={() => handleSwitch(key)}
-            className={cn(
-              'flex items-center gap-1.5 rounded-md px-2.5 py-1 font-medium transition-colors',
-              currentView === key
-                ? 'bg-elevated text-foreground'
-                : 'text-muted-foreground hover:text-foreground'
-            )}
-          >
-            <Icon size={12} />
-            {label}
-          </button>
-        ))}
-      </div>
-      {showSubtitle && (
-        <span className="text-[10px] text-muted-foreground leading-none pl-0.5">
-          {activeOption.subtitle}
-        </span>
-      )}
+    <div className="flex items-center rounded-lg border border-border bg-card p-0.5 text-xs">
+      {VIEW_OPTIONS.map(({ key, label, icon: Icon }) => (
+        <button
+          key={key}
+          onClick={() => handleSwitch(key)}
+          className={cn(
+            'flex items-center gap-1.5 rounded-md px-2.5 py-1 font-medium transition-colors',
+            currentView === key
+              ? 'bg-elevated text-foreground'
+              : 'text-muted-foreground hover:text-foreground'
+          )}
+        >
+          <Icon size={12} />
+          {label}
+        </button>
+      ))}
     </div>
   )
 }
diff --git a/frontend/src/pages/CockpitPage.tsx b/frontend/src/pages/CockpitPage.tsx
index 86c8fea4..0171359b 100644
--- a/frontend/src/pages/CockpitPage.tsx
+++ b/frontend/src/pages/CockpitPage.tsx
@@ -255,7 +255,7 @@ export default function CockpitPage() {
           </button>
           <div className="flex-1" />
           {session.activeChatId && (
-            <ViewToggle currentView="cockpit" sessionId={session.activeChatId} showSubtitle={false} />
+            <ViewToggle currentView="cockpit" sessionId={session.activeChatId} />
           )}
           <button
             onClick={session.handleNewChat}
@@ -275,11 +275,12 @@ export default function CockpitPage() {
               onResolve={() => session.setShowConclude(true)}
               onStatusUpdate={session.messages.length >= 2 ? () => session.setShowStatusUpdate(true) : undefined}
               onClose={() => session.setShowConclude(true)}
+              extraActions={
+                <div className="hidden sm:block">
+                  <ViewToggle currentView="cockpit" sessionId={session.activeChatId} />
+                </div>
+              }
             />
-            {/* View toggle bar — desktop only (mobile has it in the header) */}
-            <div className="hidden sm:flex items-center justify-end px-4 py-1.5 border-b border-border/50">
-              <ViewToggle currentView="cockpit" sessionId={session.activeChatId} />
-            </div>
 
             {/* Resizable work zone + conversation log split */}
             <div ref={splitContainerRef} className="flex-1 flex flex-col min-h-0 relative">
diff --git a/frontend/src/pages/FlowPilotPage.tsx b/frontend/src/pages/FlowPilotPage.tsx
index 1790b3d9..7981e0ec 100644
--- a/frontend/src/pages/FlowPilotPage.tsx
+++ b/frontend/src/pages/FlowPilotPage.tsx
@@ -116,7 +116,7 @@ export default function FlowPilotPage() {
                 </button>
                 <div className="flex-1" />
                 {session.activeChatId && (
-                  <ViewToggle currentView="flowpilot" sessionId={session.activeChatId} showSubtitle={false} />
+                  <ViewToggle currentView="flowpilot" sessionId={session.activeChatId} />
                 )}
                 <button
                   onClick={session.handleNewChat}
diff --git a/frontend/src/pages/QuickStartPage.tsx b/frontend/src/pages/QuickStartPage.tsx
index 7bb9900d..3dec38ea 100644
--- a/frontend/src/pages/QuickStartPage.tsx
+++ b/frontend/src/pages/QuickStartPage.tsx
@@ -52,7 +52,7 @@ export function QuickStartPage() {
         {/* View preference — standalone row above input */}
         <div className="flex items-center gap-3 mb-5">
           <span className="text-xs text-muted-foreground">Launch in</span>
-          <ViewToggle currentView={preferredView} showSubtitle={false} />
+          <ViewToggle currentView={preferredView} />
         </div>
 
         {/* Chat-style input */}