diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index b2821c3bf..5b347b2ed 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -21,7 +21,6 @@ export type Page =
   | 'trading-as-git'
   | 'settings' | 'dev'
   | 'traditional-chat' | 'notifications-legacy' | 'connectors-legacy'
-  | 'trading-accounts'
 
 /** Track whether we're at a desktop viewport (md+ in Tailwind = ≥768px). */
 function useIsDesktop(): boolean {
diff --git a/ui/src/components/ActivityBar.tsx b/ui/src/components/ActivityBar.tsx
index e1d72023c..44dae75e2 100644
--- a/ui/src/components/ActivityBar.tsx
+++ b/ui/src/components/ActivityBar.tsx
@@ -1,4 +1,4 @@
-import { type LucideIcon, MessageSquare, MessagesSquare, Inbox, Bell, LineChart, GitBranch, BarChart3, Newspaper, Zap, Settings, Code2, TerminalSquare, ChevronDown, Plug, Landmark, Info } from 'lucide-react'
+import { type LucideIcon, MessageSquare, MessagesSquare, Inbox, Bell, LineChart, GitBranch, BarChart3, Newspaper, Zap, Settings, Code2, TerminalSquare, ChevronDown, Plug, Info } from 'lucide-react'
 import { useState } from 'react'
 import { type Page } from '../App'
 import { useWorkspace } from '../tabs/store'
@@ -25,7 +25,6 @@ function activitySectionFor(page: Page): ActivitySection {
     case 'traditional-chat':     return 'traditional-chat'
     case 'notifications-legacy': return 'notifications-legacy'
     case 'connectors-legacy':    return 'connectors-legacy'
-    case 'trading-accounts':     return 'trading-accounts'
   }
 }
 
@@ -101,20 +100,18 @@ const NAV_SECTIONS: NavSection[] = [
       { page: 'news',       label: 'News',       icon: Newspaper, defaultTab: { kind: 'news', params: {} } },
     ],
   },
