diff --git a/Dockerfile b/Dockerfile
index b035b96..0083a63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ RUN npm ci
 COPY index.html vite.config.ts tsconfig.json tsconfig.node.json components.json ./
 COPY src ./src
 COPY create ./create
-COPY public ./public
 COPY scripts ./scripts
 COPY signer-static ./signer-static
 
diff --git a/create/index.html b/create/index.html
index 2fd3881..68b6c25 100644
--- a/create/index.html
+++ b/create/index.html
@@ -85,7 +85,7 @@
     <div id="app">
       <div class="header">
         <img
-          src="/assets/1Shot-Icon-New.svg"
+          src="../src/assets/1Shot-Icon-New.svg"
           alt=""
           width="40"
           height="40"
diff --git a/host/scripts/dev.mjs b/host/scripts/dev.mjs
index 420266c..afd3715 100644
--- a/host/scripts/dev.mjs
+++ b/host/scripts/dev.mjs
@@ -27,6 +27,7 @@ try {
 
   const https = resolveHttpsOptions({
     certsDir: path.join(__dirname, "../certs"),
+    pathBase: repoRoot,
   });
   const scheme = https ? "https" : "http";
   const address = viteServer.httpServer?.address();
diff --git a/host/src/App.tsx b/host/src/App.tsx
index c4487de..9754665 100644
--- a/host/src/App.tsx
+++ b/host/src/App.tsx
@@ -83,7 +83,13 @@ export function App() {
         }
         proxyRef.current = proxy;
 
-        proxy.analytics.on((event) => {
+        (
+          proxy as OWSProxy & {
+            analytics?: {
+              on: (handler: (event: IOWSAnalyticsEvent) => void) => void;
+            };
+          }
+        ).analytics?.on((event) => {
           console.info("[oneshot-wallet-host] analytics", event.name, event);
           setAnalyticsEvents((prev) =>
             [event, ...prev].slice(0, MAX_ANALYTICS_EVENTS),
@@ -106,7 +112,9 @@ export function App() {
           reportStatus(
             mode === "design"
               ? `Design preview connected on ${connectedChain}. Apply setStyle to refresh.`
-              : `Wallet connected on ${connectedChain}. Enter a message and click Sign.`,
+              : mode === "analytics"
+                ? "Live analytics — switch to Test to generate events."
+                : `Wallet connected on ${connectedChain}. Enter a message and click Sign.`,
           );
         } catch (error) {
           reportStatus(
@@ -171,19 +179,20 @@ export function App() {
           <AppHeader />
           {mode === "test" ? (
             <TestPanel {...walletActionProps} />
-          ) : (
+          ) : mode === "design" ? (
             <DesignPanel
               ready={ready}
               onApplyStyle={handleApplyStyle}
               previewMountRef={setPreviewMount}
             />
+          ) : (
+            <div className="mx-auto w-full max-w-2xl px-6 pb-6">
+              <AnalyticsPanel
+                events={analyticsEvents}
+                onClear={() => setAnalyticsEvents([])}
+              />
+            </div>
           )}
-          <div className="mx-auto w-full max-w-2xl px-6 pb-6">
-            <AnalyticsPanel
-              events={analyticsEvents}
-              onClear={() => setAnalyticsEvents([])}
-            />
-          </div>
         </SidebarInset>
         {/* Flyout create() target — never reparented; Test mode only. */}
         <div ref={flyoutContainerRef} aria-hidden="true" />
diff --git a/host/src/components/AppSidebar.tsx b/host/src/components/AppSidebar.tsx
index b7da61c..03f60b2 100644
--- a/host/src/components/AppSidebar.tsx
+++ b/host/src/components/AppSidebar.tsx
@@ -1,4 +1,4 @@
-import { FlaskConicalIcon, PaletteIcon } from "lucide-react";
+import { BarChart3Icon, FlaskConicalIcon, PaletteIcon } from "lucide-react";
 import {
   Sidebar,
   SidebarContent,
@@ -12,7 +12,7 @@ import {
   SidebarRail,
 } from "@/components/ui/sidebar";
 
-export type HostMode = "test" | "design";
+export type HostMode = "test" | "design" | "analytics";
 
 export interface IAppSidebarProps {
   mode: HostMode;
@@ -37,6 +37,12 @@ const NAV_ITEMS: {
     description: "Live setStyle playground",
     icon: PaletteIcon,
   },
+  {
+    mode: "analytics",
+    label: "Analytics",
+    description: "Live proxy.analytics event stream",
+    icon: BarChart3Icon,
+  },
 ];
 
 export function AppSidebar({ mode, onModeChange }: IAppSidebarProps) {
@@ -73,7 +79,9 @@ export function AppSidebar({ mode, onModeChange }: IAppSidebarProps) {
             <p className="text-muted-foreground px-2 text-xs leading-relaxed">
               {mode === "test"
                 ? "Wallet stays hidden. Use actions below to exercise EIP-1193."
-                : "Configurator on the left; wallet flyout stays open on the right."}
+                : mode === "design"
+                  ? "Configurator on the left; wallet flyout stays open on the right."
+                  : "Events accumulate across tabs. Switch to Test to generate traffic."}
             </p>
           </SidebarGroupContent>
         </SidebarGroup>
diff --git a/host/src/components/TestPanel.tsx b/host/src/components/TestPanel.tsx
index 137d027..49e7943 100644
--- a/host/src/components/TestPanel.tsx
+++ b/host/src/components/TestPanel.tsx
@@ -15,8 +15,8 @@ export function TestPanel(props: IWalletActionsProps) {
         <CardHeader>
           <CardTitle className="font-heading text-xl">Test</CardTitle>
           <CardDescription>
-            Exercise connect, personal_sign, chain switch, ERC-20 reads, and EIP-7715
-            delegations.
+        Exercise connect, personal_sign, eth_signTypedData_v4, chain switch, ERC-20
+        reads, and EIP-7715 delegations.
             The wallet flyout stays hidden until an action needs it.
           </CardDescription>
         </CardHeader>
diff --git a/host/src/components/WalletActions.tsx b/host/src/components/WalletActions.tsx
index e4a2870..caf99d4 100644
--- a/host/src/components/WalletActions.tsx
+++ b/host/src/components/WalletActions.tsx
@@ -9,7 +9,9 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
+import type { SignMode } from "@/constants/signDemo";
 import {
   HOST_CHAINS,
   hostChainMeta,
@@ -17,12 +19,15 @@ import {
 } from "./hostChains";
 
 export type { UsdcMode } from "./hostChains";
+export type { SignMode } from "@/constants/signDemo";
 
 export interface IWalletActionsProps {
   ready: boolean;
   busy: boolean;
   chainId: string;
   message: string;
+  signMode: SignMode;
+  typedDataJson: string;
   usdcMode: UsdcMode;
   usdcDestination: string;
   usdcAmount: string;
@@ -35,6 +40,8 @@ export interface IWalletActionsProps {
   onChainChange: (chainId: string) => void;
   onRefreshChain: () => void;
   onMessageChange: (message: string) => void;
+  onSignModeChange: (mode: SignMode) => void;
+  onTypedDataJsonChange: (json: string) => void;
   onUsdcModeChange: (mode: UsdcMode) => void;
   onUsdcDestinationChange: (address: string) => void;
   onUsdcAmountChange: (amount: string) => void;
@@ -65,6 +72,8 @@ export function WalletActions({
   busy,
   chainId,
   message,
+  signMode,
+  typedDataJson,
   usdcMode,
   usdcDestination,
   usdcAmount,
@@ -77,6 +86,8 @@ export function WalletActions({
   onChainChange,
   onRefreshChain,
   onMessageChange,
+  onSignModeChange,
+  onTypedDataJsonChange,
   onUsdcModeChange,
   onUsdcDestinationChange,
   onUsdcAmountChange,
@@ -140,14 +151,48 @@ export function WalletActions({
       </div>
 
       <div className="flex flex-col gap-1.5">
-        <Label htmlFor="message-input">Message to sign (EIP-191)</Label>
-        <Textarea
-          id="message-input"
-          rows={3}
-          value={message}
-          disabled={!ready}
-          onChange={(event) => onMessageChange(event.target.value)}
-        />
+        <Tabs
+          value={signMode}
+          onValueChange={(value) => {
+            if (value === "message" || value === "typedData") {
+              onSignModeChange(value);
+            }
+          }}
+        >
+          <TabsList className="w-full">
+            <TabsTrigger value="message" className="flex-1">
+              Message
+            </TabsTrigger>
+            <TabsTrigger value="typedData" className="flex-1">
+              Typed Data (EIP-712)
+            </TabsTrigger>
+          </TabsList>
+        </Tabs>
+        {signMode === "message" ? (
+          <>
+            <Label htmlFor="message-input">Message to sign</Label>
+            <Textarea
+              id="message-input"
+              rows={3}
+              value={message}
+              disabled={!ready}
+              onChange={(event) => onMessageChange(event.target.value)}
+            />
+          </>
+        ) : (
+          <>
+            <Label htmlFor="typed-data-input">Typed Data JSON</Label>
+            <Textarea
+              id="typed-data-input"
+              rows={3}
+              className="field-sizing-fixed resize-y overflow-auto font-mono text-xs"
+              spellCheck={false}
+              value={typedDataJson}
+              disabled={!ready}
+              onChange={(event) => onTypedDataJsonChange(event.target.value)}
+            />
+          </>
+        )}
       </div>
 
       <div className="flex flex-wrap gap-2">
diff --git a/host/src/components/WalletConfiguratorTextTabSigningSections.tsx b/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
index cbeb97e..1f907ca 100644
--- a/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
+++ b/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
@@ -141,6 +141,36 @@ export function WalletConfiguratorTextTabSigningSections({
             value={form.passkeyCancel}
             onChange={(value) => patch("passkeyCancel", value)}
           />
+          <TextField
+            id="passkey-terms-prefix"
+            label="Terms acceptance prefix"
+            value={form.passkeyTermsPrefix}
+            onChange={(value) => patch("passkeyTermsPrefix", value)}
+          />
+          <TextField
+            id="passkey-terms-of-service"
+            label="Terms of Service label"
+            value={form.passkeyTermsOfServiceLabel}
+            onChange={(value) => patch("passkeyTermsOfServiceLabel", value)}
+          />
+          <TextField
+            id="passkey-terms-joiner"
+            label="Terms acceptance joiner"
+            value={form.passkeyTermsJoiner}
+            onChange={(value) => patch("passkeyTermsJoiner", value)}
+          />
+          <TextField
+            id="passkey-privacy-label"
+            label="Privacy Policy label"
+            value={form.passkeyPrivacyLabel}
+            onChange={(value) => patch("passkeyPrivacyLabel", value)}
+          />
+          <TextField
+            id="passkey-terms-error"
+            label="Terms acceptance error"
+            value={form.passkeyTermsError}
+            onChange={(value) => patch("passkeyTermsError", value)}
+          />
         </AccordionContent>
       </AccordionItem>
 
diff --git a/host/src/constants/signDemo.ts b/host/src/constants/signDemo.ts
new file mode 100644
index 0000000..c0fb1d1
--- /dev/null
+++ b/host/src/constants/signDemo.ts
@@ -0,0 +1,58 @@
+export type SignMode = "message" | "typedData";
+
+export const DEFAULT_EIP712_TYPED_DATA = {
+  domain: {
+    name: "Ether Mail",
+    version: "1",
+    chainId: 421614,
+    verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+  },
+  types: {
+    Person: [
+      { name: "name", type: "string" },
+      { name: "wallet", type: "address" },
+    ],
+    Mail: [
+      { name: "from", type: "Person" },
+      { name: "to", type: "Person" },
+      { name: "contents", type: "string" },
+    ],
+  },
+  primaryType: "Mail",
+  message: {
+    from: {
+      name: "Cow",
+      wallet: "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+    },
+    to: {
+      name: "Bob",
+      wallet: "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+    },
+    contents: "Hello, Bob!",
+  },
+} as const;
+
+export const DEFAULT_TYPED_DATA_JSON = JSON.stringify(
+  DEFAULT_EIP712_TYPED_DATA,
+  null,
+  2,
+);
+
+export function parseTypedDataJson(json: string): Record<string, unknown> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(json);
+  } catch {
+    throw new Error("Invalid typed data JSON.");
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error("Typed data must be a JSON object.");
+  }
+  const record = parsed as Record<string, unknown>;
+  for (const key of ["domain", "types", "primaryType", "message"] as const) {
+    if (!(key in record)) {
+      throw new Error(`Typed data is missing required field "${key}".`);
+    }
+  }
+  return record;
+}
diff --git a/host/src/hooks/useHostTestActions.ts b/host/src/hooks/useHostTestActions.ts
index 4b12195..5575bd1 100644
--- a/host/src/hooks/useHostTestActions.ts
+++ b/host/src/hooks/useHostTestActions.ts
@@ -19,6 +19,11 @@ import {
   type Address,
   type Hex,
 } from "viem";
+import {
+  DEFAULT_TYPED_DATA_JSON,
+  parseTypedDataJson,
+  type SignMode,
+} from "../constants/signDemo";
 import {
   DEMO_EXECUTION_DELEGATEE,
   FOCUS_USDC_ARC,
@@ -83,6 +88,8 @@ export function useHostTestActions({
   const [busy, setBusy] = useState(false);
   const [chainId, setChainId] = useState<string>(HOST_CHAINS[0].value);
   const [message, setMessage] = useState("Hello from 1Shot Wallet");
+  const [signMode, setSignMode] = useState<SignMode>("message");
+  const [typedDataJson, setTypedDataJson] = useState(DEFAULT_TYPED_DATA_JSON);
   const [usdcMode, setUsdcMode] = useState<UsdcMode>("balance");
   const [usdcDestination, setUsdcDestination] = useState("");
   const [usdcAmount, setUsdcAmount] = useState("");
@@ -174,9 +181,48 @@ export function useHostTestActions({
   const handleSign = () => {
     const proxy = proxyRef.current;
     if (!proxy) return;
-    const trimmed = message.trim();
-    if (!trimmed) {
-      reportStatus("Enter a message to sign.", true);
+
+    if (signMode === "message") {
+      const trimmed = message.trim();
+      if (!trimmed) {
+        reportStatus("Enter a message to sign.", true);
+        return;
+      }
+
+      setBusy(true);
+      setSignature(null);
+      reportStatus("Requesting accounts…");
+
+      void (async () => {
+        try {
+          const account = await resolveAccount(proxy);
+          reportStatus("Approve the passkey prompt to sign…");
+          const nextSignature = await proxy.ethereum.request({
+            method: "personal_sign",
+            params: [trimmed, account],
+          });
+          setSignature(nextSignature);
+          reportStatus(`Signed as ${account}`);
+        } catch (error) {
+          reportStatus(
+            error instanceof Error ? error.message : "Signing failed",
+            true,
+          );
+        } finally {
+          setBusy(false);
+        }
+      })();
+      return;
+    }
+
+    let typedData: Record<string, unknown>;
+    try {
+      typedData = parseTypedDataJson(typedDataJson);
+    } catch (error) {
+      reportStatus(
+        error instanceof Error ? error.message : "Invalid typed data JSON.",
+        true,
+      );
       return;
     }
 
@@ -189,8 +235,8 @@ export function useHostTestActions({
         const account = await resolveAccount(proxy);
         reportStatus("Approve the passkey prompt to sign…");
         const nextSignature = await proxy.ethereum.request({
-          method: "personal_sign",
-          params: [trimmed, account],
+          method: "eth_signTypedData_v4",
+          params: [account, typedData],
         });
         setSignature(nextSignature);
         reportStatus(`Signed as ${account}`);
@@ -664,6 +710,8 @@ export function useHostTestActions({
     busy,
     chainId,
     message,
+    signMode,
+    typedDataJson,
     usdcMode,
     usdcDestination,
     usdcAmount,
@@ -676,6 +724,8 @@ export function useHostTestActions({
     onChainChange: handleChainChange,
     onRefreshChain: handleRefreshChain,
     onMessageChange: setMessage,
+    onSignModeChange: setSignMode,
+    onTypedDataJsonChange: setTypedDataJson,
     onUsdcModeChange: handleUsdcModeChange,
     onUsdcDestinationChange: setUsdcDestination,
     onUsdcAmountChange: setUsdcAmount,
diff --git a/host/src/styleForm.ts b/host/src/styleForm.ts
index 89a2b20..a43dd2b 100644
--- a/host/src/styleForm.ts
+++ b/host/src/styleForm.ts
@@ -49,6 +49,11 @@ export interface IStyleFormState {
   passkeyBody: string;
   passkeyContinue: string;
   passkeyCancel: string;
+  passkeyTermsPrefix: string;
+  passkeyTermsOfServiceLabel: string;
+  passkeyTermsJoiner: string;
+  passkeyPrivacyLabel: string;
+  passkeyTermsError: string;
 
   // Text — Personal sign
   signTitle: string;
@@ -218,6 +223,12 @@ export const ACME_PRESET: IStyleFormState = {
   passkeyBody: "Choose a name for this wallet passkey.",
   passkeyContinue: "Save name",
   passkeyCancel: "Cancel",
+  passkeyTermsPrefix: "I agree to the",
+  passkeyTermsOfServiceLabel: "Terms of Service",
+  passkeyTermsJoiner: "and",
+  passkeyPrivacyLabel: "Privacy Policy",
+  passkeyTermsError:
+    "Accept the Terms of Service and Privacy Policy to continue.",
   signTitle: "Approve signature",
   signLabel: "Sign",
   signReject: "Reject",
@@ -265,9 +276,9 @@ export const ACME_PRESET: IStyleFormState = {
   receiveCopyFailedLabel: "Copy failed",
   receiveCloseLabel: "Close",
   sendLabel: "Send",
-  confirmTransferTitle: "Confirm transfer",
+  confirmTransferTitle: "Confirm Transfer",
   confirmTransferBody:
-    "{domain} wants to send {amount} {tokenSymbol} ({tokenName}) to {receiver} on {chainName}.",
+    "{domain} is requesting to send tokens from your wallet. Review the amount and recipient before confirming.",
   confirmTransferConfirm: "Confirm",
   confirmTransferReject: "Reject",
   transferTokensTitle: "Send",
@@ -360,6 +371,12 @@ export const DEFAULTS_PRESET: IStyleFormState = {
   passkeyTitle: "Name your passkey",
   passkeyBody: "",
   passkeyContinue: "Continue",
+  passkeyTermsPrefix: "I agree to the",
+  passkeyTermsOfServiceLabel: "Terms of Service",
+  passkeyTermsJoiner: "and",
+  passkeyPrivacyLabel: "Privacy Policy",
+  passkeyTermsError:
+    "Accept the Terms of Service and Privacy Policy to continue.",
   signTitle: "Sign message",
   signLabel: "Sign",
   typedTitle: "Sign typed data",
@@ -402,7 +419,7 @@ export const DEFAULTS_PRESET: IStyleFormState = {
   sendLabel: "Send",
   confirmTransferTitle: "Confirm transfer",
   confirmTransferBody:
-    "{domain} wants to send {amount} {tokenSymbol} ({tokenName}) to {receiver} on {chainName}.",
+    "{domain} is requesting to send tokens from your wallet. Review the amount and recipient before confirming.",
   confirmTransferConfirm: "Confirm",
   confirmTransferReject: "Reject",
   transferTokensTitle: "Send",
@@ -494,6 +511,11 @@ export function buildSetStylePayload(
   put(passkeyName, "body", form.passkeyBody);
   put(passkeyName, "continueLabel", form.passkeyContinue);
   put(passkeyName, "cancelLabel", form.passkeyCancel);
+  put(passkeyName, "termsAcceptancePrefix", form.passkeyTermsPrefix);
+  put(passkeyName, "termsOfServiceLabel", form.passkeyTermsOfServiceLabel);
+  put(passkeyName, "termsAcceptanceJoiner", form.passkeyTermsJoiner);
+  put(passkeyName, "privacyPolicyLabel", form.passkeyPrivacyLabel);
+  put(passkeyName, "termsAcceptanceError", form.passkeyTermsError);
   if (Object.keys(passkeyName).length > 0) copy.passkeyName = passkeyName;
 
   const personalSign: Record<string, string> = {};
diff --git a/host/vite.config.mjs b/host/vite.config.mjs
index bc38a25..f87140b 100644
--- a/host/vite.config.mjs
+++ b/host/vite.config.mjs
@@ -11,6 +11,7 @@ dotenv.config({ path: path.join(__dirname, "../.env") });
 
 const https = resolveHttpsOptions({
   certsDir: path.resolve(__dirname, "certs"),
+  pathBase: path.resolve(__dirname, ".."),
 });
 
 export default defineConfig({
diff --git a/host/wallet-url.mjs b/host/wallet-url.mjs
index 3c269bc..5faed0f 100644
--- a/host/wallet-url.mjs
+++ b/host/wallet-url.mjs
@@ -32,21 +32,33 @@ export function walletIframeUrl() {
   return `http://localhost:${walletPort}/`;
 }
 
+function resolveCertPath(envValue, defaultPath, pathBase) {
+  const trimmed = envValue?.trim();
+  if (!trimmed) return defaultPath;
+  if (path.isAbsolute(trimmed)) return trimmed;
+  return path.resolve(pathBase ?? process.cwd(), trimmed);
+}
+
 /**
  * Optional HTTPS when HOST_HTTPS=1 or host/certs/dev-*.pem exist.
  * Needed when the wallet iframe is on HTTPS (ngrok) for passkey ancestor checks.
+ * HOST_SSL_* paths are repo-root-relative when not absolute.
  */
-export function resolveHttpsOptions({ certsDir }) {
+export function resolveHttpsOptions({ certsDir, pathBase }) {
   const flag = process.env.HOST_HTTPS?.trim().toLowerCase();
   const forceOn = flag === "1" || flag === "true" || flag === "yes";
   const forceOff = flag === "0" || flag === "false" || flag === "no";
 
-  const certPath = process.env.HOST_SSL_CERT?.trim()
-    ? path.resolve(process.env.HOST_SSL_CERT.trim())
-    : path.join(certsDir, "dev-cert.pem");
-  const keyPath = process.env.HOST_SSL_KEY?.trim()
-    ? path.resolve(process.env.HOST_SSL_KEY.trim())
-    : path.join(certsDir, "dev-key.pem");
+  const certPath = resolveCertPath(
+    process.env.HOST_SSL_CERT,
+    path.join(certsDir, "dev-cert.pem"),
+    pathBase,
+  );
+  const keyPath = resolveCertPath(
+    process.env.HOST_SSL_KEY,
+    path.join(certsDir, "dev-key.pem"),
+    pathBase,
+  );
 
   const certsPresent = fs.existsSync(certPath) && fs.existsSync(keyPath);
   if (forceOff) return undefined;
diff --git a/public/assets/1Shot-Icon-New.svg b/public/assets/1Shot-Icon-New.svg
deleted file mode 100644
index f91a366..0000000
--- a/public/assets/1Shot-Icon-New.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 144">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #2499a9;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="M115.54,0H28.46C12.74,0,0,12.74,0,28.46v87.08c0,15.72,12.74,28.46,28.46,28.46h87.08c15.72,0,28.46-12.74,28.46-28.46V28.46c0-15.72-12.74-28.46-28.46-28.46ZM119.98,73.57c-.81,25.13-21.28,45.6-46.41,46.4-27.75.89-50.43-21.79-49.54-49.54.8-25.13,21.27-45.6,46.4-46.41,27.75-.89,50.44,21.8,49.55,49.55Z"/>
-  <path class="cls-1" d="M93.6,72c0,11.93-9.67,21.6-21.6,21.6s-21.6-9.67-21.6-21.6,9.67-21.6,21.6-21.6,21.6,9.67,21.6,21.6Z"/>
-</svg>
diff --git a/src/App.tsx b/src/App.tsx
index b857631..66182b1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -29,7 +29,7 @@ export function App() {
         className={
           showOnboarding
             ? "flex min-h-0 flex-1 flex-col"
-            : "flex-1 px-5 py-4"
+            : "flex min-h-0 flex-1 flex-col px-5 py-4"
         }
       >
         {bootError ? (
diff --git a/src/assets/images/tokens/CircleUSDC.svg b/src/assets/images/tokens/CircleUSDC.svg
new file mode 100644
index 0000000..5dfea92
--- /dev/null
+++ b/src/assets/images/tokens/CircleUSDC.svg
@@ -0,0 +1,5 @@
+<svg data-name="86977684-12db-4850-8f30-233a7c267d11" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 2000">
+  <path d="M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z" fill="#2775ca"/>
+  <path d="M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z" fill="#fff"/>
+  <path d="M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zM1229.17 295.83c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z" fill="#fff"/>
+</svg>
diff --git a/src/assets/images/tokens/GlobalDollarUSDG.svg b/src/assets/images/tokens/GlobalDollarUSDG.svg
new file mode 100755
index 0000000..d28a9ed
--- /dev/null
+++ b/src/assets/images/tokens/GlobalDollarUSDG.svg
@@ -0,0 +1,5 @@
+<svg width="194" height="195" viewBox="0 0 194 195" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="96.8933" cy="97.2009" r="96.8386" fill="#314012"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M168.887 102.452C166.099 139.698 134.987 169.051 97.0161 169.051C57.2109 169.051 24.9424 136.793 24.9424 97.0002C24.9424 57.2075 57.2109 24.9492 97.0161 24.9492C134.924 24.9492 165.997 54.2062 168.873 91.3651H134.414C141.936 74.7437 142.391 59.6421 134.165 52.7419C122.017 42.5517 95.537 54.1062 75.0201 78.5496C54.5032 102.993 47.7189 131.069 59.8668 141.259C72.0148 151.449 98.4949 139.895 119.012 115.451C122.588 111.191 125.747 106.82 128.461 102.452H168.887Z" fill="#C7E36C"/>
+<path d="M102.43 102.452H131.251L120.121 117.025L102.43 109.924V102.452Z" fill="#C7E36C"/>
+</svg>
diff --git a/src/assets/images/tokens/mUSD-icon.svg b/src/assets/images/tokens/mUSD-icon.svg
new file mode 100644
index 0000000..1021a27
--- /dev/null
+++ b/src/assets/images/tokens/mUSD-icon.svg
@@ -0,0 +1,25 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7856_1077)">
+<rect width="1024" height="1024" rx="512" fill="#E5FFC3"/>
+<circle cx="511.248" cy="511.248" r="511.248" fill="#CCE7FF"/>
+<g clip-path="url(#clip1_7856_1077)">
+<path d="M874.787 1424.83L694.577 1371.5L558.673 1452.24L463.854 1452.2L327.871 1371.5L147.739 1424.83L92.9458 1241L147.739 1036.98L92.9458 864.492L147.739 650.709L429.21 817.83H593.316L874.787 650.709L929.581 864.492L874.787 1036.98L929.581 1241L874.787 1424.83Z" fill="#FF5C16"/>
+<path d="M147.784 650.709L429.236 817.936L418.042 932.701L147.784 650.709Z" fill="#FF5C16"/>
+<path d="M441.883 1086.06L418.082 932.794L265.73 1037.01L265.651 1036.97V1037.05L266.123 1144.33L327.904 1086.06H327.943H441.883Z" fill="#FF5C16"/>
+<path d="M874.791 650.709L593.339 817.936L604.494 932.701L874.791 650.709Z" fill="#FF5C16"/>
+<path d="M756.88 1037.05H756.92H756.88V1036.97L756.841 1037.01L604.489 932.794L580.688 1086.06H694.628L756.448 1144.33L756.88 1037.05Z" fill="#FF5C16"/>
+<path d="M593.359 817.839H511.305H429.252L418.097 932.612L476.269 1307.48H546.342L604.553 932.612L593.359 817.839Z" fill="#FF8D5D"/>
+<path d="M147.74 650.709L92.9463 864.492L147.74 1036.98H265.576L418.016 932.72L147.74 650.709Z" fill="#661800"/>
+<path d="M874.803 650.709L929.597 864.492L874.803 1036.98H756.967L604.527 932.72L874.803 650.709Z" fill="#661800"/>
+</g>
+<path d="M304.263 647.155V540.092H577.052V486.618H376.827L304.263 423.809V295.483L376.827 222.407H444.545V152.132H577.052V222.407H717.333V329.47H444.545V382.944H645.791L718.355 451.929V574.079L645.791 647.155H577.052V717.43L444.545 718.339V647.155H304.263Z" fill="#190066"/>
+</g>
+<defs>
+<clipPath id="clip0_7856_1077">
+<rect width="1024" height="1024" rx="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_7856_1077">
+<rect width="836.635" height="836.635" fill="white" transform="translate(92.9448 650.709)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/tokens/tetherUSD.svg b/src/assets/images/tokens/tetherUSD.svg
new file mode 100644
index 0000000..6746ba3
--- /dev/null
+++ b/src/assets/images/tokens/tetherUSD.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #009393;
+      }
+
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: #fff;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1-2" data-name="Layer 1">
+    <g>
+      <circle class="cls-1" cx="400" cy="400" r="400"/>
+      <path class="cls-2" d="M400.49,428.59c68.79,0,126.28-11.63,140.33-27.17-11.93-13.18-55.08-23.56-109.88-26.4v32.83c-9.81.51-20.01.76-30.46.76s-20.65-.25-30.48-.76v-32.83c-54.78,2.84-97.95,13.22-109.88,26.4,14.07,15.54,71.57,27.17,140.36,27.17ZM522.71,274.06v45.21h-91.77v31.35c64.46,3.35,112.83,17.13,113.19,33.62v34.38c-.36,16.49-48.73,30.24-113.19,33.6v76.94h-60.93v-76.94c-64.46-3.35-112.81-17.11-113.17-33.6v-34.38c.36-16.49,48.71-30.27,113.17-33.62v-31.35h-91.77v-45.21h244.48ZM242.15,202.11h322.16c7.7,0,14.79,4.05,18.63,10.63l93.85,161.16c4.86,8.36,3.42,18.91-3.52,25.68l-258.34,252.18c-8.38,8.17-21.84,8.17-30.2,0L126.71,399.92c-7.09-6.94-8.43-17.79-3.2-26.19l100.33-161.49c3.91-6.28,10.85-10.12,18.32-10.12Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/rat.png b/src/assets/rat.png
deleted file mode 100644
index de0edbe..0000000
Binary files a/src/assets/rat.png and /dev/null differ
diff --git a/src/assets/rat1.png b/src/assets/rat1.png
deleted file mode 100644
index a00798d..0000000
Binary files a/src/assets/rat1.png and /dev/null differ
diff --git a/src/components/AssetDetails.tsx b/src/components/AssetDetails.tsx
index 249accc..65ba4d6 100644
--- a/src/components/AssetDetails.tsx
+++ b/src/components/AssetDetails.tsx
@@ -13,6 +13,7 @@ import { useWallet } from "../wallet/WalletProvider";
 import { resolveActiveAddress } from "../wallet/activeAddress";
 import { useLiveTrackedBalance } from "../wallet/useLiveTrackedBalance";
 import { useWalletSessionStore } from "../wallet/sessionStore";
+import { AssetIdentityMark } from "./AssetIdentityMark";
 import { BalanceDisplay } from "./BalanceDisplay";
 import { TransactionHistory } from "./TransactionHistory";
 import { ReceiveModal } from "./modals/ReceiveModal";
@@ -64,8 +65,8 @@ export function AssetDetails({ asset: assetProp }: IAssetDetailsProps) {
     void requestBalanceRefresh(assetProp.id);
   }, [assetProp.id, requestBalanceRefresh]);
 
-  const network =
-    resolveChain(asset.chainId)?.label ?? String(asset.chainId);
+  const chain = resolveChain(asset.chainId);
+  const network = chain?.label ?? String(asset.chainId);
   const active = resolveActiveAddress({
     chainId: asset.chainId,
     evmAddress,
@@ -79,60 +80,63 @@ export function AssetDetails({ asset: assetProp }: IAssetDetailsProps) {
   }, [asset.id, requestBalanceRefresh]);
 
   return (
-    <div className="flex flex-col gap-5" aria-label={`${asset.symbol} details`}>
-      <header className="flex flex-col items-center gap-2 pt-2 text-center">
-        <div
-          className="bg-primary text-primary-foreground flex size-14 items-center justify-center rounded-full"
-          aria-hidden
-        >
-          <span className="text-lg font-semibold tracking-tight">$</span>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <h2 className="text-foreground text-lg font-semibold tracking-tight">
-            {asset.symbol}
-          </h2>
-          <p className="text-muted-foreground text-xs">
-            {asset.name} · {network}
-          </p>
-        </div>
-        <BalanceDisplay
-          trackedAssetId={asset.id}
-          balance={asset.balance}
-          decimals={asset.decimals}
-          fallback={
-            asset.type !== EAssetType.Erc20 ? copy.balanceNonErc20 : undefined
-          }
-          className="text-primary text-3xl font-semibold tracking-tight"
-        />
-      </header>
+    <div
+      className="flex min-h-0 flex-1 flex-col gap-5"
+      aria-label={`${asset.symbol} details`}
+    >
+      <div className="flex shrink-0 flex-col gap-5">
+        <header className="flex flex-col items-center gap-2 pt-2 text-center">
+          <AssetIdentityMark
+            chainId={asset.chainId}
+            address={asset.address}
+            symbol={asset.symbol}
+            chainLogoUrl={chain?.logoUrl}
+          />
+          <div className="flex flex-col gap-0.5">
+            <h2 className="text-foreground text-lg font-semibold tracking-tight">
+              {asset.symbol}
+            </h2>
+            <p className="text-muted-foreground text-xs">{network}</p>
+          </div>
+          <BalanceDisplay
+            trackedAssetId={asset.id}
+            balance={asset.balance}
+            decimals={asset.decimals}
+            fallback={
+              asset.type !== EAssetType.Erc20 ? copy.balanceNonErc20 : undefined
+            }
+            className="text-primary text-3xl font-semibold tracking-tight"
+          />
+        </header>
 
-      <nav
-        className="flex items-start justify-center gap-8"
-        aria-label="Asset actions"
-      >
-        <ActionButton
-          label="Buy"
-          variant="outline"
-          onClick={() => setPurchaseOpen(true)}
-        >
-          <PlusIcon className="size-5" />
-        </ActionButton>
-        <ActionButton
-          label={copy.sendLabel}
-          variant="primary"
-          disabled={!canSend}
-          onClick={openSend}
-        >
-          <SendIcon className="size-5" />
-        </ActionButton>
-        <ActionButton
-          label={copy.receiveLabel}
-          variant="outline"
-          onClick={() => setReceiveOpen(true)}
+        <nav
+          className="flex items-start justify-center gap-8"
+          aria-label="Asset actions"
         >
-          <QrCodeIcon className="size-5" />
-        </ActionButton>
-      </nav>
+          <ActionButton
+            label="Buy"
+            variant="outline"
+            onClick={() => setPurchaseOpen(true)}
+          >
+            <PlusIcon className="size-5" />
+          </ActionButton>
+          <ActionButton
+            label={copy.sendLabel}
+            variant="primary"
+            disabled={!canSend}
+            onClick={openSend}
+          >
+            <SendIcon className="size-5" />
+          </ActionButton>
+          <ActionButton
+            label={copy.receiveLabel}
+            variant="outline"
+            onClick={() => setReceiveOpen(true)}
+          >
+            <QrCodeIcon className="size-5" />
+          </ActionButton>
+        </nav>
+      </div>
 
       <TransactionHistory asset={asset} owner={evmAddress} />
 
diff --git a/src/components/AssetIcon.tsx b/src/components/AssetIcon.tsx
new file mode 100644
index 0000000..84726c7
--- /dev/null
+++ b/src/components/AssetIcon.tsx
@@ -0,0 +1,54 @@
+import type {
+  EVMAccountAddress,
+  EVMChainId,
+} from "@1shotapi/ows-types";
+import { cn } from "@/lib/utils";
+import { resolveAssetIconUrl } from "../lib/utils/tokenIcons";
+
+export interface IAssetIconProps {
+  chainId: EVMChainId;
+  address: EVMAccountAddress;
+  symbol: string;
+  size?: "sm" | "lg";
+  className?: string;
+}
+
+const SIZE_CLASSES = {
+  sm: "size-6 text-[0.65rem]",
+  lg: "size-14 text-lg",
+} as const;
+
+export function AssetIcon({
+  chainId,
+  address,
+  symbol,
+  size = "sm",
+  className,
+}: IAssetIconProps) {
+  const iconUrl = resolveAssetIconUrl(chainId, address, symbol);
+  const sizeClass = SIZE_CLASSES[size];
+
+  if (iconUrl) {
+    return (
+      <img
+        src={iconUrl}
+        alt=""
+        aria-hidden
+        className={cn("shrink-0 rounded-full object-cover", sizeClass, className)}
+      />
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "bg-primary text-primary-foreground flex shrink-0 items-center justify-center rounded-full font-semibold tracking-tight",
+        sizeClass,
+        className,
+      )}
+      aria-hidden
+    >
+      <span>$</span>
+    </div>
+  );
+}
diff --git a/src/components/AssetIdentityMark.tsx b/src/components/AssetIdentityMark.tsx
new file mode 100644
index 0000000..d3aadc5
--- /dev/null
+++ b/src/components/AssetIdentityMark.tsx
@@ -0,0 +1,49 @@
+import type {
+  EVMAccountAddress,
+  EVMChainId,
+} from "@1shotapi/ows-types";
+import { cn } from "@/lib/utils";
+import { resolveAssetIconUrl } from "../lib/utils/tokenIcons";
+
+export interface IAssetIdentityMarkProps {
+  chainId: EVMChainId;
+  address: EVMAccountAddress;
+  symbol: string;
+  chainLogoUrl?: string;
+  className?: string;
+}
+
+/** Large token icon with optional chain logo badge at bottom-right. */
+export function AssetIdentityMark({
+  chainId,
+  address,
+  symbol,
+  chainLogoUrl,
+  className,
+}: IAssetIdentityMarkProps) {
+  const iconUrl = resolveAssetIconUrl(chainId, address, symbol);
+  const letter = (symbol.trim()[0] ?? "?").toUpperCase();
+
+  return (
+    <div className={cn("relative size-16 shrink-0", className)} aria-hidden>
+      {iconUrl ? (
+        <img
+          src={iconUrl}
+          alt=""
+          className="size-16 rounded-full object-cover"
+        />
+      ) : (
+        <div className="bg-muted text-foreground flex size-16 items-center justify-center rounded-full text-2xl font-semibold">
+          {letter}
+        </div>
+      )}
+      {chainLogoUrl ? (
+        <img
+          src={chainLogoUrl}
+          alt=""
+          className="border-background absolute -right-0.5 -bottom-0.5 size-6 rounded-full border-2 object-cover"
+        />
+      ) : null}
+    </div>
+  );
+}
diff --git a/src/components/MainPanel.tsx b/src/components/MainPanel.tsx
index c89f89d..96ce478 100644
--- a/src/components/MainPanel.tsx
+++ b/src/components/MainPanel.tsx
@@ -65,7 +65,11 @@ function FocusedAssetPanel() {
   if (!asset) {
     return <p className="text-muted-foreground m-0 text-sm">Loading…</p>;
   }
-  return <AssetDetails asset={asset} />;
+  return (
+    <div className="flex min-h-0 flex-1 flex-col">
+      <AssetDetails asset={asset} />
+    </div>
+  );
 }
 
 /**
@@ -113,8 +117,8 @@ export function MainPanel() {
 
   if (selectedAsset) {
     return (
-      <div className="flex flex-col gap-3">
-        <div className="flex justify-end">
+      <div className="flex min-h-0 flex-1 flex-col gap-3">
+        <div className="flex shrink-0 justify-end">
           <Button
             type="button"
             variant="outline"
diff --git a/src/components/PaymentFeePicker.tsx b/src/components/PaymentFeePicker.tsx
index a9cd009..1aa6d8c 100644
--- a/src/components/PaymentFeePicker.tsx
+++ b/src/components/PaymentFeePicker.tsx
@@ -1,8 +1,16 @@
 import { useEffect, useRef, useState } from "react";
 import type { EVMAccountAddress, EVMChainId } from "@1shotapi/ows-types";
 import { formatUnits } from "viem";
+import type { IPaymentQuote, IPaymentTokenOption } from "../lib/interfaces/business";
 import { useWallet } from "../wallet/WalletProvider";
-import type { IPaymentQuote } from "../lib/interfaces/business";
+import { AssetIcon } from "./AssetIcon";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "./ui/select";
 
 export interface IPaymentFeePickerProps {
   chainId: EVMChainId;
@@ -13,6 +21,39 @@ export interface IPaymentFeePickerProps {
   onQuoteChange: (quote: IPaymentQuote | null, error: string | null) => void;
 }
 
+function findSelectedToken(
+  quote: IPaymentQuote,
+): IPaymentTokenOption | undefined {
+  return quote.tokens.find(
+    (token) =>
+      String(token.address).toLowerCase() ===
+      String(quote.selectedToken).toLowerCase(),
+  );
+}
+
+function PaymentTokenRow({
+  chainId,
+  token,
+}: {
+  chainId: EVMChainId;
+  token: IPaymentTokenOption;
+}) {
+  return (
+    <span className="flex min-w-0 items-center gap-2">
+      <AssetIcon
+        chainId={chainId}
+        address={token.address}
+        symbol={token.symbol}
+        size="sm"
+      />
+      <span>{token.symbol}</span>
+      <span className="text-muted-foreground">
+        ({formatUnits(token.balance, token.decimals)})
+      </span>
+    </span>
+  );
+}
+
 /**
  * Loads payment-token options (USDC preferred) and shows a mock fee for confirm.
  * Exact fee is settled by `relayer_estimate7710Transaction` at submit.
@@ -76,6 +117,7 @@ export function PaymentFeePicker({
   }
 
   const isLoading = loading || busy;
+  const selectedToken = quote ? findSelectedToken(quote) : undefined;
 
   return (
     <div className="mt-4 flex flex-col gap-2 border-t pt-3">
@@ -90,42 +132,55 @@ export function PaymentFeePicker({
       ) : null}
       {quote ? (
         <>
-          <p className="text-sm">
-            Est. fee:{" "}
-            <span className="font-medium">
-              {quote.feeFormatted}{" "}
-              {quote.tokens.find(
-                (t) =>
-                  String(t.address).toLowerCase() ===
-                  String(quote.selectedToken).toLowerCase(),
-              )?.symbol ?? "TOKEN"}
+          <p className="flex flex-wrap items-center gap-2 text-sm">
+            <span>Est. fee:</span>
+            <span className="inline-flex items-center gap-1.5 font-medium">
+              {quote.feeFormatted}
+              {selectedToken ? (
+                <>
+                  <AssetIcon
+                    chainId={chainId}
+                    address={selectedToken.address}
+                    symbol={selectedToken.symbol}
+                    size="sm"
+                  />
+                  {selectedToken.symbol}
+                </>
+              ) : (
+                "TOKEN"
+              )}
             </span>
-            <span className="text-muted-foreground"> (finalized on submit)</span>
+            <span className="text-muted-foreground">(finalized on submit)</span>
           </p>
-          <label className="text-muted-foreground flex flex-col gap-1 text-[0.8rem]">
-            Pay with
-            <select
-              className="border-input bg-background text-foreground rounded-md border px-2 py-1.5 text-sm"
+          <div className="text-muted-foreground flex flex-col gap-1 text-[0.8rem]">
+            <span>Pay with</span>
+            <Select
               value={String(quote.selectedToken)}
               disabled={isLoading}
-              onChange={(event) => {
-                void onSelectToken(
-                  event.target.value as EVMAccountAddress,
-                );
+              onValueChange={(value) => {
+                void onSelectToken(value as EVMAccountAddress);
               }}
             >
-              {quote.tokens.map((token) => (
-                <option
-                  key={String(token.address)}
-                  value={String(token.address)}
-                  disabled={token.balance <= 0n}
-                >
-                  {token.symbol} (
-                  {formatUnits(token.balance, token.decimals)})
-                </option>
-              ))}
-            </select>
-          </label>
+              <SelectTrigger className="w-full">
+                <SelectValue placeholder="Select payment token">
+                  {selectedToken ? (
+                    <PaymentTokenRow chainId={chainId} token={selectedToken} />
+                  ) : null}
+                </SelectValue>
+              </SelectTrigger>
+              <SelectContent className="z-[10001]">
+                {quote.tokens.map((token) => (
+                  <SelectItem
+                    key={String(token.address)}
+                    value={String(token.address)}
+                    disabled={token.balance <= 0n}
+                  >
+                    <PaymentTokenRow chainId={chainId} token={token} />
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
         </>
       ) : null}
     </div>
diff --git a/src/components/TransactionHistory.tsx b/src/components/TransactionHistory.tsx
index b808bbc..40018a6 100644
--- a/src/components/TransactionHistory.tsx
+++ b/src/components/TransactionHistory.tsx
@@ -133,8 +133,8 @@ export function TransactionHistory({
       : null;
 
   return (
-    <section className="border-border flex flex-col gap-3 border-t pt-4">
-      <div className="flex items-center justify-between gap-2">
+    <section className="border-border flex min-h-0 flex-1 flex-col gap-3 border-t pt-4">
+      <div className="flex shrink-0 items-center justify-between gap-2">
         <h3 className="text-foreground text-sm font-semibold">
           Recent Activity
         </h3>
@@ -158,21 +158,22 @@ export function TransactionHistory({
         )}
       </div>
 
-      {loading && rows.length === 0 ? (
-        <p className="text-muted-foreground text-sm">Loading…</p>
-      ) : null}
-      {error && rows.length === 0 ? (
-        <p className="text-destructive text-sm" role="alert">
-          {error}
-        </p>
-      ) : null}
-      {!loading && !error && rows.length === 0 ? (
-        <p className="text-muted-foreground text-sm">No recent activity.</p>
-      ) : null}
-
-      {rows.length > 0 ? (
-        <ul className="flex flex-col gap-1">
-          {rows.map((item) => {
+      <div className="min-h-0 flex-1 overflow-y-auto">
+        {loading && rows.length === 0 ? (
+          <p className="text-muted-foreground text-sm">Loading…</p>
+        ) : null}
+        {error && rows.length === 0 ? (
+          <p className="text-destructive text-sm" role="alert">
+            {error}
+          </p>
+        ) : null}
+        {!loading && !error && rows.length === 0 ? (
+          <p className="text-muted-foreground text-sm">No recent activity.</p>
+        ) : null}
+
+        {rows.length > 0 ? (
+          <ul className="flex flex-col gap-1">
+            {rows.map((item) => {
             const explorerUrl = chain?.txExplorerUrl(item.hash);
             const positive = item.kind === EAssetActivityKind.Received;
             const content = (
@@ -217,8 +218,9 @@ export function TransactionHistory({
               </li>
             );
           })}
-        </ul>
-      ) : null}
+          </ul>
+        ) : null}
+      </div>
     </section>
   );
 }
diff --git a/src/components/balances/AddAssetView.tsx b/src/components/balances/AddAssetView.tsx
new file mode 100644
index 0000000..7a956a1
--- /dev/null
+++ b/src/components/balances/AddAssetView.tsx
@@ -0,0 +1,98 @@
+import { useState } from "react";
+import { EVMAccountAddress } from "@1shotapi/ows-types";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Modal } from "../Modal";
+import { useStyle } from "../../style/StyleProvider";
+import { useWallet } from "../../wallet/WalletProvider";
+import { useWalletSessionStore } from "../../wallet/sessionStore";
+
+const ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
+
+export interface IAddAssetViewProps {
+  onClose: () => void;
+}
+
+/** Full-page add-asset flow (current network). */
+export function AddAssetView({ onClose }: IAddAssetViewProps) {
+  const { style } = useStyle();
+  const { balances: copy } = style.copy;
+  const { addTrackedAsset } = useWallet();
+  const chainId = useWalletSessionStore((state) => state.chainId);
+
+  const [addressInput, setAddressInput] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [adding, setAdding] = useState(false);
+
+  const onSubmit = async () => {
+    const trimmed = addressInput.trim();
+    if (!ADDRESS_RE.test(trimmed)) {
+      setError(copy.invalidAddressError);
+      return;
+    }
+    setAdding(true);
+    setError(null);
+    try {
+      await addTrackedAsset(
+        chainId,
+        EVMAccountAddress(trimmed as `0x${string}`),
+      );
+      onClose();
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : copy.addFailedError);
+    } finally {
+      setAdding(false);
+    }
+  };
+
+  return (
+    <Modal
+      title={copy.addDialogTitle}
+      onBackdropDismiss={onClose}
+      actions={[
+        {
+          label: copy.addDialogCancelLabel,
+          variant: "secondary",
+          onClick: onClose,
+          disabled: adding,
+        },
+        {
+          label: copy.addDialogSubmitLabel,
+          variant: "primary",
+          disabled: adding,
+          onClick: () => {
+            void onSubmit();
+          },
+        },
+      ]}
+    >
+      <div className="text-foreground flex flex-col gap-4">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed">
+          {copy.addDialogBody}
+        </p>
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="add-asset-address">{copy.addressLabel}</Label>
+          <Input
+            id="add-asset-address"
+            value={addressInput}
+            placeholder={copy.addressPlaceholder}
+            autoComplete="off"
+            spellCheck={false}
+            autoFocus
+            disabled={adding}
+            onChange={(event) => setAddressInput(event.target.value)}
+            onKeyDown={(event) => {
+              if (event.key === "Enter") {
+                event.preventDefault();
+                void onSubmit();
+              }
+            }}
+          />
+          {error ? (
+            <p className="text-destructive m-0 text-sm">{error}</p>
+          ) : null}
+        </div>
+      </div>
+    </Modal>
+  );
+}
diff --git a/src/components/balances/AssetList.tsx b/src/components/balances/AssetList.tsx
index 6a97bdc..dad14b6 100644
--- a/src/components/balances/AssetList.tsx
+++ b/src/components/balances/AssetList.tsx
@@ -28,6 +28,7 @@ import { EAssetType } from "../../lib/types/enum/EAssetType";
 import { useStyle } from "../../style/StyleProvider";
 import { useWallet } from "../../wallet/WalletProvider";
 import { useWalletSessionStore } from "../../wallet/sessionStore";
+import { AssetIcon } from "../AssetIcon";
 import { BalanceDisplay } from "../BalanceDisplay";
 
 const PAGE_SIZE = 5;
@@ -92,12 +93,11 @@ export function AssetList({
         header: copy.assetColumn,
         cell: ({ row }) => (
           <div className="flex min-w-0 items-center gap-2">
-            <div
-              className="bg-primary text-primary-foreground flex size-6 shrink-0 items-center justify-center rounded-full text-[0.65rem] font-semibold"
-              aria-hidden
-            >
-              $
-            </div>
+            <AssetIcon
+              chainId={row.original.chainId}
+              address={row.original.address}
+              symbol={row.original.symbol}
+            />
             <span className="truncate font-medium">{row.original.symbol}</span>
           </div>
         ),
diff --git a/src/components/balances/BalancesTab.tsx b/src/components/balances/BalancesTab.tsx
index fb8c60e..5f7abc3 100644
--- a/src/components/balances/BalancesTab.tsx
+++ b/src/components/balances/BalancesTab.tsx
@@ -1,24 +1,10 @@
 import { useState } from "react";
-import { EVMAccountAddress } from "@1shotapi/ows-types";
 import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import type { TrackedAsset } from "../../lib/types/domain";
 import { useStyle } from "../../style/StyleProvider";
-import { useWallet } from "../../wallet/WalletProvider";
-import { useWalletSessionStore } from "../../wallet/sessionStore";
+import { AddAssetView } from "./AddAssetView";
 import { AssetList } from "./AssetList";
 
-const ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
-
 export interface IBalancesTabProps {
   onView: (asset: TrackedAsset) => void;
 }
@@ -26,35 +12,7 @@ export interface IBalancesTabProps {
 export function BalancesTab({ onView }: IBalancesTabProps) {
   const { style } = useStyle();
   const { balances: copy } = style.copy;
-  const { addTrackedAsset } = useWallet();
-  const chainId = useWalletSessionStore((state) => state.chainId);
-
   const [addOpen, setAddOpen] = useState(false);
-  const [addressInput, setAddressInput] = useState("");
-  const [addError, setAddError] = useState<string | null>(null);
-  const [adding, setAdding] = useState(false);
-
-  const onSubmitAdd = async () => {
-    const trimmed = addressInput.trim();
-    if (!ADDRESS_RE.test(trimmed)) {
-      setAddError(copy.invalidAddressError);
-      return;
-    }
-    setAdding(true);
-    setAddError(null);
-    try {
-      await addTrackedAsset(
-        chainId,
-        EVMAccountAddress(trimmed as `0x${string}`),
-      );
-      setAddOpen(false);
-      setAddressInput("");
-    } catch (err: unknown) {
-      setAddError(err instanceof Error ? err.message : copy.addFailedError);
-    } finally {
-      setAdding(false);
-    }
-  };
 
   return (
     <div className="flex flex-col gap-3">
@@ -64,71 +22,12 @@ export function BalancesTab({ onView }: IBalancesTabProps) {
         type="button"
         size="sm"
         className="self-center"
-        onClick={() => {
-          setAddError(null);
-          setAddressInput("");
-          setAddOpen(true);
-        }}
+        onClick={() => setAddOpen(true)}
       >
         {copy.addLabel}
       </Button>
 
-      <Dialog
-        open={addOpen}
-        onOpenChange={(open) => {
-          setAddOpen(open);
-          if (!open) {
-            setAddError(null);
-            setAddressInput("");
-          }
-        }}
-      >
-        <DialogContent className="sm:max-w-md">
-          <DialogHeader>
-            <DialogTitle>{copy.addDialogTitle}</DialogTitle>
-            <DialogDescription>{copy.addDialogBody}</DialogDescription>
-          </DialogHeader>
-          <div className="flex flex-col gap-2 py-2">
-            <Label htmlFor="add-asset-address">{copy.addressLabel}</Label>
-            <Input
-              id="add-asset-address"
-              value={addressInput}
-              placeholder={copy.addressPlaceholder}
-              autoComplete="off"
-              spellCheck={false}
-              onChange={(event) => setAddressInput(event.target.value)}
-              onKeyDown={(event) => {
-                if (event.key === "Enter") {
-                  event.preventDefault();
-                  void onSubmitAdd();
-                }
-              }}
-            />
-            {addError ? (
-              <p className="text-destructive m-0 text-sm">{addError}</p>
-            ) : null}
-          </div>
-          <DialogFooter>
-            <Button
-              type="button"
-              variant="outline"
-              disabled={adding}
-              onClick={() => setAddOpen(false)}
-            >
-              {copy.addDialogCancelLabel}
-            </Button>
-            <Button
-              type="button"
-              disabled={adding}
-              onClick={() => {
-                void onSubmitAdd();
-              }}
-            >
-              {copy.addDialogSubmitLabel}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+      {addOpen ? <AddAssetView onClose={() => setAddOpen(false)} /> : null}
     </div>
   );
 }
diff --git a/src/components/modals/AddAssetModal.tsx b/src/components/modals/AddAssetModal.tsx
index a0069d1..60258d3 100644
--- a/src/components/modals/AddAssetModal.tsx
+++ b/src/components/modals/AddAssetModal.tsx
@@ -1,4 +1,6 @@
+import { InfoIcon } from "lucide-react";
 import { Modal } from "../Modal";
+import { AssetIdentityMark } from "../AssetIdentityMark";
 import { useStyle } from "../../style/StyleProvider";
 import { useWallet } from "../../wallet/WalletProvider";
 import type { IAddAssetApprovalRequest } from "../../wallet/registerAddAsset";
@@ -15,9 +17,8 @@ export function AddAssetModal({
   const { resolveChain } = useWallet();
   const { balances: copy, account } = style.copy;
   const displayName = request.assetSymbol || request.assetName;
-  const network =
-    resolveChain(request.chainId)?.label ??
-    String(request.chainId);
+  const chain = resolveChain(request.chainId);
+  const network = chain?.label ?? String(request.chainId);
 
   return (
     <Modal
@@ -37,39 +38,49 @@ export function AddAssetModal({
         },
       ]}
     >
-      <p className="text-muted-foreground m-0">
-        {copy.addConfirmBody
-          .replace("{assetName}", displayName)
-          .replace("{chainLabel}", network)}
-      </p>
-      <dl className="mt-3 flex flex-col gap-2 text-sm">
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.assetColumn}
-          </dt>
-          <dd className="text-foreground m-0 font-medium">{displayName}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.chainColumn}
-          </dt>
-          <dd className="text-foreground m-0">{network}</dd>
+      <div className="text-foreground flex flex-col gap-5">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed">
+          {copy.addConfirmBody}
+        </p>
+
+        <div className="flex items-center gap-4">
+          <AssetIdentityMark
+            chainId={request.chainId}
+            address={request.assetAddress}
+            symbol={request.assetSymbol}
+            chainLogoUrl={chain?.logoUrl}
+          />
+          <div className="flex min-w-0 flex-col gap-1.5">
+            <span className="text-xl font-semibold tracking-tight">
+              {displayName}
+            </span>
+            <span className="bg-muted text-muted-foreground w-fit rounded-full px-2.5 py-0.5 text-[0.65rem] font-semibold uppercase tracking-wide">
+              {network}
+            </span>
+          </div>
         </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
+
+        <div className="flex flex-col gap-1.5">
+          <span className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
             {copy.addressLabel}
-          </dt>
-          <dd className="m-0 min-w-0">
-            <CopyableText
-              text={request.assetAddress}
-              truncate
-              copyLabel={account.copyAddressLabel}
-              copiedLabel={account.addressCopiedLabel}
-              copyFailedLabel={account.addressCopyFailedLabel}
-            />
-          </dd>
+          </span>
+          <CopyableText
+            text={request.assetAddress}
+            truncate
+            copyLabel={account.copyAddressLabel}
+            copiedLabel={account.addressCopiedLabel}
+            copyFailedLabel={account.addressCopyFailedLabel}
+          />
+        </div>
+
+        <div className="bg-primary/5 flex gap-2.5 rounded-xl px-3 py-3 text-sm leading-relaxed">
+          <InfoIcon
+            className="text-primary mt-0.5 size-4 shrink-0"
+            aria-hidden
+          />
+          <p className="text-muted-foreground m-0">{copy.addConfirmWarning}</p>
         </div>
-      </dl>
+      </div>
     </Modal>
   );
 }
diff --git a/src/components/modals/SetupModals.tsx b/src/components/modals/SetupModals.tsx
index 7a7fcb5..123710d 100644
--- a/src/components/modals/SetupModals.tsx
+++ b/src/components/modals/SetupModals.tsx
@@ -72,15 +72,22 @@ export function PasskeyNameModal({
   const { style } = useStyle();
   const { passkeyName } = style.copy;
   const [name, setName] = useState("");
+  const [termsAccepted, setTermsAccepted] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
+  const trimmedName = name.trim();
+  const canContinue = trimmedName.length > 0 && termsAccepted;
+
   const submit = () => {
-    const trimmed = name.trim();
-    if (!trimmed) {
+    if (!trimmedName) {
       setError(passkeyName.emptyError);
       return;
     }
-    onResolve(trimmed);
+    if (!termsAccepted) {
+      setError(passkeyName.termsAcceptanceError);
+      return;
+    }
+    onResolve(trimmedName);
   };
 
   return (
@@ -96,6 +103,7 @@ export function PasskeyNameModal({
         {
           label: passkeyName.continueLabel,
           variant: "primary",
+          disabled: !canContinue,
           onClick: submit,
         },
       ]}
@@ -118,11 +126,46 @@ export function PasskeyNameModal({
           onKeyDown={(event) => {
             if (event.key === "Enter") {
               event.preventDefault();
-              submit();
+              if (canContinue) {
+                submit();
+              }
             }
           }}
         />
       </div>
+      <label className="mt-4 flex cursor-pointer items-start gap-2.5 text-left">
+        <input
+          type="checkbox"
+          className="border-input bg-background text-primary mt-0.5 size-4 shrink-0 rounded border accent-[var(--primary)]"
+          checked={termsAccepted}
+          onChange={(event) => {
+            setTermsAccepted(event.target.checked);
+            setError(null);
+          }}
+        />
+        <span className="text-muted-foreground text-[0.85rem] leading-snug">
+          {passkeyName.termsAcceptancePrefix}{" "}
+          <a
+            href={passkeyName.termsOfServiceUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-primary font-medium hover:underline"
+            onClick={(event) => event.stopPropagation()}
+          >
+            {passkeyName.termsOfServiceLabel}
+          </a>{" "}
+          {passkeyName.termsAcceptanceJoiner}{" "}
+          <a
+            href={passkeyName.privacyPolicyUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-primary font-medium hover:underline"
+            onClick={(event) => event.stopPropagation()}
+          >
+            {passkeyName.privacyPolicyLabel}
+          </a>
+        </span>
+      </label>
       {error ? (
         <p className="text-destructive m-0 mt-2 text-[0.85rem]">{error}</p>
       ) : null}
diff --git a/src/components/modals/SignModals.tsx b/src/components/modals/SignModals.tsx
index cf33280..b9ebca5 100644
--- a/src/components/modals/SignModals.tsx
+++ b/src/components/modals/SignModals.tsx
@@ -20,6 +20,8 @@ import type {
 import { useStyle } from "../../style/StyleProvider";
 import { useWallet } from "../../wallet/WalletProvider";
 import { Modal } from "../Modal";
+import { AssetIdentityMark } from "../AssetIdentityMark";
+import { CopyableText } from "../CopyableText";
 import { PaymentFeePicker } from "../PaymentFeePicker";
 
 function isSignDenied(error: unknown): boolean {
@@ -44,7 +46,7 @@ export function PersonalSignModal({
 }) {
   const { getSigner } = useWallet();
   const { style } = useStyle();
-  const { personalSign } = style.copy;
+  const { personalSign, account: accountCopy } = style.copy;
   const [phase, setPhase] = useState<"confirm" | "signing">("confirm");
   /** Bumped on cancel and each startSign so stale in-flight ops cannot settle. */
   const signGenerationRef = useRef(0);
@@ -98,7 +100,15 @@ export function PersonalSignModal({
       }
     >
       <FieldLabel>{personalSign.accountLabel}</FieldLabel>
-      <p className="mb-3 break-all font-mono text-[0.8rem]">{request.address}</p>
+      <div className="mb-3">
+        <CopyableText
+          text={String(request.address)}
+          truncate
+          copyLabel={accountCopy.copyAddressLabel}
+          copiedLabel={accountCopy.addressCopiedLabel}
+          copyFailedLabel={accountCopy.addressCopyFailedLabel}
+        />
+      </div>
       <FieldLabel>{personalSign.messageLabel}</FieldLabel>
       <DetailBlock content={formatMessageForDisplay(request.message)} />
       {phase === "signing" ? (
@@ -319,19 +329,15 @@ export function ConfirmTransferModal({
   onReject: (error: unknown) => void;
 }) {
   const { style } = useStyle();
-  const { confirmTransfer: copy } = style.copy;
+  const { resolveChain } = useWallet();
+  const { confirmTransfer: copy, account: accountCopy } = style.copy;
   const [quote, setQuote] = useState<IPaymentQuote | null>(null);
   const [quoteError, setQuoteError] = useState<string | null>(null);
   const [phase, setPhase] = useState<"confirm" | "signing">("confirm");
   const [error, setError] = useState<string | null>(null);
   const abortedRef = useRef(false);
-  const body = copy.body
-    .replace("{domain}", request.domain)
-    .replace("{amount}", request.amount)
-    .replace("{tokenName}", request.tokenName)
-    .replace("{tokenSymbol}", request.tokenSymbol)
-    .replace("{receiver}", request.receiver)
-    .replace("{chainName}", request.chainName);
+  const body = copy.body.replace("{domain}", request.domain);
+  const chain = resolveChain(request.chainId);
 
   const canConfirm =
     !request.useRelayer || (quote !== null && quoteError === null);
@@ -387,15 +393,40 @@ export function ConfirmTransferModal({
           : undefined
       }
     >
-      <p className="text-muted-foreground m-0">{body}</p>
-      <div className="mt-4 flex flex-col gap-3">
-        <LabeledBlock
-          label={copy.amountLabel}
-          content={`${request.amount} ${request.tokenSymbol}`}
-        />
-        <LabeledBlock label={copy.tokenLabel} content={request.tokenName} />
-        <LabeledBlock label={copy.receiverLabel} content={request.receiver} />
-        <LabeledBlock label={copy.chainLabel} content={request.chainName} />
+      <div className="text-foreground flex flex-col gap-5">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed">
+          {body}
+        </p>
+
+        <div className="flex items-center gap-4">
+          <AssetIdentityMark
+            chainId={request.chainId}
+            address={request.tokenAddress}
+            symbol={request.tokenSymbol}
+            chainLogoUrl={chain?.logoUrl}
+          />
+          <div className="flex min-w-0 flex-col gap-1.5">
+            <span className="text-xl font-semibold tracking-tight">
+              {request.amount} {request.tokenSymbol}
+            </span>
+            <span className="bg-muted text-muted-foreground w-fit rounded-full px-2.5 py-0.5 text-[0.65rem] font-semibold uppercase tracking-wide">
+              {request.chainName}
+            </span>
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-1.5">
+          <span className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
+            {copy.receiverLabel}
+          </span>
+          <CopyableText
+            text={request.receiver}
+            truncate
+            copyLabel={accountCopy.copyAddressLabel}
+            copiedLabel={accountCopy.addressCopiedLabel}
+            copyFailedLabel={accountCopy.addressCopyFailedLabel}
+          />
+        </div>
       </div>
       {request.useRelayer ? (
         <PaymentFeePicker
diff --git a/src/lib/implementations/data/HardcodedChainRepository.ts b/src/lib/implementations/data/HardcodedChainRepository.ts
index 9dff1b2..5ee4186 100644
--- a/src/lib/implementations/data/HardcodedChainRepository.ts
+++ b/src/lib/implementations/data/HardcodedChainRepository.ts
@@ -38,7 +38,7 @@ const CATALOG: readonly SupportedChain[] = [
     false,
     arcLogo,
     true,
-    `https://arc-testnet.g.alchemy.com/v2/${ALCHEMY_KEY}`,
+    `https://rpc.testnet.arc.io`,
     "Arc Testnet",
     "https://testnet.arcscan.app",
   ),
diff --git a/src/lib/implementations/data/HardcodedKnownAssetRepository.ts b/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
index abe5708..1be5f29 100644
--- a/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
+++ b/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
@@ -1,9 +1,7 @@
 import { erc20Abi } from "viem";
-import {
-  EVMAccountAddress,
-  EVMChainId,
-  type EVMAccountAddress as EVMAccountAddressType,
-  type EVMChainId as EVMChainIdType,
+import type {
+  EVMAccountAddress as EVMAccountAddressType,
+  EVMChainId as EVMChainIdType,
 } from "@1shotapi/ows-types";
 import type { IBlockchainProvider } from "@1shotapi/ows-wallet-utils";
 import type { IKnownAssetRepository } from "../../interfaces/data/IKnownAssetRepository";
@@ -11,65 +9,33 @@ import { KnownAsset } from "../../types/domain/KnownAsset";
 import { NewTrackedAsset } from "../../types/domain/TrackedAsset";
 import { EAssetType } from "../../types/enum/EAssetType";
 import { makeTrackedAssetId } from "@/lib/types/primitives";
-
-/** Seeded known ERC-20s for demos (USDC on Arc / Sepolia / Base Sepolia / Base + Base USDT). */
-const SEEDED_KNOWN: readonly KnownAsset[] = [
-  new KnownAsset(
-    EVMChainId("0x4cef52"),
-    EVMAccountAddress("0x3600000000000000000000000000000000000000"),
-    EAssetType.Erc20,
-    "USDC",
-    "USDC",
-    6,
-  ),
-  new KnownAsset(
-    EVMChainId("0xaa36a7"),
-    EVMAccountAddress("0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"),
-    EAssetType.Erc20,
-    "USDC",
-    "USDC",
-    6,
-  ),
-  new KnownAsset(
-    EVMChainId("0x14a34"),
-    EVMAccountAddress("0x036CbD53842c5426634e7929541eC2318f3dCF7e"),
-    EAssetType.Erc20,
-    "USDC",
-    "USDC",
-    6,
-  ),
-  new KnownAsset(
-    EVMChainId("0x2105"),
-    EVMAccountAddress("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"),
-    EAssetType.Erc20,
-    "USDC",
-    "USDC",
-    6,
-  ),
-  new KnownAsset(
-    EVMChainId("0x2105"),
-    EVMAccountAddress("0xfde4c96c8593536e31f229ea8f37b2ada2699bb2"),
-    EAssetType.Erc20,
-    "USDT",
-    "USDT",
-    6,
-  ),
-];
+import { RELAYER_KNOWN_ASSETS } from "./relayerKnownAssets";
 
 const BY_KEY = new Map(
-  SEEDED_KNOWN.map((asset) => [
+  RELAYER_KNOWN_ASSETS.map((asset) => [
     makeTrackedAssetId(asset.chainId, asset.address),
     asset,
   ]),
 );
 
+const DEFAULT_TRACKED_USDC_CHAIN_IDS = new Set([
+  "0x4cef52",
+  "0xaa36a7",
+  "0x14a34",
+  "0x2105",
+]);
+
 /**
  * USDC on every supported demo chain — always shown in Balances (not removable).
  */
 export const DEFAULT_TRACKED_USDC: readonly NewTrackedAsset[] =
-  SEEDED_KNOWN.filter((asset) => asset.symbol === "USDC").map((asset) =>
-    NewTrackedAsset.fromKnown(asset),
-  );
+  RELAYER_KNOWN_ASSETS.filter(
+    (asset) =>
+      asset.symbol === "USDC" &&
+      DEFAULT_TRACKED_USDC_CHAIN_IDS.has(
+        String(asset.chainId).toLowerCase(),
+      ),
+  ).map((asset) => NewTrackedAsset.fromKnown(asset));
 
 const DEFAULT_TRACKED_USDC_KEYS = new Set(
   DEFAULT_TRACKED_USDC.map((asset) =>
diff --git a/src/lib/implementations/data/relayerKnownAssets.ts b/src/lib/implementations/data/relayerKnownAssets.ts
new file mode 100644
index 0000000..901d525
--- /dev/null
+++ b/src/lib/implementations/data/relayerKnownAssets.ts
@@ -0,0 +1,316 @@
+import {
+  EVMAccountAddress,
+  EVMChainId,
+  type EVMAccountAddress as EVMAccountAddressType,
+  type EVMChainId as EVMChainIdType,
+} from "@1shotapi/ows-types";
+import { KnownAsset } from "../../types/domain/KnownAsset";
+import { EAssetType } from "../../types/enum/EAssetType";
+import { makeTrackedAssetId } from "../../types/primitives";
+import {
+  iconUrlForSymbol,
+  registerKnownAssetIconResolver,
+} from "../../utils/tokenIcons";
+
+type ISeedRow = {
+  chainId: EVMChainIdType;
+  address: EVMAccountAddressType;
+  symbol: string;
+  name: string;
+  decimals: number;
+};
+
+function seed(row: ISeedRow): KnownAsset {
+  return new KnownAsset(
+    row.chainId,
+    row.address,
+    EAssetType.Erc20,
+    row.name,
+    row.symbol,
+    row.decimals,
+    iconUrlForSymbol(row.symbol),
+  );
+}
+
+/**
+ * Static snapshot from `relayer_getCapabilities` (prod + dev) plus Arc Testnet USDC.
+ * @see https://www.1shotapi.com/docs/relayer/get-started/overview
+ */
+const SEED_ROWS: readonly ISeedRow[] = [
+  // Arc Testnet — demo network, not returned by relayer.
+  {
+    chainId: EVMChainId("0x4cef52"),
+    address: EVMAccountAddress(
+      "0x3600000000000000000000000000000000000000",
+    ),
+    symbol: "USDC",
+    name: "USDC",
+    decimals: 6,
+  },
+  // Ethereum mainnet (1)
+  {
+    chainId: EVMChainId("0x1"),
+    address: EVMAccountAddress(
+      "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x1"),
+    address: EVMAccountAddress(
+      "0xdac17f958d2ee523a2206206994597c13d831ec7",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x1"),
+    address: EVMAccountAddress(
+      "0xe343167631d89B6Ffc58B88d6b7fB0228795491D",
+    ),
+    symbol: "USDG",
+    name: "Global Dollar",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x1"),
+    address: EVMAccountAddress(
+      "0xacA92E438df0B2401fF60dA7E4337B687a2435DA",
+    ),
+    symbol: "mUSD",
+    name: "mUSD",
+    decimals: 6,
+  },
+  // Optimism (10)
+  {
+    chainId: EVMChainId("0xa"),
+    address: EVMAccountAddress(
+      "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0xa"),
+    address: EVMAccountAddress(
+      "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // BSC (56)
+  {
+    chainId: EVMChainId("0x38"),
+    address: EVMAccountAddress(
+      "0x8AC76a51cc950d9822D68b83fe1Ad97B32Cd580d",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 18,
+  },
+  {
+    chainId: EVMChainId("0x38"),
+    address: EVMAccountAddress(
+      "0x55d398326f99059fF775485246999027B3197955",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 18,
+  },
+  // Unichain (130)
+  {
+    chainId: EVMChainId("0x82"),
+    address: EVMAccountAddress(
+      "0x078D782b760474a361dDA0AF3839290b0EF57AD6",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x82"),
+    address: EVMAccountAddress(
+      "0xfe97E85d13ABD9c1c33384E796F10B73905637cE",
+    ),
+    symbol: "USD₮0",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Polygon (137)
+  {
+    chainId: EVMChainId("0x89"),
+    address: EVMAccountAddress(
+      "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x89"),
+    address: EVMAccountAddress(
+      "0xc2132D05D31c914a87C6611C10748AeB04B58e8F",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Sonic (146)
+  {
+    chainId: EVMChainId("0x92"),
+    address: EVMAccountAddress(
+      "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  // Monad (143)
+  {
+    chainId: EVMChainId("0x8f"),
+    address: EVMAccountAddress(
+      "0x754704Bc059F8C67012fEd69BC8A327a5aafb603",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x8f"),
+    address: EVMAccountAddress(
+      "0xe7cd86e13AC4309349F30B3435a9d337750fC82D",
+    ),
+    symbol: "USDT0",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Base (8453)
+  {
+    chainId: EVMChainId("0x2105"),
+    address: EVMAccountAddress(
+      "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0x2105"),
+    address: EVMAccountAddress(
+      "0xfde4c96c8593536e31f229ea8f37b2ada2699bb2",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Arbitrum (42161)
+  {
+    chainId: EVMChainId("0xa4b1"),
+    address: EVMAccountAddress(
+      "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0xa4b1"),
+    address: EVMAccountAddress(
+      "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Celo (42220)
+  {
+    chainId: EVMChainId("0xa4ec"),
+    address: EVMAccountAddress(
+      "0xcebA9300f2b948710d2653dd7b07f33A8B32118C",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0xa4ec"),
+    address: EVMAccountAddress(
+      "0x48065fbBE25f71C9282ddf5e1cD6D6A887483D5e",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  // Linea (59144)
+  {
+    chainId: EVMChainId("0xe708"),
+    address: EVMAccountAddress(
+      "0x176211869cA2b568f2A7D4EE941E073a821EE1ff",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0xe708"),
+    address: EVMAccountAddress(
+      "0xA219439258ca9da29E9Cc4cE5596924745e12B93",
+    ),
+    symbol: "USDT",
+    name: "Tether USD",
+    decimals: 6,
+  },
+  {
+    chainId: EVMChainId("0xe708"),
+    address: EVMAccountAddress(
+      "0xaca92e438df0b2401ff60da7e4337b687a2435da",
+    ),
+    symbol: "mUSD",
+    name: "mUSD",
+    decimals: 6,
+  },
+  // Base Sepolia (84532)
+  {
+    chainId: EVMChainId("0x14a34"),
+    address: EVMAccountAddress(
+      "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+  // Sepolia (11155111)
+  {
+    chainId: EVMChainId("0xaa36a7"),
+    address: EVMAccountAddress(
+      "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+    ),
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+  },
+];
+
+export const RELAYER_KNOWN_ASSETS: readonly KnownAsset[] =
+  SEED_ROWS.map(seed);
+
+const BY_KEY = new Map(
+  RELAYER_KNOWN_ASSETS.map((asset) => [
+    makeTrackedAssetId(asset.chainId, asset.address),
+    asset,
+  ]),
+);
+
+export function getKnownAssetIconUrl(
+  chainId: EVMChainIdType,
+  address: EVMAccountAddressType,
+): string | undefined {
+  return BY_KEY.get(makeTrackedAssetId(chainId, address))?.iconUrl;
+}
+
+registerKnownAssetIconResolver(getKnownAssetIconUrl);
diff --git a/src/lib/utils/tokenIcons.ts b/src/lib/utils/tokenIcons.ts
new file mode 100644
index 0000000..0d211a7
--- /dev/null
+++ b/src/lib/utils/tokenIcons.ts
@@ -0,0 +1,60 @@
+import type {
+  EVMAccountAddress,
+  EVMChainId,
+} from "@1shotapi/ows-types";
+
+import usdcIcon from "../../assets/images/tokens/CircleUSDC.svg";
+import usdgIcon from "../../assets/images/tokens/GlobalDollarUSDG.svg";
+import musdIcon from "../../assets/images/tokens/mUSD-icon.svg";
+import usdtIcon from "../../assets/images/tokens/tetherUSD.svg";
+
+const ICON_BY_SYMBOL: Readonly<Record<string, string>> = {
+  USDC: usdcIcon,
+  USDT: usdtIcon,
+  USDG: usdgIcon,
+  MUSD: musdIcon,
+};
+
+/** Normalize relayer/market symbol variants (e.g. USDT0, USD₮0) to icon keys. */
+function normalizeSymbol(symbol: string): string {
+  const upper = symbol.toUpperCase();
+  if (upper === "USDT0" || upper === "USD₮0") {
+    return "USDT";
+  }
+  return upper;
+}
+
+/** Bundled SVG URL for a relayer stablecoin symbol, if recognized. */
+export function iconUrlForSymbol(symbol: string): string | undefined {
+  return ICON_BY_SYMBOL[normalizeSymbol(symbol)];
+}
+
+export type IResolveAssetIconUrl = (
+  chainId: EVMChainId,
+  address: EVMAccountAddress,
+) => string | undefined;
+
+let resolveKnownAssetIconUrl: IResolveAssetIconUrl | null = null;
+
+/** Wired by relayerKnownAssets after the known-asset map is built. */
+export function registerKnownAssetIconResolver(
+  resolver: IResolveAssetIconUrl,
+): void {
+  resolveKnownAssetIconUrl = resolver;
+}
+
+/** Known (chainId, address) catalog first, then symbol fallback. */
+export function resolveAssetIconUrl(
+  chainId: EVMChainId,
+  address: EVMAccountAddress,
+  symbol?: string,
+): string | undefined {
+  const fromCatalog = resolveKnownAssetIconUrl?.(chainId, address);
+  if (fromCatalog) {
+    return fromCatalog;
+  }
+  if (symbol) {
+    return iconUrlForSymbol(symbol);
+  }
+  return undefined;
+}
diff --git a/src/style/defaults.ts b/src/style/defaults.ts
index 483a950..ab9ecad 100644
--- a/src/style/defaults.ts
+++ b/src/style/defaults.ts
@@ -47,6 +47,14 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       fieldLabel: "Account name",
       placeholder: "e.g. My wallet",
       emptyError: "Enter a name for your passkey.",
+      termsAcceptancePrefix: "I agree to the",
+      termsOfServiceLabel: "Terms of Service",
+      termsAcceptanceJoiner: "and",
+      privacyPolicyLabel: "Privacy Policy",
+      termsAcceptanceError:
+        "Accept the Terms of Service and Privacy Policy to continue.",
+      termsOfServiceUrl: "https://1shotapi.com/terms-of-service",
+      privacyPolicyUrl: "https://1shotapi.com/privacy-policy",
       cancelLabel: "Cancel",
       continueLabel: "Continue",
     },
@@ -79,7 +87,7 @@ export const DEFAULT_STYLE: IResolvedStyle = {
     },
     confirmTransfer: {
       title: "Confirm transfer",
-      body: "{domain} wants to send {amount} {tokenSymbol} ({tokenName}) to {receiver} on {chainName}.",
+      body: "{domain} is requesting to send tokens from your wallet. Review the amount and recipient before confirming.",
       amountLabel: "Amount",
       tokenLabel: "Token",
       receiverLabel: "To",
@@ -275,9 +283,11 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       addressPlaceholder: "0x…",
       addDialogCancelLabel: "Cancel",
       addDialogSubmitLabel: "Add",
-      addConfirmTitle: "Add asset?",
+      addConfirmTitle: "Add asset",
       addConfirmBody:
-        "The connected app wants you to track {assetName} on {chainLabel}.",
+        "The connected app is requesting to add a custom token to your wallet for tracking. Please verify the contract details before proceeding.",
+      addConfirmWarning:
+        "Anyone can create a token. Make sure you trust this source before adding it to your portfolio.",
       addConfirmRejectLabel: "Reject",
       addConfirmAcceptLabel: "Add",
       balanceUnavailable: "—",
diff --git a/src/style/registerSetStyle.ts b/src/style/registerSetStyle.ts
index 58675c3..c5794a8 100644
--- a/src/style/registerSetStyle.ts
+++ b/src/style/registerSetStyle.ts
@@ -54,6 +54,13 @@ const passkeyNameCopySchema = z.strictObject({
     fieldLabel: z.string().optional(),
     placeholder: z.string().optional(),
     emptyError: z.string().optional(),
+    termsAcceptancePrefix: z.string().optional(),
+    termsOfServiceLabel: z.string().optional(),
+    termsAcceptanceJoiner: z.string().optional(),
+    privacyPolicyLabel: z.string().optional(),
+    termsAcceptanceError: z.string().optional(),
+    termsOfServiceUrl: z.string().url().optional(),
+    privacyPolicyUrl: z.string().url().optional(),
     cancelLabel: z.string().optional(),
     continueLabel: z.string().optional(),
   })
@@ -276,6 +283,7 @@ const balancesCopySchema = z.strictObject({
     addDialogSubmitLabel: z.string().optional(),
     addConfirmTitle: z.string().optional(),
     addConfirmBody: z.string().optional(),
+    addConfirmWarning: z.string().optional(),
     addConfirmRejectLabel: z.string().optional(),
     addConfirmAcceptLabel: z.string().optional(),
     balanceUnavailable: z.string().optional(),
diff --git a/src/style/types.ts b/src/style/types.ts
index a4d5f86..815b9e8 100644
--- a/src/style/types.ts
+++ b/src/style/types.ts
@@ -51,6 +51,13 @@ export interface IStyleCopyPasskeyName {
   fieldLabel: string;
   placeholder: string;
   emptyError: string;
+  termsAcceptancePrefix: string;
+  termsOfServiceLabel: string;
+  termsAcceptanceJoiner: string;
+  privacyPolicyLabel: string;
+  termsAcceptanceError: string;
+  termsOfServiceUrl: string;
+  privacyPolicyUrl: string;
   cancelLabel: string;
   continueLabel: string;
 }
@@ -90,8 +97,7 @@ export interface IStyleCopySendTransaction {
 
 /**
  * Friendly host ERC-20 transfer confirm.
- * `body` supports `{domain}`, `{amount}`, `{tokenName}`, `{tokenSymbol}`,
- * `{receiver}`, `{chainName}`.
+ * `body` supports `{domain}`.
  */
 export interface IStyleCopyConfirmTransfer {
   title: string;
@@ -282,7 +288,7 @@ export interface IStyleCopyDelegations {
 /**
  * Balances tab + add-asset flows.
  * `countLabel` supports `{count}`.
- * `addConfirmBody` supports `{assetName}` and `{chainLabel}`.
+ * `addConfirmBody` is shown above the asset identity block.
  */
 export interface IStyleCopyBalances {
   tabLabel: string;
@@ -309,6 +315,7 @@ export interface IStyleCopyBalances {
   addDialogSubmitLabel: string;
   addConfirmTitle: string;
   addConfirmBody: string;
+  addConfirmWarning: string;
   addConfirmRejectLabel: string;
   addConfirmAcceptLabel: string;
   balanceUnavailable: string;
diff --git a/src/wallet/modalTypes.ts b/src/wallet/modalTypes.ts
index b7a5d2e..18ae8ab 100644
--- a/src/wallet/modalTypes.ts
+++ b/src/wallet/modalTypes.ts
@@ -23,6 +23,7 @@ export interface IConfirmTransferRequest {
   amount: string;
   tokenName: string;
   tokenSymbol: string;
+  tokenAddress: EVMAccountAddress;
   receiver: string;
   chainName: string;
   chainId: EVMChainId;
diff --git a/src/wallet/useWalletBoot.ts b/src/wallet/useWalletBoot.ts
index ecc92e1..9dfbb38 100644
--- a/src/wallet/useWalletBoot.ts
+++ b/src/wallet/useWalletBoot.ts
@@ -653,6 +653,7 @@ export function useWalletBoot({
                       ),
                       tokenName,
                       tokenSymbol,
+                      tokenAddress: transfer.tokenAddress,
                       receiver: transfer.recipient,
                       chainName: transactionUtils.chainLabelFor(
                         request.chainId,