diff --git a/projects/keepkey-vault/src/bun/reports.ts b/projects/keepkey-vault/src/bun/reports.ts
index 7aa67b64..61b54356 100644
--- a/projects/keepkey-vault/src/bun/reports.ts
+++ b/projects/keepkey-vault/src/bun/reports.ts
@@ -12,7 +12,7 @@
  */
 
 import type { ReportData, ReportSection, ChainBalance } from '../shared/types'
-import { getLatestDeviceSnapshot, getCachedPubkeys } from './db'
+import { getLatestDeviceSnapshot, getCachedPubkeys, getSetting } from './db'
 import { getPioneer } from './pioneer'
 
 /** Section title prefixes — shared with tax-export.ts for reliable extraction. */
@@ -767,6 +767,9 @@ function sanitize(text: string): string {
 
 export async function reportToPdfBuffer(data: ReportData): Promise<Buffer> {
 	const { PDFDocument, StandardFonts, rgb, degrees } = await import('pdf-lib')
+	const reportLocale = getSetting('number_locale') || 'en-US'
+	// Stored values are always USD — use USD currency label with user's number locale for separators
+	const reportCurrency = 'USD'
 
 	console.log('[reports] Starting PDF generation...')
 
@@ -897,7 +900,7 @@ export async function reportToPdfBuffer(data: ReportData): Promise<Buffer> {
 	y -= 30
 
 	// ── Total Portfolio Value (big number) ──
-	const totalStr = `$${totalPortfolioUsd.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`
+	const totalStr = new Intl.NumberFormat(reportLocale, { style: 'currency', currency: reportCurrency, minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(totalPortfolioUsd)
 	const totalLabel = 'Total Portfolio Value'
 	const totalLabelW = font.widthOfTextAtSize(totalLabel, 11)
 	const totalValW = bold.widthOfTextAtSize(totalStr, 28)
@@ -958,7 +961,7 @@ export async function reportToPdfBuffer(data: ReportData): Promise<Buffer> {
 
 		for (const slice of slices.slice(0, 12)) {
 			const pct = ((slice.usd / totalPortfolioUsd) * 100).toFixed(1)
-			const usdStr = `$${slice.usd.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`
+			const usdStr = new Intl.NumberFormat(reportLocale, { style: 'currency', currency: reportCurrency, minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(slice.usd)
 
 			// Color swatch
 			page.drawRectangle({
diff --git a/projects/keepkey-vault/src/bun/swap-report.ts b/projects/keepkey-vault/src/bun/swap-report.ts
index 819e9b62..b3e714d5 100644
--- a/projects/keepkey-vault/src/bun/swap-report.ts
+++ b/projects/keepkey-vault/src/bun/swap-report.ts
@@ -5,6 +5,7 @@
  * CSV is plain-text, compatible with spreadsheet apps and tax tools.
  */
 import type { SwapHistoryRecord } from '../shared/types'
+import { getSetting } from './db'
 
 // ── CSV Export ────────────────────────────────────────────────────────
 
@@ -189,7 +190,8 @@ export async function generateSwapPdf(records: SwapHistoryRecord[]): Promise<Buf
     colX = ML + 4
 
     // Date
-    const dateStr = new Date(r.createdAt).toLocaleString('en-US', {
+    const swapLocale = getSetting('number_locale') || 'en-US'
+    const dateStr = new Date(r.createdAt).toLocaleString(swapLocale, {
       month: '2-digit', day: '2-digit', year: '2-digit',
       hour: '2-digit', minute: '2-digit', hour12: false,
     })
diff --git a/projects/keepkey-vault/src/mainview/components/AnimatedUsd.tsx b/projects/keepkey-vault/src/mainview/components/AnimatedUsd.tsx
index baf866b9..3d4cbc99 100644
--- a/projects/keepkey-vault/src/mainview/components/AnimatedUsd.tsx
+++ b/projects/keepkey-vault/src/mainview/components/AnimatedUsd.tsx
@@ -1,24 +1,51 @@
+import { useMemo } from "react"
 import CountUp from "react-countup"
 import { Text, type TextProps } from "@chakra-ui/react"
+import { useFiat } from "../lib/fiat-context"
+import { getFiatConfig } from "../../shared/fiat"
 
 interface AnimatedUsdProps extends TextProps {
 	value: number
+	/** Wrapper text before the formatted value (e.g. "(" for parenthesized display) */
 	prefix?: string
+	/** Wrapper text after the formatted value (e.g. ")") */
 	suffix?: string
 	duration?: number
+	/** Override decimal places (defaults to the currency's configured decimals) */
 	decimals?: number
 }
 
-/** Animated USD counter with CountUp animation. */
-export function AnimatedUsd({ value, prefix = "$", suffix, duration = 1.2, decimals = 2, color = "#23DCC8", ...textProps }: AnimatedUsdProps) {
+/** Animated fiat counter. Delegates all number+symbol formatting to Intl.NumberFormat. */
+export function AnimatedUsd({ value, prefix = "", suffix = "", duration = 1.2, decimals, color = "#23DCC8", ...textProps }: AnimatedUsdProps) {
+	const { currency, locale } = useFiat()
+	const cfg = getFiatConfig(currency)
+	const dec = decimals ?? cfg.decimals
+
+	const formatter = useMemo(() => {
+		try {
+			return new Intl.NumberFormat(locale, {
+				style: 'currency',
+				currency,
+				minimumFractionDigits: dec,
+				maximumFractionDigits: dec,
+				currencyDisplay: 'narrowSymbol',
+			})
+		} catch {
+			return null
+		}
+	}, [locale, currency, dec])
+
+	const formatValue = (n: number) => {
+		const formatted = formatter ? formatter.format(n) : `${cfg.symbol}${n.toFixed(dec)}`
+		return `${prefix}${formatted}${suffix}`
+	}
+
 	if (!isFinite(value) || value <= 0) {
-		return <Text as="span" color={color} {...textProps}>{prefix}0.{'0'.repeat(decimals)}{suffix}</Text>
+		return <Text as="span" color={color} {...textProps}>{formatValue(0)}</Text>
 	}
 	return (
 		<Text as="span" color={color} {...textProps}>
-			{prefix}
-			<CountUp key={value} start={0} end={value} decimals={decimals} duration={duration} separator="," preserveValue={false} />
-			{suffix}
+			<CountUp key={value} start={0} end={value} decimals={dec} duration={duration} formattingFn={formatValue} preserveValue={false} />
 		</Text>
 	)
 }
diff --git a/projects/keepkey-vault/src/mainview/components/AssetPage.tsx b/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
index b9df6297..aa4fb0b2 100644
--- a/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
+++ b/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
@@ -8,7 +8,8 @@ import { CHAINS, BTC_SCRIPT_TYPES, btcAccountPath, isChainSupported } from "../.
 import type { ChainBalance, TokenBalance, TokenVisibilityStatus, AppSettings } from "../../shared/types"
 import { getAssetIcon, caipToIcon } from "../../shared/assetLookup"
 import { AnimatedUsd } from "./AnimatedUsd"
-import { formatBalance, formatUsd } from "../lib/formatting"
+import { formatBalance } from "../lib/formatting"
+import { useFiat } from "../lib/fiat-context"
 import { ReceiveView } from "./ReceiveView"
 import { SendForm } from "./SendForm"
 
@@ -48,6 +49,7 @@ interface AssetPageProps {
 
 export function AssetPage({ chain, balance, onBack, firmwareVersion }: AssetPageProps) {
 	const { t } = useTranslation("asset")
+	const { fmtCompact, symbol: fiatSymbol } = useFiat()
 	const [view, setView] = useState<AssetView>("receive")
 	const [selectedToken, setSelectedToken] = useState<TokenBalance | null>(null)
 	const [address, setAddress] = useState<string | null>(balance?.address || null)
@@ -381,7 +383,7 @@ export function AssetPage({ chain, balance, onBack, firmwareVersion }: AssetPage
 							</Text>
 							{tok.balanceUsd > 0 && (
 								<Text fontSize="11px" color="kk.textMuted" lineHeight="1.2">
-									${formatUsd(tok.balanceUsd)}
+									{fmtCompact(tok.balanceUsd)}
 								</Text>
 							)}
 						</Box>
@@ -476,7 +478,7 @@ export function AssetPage({ chain, balance, onBack, firmwareVersion }: AssetPage
 								{activeBalance.balance} {chain.symbol}
 							</Text>
 							{cleanBalanceUsd > 0 && (
-								<AnimatedUsd value={cleanBalanceUsd} prefix="($" suffix=")" fontSize="xs" fontWeight="500" display={{ base: "none", sm: "block" }} />
+								<AnimatedUsd value={cleanBalanceUsd} prefix="(" suffix=")" fontSize="xs" fontWeight="500" display={{ base: "none", sm: "block" }} />
 							)}
 							<Box
 								as="button"
@@ -651,7 +653,7 @@ export function AssetPage({ chain, balance, onBack, firmwareVersion }: AssetPage
 									</Text>
 								)}
 								{tokenTotalUsd > 0 && (
-									<Text fontSize="xs" color="kk.gold" fontWeight="500">${formatUsd(tokenTotalUsd)}</Text>
+									<Text fontSize="xs" color="kk.gold" fontWeight="500">{fmtCompact(tokenTotalUsd)}</Text>
 								)}
 								{isEvmChain && (
 									<IconButton
@@ -694,7 +696,7 @@ export function AssetPage({ chain, balance, onBack, firmwareVersion }: AssetPage
 										{zeroValueTokens.length > 0 && (
 											<>
 												<Text fontSize="10px" color="kk.textMuted" w="100%" px="1" mt="1">
-													{t("zeroValueTokens", { count: zeroValueTokens.length })}
+													{t("zeroValueTokens", { count: zeroValueTokens.length, zeroValue: fmtCompact(0) || `${fiatSymbol}0` })}
 												</Text>
 												{zeroValueTokens.map((tok) => renderTokenRow(tok))}
 											</>
diff --git a/projects/keepkey-vault/src/mainview/components/BtcXpubSelector.tsx b/projects/keepkey-vault/src/mainview/components/BtcXpubSelector.tsx
index c61fcd5d..2bbebca7 100644
--- a/projects/keepkey-vault/src/mainview/components/BtcXpubSelector.tsx
+++ b/projects/keepkey-vault/src/mainview/components/BtcXpubSelector.tsx
@@ -2,7 +2,8 @@ import { Box, Flex, Text, Button } from "@chakra-ui/react"
 import { FaPlus } from "react-icons/fa"
 import { useTranslation } from "react-i18next"
 import { BTC_SCRIPT_TYPES } from "../../shared/chains"
-import { formatBalance, formatUsd } from "../lib/formatting"
+import { formatBalance } from "../lib/formatting"
+import { useFiat } from "../lib/fiat-context"
 import type { BtcAccountSet, BtcScriptType } from "../../shared/types"
 
 interface BtcXpubSelectorProps {
@@ -15,6 +16,7 @@ interface BtcXpubSelectorProps {
 export function BtcXpubSelector({ btcAccounts, onSelectXpub, onAddAccount, addingAccount }: BtcXpubSelectorProps) {
   const { accounts, selectedXpub } = btcAccounts
   const { t } = useTranslation("receive")
+  const { fmtCompact } = useFiat()
   if (accounts.length === 0) return null
 
   const selAcct = selectedXpub?.accountIndex ?? 0
@@ -95,7 +97,7 @@ export function BtcXpubSelector({ btcAccounts, onSelectXpub, onAddAccount, addin
                 )}
                 {xpubData && xpubData.balanceUsd > 0 && (
                   <Text fontSize="9px" color="kk.textMuted" lineHeight="1.2">
-                    ${formatUsd(xpubData.balanceUsd)}
+                    {fmtCompact(xpubData.balanceUsd)}
                   </Text>
                 )}
               </Flex>
diff --git a/projects/keepkey-vault/src/mainview/components/EvmAddressSelector.tsx b/projects/keepkey-vault/src/mainview/components/EvmAddressSelector.tsx
index 94ef69da..d73ef6de 100644
--- a/projects/keepkey-vault/src/mainview/components/EvmAddressSelector.tsx
+++ b/projects/keepkey-vault/src/mainview/components/EvmAddressSelector.tsx
@@ -1,6 +1,6 @@
 import { Box, Flex, Text, Button } from "@chakra-ui/react"
 import { FaPlus, FaTimes } from "react-icons/fa"
-import { formatUsd } from "../lib/formatting"
+import { useFiat } from "../lib/fiat-context"
 import type { EvmAddressSet } from "../../shared/types"
 
 interface EvmAddressSelectorProps {
@@ -12,6 +12,7 @@ interface EvmAddressSelectorProps {
 }
 
 export function EvmAddressSelector({ evmAddresses, onSelectIndex, onAddIndex, onRemoveIndex, adding }: EvmAddressSelectorProps) {
+  const { fmtCompact } = useFiat()
   const { addresses, selectedIndex } = evmAddresses
 
   // Don't render if only one address tracked
@@ -56,7 +57,7 @@ export function EvmAddressSelector({ evmAddresses, onSelectIndex, onAddIndex, on
                 </Text>
                 {addr.balanceUsd > 0 && (
                   <Text fontSize="9px" color="kk.textMuted" lineHeight="1.2">
-                    ${formatUsd(addr.balanceUsd)}
+                    {fmtCompact(addr.balanceUsd)}
                   </Text>
                 )}
               </Flex>
diff --git a/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx b/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx
index 4e14c229..f062753f 100644
--- a/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx
+++ b/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback, useRef } from "react"
 import { Box, Flex, Text, Spinner, Image } from "@chakra-ui/react"
 import { rpcRequest, onRpcMessage } from "../lib/rpc"
+import { useFiat } from "../lib/fiat-context"
 import { Z } from "../lib/z-index"
 import type { ReportMeta } from "../../shared/types"
 
@@ -22,6 +23,7 @@ interface ReportDialogProps {
 }
 
 export function ReportDialog({ onClose }: ReportDialogProps) {
+	const { locale: fiatLocale, fmtCompact } = useFiat()
 	const [generating, setGenerating] = useState(false)
 	const [progress, setProgress] = useState<{ message: string; percent: number } | null>(null)
 	const [reports, setReports] = useState<ReportMeta[]>([])
@@ -250,11 +252,11 @@ export function ReportDialog({ onClose }: ReportDialogProps) {
 												Full Detail Report
 											</Text>
 											<Text fontSize="10px" color={r.status === "error" ? "#DC3545" : "kk.textMuted"}>
-												{r.status === "error" ? "Failed" : `$${r.totalUsd.toFixed(2)}`}
+												{r.status === "error" ? "Failed" : fmtCompact(r.totalUsd)}
 											</Text>
 										</Flex>
 										<Text fontSize="10px" color="kk.textMuted" mb="3">
-											{new Date(r.createdAt).toLocaleString()}
+											{new Date(r.createdAt).toLocaleString(fiatLocale)}
 										</Text>
 										{r.error && (
 											<Text fontSize="10px" color="#DC3545" mb="3">{r.error}</Text>
diff --git a/projects/keepkey-vault/src/mainview/components/SendForm.tsx b/projects/keepkey-vault/src/mainview/components/SendForm.tsx
index e2f4d7b2..eca3347c 100644
--- a/projects/keepkey-vault/src/mainview/components/SendForm.tsx
+++ b/projects/keepkey-vault/src/mainview/components/SendForm.tsx
@@ -2,7 +2,8 @@ import { useState, useEffect, useCallback, useMemo, Fragment } from "react"
 import { useTranslation } from "react-i18next"
 import { Box, Flex, Text, VStack, Button, Input } from "@chakra-ui/react"
 import { rpcRequest } from "../lib/rpc"
-import { formatBalance, formatUsd } from "../lib/formatting"
+import { formatBalance } from "../lib/formatting"
+import { useFiat } from "../lib/fiat-context"
 import { getAsset } from "../../shared/assetLookup"
 import { QrScannerOverlay } from "./QrScannerOverlay"
 import type { ChainDef } from "../../shared/chains"
@@ -41,6 +42,7 @@ interface SendFormProps {
 
 export function SendForm({ chain, address, balance, token, onClearToken, xpubOverride, scriptTypeOverride, evmAddressIndex }: SendFormProps) {
 	const { t } = useTranslation("send")
+	const { fmt, fmtCompact } = useFiat()
 	const [recipient, setRecipient] = useState("")
 	const [amount, setAmount] = useState("")
 	const [usdAmount, setUsdAmount] = useState("")
@@ -301,7 +303,7 @@ export function SendForm({ chain, address, balance, token, onClearToken, xpubOve
 					</Text>
 					{hasPrice && (
 						<Text fontSize="10px" fontFamily="mono" color="kk.textMuted">
-							${formatUsd(parseFloat(displayBalance) * pricePerUnit)}
+							{fmtCompact(parseFloat(displayBalance) * pricePerUnit)}
 						</Text>
 					)}
 				</Flex>
@@ -408,7 +410,7 @@ export function SendForm({ chain, address, balance, token, onClearToken, xpubOve
 									<Flex align="center" gap="1">
 										{inputMode === 'crypto' ? (
 											<Text fontSize="11px" color="kk.textMuted" fontFamily="mono">
-												{amountUsdPreview !== null ? `$${formatUsd(amountUsdPreview)}` : '$0.00'}
+												{amountUsdPreview !== null ? (fmtCompact(amountUsdPreview) || fmt(0)) : fmt(0)}
 											</Text>
 										) : (
 											<Text fontSize="11px" color="kk.textMuted" fontFamily="mono">
@@ -421,7 +423,7 @@ export function SendForm({ chain, address, balance, token, onClearToken, xpubOve
 									</Flex>
 								)}
 								{pricePerUnit > 0 && (
-									<Text fontSize="10px" color="kk.textMuted">1 {displaySymbol} = ${formatUsd(pricePerUnit)}</Text>
+									<Text fontSize="10px" color="kk.textMuted">1 {displaySymbol} = {fmtCompact(pricePerUnit)}</Text>
 								)}
 							</Flex>
 						)}
@@ -492,7 +494,7 @@ export function SendForm({ chain, address, balance, token, onClearToken, xpubOve
 							<Flex direction="column" align="flex-end">
 								<Text fontSize="xs" fontFamily="mono" color="kk.textPrimary">{isMax ? 'MAX' : amount} {displaySymbol}</Text>
 								{!isMax && amountUsdPreview !== null && (
-									<Text fontSize="10px" fontFamily="mono" color="kk.textMuted">${formatUsd(amountUsdPreview)}</Text>
+									<Text fontSize="10px" fontFamily="mono" color="kk.textMuted">{fmtCompact(amountUsdPreview)}</Text>
 								)}
 							</Flex>
 						</Flex>
@@ -501,7 +503,7 @@ export function SendForm({ chain, address, balance, token, onClearToken, xpubOve
 							<Flex direction="column" align="flex-end">
 								<Text fontSize="xs" fontFamily="mono" color="kk.textPrimary">{formatBalance(buildResult.fee)} {chain.symbol}</Text>
 								{buildResult.feeUsd != null && buildResult.feeUsd > 0 && (
-									<Text fontSize="10px" fontFamily="mono" color="kk.textMuted">${formatUsd(buildResult.feeUsd)}</Text>
+									<Text fontSize="10px" fontFamily="mono" color="kk.textMuted">{fmtCompact(buildResult.feeUsd)}</Text>
 								)}
 							</Flex>
 						</Flex>
diff --git a/projects/keepkey-vault/src/mainview/components/StakingPanel.tsx b/projects/keepkey-vault/src/mainview/components/StakingPanel.tsx
index 241966aa..c42749c1 100644
--- a/projects/keepkey-vault/src/mainview/components/StakingPanel.tsx
+++ b/projects/keepkey-vault/src/mainview/components/StakingPanel.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next"
 import type { ChainDef } from "../../shared/chains"
 import type { BuildTxResult, BroadcastResult, StakingPosition } from "../../shared/types"
 import { rpcRequest } from "../lib/rpc"
+import { useFiat } from "../lib/fiat-context"
 import { Z } from "../lib/z-index"
 
 interface StakingPanelProps {
@@ -53,6 +54,7 @@ interface DelegateDialogProps {
 
 function DelegateDialog({ isOpen, onClose, chain, availableBalance, rewardAmount, rewardUsd, onSuccess, watchOnly }: DelegateDialogProps) {
 	const { t } = useTranslation("staking")
+	const { fmtCompact } = useFiat()
 	const [validatorAddress, setValidatorAddress] = useState("")
 	const [amount, setAmount] = useState("")
 	const [memo, setMemo] = useState(t('defaultDelegationMemo'))
@@ -287,7 +289,7 @@ function DelegateDialog({ isOpen, onClose, chain, availableBalance, rewardAmount
 								{rewardAmount && (
 									<Text fontSize="10px" color="kk.textMuted" mt="2">
 										{rewardUsd && rewardUsd > 0
-											? t('rewardsAvailableWithUsd', { amount: rewardAmount, symbol: chain.symbol, usd: rewardUsd.toFixed(2) })
+											? t('rewardsAvailableWithUsd', { amount: rewardAmount, symbol: chain.symbol, fiatValue: fmtCompact(rewardUsd) })
 											: t('rewardsAvailable', { amount: rewardAmount, symbol: chain.symbol })}
 									</Text>
 								)}
diff --git a/projects/keepkey-vault/src/mainview/components/SwapDialog.tsx b/projects/keepkey-vault/src/mainview/components/SwapDialog.tsx
index 7e2c555c..b9a26ef6 100644
--- a/projects/keepkey-vault/src/mainview/components/SwapDialog.tsx
+++ b/projects/keepkey-vault/src/mainview/components/SwapDialog.tsx
@@ -10,7 +10,7 @@ import { Box, Flex, Text, VStack, Button, Input, Image, HStack } from "@chakra-u
 import CountUp from "react-countup"
 import { rpcRequest, onRpcMessage } from "../lib/rpc"
 import { formatBalance } from "../lib/formatting"
-import { formatUsd } from "../lib/formatting"
+import { useFiat } from "../lib/fiat-context"
 import { getAssetIcon } from "../../shared/assetLookup"
 import { CHAINS, getExplorerTxUrl } from "../../shared/chains"
 import type { ChainDef } from "../../shared/chains"
@@ -240,7 +240,7 @@ interface AssetSelectorProps {
 
 function AssetSelector({ label, selected, assets, onSelect, balances, exclude, disabled, nativeOnly }: AssetSelectorProps) {
   const { t } = useTranslation("swap")
-  const fmtCompact = (v: number | string | null | undefined) => { const n = typeof v === 'string' ? parseFloat(v) : (v ?? 0); return !isFinite(n) || n === 0 ? '' : `$${formatUsd(n)}` }
+  const { fmtCompact } = useFiat()
   const [open, setOpen] = useState(false)
   const [search, setSearch] = useState("")
   const inputRef = useRef<HTMLInputElement>(null)
@@ -445,8 +445,7 @@ interface SwapDialogProps {
 // ── Main SwapDialog ─────────────────────────────────────────────────
 export function SwapDialog({ open, onClose, chain, balance, address, resumeSwap }: SwapDialogProps) {
   const { t } = useTranslation("swap")
-  const fmtCompact = (v: number | string | null | undefined) => { const n = typeof v === 'string' ? parseFloat(v) : (v ?? 0); return !isFinite(n) || n === 0 ? '' : `$${formatUsd(n)}` }
-  const fiatSymbol = '$'
+  const { fmtCompact, symbol: fiatSymbol } = useFiat()
 
   // ── State ─────────────────────────────────────────────────────────
   const [phase, setPhase] = useState<SwapPhase>('input')
diff --git a/projects/keepkey-vault/src/mainview/components/ZcashPrivacyTab.tsx b/projects/keepkey-vault/src/mainview/components/ZcashPrivacyTab.tsx
index 8de11736..98672449 100644
--- a/projects/keepkey-vault/src/mainview/components/ZcashPrivacyTab.tsx
+++ b/projects/keepkey-vault/src/mainview/components/ZcashPrivacyTab.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next"
 import { Box, Flex, Text, Button, Input, Spinner } from "@chakra-ui/react"
 import { FaShieldAlt, FaCopy, FaCheck, FaEnvelope, FaChevronDown, FaChevronUp } from "react-icons/fa"
 import { rpcRequest, onRpcMessage } from "../lib/rpc"
+import { useFiat } from "../lib/fiat-context"
 import { generateQRSvg } from "../lib/qr"
 
 /** Validate Zcash recipient: unified (u1...), Sapling (zs1...), or transparent (t1.../t3...) */
@@ -45,6 +46,7 @@ function formatEta(seconds: number): string {
 
 export function ZcashPrivacyTab() {
 	const { t } = useTranslation("asset")
+	const { locale: fiatLocale } = useFiat()
 
 	// ── State ──────────────────────────────────────────────────────────
 	const [status, setStatus] = useState<SidecarStatus>("checking")
@@ -497,7 +499,7 @@ export function ZcashPrivacyTab() {
 								{scanState === "scanning" ? (
 									<><Spinner size="xs" mr="2" /> {t("scanning")}</>
 								) : (
-									t("scanFromBlock", { block: KEEPKEY_RELEASE_BLOCK.toLocaleString() })
+									t("scanFromBlock", { block: KEEPKEY_RELEASE_BLOCK.toLocaleString(fiatLocale) })
 								)}
 							</Button>
 						</Flex>
@@ -516,7 +518,7 @@ export function ZcashPrivacyTab() {
 							)}
 							{syncedTo && (
 								<Text fontSize="10px" color="kk.textMuted" mt="0.5">
-									{t("lastSynced", { height: syncedTo.toLocaleString() })}
+									{t("lastSynced", { height: syncedTo.toLocaleString(fiatLocale) })}
 								</Text>
 							)}
 						</Flex>
@@ -778,7 +780,7 @@ export function ZcashPrivacyTab() {
 							title="Click to use KeepKey release block"
 							onClick={() => setScanFromHeight(String(KEEPKEY_RELEASE_BLOCK))}
 						>
-							#{KEEPKEY_RELEASE_BLOCK.toLocaleString()}
+							#{KEEPKEY_RELEASE_BLOCK.toLocaleString(fiatLocale)}
 						</Text>
 					</Flex>
 
@@ -812,11 +814,11 @@ export function ZcashPrivacyTab() {
 								{scanProgress ? (
 									<Flex gap="3" align="center">
 										<Text fontSize="10px" color="kk.textMuted" fontFamily="mono">
-											{scanProgress.scannedHeight.toLocaleString()} / {scanProgress.tipHeight.toLocaleString()}
+											{scanProgress.scannedHeight.toLocaleString(fiatLocale)} / {scanProgress.tipHeight.toLocaleString(fiatLocale)}
 										</Text>
 										{scanProgress.blocksPerSec > 0 && (
 											<Text fontSize="10px" color="kk.textMuted">
-												{scanProgress.blocksPerSec.toLocaleString()} blk/s
+												{scanProgress.blocksPerSec.toLocaleString(fiatLocale)} blk/s
 											</Text>
 										)}
 										<Text fontSize="10px" color="kk.textSecondary" fontWeight="500">
@@ -1060,7 +1062,7 @@ export function ZcashPrivacyTab() {
 													setScanFromHeight(String(tx.block_height))
 												}}
 											>
-												#{tx.block_height.toLocaleString()}
+												#{tx.block_height.toLocaleString(fiatLocale)}
 											</Text>
 											<Text
 												fontSize="9px"
diff --git a/projects/keepkey-vault/src/mainview/i18n/index.ts b/projects/keepkey-vault/src/mainview/i18n/index.ts
index 4cc9aa9b..5e616a47 100644
--- a/projects/keepkey-vault/src/mainview/i18n/index.ts
+++ b/projects/keepkey-vault/src/mainview/i18n/index.ts
@@ -20,8 +20,20 @@ import staking from "./locales/en/staking.json"
 
 const STORAGE_KEY = "keepkey-vault-lang"
 
-let savedLang = "en"
-try { savedLang = localStorage.getItem(STORAGE_KEY) || "en" } catch { /* private browsing / blocked */ }
+const SUPPORTED_LANGS = ["en","es","fr","de","ja","zh","ko","pt","ru","it","pl","nl","th","tr","vi"]
+
+function detectInitialLang(): string {
+	try {
+		const saved = localStorage.getItem(STORAGE_KEY)
+		if (saved) return saved
+		// Auto-detect from browser on first launch
+		const browserLang = (navigator.language || '').split('-')[0]
+		if (browserLang && SUPPORTED_LANGS.includes(browserLang)) return browserLang
+	} catch { /* private browsing / blocked */ }
+	return "en"
+}
+
+let savedLang = detectInitialLang()
 
 i18n
 	.use(initReactI18next)
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/de/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/de/asset.json
index 570d7d63..4c07899d 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/de/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/de/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "{{count}} gefilterte Token anzeigen",
 	"hideFiltered_one": "{{count}} gefilterten Token ausblenden",
 	"hideFiltered_other": "{{count}} gefilterte Token ausblenden",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Verdächtiger Spam ({{count}})",
 	"markAsSafe": "Als sicher markieren",
 	"hideToken": "Token ausblenden",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/de/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/de/staking.json
index f3095f92..16788538 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/de/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/de/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Beispiele für Top-Validatoren",
 	"browseAllValidators": "Alle Validatoren durchsuchen",
 	"rewardsAvailable": "Verfügbare Belohnungen: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Verfügbare Belohnungen: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Verfügbare Belohnungen: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Betrag",
 	"max": "MAX",
 	"memoOptional": "Memo (optional)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/en/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/en/asset.json
index ca751124..16dda044 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/en/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/en/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "Show {{count}} filtered tokens",
 	"hideFiltered_one": "Hide {{count}} filtered token",
 	"hideFiltered_other": "Hide {{count}} filtered tokens",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Suspected spam ({{count}})",
 	"markAsSafe": "Mark as safe",
 	"hideToken": "Hide token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/en/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/en/staking.json
index d35a9494..62de20b6 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/en/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/en/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Top validator examples",
 	"browseAllValidators": "Browse all validators",
 	"rewardsAvailable": "Rewards available: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Rewards available: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Rewards available: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Amount",
 	"max": "MAX",
 	"memoOptional": "Memo (optional)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/es/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/es/asset.json
index f1a12dce..37043f4b 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/es/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/es/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "Mostrar {{count}} tokens filtrados",
 	"hideFiltered_one": "Ocultar {{count}} token filtrado",
 	"hideFiltered_other": "Ocultar {{count}} tokens filtrados",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Spam sospechoso ({{count}})",
 	"markAsSafe": "Marcar como seguro",
 	"hideToken": "Ocultar token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/es/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/es/staking.json
index b9183653..3103d87e 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/es/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/es/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Ejemplos de validadores principales",
 	"browseAllValidators": "Explorar todos los validadores",
 	"rewardsAvailable": "Recompensas disponibles: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Recompensas disponibles: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Recompensas disponibles: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Cantidad",
 	"max": "MÁX",
 	"memoOptional": "Memo (opcional)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/fr/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/fr/asset.json
index 9a276100..d2ac4729 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/fr/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/fr/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "Afficher {{count}} jetons filtrés",
 	"hideFiltered_one": "Masquer {{count}} jeton filtré",
 	"hideFiltered_other": "Masquer {{count}} jetons filtrés",
-	"zeroValueTokens": "0,00 $ USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Spam suspecté ({{count}})",
 	"markAsSafe": "Marquer comme sûr",
 	"hideToken": "Masquer le jeton",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/fr/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/fr/staking.json
index 606100fe..f5904800 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/fr/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/fr/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Exemples de validateurs principaux",
 	"browseAllValidators": "Parcourir tous les validateurs",
 	"rewardsAvailable": "Récompenses disponibles : {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Récompenses disponibles : {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Récompenses disponibles : {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Montant",
 	"max": "MAX",
 	"memoOptional": "Mémo (facultatif)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/it/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/it/asset.json
index c64adeec..18ecce04 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/it/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/it/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "Mostra {{count}} token filtrati",
 	"hideFiltered_one": "Nascondi {{count}} token filtrato",
 	"hideFiltered_other": "Nascondi {{count}} token filtrati",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Sospetto spam ({{count}})",
 	"markAsSafe": "Segna come sicuro",
 	"hideToken": "Nascondi token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/it/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/it/staking.json
index 765487fe..28b838c7 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/it/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/it/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Esempi di validatori principali",
 	"browseAllValidators": "Sfoglia tutti i validatori",
 	"rewardsAvailable": "Ricompense disponibili: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Ricompense disponibili: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Ricompense disponibili: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Importo",
 	"max": "MAX",
 	"memoOptional": "Memo (facoltativo)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ja/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/ja/asset.json
index ca00ccae..1d6c1732 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ja/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ja/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "{{count}} 件のフィルタ済みトークンを表示",
 	"hideFiltered_one": "{{count}} 件のフィルタ済みトークンを非表示",
 	"hideFiltered_other": "{{count}} 件のフィルタ済みトークンを非表示",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "スパムの疑い ({{count}})",
 	"markAsSafe": "安全としてマーク",
 	"hideToken": "トークンを非表示",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ja/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/ja/staking.json
index ff6efe01..1440ef7a 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ja/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ja/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "トップバリデーターの例",
 	"browseAllValidators": "すべてのバリデーターを閲覧",
 	"rewardsAvailable": "利用可能な報酬: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "利用可能な報酬: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "利用可能な報酬: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "金額",
 	"max": "最大",
 	"memoOptional": "メモ（任意）",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ko/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/ko/asset.json
index 4f737e03..df719930 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ko/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ko/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "필터링된 토큰 {{count}}개 표시",
 	"hideFiltered_one": "필터링된 토큰 {{count}}개 숨기기",
 	"hideFiltered_other": "필터링된 토큰 {{count}}개 숨기기",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "스팸 의심 ({{count}})",
 	"markAsSafe": "안전으로 표시",
 	"hideToken": "토큰 숨기기",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ko/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/ko/staking.json
index 25596c18..89236355 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ko/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ko/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "상위 검증자 예시",
 	"browseAllValidators": "모든 검증자 탐색",
 	"rewardsAvailable": "사용 가능한 보상: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "사용 가능한 보상: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "사용 가능한 보상: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "금액",
 	"max": "최대",
 	"memoOptional": "메모 (선택사항)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/nl/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/nl/asset.json
index 590b97ae..1a6eab6c 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/nl/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/nl/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "Toon {{count}} gefilterde tokens",
 	"hideFiltered_one": "Verberg {{count}} gefilterde token",
 	"hideFiltered_other": "Verberg {{count}} gefilterde tokens",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Vermoedelijke spam ({{count}})",
 	"markAsSafe": "Markeer als veilig",
 	"hideToken": "Verberg token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pl/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/pl/asset.json
index e1f054f5..06764c0e 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pl/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pl/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "Pokaż {{count}} odfiltrowanych tokenów",
 	"hideFiltered_one": "Ukryj {{count}} odfiltrowany token",
 	"hideFiltered_other": "Ukryj {{count}} odfiltrowanych tokenów",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Podejrzany spam ({{count}})",
 	"markAsSafe": "Oznacz jako bezpieczny",
 	"hideToken": "Ukryj token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pt/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/pt/asset.json
index b71a8439..5410cc5a 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pt/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pt/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "Mostrar {{count}} tokens filtrados",
 	"hideFiltered_one": "Ocultar {{count}} token filtrado",
 	"hideFiltered_other": "Ocultar {{count}} tokens filtrados",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Spam suspeito ({{count}})",
 	"markAsSafe": "Marcar como seguro",
 	"hideToken": "Ocultar token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pt/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/pt/staking.json
index 156b51e5..d7a02740 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pt/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pt/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Exemplos de principais validadores",
 	"browseAllValidators": "Ver todos os validadores",
 	"rewardsAvailable": "Recompensas disponiveis: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Recompensas disponiveis: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Recompensas disponiveis: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Quantia",
 	"max": "MAX",
 	"memoOptional": "Memo (opcional)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ru/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/ru/asset.json
index 7159e30e..e3f7003e 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ru/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ru/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "Показать {{count}} отфильтрованных токенов",
 	"hideFiltered_one": "Скрыть {{count}} отфильтрованный токен",
 	"hideFiltered_other": "Скрыть {{count}} отфильтрованных токенов",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Подозрительный спам ({{count}})",
 	"markAsSafe": "Отметить как безопасный",
 	"hideToken": "Скрыть токен",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ru/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/ru/staking.json
index 1c43b362..28daa076 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ru/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ru/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "Примеры лучших валидаторов",
 	"browseAllValidators": "Просмотреть всех валидаторов",
 	"rewardsAvailable": "Доступные вознаграждения: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "Доступные вознаграждения: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "Доступные вознаграждения: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "Сумма",
 	"max": "МАКС",
 	"memoOptional": "Memo (необязательно)",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/th/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/th/asset.json
index f3507e4c..814f1d74 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/th/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/th/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "แสดง {{count}} โทเค็นที่ถูกกรอง",
 	"hideFiltered_one": "ซ่อน {{count}} โทเค็นที่ถูกกรอง",
 	"hideFiltered_other": "ซ่อน {{count}} โทเค็นที่ถูกกรอง",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "สงสัยว่าเป็นสแปม ({{count}})",
 	"markAsSafe": "ทำเครื่องหมายว่าปลอดภัย",
 	"hideToken": "ซ่อนโทเค็น",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/tr/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/tr/asset.json
index 7422d173..c06a5afb 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/tr/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/tr/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "{{count}} filtrelenmiş tokeni göster",
 	"hideFiltered_one": "{{count}} filtrelenmiş tokeni gizle",
 	"hideFiltered_other": "{{count}} filtrelenmiş tokeni gizle",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Şüpheli spam ({{count}})",
 	"markAsSafe": "Güvenli olarak işaretle",
 	"hideToken": "Tokeni gizle",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/vi/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/vi/asset.json
index cabb063b..75f927d0 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/vi/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/vi/asset.json
@@ -11,7 +11,7 @@
 	"showFiltered_other": "Hiện {{count}} token đã lọc",
 	"hideFiltered_one": "Ẩn {{count}} token đã lọc",
 	"hideFiltered_other": "Ẩn {{count}} token đã lọc",
-	"zeroValueTokens": "$0,00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "Nghi ngờ spam ({{count}})",
 	"markAsSafe": "Đánh dấu an toàn",
 	"hideToken": "Ẩn token",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/zh/asset.json b/projects/keepkey-vault/src/mainview/i18n/locales/zh/asset.json
index 85c128cf..f0e1e11f 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/zh/asset.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/zh/asset.json
@@ -10,7 +10,7 @@
 	"showFiltered_other": "显示 {{count}} 个已过滤代币",
 	"hideFiltered_one": "隐藏 {{count}} 个已过滤代币",
 	"hideFiltered_other": "隐藏 {{count}} 个已过滤代币",
-	"zeroValueTokens": "$0.00 USD ({{count}})",
+	"zeroValueTokens": "{{zeroValue}} ({{count}})",
 	"suspectedSpam": "疑似垃圾 ({{count}})",
 	"markAsSafe": "标记为安全",
 	"hideToken": "隐藏代币",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/zh/staking.json b/projects/keepkey-vault/src/mainview/i18n/locales/zh/staking.json
index 698ad8fb..c085d772 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/zh/staking.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/zh/staking.json
@@ -11,7 +11,7 @@
 	"topValidatorExamples": "顶级验证者示例",
 	"browseAllValidators": "浏览所有验证者",
 	"rewardsAvailable": "可用奖励: {{amount}} {{symbol}}",
-	"rewardsAvailableWithUsd": "可用奖励: {{amount}} {{symbol}} (~${{usd}})",
+	"rewardsAvailableWithUsd": "可用奖励: {{amount}} {{symbol}} (~{{fiatValue}})",
 	"amount": "金额",
 	"max": "最大",
 	"memoOptional": "备注（可选）",
diff --git a/projects/keepkey-vault/src/mainview/lib/formatting.ts b/projects/keepkey-vault/src/mainview/lib/formatting.ts
index 6c5411e6..4a2c37d7 100644
--- a/projects/keepkey-vault/src/mainview/lib/formatting.ts
+++ b/projects/keepkey-vault/src/mainview/lib/formatting.ts
@@ -1,5 +1,5 @@
-/** Format a crypto balance for display. */
-export function formatBalance(val: string): string {
+/** Format a crypto balance for display. Accepts an optional locale for number separators. */
+export function formatBalance(val: string, locale?: string): string {
 	const num = parseFloat(val)
 	if (isNaN(num) || num === 0) return '0'
 	const abs = Math.abs(num)
@@ -7,13 +7,5 @@ export function formatBalance(val: string): string {
 	if (abs < 0.000001) return num.toExponential(2)
 	if (abs < 1) return sign + abs.toFixed(6)
 	if (abs < 1000) return sign + abs.toFixed(4)
-	return sign + abs.toLocaleString(undefined, { maximumFractionDigits: 2 })
-}
-
-/** Format a USD value for display (e.g. "1,234.56"). Legacy — prefer useFiat().fmt() */
-export function formatUsd(value: number | string | null | undefined): string {
-	if (value === null || value === undefined) return '0.00'
-	const num = typeof value === 'string' ? parseFloat(value) : value
-	if (!isFinite(num)) return '0.00'
-	return num.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+	return sign + abs.toLocaleString(locale || 'en-US', { maximumFractionDigits: 2 })
 }