-  // Beta — functional but unstable. Goal: unified abstraction across
-  // broker accounts (Trading Accounts) + the Trading-as-Git workflow
-  // + the Portfolio view that surfaces it. Large engineering ahead,
-  // no fixed timeline — configurable today, but lock-in cost can
-  // change as the abstraction settles. Default-expanded because the
-  // items here are actively useful; the Beta label is the right
-  // amount of caution, not a hide.
+  // Beta — functional but unstable. The underlying cross-broker
+  // unification (UTA abstraction, FX/options/futures) is in active
+  // rearchitecture. Portfolio surfaces that state; Trading-as-Git is
+  // the operations side (pending broker writes). Broker connection
+  // CRUD lives under Settings → Trading, not here — it's a config
+  // surface, not a state/ops one.
   {
     sectionLabel: 'Beta',
-    description: 'Goal here is a unified abstraction across broker accounts (deposit/withdraw, options, futures, FX). Large engineering effort, no fixed timeline. Configure and try, but don\'t depend on schema or UX as stable yet.',
+    description: 'Cross-broker unified state + ops surfaces. The abstraction underneath is still being settled — try them, but don\'t depend on schema or UX as stable yet. Broker connection setup lives in Settings → Trading.',
     items: [
-      { page: 'trading-accounts', label: 'Trading Accounts', icon: Landmark, defaultTab: { kind: 'settings', params: { category: 'trading' } } },
-      { page: 'trading-as-git',   label: 'Trading as Git',   icon: GitBranch },
-      { page: 'portfolio',        label: 'Portfolio',        icon: LineChart, defaultTab: { kind: 'portfolio', params: {} } },
+      { page: 'trading-as-git', label: 'Trading as Git', icon: GitBranch },
+      { page: 'portfolio',      label: 'Portfolio',      icon: LineChart, defaultTab: { kind: 'portfolio', params: {} } },
     ],
   },
   {
diff --git a/ui/src/components/PortfolioSidebar.tsx b/ui/src/components/PortfolioSidebar.tsx
index 3f6206bcf..aa2c39377 100644
--- a/ui/src/components/PortfolioSidebar.tsx
+++ b/ui/src/components/PortfolioSidebar.tsx
@@ -39,7 +39,7 @@ export function PortfolioSidebar() {
           <p className="px-3 py-1 text-[12px] text-text-muted/60">Loading…</p>
         ) : utas.length === 0 ? (
           <p className="px-3 py-1 text-[12px] text-text-muted/60 leading-snug">
-            No accounts yet. Add one in Settings → Trading Accounts.
+            No accounts yet. Add one in Settings → Trading.
           </p>
         ) : (
           utas.map((uta) => {
diff --git a/ui/src/components/SettingsCategoryList.tsx b/ui/src/components/SettingsCategoryList.tsx
index 37295fcf8..539f86466 100644
--- a/ui/src/components/SettingsCategoryList.tsx
+++ b/ui/src/components/SettingsCategoryList.tsx
@@ -7,24 +7,16 @@ type SettingsCategory = Extract<ViewSpec, { kind: 'settings' }>['params']['categ
 interface CategoryItem {
   label: string
   category: SettingsCategory
-  /**
-   * Other view kinds that count as "active" for this row. Used by
-   * Trading Accounts: when a uta-detail tab is focused, Trading
-   * Accounts should still light up.
-   */
-  alsoActiveFor?: ViewSpec['kind'][]
 }
 
 const CATEGORIES: CategoryItem[] = [
-  { label: 'General', category: 'general' },
-  { label: 'AI Provider', category: 'ai-provider' },
-  // Trading Accounts moved to its own ActivityBar Beta entry — see
-  // TradingAccountsBetaSidebar. The `settings/trading` ViewSpec is
-  // still the underlying tab.
+  { label: 'General',      category: 'general' },
+  { label: 'AI Provider',  category: 'ai-provider' },
+  { label: 'Trading',      category: 'trading' },
   // Connectors moved to its own ActivityBar Legacy entry — see
   // ConnectorsLegacySidebar.
-  { label: 'MCP Server', category: 'mcp' },
-  { label: 'Market Data', category: 'market-data' },
+  { label: 'MCP Server',   category: 'mcp' },
+  { label: 'Market Data',  category: 'market-data' },
   { label: 'News Sources', category: 'news-collector' },
 ]
 
@@ -41,8 +33,7 @@ export function SettingsCategoryList() {
     <div className="py-0.5">
       {CATEGORIES.map((item) => {
         const active =
-          (focused?.kind === 'settings' && focused.params.category === item.category) ||
-          (item.alsoActiveFor != null && focused != null && item.alsoActiveFor.includes(focused.kind))
+          focused?.kind === 'settings' && focused.params.category === item.category
         return (
           <SidebarRow
             key={item.category}
diff --git a/ui/src/components/TradingAccountsBetaSidebar.tsx b/ui/src/components/TradingAccountsBetaSidebar.tsx
deleted file mode 100644
index 5ea27fa8b..000000000
--- a/ui/src/components/TradingAccountsBetaSidebar.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Landmark } from 'lucide-react'
-import { useWorkspace } from '../tabs/store'
-import { getFocusedTab } from '../tabs/types'
-import { SidebarRow } from './SidebarRow'
-
-/**
- * Trading Accounts (Beta) sidebar.
- *
- * Trading account configuration was previously a sub-item under the
- * Settings sidebar. Promoted to a top-level Beta entry because the
- * cross-broker unification work is in active rearchitecture and the
- * lifecycle stage warrants visibility at the ActivityBar level.
- *
- * Sidebar opens the existing `settings/trading` page (no new ViewSpec).
- * The Beta-section description is rendered once at the ActivityBar
- * section header — we don't duplicate it inside the sidebar itself.
- */
-export function TradingAccountsBetaSidebar() {
-  const focused = useWorkspace((state) => getFocusedTab(state)?.spec)
-  // Also light up when a `uta-detail` tab is focused — that's the
-  // sibling view that gets opened from inside the TradingPage.
-  const isActive =
-    (focused?.kind === 'settings' && focused.params.category === 'trading')
-    || focused?.kind === 'uta-detail'
-  const openOrFocus = useWorkspace((state) => state.openOrFocus)
-
-  return (
-    <div className="flex flex-col h-full">
-      <div className="py-0.5">
-        <SidebarRow
-          label={
-            <span className="flex items-center gap-2">
-              <Landmark size={14} strokeWidth={1.8} className="shrink-0" />
-              <span>Trading Accounts</span>
-            </span>
-          }
-          active={isActive}
-          onClick={() =>
-            openOrFocus({ kind: 'settings', params: { category: 'trading' } })
-          }
-        />
-      </div>
-    </div>
-  )
-}
diff --git a/ui/src/components/uta/EditUTADialog.tsx b/ui/src/components/uta/EditUTADialog.tsx
index 18d9c0f7a..9dbd22dd9 100644
--- a/ui/src/components/uta/EditUTADialog.tsx
+++ b/ui/src/components/uta/EditUTADialog.tsx
@@ -11,15 +11,21 @@ import { SchemaFormFields } from './SchemaFormFields'
 
 /**
  * UTA configuration dialog — edits credentials, guards, enabled state.
- * Mounted from both the trading page (legacy entry) and the UTA detail
- * page (new entry, accessed via the Edit button in the page header).
+ * Mounted from Settings → Trading (primary CRUD entry) and from the UTA
+ * detail page in Portfolio (sibling Edit button).
+ *
+ * When opened from Settings → Trading, the parent passes `onViewInPortfolio`
+ * to render a header link that switches the user over to the Portfolio
+ * drill-in for this account. When opened from inside Portfolio's detail
+ * page, that prop is omitted (the user is already in that context).
  */
-export function EditUTADialog({ uta, preset, health, onSave, onDelete, onClose }: {
+export function EditUTADialog({ uta, preset, health, onSave, onDelete, onViewInPortfolio, onClose }: {
   uta: UTAConfig
   preset?: BrokerPreset
   health?: BrokerHealthInfo
   onSave: (a: UTAConfig) => Promise<void>
   onDelete: () => Promise<void>
+  onViewInPortfolio?: () => void
   onClose: () => void
 }) {
   const [draft, setDraft] = useState(uta)
@@ -74,11 +80,25 @@ export function EditUTADialog({ uta, preset, health, onSave, onDelete, onClose }
           <h3 className="text-[14px] font-semibold text-text truncate">{uta.id}</h3>
           <HealthBadge health={health} size="md" />
         </div>
-        <button onClick={onClose} className="text-text-muted hover:text-text p-1 transition-colors shrink-0">
-          <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
-            <path d="M18 6L6 18M6 6l12 12" />
-          </svg>
-        </button>
+        <div className="flex items-center gap-3 shrink-0">
+          {onViewInPortfolio && (
+            <button
+              onClick={onViewInPortfolio}
+              className="text-[11px] text-text-muted hover:text-text inline-flex items-center gap-1 transition-colors"
+              title="See this account's positions and equity in Portfolio"
+            >
+              View in Portfolio
+              <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <path d="M7 17L17 7M9 7h8v8" />
+              </svg>
+            </button>
+          )}
+          <button onClick={onClose} className="text-text-muted hover:text-text p-1 transition-colors">
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
+              <path d="M18 6L6 18M6 6l12 12" />
+            </svg>
+          </button>
+        </div>
       </div>
 
       {/* Body */}
diff --git a/ui/src/pages/PortfolioPage.tsx b/ui/src/pages/PortfolioPage.tsx
index e169b1a79..05a42910e 100644
--- a/ui/src/pages/PortfolioPage.tsx
+++ b/ui/src/pages/PortfolioPage.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect, useCallback, useMemo } from 'react'
 import { api, type Position, type WalletCommitLog, type EquityCurvePoint, type UTASnapshotSummary } from '../api'
 import { useAutoSave } from '../hooks/useAutoSave'
 import { useAccountHealth } from '../hooks/useAccountHealth'
+import { useWorkspace } from '../tabs/store'
 import { PageHeader } from '../components/PageHeader'
 import { EmptyState } from '../components/StateViews'
 import { EquityCurve } from '../components/EquityCurve'
@@ -277,7 +278,7 @@ export function PortfolioPage() {
 
             {/* Empty states */}
             {data.accounts.length === 0 && !loading && (
-              <EmptyState title="No trading accounts connected." description="Configure connections in the Trading page." />
+              <NoAccountsEmpty />
             )}
             {data.accounts.length > 0 && allPositions.length === 0 && !loading && (
               <EmptyState title="No open positions." />
@@ -334,6 +335,31 @@ async function fetchPortfolioData(): Promise<PortfolioData> {
   }
 }
 
+// ==================== Empty: no trading accounts ====================
+
+function NoAccountsEmpty() {
+  const openOrFocus = useWorkspace((s) => s.openOrFocus)
+  const setSidebar = useWorkspace((s) => s.setSidebar)
+  const goToTradingSettings = () => {
+    setSidebar('settings')
+    openOrFocus({ kind: 'settings', params: { category: 'trading' } })
+  }
+  return (
+    <div className="flex flex-col items-center justify-center py-16 text-center">
+      <p className="text-sm font-medium text-text-muted">No trading accounts connected.</p>
+      <p className="text-[12px] text-text-muted/60 mt-1.5 max-w-[320px]">
+        Portfolio shows live equity, positions and PnL across all your brokers. Add a connection to get started.
+      </p>
+      <button
+        onClick={goToTradingSettings}
+        className="mt-4 btn-primary text-[12px]"
+      >
+        Add broker in Settings → Trading
+      </button>
+    </div>
+  )
+}
+
 // ==================== Hero Metrics ====================
 
 function HeroMetrics({ equity, curve }: {
diff --git a/ui/src/pages/TradingPage.tsx b/ui/src/pages/TradingPage.tsx
index ab7da0ac4..e44e53e10 100644
--- a/ui/src/pages/TradingPage.tsx
+++ b/ui/src/pages/TradingPage.tsx
@@ -1,5 +1,4 @@
-import { useState, useEffect, useMemo, useCallback } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useState, useEffect, useMemo } from 'react'
 import { Field, inputClass } from '../components/form'
 import { SDKSelector } from '../components/SDKSelector'
 import type { SDKOption } from '../components/SDKSelector'
@@ -10,13 +9,18 @@ import { PageHeader } from '../components/PageHeader'
 import { Dialog } from '../components/uta/Dialog'
 import { HealthBadge } from '../components/uta/HealthBadge'
 import { SchemaFormFields } from '../components/uta/SchemaFormFields'
-import { Metric, signFromDelta } from '../components/Metric'
-import { Sparkline } from '../components/Sparkline'
-import { fmt, fmtPnl, fmtPctSigned } from '../lib/format'
+import { EditUTADialog } from '../components/uta/EditUTADialog'
+import { fmt } from '../lib/format'
 import { api } from '../api'
-import type { UTAConfig, BrokerPreset, BrokerHealthInfo, TestConnectionResult, Position, AccountInfo, EquityCurvePoint } from '../api/types'
+import { useWorkspace } from '../tabs/store'
+import type { UTAConfig, BrokerPreset, BrokerHealthInfo, TestConnectionResult, Position, AccountInfo } from '../api/types'
 
 // ==================== Live equity (across all UTAs) ====================
+//
+// TradingPage is the CRUD surface for broker connections. The single
+// per-card equity number is here as a liveness signal — "this connection
+// returned real account data" — not as a portfolio view. Aggregate
+// equity, sparklines, 24h deltas, and trade logs live in Portfolio.
 
 interface EquitySummary {
   totalEquity: string
@@ -26,105 +30,50 @@ interface EquitySummary {
   accounts: Array<{ id: string; label: string; equity: string; cash: string }>
 }
 
-interface PerUtaCurve { values: number[]; firstAtCutoff: number | null; latest: number | null }
-
-interface CurveSummary {
-  /** Aggregate (across all UTAs) — feeds the hero banner. */
-  total: { values: number[]; firstAtCutoff: number | null; latest: number | null }
-  /** Per-UTA curves — feed the per-card sparkline + 24h delta. */
-  perUta: Record<string, PerUtaCurve>
-}
-
-const CUTOFF_24H_MS = 24 * 60 * 60 * 1000
-
-/** Build a curve summary from equity-curve points: latest value + the
- *  oldest value still within the trailing 24h window (the "baseline"
- *  for today PnL). */
-function summarizeCurve(points: EquityCurvePoint[]): CurveSummary {
-  const sorted = [...points].sort((a, b) => a.timestamp.localeCompare(b.timestamp))
-  const cutoff = Date.now() - CUTOFF_24H_MS
-
-  const totalValues: number[] = []
-  let totalFirstAtCutoff: number | null = null
-  let totalLatest: number | null = null
-  const perUtaValues = new Map<string, number[]>()
-  const perUtaFirstAtCutoff = new Map<string, number>()
-  const perUtaLatest = new Map<string, number>()
-
-  for (const p of sorted) {
-    const t = new Date(p.timestamp).getTime()
-    const totalN = Number(p.equity)
-    if (Number.isFinite(totalN)) {
-      totalValues.push(totalN)
-      totalLatest = totalN
-      if (t >= cutoff && totalFirstAtCutoff == null) totalFirstAtCutoff = totalN
-    }
-    for (const [id, raw] of Object.entries(p.accounts ?? {})) {
-      const n = Number(raw)
-      if (!Number.isFinite(n)) continue
-      let arr = perUtaValues.get(id)
-      if (!arr) { arr = []; perUtaValues.set(id, arr) }
-      arr.push(n)
-      perUtaLatest.set(id, n)
-      if (t >= cutoff && !perUtaFirstAtCutoff.has(id)) perUtaFirstAtCutoff.set(id, n)
-    }
-  }
-
-  const perUta: Record<string, PerUtaCurve> = {}
-  for (const [id, values] of perUtaValues) {
-    perUta[id] = {
-      values,
-      firstAtCutoff: perUtaFirstAtCutoff.get(id) ?? null,
-      latest: perUtaLatest.get(id) ?? null,
-    }
-  }
-
-  return {
-    total: { values: totalValues, firstAtCutoff: totalFirstAtCutoff, latest: totalLatest },
-    perUta,
-  }
-}
-
 // ==================== Page ====================
 
 export function TradingPage() {
   const tc = useTradingConfig()
   const healthMap = useAccountHealth()
-  const navigate = useNavigate()
+  const openOrFocus = useWorkspace((s) => s.openOrFocus)
+  const setSidebar = useWorkspace((s) => s.setSidebar)
   const [showAdd, setShowAdd] = useState(false)
+  const [editingId, setEditingId] = useState<string | null>(null)
   const [presets, setPresets] = useState<BrokerPreset[]>([])
   const [equity, setEquity] = useState<EquitySummary | null>(null)
-  const [curve, setCurve] = useState<CurveSummary | null>(null)
   const [lastUpdated, setLastUpdated] = useState<Date | null>(null)
 
   useEffect(() => {
     api.trading.getBrokerPresets().then(r => setPresets(r.presets)).catch(() => {})
   }, [])
 
-  // Live aggregates: pull `equity()` for headline numbers and `equityCurve()`
-  // for trend + 24h delta. One fetch each per cycle, shared across the
-  // hero banner + every UTA card. Polling cadence (30s) is informational —
-  // user can drill into a UTA for the 15s refresh of broker state.
-  const refreshAggregates = useCallback(async () => {
-    try {
-      const [eq, cv] = await Promise.all([
-        api.trading.equity().catch(() => null),
-        api.trading.equityCurve({ limit: 1500 }).catch(() => ({ points: [] as EquityCurvePoint[] })),
-      ])
-      if (eq) setEquity(eq)
-      setCurve(summarizeCurve(cv.points))
-      setLastUpdated(new Date())
-    } catch {
-      // Don't surface — aggregates are nice-to-have, the page still renders
-      // from useTradingConfig if the equity endpoint is down.
+  // Per-card liveness signal — `equity()` lets each card show "this
+  // connection actually returned an account balance" rather than just
+  // "ping went through". 60s cadence is enough; trend/sparkline/aggregate
+  // moved to Portfolio.
+  useEffect(() => {
+    let cancelled = false
+    const refresh = async () => {
+      const eq = await api.trading.equity().catch(() => null)
+      if (cancelled) return
+      if (eq) {
+        setEquity(eq)
+        setLastUpdated(new Date())
+      }
     }
+    refresh()
+    const id = setInterval(refresh, 60_000)
+    return () => { cancelled = true; clearInterval(id) }
   }, [])
 
-  useEffect(() => {
-    refreshAggregates()
-    const id = setInterval(refreshAggregates, 30_000)
-    return () => clearInterval(id)
-  }, [refreshAggregates])
+  const editingUTA = editingId ? tc.utas.find(u => u.id === editingId) : null
+  const editingPreset = editingUTA ? presets.find(p => p.id === editingUTA.presetId) : undefined
+
+  const openInPortfolio = (id: string) => {
+    setEditingId(null)
+    setSidebar('portfolio')
+    openOrFocus({ kind: 'uta-detail', params: { id } })
+  }
 
   if (tc.loading) return <PageShell subtitle="Loading..." />
   if (tc.error) {
@@ -149,32 +98,27 @@ export function TradingPage() {
           {tc.utas.length === 0 ? (
             <EmptyState onAdd={() => setShowAdd(true)} />
           ) : (
-            <>
-              {equity && <PortfolioBanner equity={equity} curve={curve?.total ?? null} />}
-
-              <div className="space-y-2.5">
-                {tc.utas.map((uta) => {
-                  const equityRow = equity?.accounts.find(a => a.id === uta.id) ?? null
-                  return (
-                    <UTACard
-                      key={uta.id}
-                      uta={uta}
-                      preset={presets.find(p => p.id === uta.presetId)}
-                      health={healthMap[uta.id]}
-                      equity={equityRow}
-                      curve={curve?.perUta[uta.id] ?? null}
-                      onClick={() => navigate(`/uta/${uta.id}`)}
-                    />
-                  )
-                })}
-                <button
-                  onClick={() => setShowAdd(true)}
-                  className="w-full py-2.5 text-[12px] text-text-muted hover:text-text border border-dashed border-border hover:border-text-muted/40 rounded-lg transition-colors"
-                >
-                  + Add UTA
-                </button>
-              </div>
-            </>
+            <div className="space-y-2.5">
+              {tc.utas.map((uta) => {
+                const equityRow = equity?.accounts.find(a => a.id === uta.id) ?? null
+                return (
+                  <UTACard
+                    key={uta.id}
+                    uta={uta}
+                    preset={presets.find(p => p.id === uta.presetId)}
+                    health={healthMap[uta.id]}
+                    equity={equityRow}
+                    onClick={() => setEditingId(uta.id)}
+                  />
+                )
+              })}
+              <button
+                onClick={() => setShowAdd(true)}
+                className="w-full py-2.5 text-[12px] text-text-muted hover:text-text border border-dashed border-border hover:border-text-muted/40 rounded-lg transition-colors"
+              >
+                + Add UTA
+              </button>
+            </div>
           )}
         </div>
       </div>
@@ -190,16 +134,31 @@ export function TradingPage() {
             }
             setShowAdd(false)
             // Trigger a fresh fetch so the new UTA shows live numbers right away.
-            void refreshAggregates()
+            void api.trading.equity().then(setEquity).catch(() => {})
             return created
           }}
           onOpenExisting={(id) => {
             setShowAdd(false)
-            navigate(`/uta/${id}`)
+            setEditingId(id)
           }}
           onClose={() => setShowAdd(false)}
         />
       )}
+
+      {editingUTA && (
+        <EditUTADialog
+          uta={editingUTA}
+          preset={editingPreset}
+          health={healthMap[editingUTA.id]}
+          onSave={async (next) => { await tc.saveUTA(next) }}
+          onDelete={async () => {
+            await tc.deleteUTA(editingUTA.id)
+            setEditingId(null)
+          }}
+          onViewInPortfolio={() => openInPortfolio(editingUTA.id)}
+          onClose={() => setEditingId(null)}
+        />
+      )}
     </div>
   )
 }
@@ -233,48 +192,6 @@ function EmptyState({ onAdd }: { onAdd: () => void }) {
 
 // ==================== Portfolio banner (hero) ====================
 
-function PortfolioBanner({ equity, curve }: {
-  equity: EquitySummary
-  curve: { values: number[]; firstAtCutoff: number | null; latest: number | null } | null
-}) {
-  const total = Number(equity.totalEquity)
-  const cash = Number(equity.totalCash)
-  const unrealized = Number(equity.totalUnrealizedPnL)
-
-  // 24h delta from the curve summary. If curve is empty or the cutoff
-  // baseline isn't available (UTA freshly added), suppress the delta.
-  let deltaNode: React.ReactNode = null
-  if (curve && curve.latest != null && curve.firstAtCutoff != null) {
-    const delta = curve.latest - curve.firstAtCutoff
-    const pct = curve.firstAtCutoff !== 0 ? (delta / curve.firstAtCutoff) * 100 : 0
-    const sign = signFromDelta(delta)
-    const arrow = sign === 'up' ? '▲' : sign === 'down' ? '▼' : '·'
-    const color = sign === 'up' ? 'text-green' : sign === 'down' ? 'text-red' : 'text-text-muted'
-    deltaNode = (
-      <span className={`text-[14px] tabular-nums ${color}`}>
-        {arrow} {fmtPnl(delta, 'USD')} ({fmtPctSigned(pct)}) today
-      </span>
-    )
-  }
-
-  return (
-    <div className="rounded-lg border border-border bg-bg-secondary px-5 py-4">
-      <p className="text-[11px] text-text-muted uppercase tracking-wide mb-1">Total Portfolio · USD</p>
-      <div className="flex flex-wrap items-baseline gap-x-4 gap-y-1">
-        <span className="text-[26px] md:text-[30px] font-bold tabular-nums text-text">
-          {fmt(total, 'USD')}
-        </span>
-        {deltaNode}
-      </div>
-      <div className="mt-2.5 flex flex-wrap gap-x-4 gap-y-1 text-[12px] text-text-muted">
-        <span>Cash <span className="text-text tabular-nums">{fmt(cash, 'USD')}</span></span>
-        <span className="text-text-muted/40">·</span>
-        <span>Unrealized <span className={`tabular-nums ${unrealized >= 0 ? 'text-green' : 'text-red'}`}>{fmtPnl(unrealized, 'USD')}</span></span>
-      </div>
-    </div>
-  )
-}
-
 // ==================== Subtitle builder ====================
 
 function buildSubtitle(uta: UTAConfig, preset?: BrokerPreset): string {
@@ -300,12 +217,11 @@ function buildSubtitle(uta: UTAConfig, preset?: BrokerPreset): string {
 
 // ==================== UTA Card ====================
 
-function UTACard({ uta, preset, health, equity, curve, onClick }: {
+function UTACard({ uta, preset, health, equity, onClick }: {
   uta: UTAConfig
   preset?: BrokerPreset
   health?: BrokerHealthInfo
   equity?: { equity: string; cash: string } | null
-  curve?: PerUtaCurve | null
   onClick: () => void
 }) {
   const isDisabled = health?.disabled || uta.enabled === false
@@ -313,23 +229,21 @@ function UTACard({ uta, preset, health, equity, curve, onClick }: {
     ? { text: preset.badge, color: `${preset.badgeColor} ${preset.badgeColor.replace('text-', 'bg-')}/10` }
     : { text: uta.presetId.slice(0, 2).toUpperCase(), color: 'text-text-muted bg-text-muted/10' }
 
-  // 24h delta for this UTA.
-  const delta = curve && curve.latest != null && curve.firstAtCutoff != null
-    ? { value: curve.latest - curve.firstAtCutoff, pct: curve.firstAtCutoff !== 0 ? ((curve.latest - curve.firstAtCutoff) / curve.firstAtCutoff) * 100 : 0 }
-    : null
-
-  const sparkValues = curve?.values ?? []
-  const showSpark = !isDisabled && sparkValues.length >= 2
-
+  // Per-card equity is a liveness signal, not a portfolio view —
+  // proves the connection returned a real account balance, not just
+  // a ping. Aggregate / curves / per-account drill-in all live in
+  // Portfolio.
   const equityNum = equity ? Number(equity.equity) : null
-  const cashNum = equity ? Number(equity.cash) : null
+  const equityNode = !isDisabled && equityNum != null && Number.isFinite(equityNum)
+    ? <span className="tabular-nums">{fmt(equityNum, 'USD')}</span>
+    : null
 
   return (
     <button
       onClick={onClick}
-      className={`w-full text-left rounded-lg border border-border bg-bg-secondary/30 px-4 py-3.5 transition-all hover:border-text-muted/40 hover:bg-bg-tertiary/20 ${isDisabled ? 'opacity-50' : ''}`}
+      className={`w-full text-left rounded-lg border border-border bg-bg-secondary/30 px-4 py-3 transition-all hover:border-text-muted/40 hover:bg-bg-tertiary/20 ${isDisabled ? 'opacity-50' : ''}`}
     >
-      <div className="flex items-center gap-3 mb-2.5">
+      <div className="flex items-center gap-3">
         <span className={`text-[10px] font-bold px-2 py-1 rounded-md shrink-0 ${badge.color}`}>
           {badge.text}
         </span>
@@ -342,40 +256,16 @@ function UTACard({ uta, preset, health, equity, curve, onClick }: {
             {uta.guards.length > 0 && <span className="ml-1.5 text-text-muted/50">{uta.guards.length} guard{uta.guards.length > 1 ? 's' : ''}</span>}
           </div>
         </div>
-        <div className="shrink-0">
+        <div className="shrink-0 flex items-center gap-3">
+          {equityNode && (
+            <span className="text-[11px] text-text-muted/80 hidden sm:inline">{equityNode}</span>
+          )}
           {uta.enabled === false
             ? <span className="text-[11px] text-text-muted">Disabled</span>
             : <HealthBadge health={health} />
           }
         </div>
       </div>
-
-      <div className="flex items-end justify-between gap-3">
-        <div className="min-w-0">
-          {equityNum != null && Number.isFinite(equityNum) ? (
-            <p className="text-[22px] font-bold tabular-nums text-text leading-tight">
-              {fmt(equityNum, 'USD')}
-            </p>
-          ) : (
-            <p className="text-[16px] text-text-muted/70 italic">live data unavailable</p>
-          )}
-          {delta && (
-            <p className={`text-[12px] tabular-nums mt-0.5 ${delta.value >= 0 ? 'text-green' : 'text-red'}`}>
-              {delta.value >= 0 ? '▲' : '▼'} {fmtPnl(delta.value, 'USD')} ({fmtPctSigned(delta.pct)}) today
-            </p>
-          )}
-          {cashNum != null && Number.isFinite(cashNum) && (
-            <p className="text-[11px] text-text-muted mt-1">
-              Cash <span className="text-text-muted tabular-nums">{fmt(cashNum, 'USD')}</span>
-            </p>
-          )}
-        </div>
-        {showSpark && (
-          <div className="hidden md:block shrink-0">
-            <Sparkline values={sparkValues} width={120} height={42} color="auto" />
-          </div>
-        )}
-      </div>
     </button>
   )
 }
diff --git a/ui/src/sections.tsx b/ui/src/sections.tsx
index 4201ba08f..ad48f2873 100644
--- a/ui/src/sections.tsx
+++ b/ui/src/sections.tsx
@@ -9,6 +9,14 @@
  * Routes have moved to tabs/UrlAdopter.tsx (URL → spec adoption) and
  * tabs/registry.tsx (spec → URL projection). This file is now just the
  * activity-section → sidebar lookup.
+ *
+ * Subsection-header convention: a sidebar uses subsection headers (e.g.
+ * Portfolio's "Overview" / "Accounts (N)") IF AND ONLY IF it lists items
+ * of more than one shape — typically an aggregate view alongside per-
+ * instance rows. Sidebars listing one kind of thing (Settings categories,
+ * Workspace instances, Market list, Chat channels) do NOT use headers;
+ * adding them for symmetry would perform a categorization that isn't in
+ * the underlying data. Portfolio is the only sidebar that qualifies today.
  */
 
 import type { ComponentType } from 'react'
@@ -16,7 +24,6 @@ import { ChatChannelListContainer } from './components/ChatChannelListContainer'
 import { TraditionalChatSidebar } from './components/TraditionalChatSidebar'
 import { NotificationsLegacySidebar } from './components/NotificationsLegacySidebar'
 import { ConnectorsLegacySidebar } from './components/ConnectorsLegacySidebar'
-import { TradingAccountsBetaSidebar } from './components/TradingAccountsBetaSidebar'
 import { NewChannelButton } from './components/NewChannelButton'
 import { InboxSidebar } from './components/InboxSidebar'
 import { WorkspacesSidebar } from './components/workspace/WorkspacesSidebar'
@@ -98,10 +105,6 @@ const SECTION_BY_KEY: Record<ActivitySection, SidebarSection> = {
     title: 'Connectors',
     Secondary: ConnectorsLegacySidebar,
   },
-  'trading-accounts': {
-    title: 'Trading Accounts',
-    Secondary: TradingAccountsBetaSidebar,
-  },
 }
 
 /** Resolve the sidebar config for the currently selected ActivitySection. */
diff --git a/ui/src/tabs/UrlAdopter.tsx b/ui/src/tabs/UrlAdopter.tsx
index 034a82a85..52fcb59ce 100644
--- a/ui/src/tabs/UrlAdopter.tsx
+++ b/ui/src/tabs/UrlAdopter.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { Navigate, Route, Routes, useParams } from 'react-router-dom'
 import { useWorkspace } from './store'
-import { specEquals, type ViewSpec } from './types'
+import { specEquals, type ActivitySection, type ViewSpec } from './types'
 import { getView } from './registry'
 
 /**
@@ -86,6 +86,7 @@ export function UrlAdopter() {
         <Route path="/scheduler" element={<Navigate to="/automation/cron" replace />} />
         <Route path="/ai-provider" element={<Navigate to="/settings/ai-provider" replace />} />
         <Route path="/trading" element={<Navigate to="/settings/trading" replace />} />
+        <Route path="/trading-accounts" element={<Navigate to="/settings/trading" replace />} />
         <Route path="/connectors" element={<Navigate to="/settings/connectors" replace />} />
         <Route path="/market-data" element={<Navigate to="/settings/market-data" replace />} />
         <Route path="/news-collector" element={<Navigate to="/settings/news-collector" replace />} />
@@ -195,15 +196,50 @@ function SetSidebarOnly({ section }: { section: import('./types').ActivitySectio
   return null
 }
 
+/**
+ * Map a ViewSpec to the ActivitySection whose sidebar should accompany
+ * it. URL adoption uses this so a fresh page load / deep link / browser
+ * back-forward lands on a screen with the matching sidebar already
+ * open — otherwise `selectedSidebar` stays at whatever was persisted
+ * (or null on first run), and the page renders without left context.
+ *
+ * `uta-detail` is intentionally Portfolio's sidebar: the URL lives
+ * under /settings/uta/:id for historical reasons but the page is a
+ * Portfolio drill-in (positions / equity for one account).
+ */
+function specToSection(spec: ViewSpec): ActivitySection {
+  switch (spec.kind) {
+    case 'inbox':              return 'inbox'
+    case 'chat':               return 'traditional-chat'
+    case 'workspace':
+    case 'workspace-list':
+    case 'template-catalog':
+    case 'template-detail':    return 'workspaces'
+    case 'portfolio':
+    case 'uta-detail':         return 'portfolio'
+    case 'automation':         return 'automation'
+    case 'news':               return 'news'
+    case 'market-list':
+    case 'market-detail':      return 'market'
+    case 'settings':           return 'settings'
+    case 'dev':                return 'dev'
+    case 'notifications-inbox': return 'notifications-legacy'
+  }
+}
+
 /**
  * Compare focused tab against `spec` and openOrFocus only if different —
- * skips redundant store updates on every render.
+ * skips redundant store updates on every render. Also activates the
+ * matching sidebar so URL-driven navigation (fresh load, deep link,
+ * back-forward) lands with the expected left-rail context, not blank.
  */
 function useAdopt(spec: ViewSpec) {
   const openOrFocus = useWorkspace((state) => state.openOrFocus)
+  const setSidebar = useWorkspace((state) => state.setSidebar)
   // Stable string key for dep tracking; spec is freshly built each render.
   const key = `${spec.kind}:${JSON.stringify(spec.params)}`
   useEffect(() => {
+    setSidebar(specToSection(spec))
     const state = useWorkspace.getState()
     const focused = state.tree.kind === 'leaf' && state.tree.group.activeTabId
       ? state.tabs[state.tree.group.activeTabId]
diff --git a/ui/src/tabs/registry.tsx b/ui/src/tabs/registry.tsx
index 1213b1bd7..f35b29930 100644
--- a/ui/src/tabs/registry.tsx
+++ b/ui/src/tabs/registry.tsx
@@ -124,7 +124,7 @@ const settingsCategoryTitle: Record<
 > = {
   general: 'Settings',
   'ai-provider': 'AI Provider',
-  trading: 'Trading Accounts',
+  trading: 'Trading',
   connectors: 'Connectors',
   mcp: 'MCP Server',
   'market-data': 'Market Data',
diff --git a/ui/src/tabs/types.ts b/ui/src/tabs/types.ts
index b639b548e..62cffec13 100644
--- a/ui/src/tabs/types.ts
+++ b/ui/src/tabs/types.ts
@@ -56,7 +56,6 @@ export type ActivitySection =
   | 'traditional-chat'
   | 'notifications-legacy'
   | 'connectors-legacy'
-  | 'trading-accounts'
 
 export interface Tab {
   id: string