diff --git a/popup.html b/popup.html
index 12e34572..579a56e8 100644
--- a/popup.html
+++ b/popup.html
@@ -7,11 +7,6 @@
     <style>
       html,
       body {
-        width: 360px;
-        height: 600px;
-        max-height: 600px;
-        min-width: 360px;
-        min-height: 600px;
         margin: 0;
         overflow: hidden;
         font-family: "Space Grotesk", ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
diff --git a/src/components/dapp/dapp-approval-drawer.tsx b/src/components/dapp/dapp-approval-drawer.tsx
index 5696501b..5c4f9f7b 100644
--- a/src/components/dapp/dapp-approval-drawer.tsx
+++ b/src/components/dapp/dapp-approval-drawer.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useDrawerAutoFocus } from '@/hooks/use-drawer-auto-focus'
 import { useTranslation } from 'react-i18next'
 import { useLocation } from 'react-router-dom'
 import { ChevronDownIcon, ChevronUpIcon, GlobeIcon, Link2OffIcon, LinkIcon } from 'lucide-react'
@@ -26,7 +27,11 @@ import {
 import { getChromeApi } from '@/lib/dapp/chrome-api'
 import { PasswordInput } from '@/components/ui/password-input'
 import { formatIntegerLike, formatNumber, truncateString } from '@/lib/utils'
-import { NATIVE_TOKEN_SYMBOL } from '@/lib/config/constants'
+import {
+  DAPP_APPROVAL_QUERY_PARAM,
+  DAPP_APPROVAL_QUERY_VALUE,
+  NATIVE_TOKEN_SYMBOL,
+} from '@/lib/config/constants'
 import AddressLabel from '@/components/address-label'
 import { useTxTypeDescription } from '@/hooks/use-tx-type-description'
 import { isWalletLocked } from '@/lib/lock'
@@ -45,7 +50,8 @@ const DappApprovalDrawer = () => {
   const [locked, setLocked] = useState(() => isWalletLocked())
   const isDappApprovalPopup =
     window.location.pathname.endsWith('popup.html') &&
-    new URLSearchParams(window.location.search).get('dapp') === '1'
+    new URLSearchParams(window.location.search).get(DAPP_APPROVAL_QUERY_PARAM) ===
+      DAPP_APPROVAL_QUERY_VALUE
 
   const loadPendingRequests = useCallback(async () => {
     const next = await getDappPendingRequests()
@@ -108,6 +114,10 @@ const DappApprovalDrawer = () => {
         current.method === 'sendTransaction') &&
       accountSummary?.accountWatchOnly,
   )
+  const { ref: passphraseInputRef, onOpenAutoFocus: onPassphraseOpenAutoFocus } =
+    useDrawerAutoFocus<HTMLInputElement>({
+      enabled: requiresPassphrase && !isWatchOnlySigningRequest,
+    })
 
   const title = useMemo(() => {
     if (!current) return ''
@@ -163,13 +173,12 @@ const DappApprovalDrawer = () => {
       return
     }
 
-    const normalizedPassphrase = passphrase.trim()
     if (approved && requiresPassphrase) {
-      if (!normalizedPassphrase) {
+      if (!passphrase.trim()) {
         setError(t('passphraseAuth.validation.required'))
         return
       }
-      const validation = await validateVaultPassphrase(normalizedPassphrase)
+      const validation = await validateVaultPassphrase(passphrase)
       if (!validation.valid) {
         setError(
           validation.reason === 'invalid'
@@ -194,7 +203,7 @@ const DappApprovalDrawer = () => {
             payload: {
               id: current.id,
               approved,
-              passphrase: approved && requiresPassphrase ? normalizedPassphrase : undefined,
+              passphrase: approved && requiresPassphrase ? passphrase : undefined,
             },
           },
           (response?: { ok?: boolean; executed?: boolean; targetTick?: number }) => {
@@ -246,6 +255,7 @@ const DappApprovalDrawer = () => {
       }}
     >
       <DrawerContent
+        onOpenAutoFocus={onPassphraseOpenAutoFocus}
         className={
           isDappApprovalPopup
             ? 'inset-0 h-full max-h-none overflow-hidden rounded-none border-none bg-background data-[vaul-drawer-direction=bottom]:mt-0 data-[vaul-drawer-direction=bottom]:max-h-none data-[vaul-drawer-direction=bottom]:rounded-none data-[vaul-drawer-direction=bottom]:border-none'
@@ -387,6 +397,7 @@ const DappApprovalDrawer = () => {
             )}
             {requiresPassphrase && !isWatchOnlySigningRequest && (
               <PasswordInput
+                ref={passphraseInputRef}
                 id="dapp-passphrase"
                 groupClassName="h-12"
                 placeholder={t('passphraseAuth.form.passphrasePlaceholder')}
diff --git a/src/components/icons/key-vertical-icon.tsx b/src/components/icons/key-vertical-icon.tsx
new file mode 100644
index 00000000..ca545f27
--- /dev/null
+++ b/src/components/icons/key-vertical-icon.tsx
@@ -0,0 +1,15 @@
+const KeyVerticalIcon = (props: React.SVGProps<SVGSVGElement>) => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 -960 960 960"
+    fill="currentColor"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-hidden="true"
+    {...props}
+  >
+    <path d="M420-680q0-33 23.5-56.5T500-760q33 0 56.5 23.5T580-680q0 33-23.5 56.5T500-600q-33 0-56.5-23.5T420-680ZM500 0 320-180l60-80-60-80 60-85v-47q-54-32-87-86.5T260-680q0-100 70-170t170-70q100 0 170 70t70 170q0 67-33 121.5T620-472v352L500 0ZM340-680q0 56 34 98.5t86 56.5v125l-41 58 61 82-55 71 75 75 40-40v-371q52-14 86-56.5t34-98.5q0-66-47-113t-113-47q-66 0-113 47t-47 113Z" />
+  </svg>
+)
+
+export { KeyVerticalIcon }
diff --git a/src/components/pages/manage-accounts/account-list-item.tsx b/src/components/pages/manage-accounts/account-list-item.tsx
index 01198d90..a6ce6e87 100644
--- a/src/components/pages/manage-accounts/account-list-item.tsx
+++ b/src/components/pages/manage-accounts/account-list-item.tsx
@@ -4,10 +4,10 @@ import {
   GripVerticalIcon,
   MoreHorizontalIcon,
   PencilIcon,
-  ShieldCheckIcon,
   TrashIcon,
 } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
+import { KeyVerticalIcon } from '@/components/icons/key-vertical-icon'
 import { Button } from '@/components/ui/button'
 import {
   DropdownMenu,
@@ -71,16 +71,18 @@ const AccountListItem = ({
         }
       }}
       aria-label={`${t('accounts.manage.menu')} ${account.name}`}
-      className={`flex w-full items-center justify-between gap-2 rounded-lg border border-border/60 bg-card/80 px-3 py-2 ${
+      className={`flex w-full items-center justify-between gap-2 rounded-lg border border-border/60 bg-card/80 pl-2 pr-3 py-2 ${
         isOver ? 'ring-2 ring-primary/40' : ''
       } ${isDragging ? 'opacity-60' : ''}`}
     >
-      <div className="flex min-w-0 items-center gap-2">
-        <div className="min-w-0">
-          <div className="flex min-w-0 items-center gap-2">
-            <span className="min-w-0 flex-1 truncate text-sm font-semibold text-foreground">
+      <div className="min-w-0 flex-1">
+        <div className="flex min-w-0 items-start justify-between gap-2">
+          <div className="min-w-0">
+            <span className="block truncate text-sm font-semibold text-foreground">
               {account.name}
             </span>
+          </div>
+          <div className="flex shrink-0 items-center gap-2">
             {account.watchOnly && (
               <span className="inline-flex shrink-0 items-center gap-1 rounded-full border border-amber-500/30 bg-amber-500/10 px-1.5 py-0.5 text-[10px] text-amber-700 dark:text-amber-200">
                 <EyeIcon className="h-2.5 w-2.5" />
@@ -93,18 +95,18 @@ const AccountListItem = ({
               </span>
             )}
           </div>
-          <div className="flex items-center gap-2 text-xs text-muted-foreground">
-            <span className="truncate">
-              {truncateString(account.identity, { leading: 5, trailing: 5 })}
-            </span>
-            <span className="text-[11px] font-semibold text-foreground">
-              {isVisible
-                ? balance !== undefined
-                  ? formatBalanceCompact(balance)
-                  : '--'
-                : HIDDEN_BALANCE}
-            </span>
-          </div>
+        </div>
+        <div className="flex items-center justify-between gap-2 text-xs text-muted-foreground">
+          <span className="truncate">
+            {truncateString(account.identity, { leading: 5, trailing: 5 })}
+          </span>
+          <span className="text-[11px] font-semibold text-foreground">
+            {isVisible
+              ? balance !== undefined
+                ? formatBalanceCompact(balance)
+                : '--'
+              : HIDDEN_BALANCE}
+          </span>
         </div>
       </div>
       <div className="flex items-center gap-1">
@@ -128,7 +130,7 @@ const AccountListItem = ({
             </DropdownMenuItem>
             {!account.watchOnly && (
               <DropdownMenuItem onClick={() => onReveal(account)}>
-                <ShieldCheckIcon className="h-4 w-4" />
+                <KeyVerticalIcon className="h-4 w-4" />
                 {t('accounts.manage.reveal')}
               </DropdownMenuItem>
             )}
diff --git a/src/components/pages/manage-accounts/passphrase-prompt-drawer.tsx b/src/components/pages/manage-accounts/passphrase-prompt-drawer.tsx
index 12eb4155..54408f45 100644
--- a/src/components/pages/manage-accounts/passphrase-prompt-drawer.tsx
+++ b/src/components/pages/manage-accounts/passphrase-prompt-drawer.tsx
@@ -1,6 +1,7 @@
 import { CheckIcon } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { Button } from '@/components/ui/button'
+import { useDrawerAutoFocus } from '@/hooks/use-drawer-auto-focus'
 import {
   Drawer,
   DrawerContent,
@@ -8,7 +9,7 @@ import {
   DrawerHeader,
   DrawerTitle,
 } from '@/components/ui/drawer'
-import { Input } from '@/components/ui/input'
+import { PasswordInput } from '@/components/ui/password-input'
 import { Label } from '@/components/ui/label'
 
 type PassphrasePromptDrawerProps = {
@@ -29,18 +30,19 @@ const PassphrasePromptDrawer = ({
   onSubmit,
 }: PassphrasePromptDrawerProps) => {
   const { t } = useTranslation()
+  const { ref: inputRef, onOpenAutoFocus } = useDrawerAutoFocus<HTMLInputElement>()
 
   return (
     <Drawer open={open} onOpenChange={onOpenChange}>
-      <DrawerContent>
+      <DrawerContent onOpenAutoFocus={onOpenAutoFocus}>
         <DrawerHeader>
           <DrawerTitle>{t('accounts.manage.passphraseTitle')}</DrawerTitle>
         </DrawerHeader>
         <div className="space-y-2 px-4">
           <Label htmlFor="vault-passphrase">{t('accounts.manage.passphrase')}</Label>
-          <Input
+          <PasswordInput
+            ref={inputRef}
             id="vault-passphrase"
-            type="password"
             value={passphrase}
             onChange={(event) => onPassphraseChange(event.target.value)}
           />
diff --git a/src/components/pages/manage-accounts/rename-account-drawer.tsx b/src/components/pages/manage-accounts/rename-account-drawer.tsx
index 09fd3cc5..d134098e 100644
--- a/src/components/pages/manage-accounts/rename-account-drawer.tsx
+++ b/src/components/pages/manage-accounts/rename-account-drawer.tsx
@@ -1,6 +1,7 @@
 import { CheckIcon } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { Button } from '@/components/ui/button'
+import { useDrawerAutoFocus } from '@/hooks/use-drawer-auto-focus'
 import {
   Drawer,
   DrawerContent,
@@ -33,16 +34,18 @@ const RenameAccountDrawer = ({
   onSubmit,
 }: RenameAccountDrawerProps) => {
   const { t } = useTranslation()
+  const { ref: inputRef, onOpenAutoFocus } = useDrawerAutoFocus<HTMLInputElement>()
 
   return (
     <Drawer open={open} onOpenChange={onOpenChange}>
-      <DrawerContent>
+      <DrawerContent onOpenAutoFocus={onOpenAutoFocus}>
         <DrawerHeader>
           <DrawerTitle>{t('accounts.manage.renameTitle')}</DrawerTitle>
         </DrawerHeader>
         <div className="space-y-2 px-4">
           <Label htmlFor="rename-input">{t('accounts.manage.renameLabel')}</Label>
           <Input
+            ref={inputRef}
             id="rename-input"
             value={value}
             onChange={(event) => onValueChange(event.target.value)}
diff --git a/src/components/ui/input-group.tsx b/src/components/ui/input-group.tsx
index a9666b69..e5f7b37c 100644
--- a/src/components/ui/input-group.tsx
+++ b/src/components/ui/input-group.tsx
@@ -12,12 +12,12 @@ function InputGroup({ className, ...props }: React.ComponentProps<'div'>) {
       data-slot="input-group"
       role="group"
       className={cn(
-        'group/input-group border-input bg-muted/30 relative flex w-full items-center rounded-md border shadow-xs transition-[color,box-shadow] outline-none',
-        'h-9 min-w-0 has-[>textarea]:h-auto',
+        'group/input-group border-input bg-muted/50 dark:bg-white/[0.04] dark:border-white/20 relative flex w-full items-center rounded-md border shadow-xs transition-[color,box-shadow] outline-none',
+        'h-12 min-w-0 has-[>textarea]:h-auto',
 
         // Variants based on alignment.
-        'has-[>[data-align=inline-start]]:[&>input]:pl-2',
-        'has-[>[data-align=inline-end]]:[&>input]:pr-2',
+        'has-[>[data-align=inline-start]]:[&>input]:pl-3',
+        'has-[>[data-align=inline-end]]:[&>input]:pr-3',
         'has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>[data-align=block-start]]:[&>input]:pb-3',
         'has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-end]]:[&>input]:pt-3',
 
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index d0a55dd9..01822e4a 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
       type={type}
       data-slot="input"
       className={cn(
-        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground border-input h-12 w-full min-w-0 rounded-md border bg-muted/30 px-3 py-2 text-base shadow-sm transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground border-input bg-muted/50 dark:bg-white/[0.04] dark:border-white/20 h-12 w-full min-w-0 rounded-md border px-3 py-2 text-base shadow-sm transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
         'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
         'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
         className,
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index c8d94930..b6bee1d0 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -31,7 +31,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex w-fit items-center justify-between gap-2 rounded-md border bg-muted/30 px-3 py-2 text-sm whitespace-nowrap shadow-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-12 data-[size=sm]:h-10 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "border-input bg-muted/50 dark:bg-white/[0.04] dark:border-white/20 data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex w-fit items-center justify-between gap-2 rounded-md border px-3 py-2 text-sm whitespace-nowrap shadow-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-12 data-[size=sm]:h-10 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className,
       )}
       {...props}
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index 6d39ce7e..d6a4d44f 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -7,7 +7,7 @@ function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
     <textarea
       data-slot="textarea"
       className={cn(
-        'border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex field-sizing-content min-h-16 w-full rounded-md border bg-muted/30 px-3 py-2 text-base shadow-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        'border-input bg-muted/50 dark:bg-white/[0.04] dark:border-white/20 placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive flex field-sizing-content min-h-16 w-full rounded-md border px-3 py-2 text-base shadow-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
         className,
       )}
       {...props}
diff --git a/src/hooks/use-drawer-auto-focus.ts b/src/hooks/use-drawer-auto-focus.ts
new file mode 100644
index 00000000..678ce2da
--- /dev/null
+++ b/src/hooks/use-drawer-auto-focus.ts
@@ -0,0 +1,16 @@
+import { useRef } from 'react'
+
+type Options = { enabled?: boolean }
+
+export const useDrawerAutoFocus = <T extends HTMLElement>(options: Options = {}) => {
+  const ref = useRef<T>(null)
+  const enabled = options.enabled ?? true
+
+  const onOpenAutoFocus = (event: Event) => {
+    if (!enabled) return
+    event.preventDefault()
+    ref.current?.focus()
+  }
+
+  return { ref, onOpenAutoFocus }
+}
diff --git a/src/lib/config/constants.ts b/src/lib/config/constants.ts
index a6adc4bb..471e80b2 100644
--- a/src/lib/config/constants.ts
+++ b/src/lib/config/constants.ts
@@ -5,3 +5,11 @@ export const NATIVE_TOKEN_SYMBOL = 'QU'
 export const NATIVE_TOKEN_NAME = 'QUBIC'
 export const EMPTY_ADDRESS = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFXIB'
 export const QX_CONTRACT_INDEX = 1
+
+export const TOOLBAR_POPUP_WIDTH_PX = 360
+export const TOOLBAR_POPUP_HEIGHT_PX = 600
+export const DAPP_APPROVAL_POPUP_WIDTH_PX = 420
+export const DAPP_APPROVAL_POPUP_HEIGHT_PX = 720
+
+export const DAPP_APPROVAL_QUERY_PARAM = 'dapp'
+export const DAPP_APPROVAL_QUERY_VALUE = '1'
diff --git a/src/lib/dapp/controller.ts b/src/lib/dapp/controller.ts
index 82ff77f5..3638ded2 100644
--- a/src/lib/dapp/controller.ts
+++ b/src/lib/dapp/controller.ts
@@ -48,14 +48,18 @@ import {
   signMessageFromSeed,
   signTransactionFromSeed,
 } from '@/lib/dapp/signing'
-import { QUBIC_RPC_BASE_URL } from '@/lib/config/constants'
+import {
+  DAPP_APPROVAL_POPUP_HEIGHT_PX,
+  DAPP_APPROVAL_POPUP_WIDTH_PX,
+  DAPP_APPROVAL_QUERY_PARAM,
+  DAPP_APPROVAL_QUERY_VALUE,
+  QUBIC_RPC_BASE_URL,
+} from '@/lib/config/constants'
 import { upsertPendingTransactionInChromeStorage } from '@/lib/pending-transactions-storage'
 import { normalizeBalance } from '@/lib/utils'
 import { openBrowserVault, verifyVaultAccess } from '@/lib/vault'
 
 const sdk = createSdk({ baseUrl: QUBIC_RPC_BASE_URL })
-const DAPP_APPROVAL_WINDOW_WIDTH = 380
-const DAPP_APPROVAL_WINDOW_HEIGHT = 600
 const processingApprovalDecisionIds = new Set<string>()
 
 type DappSendTransactionParams = {
@@ -120,14 +124,16 @@ const hasOpenSidePanel = async () => {
 const ensureApprovalWindow = async () => {
   if (await hasOpenSidePanel()) return
 
-  const popupUrl = chrome.runtime.getURL('popup.html?dapp=1')
+  const popupUrl = chrome.runtime.getURL(
+    `popup.html?${DAPP_APPROVAL_QUERY_PARAM}=${DAPP_APPROVAL_QUERY_VALUE}`,
+  )
   try {
     await chrome.windows.create({
       url: popupUrl,
       type: 'popup',
       focused: true,
-      width: DAPP_APPROVAL_WINDOW_WIDTH,
-      height: DAPP_APPROVAL_WINDOW_HEIGHT,
+      width: DAPP_APPROVAL_POPUP_WIDTH_PX,
+      height: DAPP_APPROVAL_POPUP_HEIGHT_PX,
     })
   } catch {
     throw new DappProviderError(
@@ -424,8 +430,8 @@ const executeApprovedRequest = async (
       if (!decision.approved) {
         return asDappFailure(request.id, 'USER_REJECTED', 'Request was rejected by user')
       }
-      const passphrase = decision.passphrase?.trim()
-      if (!passphrase) {
+      const passphrase = decision.passphrase
+      if (!passphrase || !passphrase.trim()) {
         return asDappFailure(request.id, 'INVALID_PASSPHRASE', 'Passphrase is required')
       }
       const permissions = await getDappPermissions()
diff --git a/src/lib/lock.ts b/src/lib/lock.ts
index f9de55ac..de25f4f3 100644
--- a/src/lib/lock.ts
+++ b/src/lib/lock.ts
@@ -8,6 +8,7 @@ const MIN_LOCK_TIMEOUT_MINUTES = 0
 const MAX_LOCK_TIMEOUT_MINUTES = 120
 const ACTIVITY_TOUCH_THROTTLE_MS = 1_000
 let lastActivityTouchAt = 0
+let sessionUnlockedMemory = false
 
 type ChromeStorageSession = {
   get: (keys: string[], callback: (items: Record<string, unknown>) => void) => void
@@ -28,6 +29,7 @@ const getChromeSessionStorage = (): ChromeStorageSession | null => {
 }
 
 const setSessionUnlockedFlag = (value: boolean) => {
+  sessionUnlockedMemory = value
   const sessionStorage = getChromeSessionStorage()
   if (!sessionStorage) return
 
@@ -155,6 +157,8 @@ const normalizeLockTimeoutOption = (minutes: number) => {
 }
 
 const readSessionUnlockedFlag = async () => {
+  if (sessionUnlockedMemory) return true
+
   const sessionStorage = getChromeSessionStorage()
   if (!sessionStorage) return true
 
diff --git a/src/lib/passphrase.ts b/src/lib/passphrase.ts
new file mode 100644
index 00000000..9a06dfc5
--- /dev/null
+++ b/src/lib/passphrase.ts
@@ -0,0 +1,18 @@
+const MIN_PASSPHRASE_LENGTH = 12
+
+export type PassphraseStrengthResult =
+  | { valid: true }
+  | { valid: false; reason: 'required' | 'tooShort' }
+
+export const validatePassphraseStrength = (
+  passphrase: string,
+  options: { requireMinLength?: boolean } = {},
+): PassphraseStrengthResult => {
+  const trimmed = passphrase.trim()
+  if (!trimmed) return { valid: false, reason: 'required' }
+  const requireMinLength = options.requireMinLength ?? true
+  if (requireMinLength && trimmed.length < MIN_PASSPHRASE_LENGTH) {
+    return { valid: false, reason: 'tooShort' }
+  }
+  return { valid: true }
+}
diff --git a/src/lib/vault-password.ts b/src/lib/vault-password.ts
index 092ad992..7f5c99f0 100644
--- a/src/lib/vault-password.ts
+++ b/src/lib/vault-password.ts
@@ -4,9 +4,7 @@ export const changeVaultPassphrase = async (
   currentPassphrase: string,
   newPassphrase: string,
 ): Promise<void> => {
-  const trimmedCurrent = currentPassphrase.trim()
-  const trimmedNew = newPassphrase.trim()
-  const vault = await openBrowserVault(trimmedCurrent, false)
-  await vault.rotatePassphrase(trimmedNew)
+  const vault = await openBrowserVault(currentPassphrase, false)
+  await vault.rotatePassphrase(newPassphrase)
   await vault.save()
 }
diff --git a/src/locales/de.json b/src/locales/de.json
index 0f65d334..94908709 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Entsperren und sichern",
-        "subtitle": "Lege ein neues Passwort für dieses Gerät fest und gib bei Bedarf das Quell-Passwort ein.",
-        "newPassphrase": "Neues Tresor-Passwort",
-        "sourcePassphrase": "Quell-Tresor-Passwort"
-      },
-      "review": {
-        "title": "Import überprüfen",
-        "subtitle": "Bestätige die Datei- und Passwort-Details vor dem Import.",
-        "vaultFile": "Tresor-Datei",
-        "notSelected": "Nicht ausgewählt",
-        "sourcePassphraseProvided": "Angegeben",
-        "sourcePassphraseSame": "Gleich wie neue",
-        "sourcePassphraseLabel": "Quell-Passwort",
+        "subtitle": "Lege ein Passwort für dieses Gerät fest.",
+        "newPassphrase": "Tresor-Passwort",
         "addMoreLater": "Du kannst später weitere Konten unter Konten verwalten hinzufügen."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "Die ausgewählte Datei ist zu groß für eine gültige Tresor-Datei.",
         "selectFile": "Wähle eine Tresor-Datei aus.",
         "passphraseRequired": "Passwort ist erforderlich.",
-        "importFailed": "Web-Wallet-Tresor konnte nicht importiert werden.",
+        "invalidSourcePassphrase": "Ungültiges Quell-Tresor-Passwort.",
         "noEntries": "Tresor importiert, aber keine Einträge gefunden.",
-        "generic": "Tresor konnte nicht importiert werden."
+        "generic": "Tresor konnte nicht importiert werden.",
+        "invalidFileOrPassphrase": "Die ausgewählte Datei ist keine Qubic-Tresor-Datei oder das Passwort ist falsch."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/en.json b/src/locales/en.json
index b7681b47..be160e0f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Unlock and secure",
-        "subtitle": "Provide a new password for this device and, if needed, the source password.",
-        "newPassphrase": "New vault password",
-        "sourcePassphrase": "Source vault password"
-      },
-      "review": {
-        "title": "Review import",
-        "subtitle": "Confirm the file and password details before importing.",
-        "vaultFile": "Vault file",
-        "notSelected": "Not selected",
-        "sourcePassphraseProvided": "Provided",
-        "sourcePassphraseSame": "Same as new",
-        "sourcePassphraseLabel": "Source password",
+        "subtitle": "Enter the password for this vault file. You'll use the same password to unlock the wallet on this device.",
+        "newPassphrase": "Vault password",
         "addMoreLater": "You can add more accounts later in Manage Accounts."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "The selected file is too large to be a valid vault file.",
         "selectFile": "Select a vault file.",
         "passphraseRequired": "Password is required.",
-        "importFailed": "Failed to import web wallet vault.",
+        "invalidSourcePassphrase": "Invalid source vault password.",
         "noEntries": "Vault imported but no entries were found.",
-        "generic": "Failed to import vault."
+        "generic": "Failed to import vault.",
+        "invalidFileOrPassphrase": "Selected file is not a Qubic vault file or password is incorrect."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/es.json b/src/locales/es.json
index e541e9e0..2943b037 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Desbloquear y asegurar",
-        "subtitle": "Proporciona una nueva contraseña para este dispositivo y, si es necesario, la contraseña de origen.",
-        "newPassphrase": "Nueva contraseña del vault",
-        "sourcePassphrase": "Contraseña del vault de origen"
-      },
-      "review": {
-        "title": "Revisar importación",
-        "subtitle": "Confirma los detalles del archivo y la contraseña antes de importar.",
-        "vaultFile": "Archivo vault",
-        "notSelected": "No seleccionado",
-        "sourcePassphraseProvided": "Proporcionada",
-        "sourcePassphraseSame": "Igual que la nueva",
-        "sourcePassphraseLabel": "Contraseña de origen",
+        "subtitle": "Ingresa la contraseña de este archivo de vault. Usarás la misma contraseña para desbloquear la billetera en este dispositivo.",
+        "newPassphrase": "Contraseña del vault",
         "addMoreLater": "Puedes agregar más cuentas luego en Administrar Cuentas."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "El archivo seleccionado es demasiado grande para ser un vault válido.",
         "selectFile": "Selecciona un archivo vault.",
         "passphraseRequired": "Se requiere contraseña.",
-        "importFailed": "No se pudo importar el vault de la billetera web.",
+        "invalidSourcePassphrase": "Contraseña del vault de origen inválida.",
         "noEntries": "Vault importado pero no se encontraron entradas.",
-        "generic": "No se pudo importar el vault."
+        "generic": "No se pudo importar el vault.",
+        "invalidFileOrPassphrase": "El archivo seleccionado no es un archivo Qubic vault o la contraseña es incorrecta."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/fr.json b/src/locales/fr.json
index cb37d9b5..511f9d5d 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Déverrouiller et sécuriser",
-        "subtitle": "Définissez un nouveau mot de passe pour cet appareil et, si nécessaire, le mot de passe source.",
-        "newPassphrase": "Nouveau mot de passe du vault",
-        "sourcePassphrase": "Mot de passe du vault source"
-      },
-      "review": {
-        "title": "Vérifier l'importation",
-        "subtitle": "Confirmez le fichier et les détails du mot de passe avant d'importer.",
-        "vaultFile": "Fichier vault",
-        "notSelected": "Non sélectionné",
-        "sourcePassphraseProvided": "Fourni",
-        "sourcePassphraseSame": "Identique au nouveau",
-        "sourcePassphraseLabel": "Mot de passe source",
+        "subtitle": "Définissez un mot de passe pour cet appareil.",
+        "newPassphrase": "Mot de passe du vault",
         "addMoreLater": "Vous pourrez ajouter d'autres comptes plus tard dans Gérer les comptes."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "Le fichier sélectionné est trop volumineux pour être un fichier vault valide.",
         "selectFile": "Sélectionnez un fichier vault.",
         "passphraseRequired": "Le mot de passe est requis.",
-        "importFailed": "Échec de l'importation du vault du portefeuille web.",
+        "invalidSourcePassphrase": "Mot de passe du vault source invalide.",
         "noEntries": "Vault importé mais aucune entrée trouvée.",
-        "generic": "Échec de l'importation du vault."
+        "generic": "Échec de l'importation du vault.",
+        "invalidFileOrPassphrase": "Le fichier sélectionné n'est pas un fichier Qubic vault ou le mot de passe est incorrect."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 2b0b8227..0a7d59d2 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Разблокировка и защита",
-        "subtitle": "Задайте новый пароль для этого устройства и, при необходимости, пароль исходного vault.",
-        "newPassphrase": "Новый пароль vault",
-        "sourcePassphrase": "Пароль исходного vault"
-      },
-      "review": {
-        "title": "Проверка импорта",
-        "subtitle": "Подтвердите файл и пароль перед импортом.",
-        "vaultFile": "Файл vault",
-        "notSelected": "Не выбран",
-        "sourcePassphraseProvided": "Указан",
-        "sourcePassphraseSame": "Совпадает с новым",
-        "sourcePassphraseLabel": "Пароль источника",
+        "subtitle": "Задайте пароль для этого устройства.",
+        "newPassphrase": "Пароль vault",
         "addMoreLater": "Вы можете добавить больше аккаунтов позже в разделе Управление аккаунтами."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "Выбранный файл слишком большой для допустимого файла vault.",
         "selectFile": "Выберите файл vault.",
         "passphraseRequired": "Необходимо ввести пароль.",
-        "importFailed": "Не удалось импортировать vault веб-кошелька.",
+        "invalidSourcePassphrase": "Неверный пароль исходного vault.",
         "noEntries": "Vault импортирован, но записи не найдены.",
-        "generic": "Не удалось импортировать vault."
+        "generic": "Не удалось импортировать vault.",
+        "invalidFileOrPassphrase": "Выбранный файл не является файлом Qubic vault или пароль введён неверно."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/tr.json b/src/locales/tr.json
index b86bdaf8..0be09439 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Kilidi aç ve güvence altına al",
-        "subtitle": "Bu cihaz için yeni bir parola belirleyin ve gerekirse kaynak parolayı girin.",
-        "newPassphrase": "Yeni vault parolası",
-        "sourcePassphrase": "Kaynak vault parolası"
-      },
-      "review": {
-        "title": "İçe aktarmayı gözden geçir",
-        "subtitle": "İçe aktarmadan önce dosya ve parola detaylarını doğrulayın.",
-        "vaultFile": "Vault dosyası",
-        "notSelected": "Seçilmedi",
-        "sourcePassphraseProvided": "Girildi",
-        "sourcePassphraseSame": "Yenisi ile aynı",
-        "sourcePassphraseLabel": "Kaynak parolası",
+        "subtitle": "Bu cihaz için bir parola belirleyin.",
+        "newPassphrase": "Vault parolası",
         "addMoreLater": "Daha sonra Hesapları Yönet bölümünden daha fazla hesap ekleyebilirsiniz."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "Seçilen dosya geçerli bir vault dosyası için çok büyük.",
         "selectFile": "Bir vault dosyası seçin.",
         "passphraseRequired": "Parola gereklidir.",
-        "importFailed": "Web cüzdanı vault dosyası içe aktarılamadı.",
+        "invalidSourcePassphrase": "Kaynak vault parolası geçersiz.",
         "noEntries": "Vault içe aktarıldı ancak hiçbir giriş bulunamadı.",
-        "generic": "Vault içe aktarılamadı."
+        "generic": "Vault içe aktarılamadı.",
+        "invalidFileOrPassphrase": "Seçilen dosya bir Qubic vault dosyası değil veya parola yanlış."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/vi.json b/src/locales/vi.json
index 98cecac0..da78d457 100644
--- a/src/locales/vi.json
+++ b/src/locales/vi.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "Mở khóa và bảo mật",
-        "subtitle": "Cung cấp mật khẩu mới cho thiết bị này và mật khẩu nguồn nếu cần.",
-        "newPassphrase": "Mật khẩu vault mới",
-        "sourcePassphrase": "Mật khẩu vault nguồn"
-      },
-      "review": {
-        "title": "Xem lại nhập",
-        "subtitle": "Xác nhận chi tiết tập tin và mật khẩu trước khi nhập.",
-        "vaultFile": "Tập tin vault",
-        "notSelected": "Chưa chọn",
-        "sourcePassphraseProvided": "Đã cung cấp",
-        "sourcePassphraseSame": "Giống mật khẩu mới",
-        "sourcePassphraseLabel": "Mật khẩu nguồn",
+        "subtitle": "Cung cấp mật khẩu cho thiết bị này.",
+        "newPassphrase": "Mật khẩu vault",
         "addMoreLater": "Bạn có thể thêm tài khoản sau trong Quản lý tài khoản."
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "Tập tin đã chọn quá lớn để là tập tin vault hợp lệ.",
         "selectFile": "Chọn một tập tin vault.",
         "passphraseRequired": "Yêu cầu mật khẩu.",
-        "importFailed": "Không thể nhập vault từ ví web.",
+        "invalidSourcePassphrase": "Mật khẩu vault nguồn không hợp lệ.",
         "noEntries": "Đã nhập vault nhưng không tìm thấy mục nào.",
-        "generic": "Không thể nhập vault."
+        "generic": "Không thể nhập vault.",
+        "invalidFileOrPassphrase": "Tập tin đã chọn không phải là tập tin Qubic vault hoặc mật khẩu không chính xác."
       }
     },
     "seedSecurity": {
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 47e9b99b..615d1796 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -573,18 +573,8 @@
       },
       "unlockSecure": {
         "title": "解锁并设置安全",
-        "subtitle": "为此设备设置新密码，如需要，请提供来源 vault 密码。",
-        "newPassphrase": "新 vault 密码",
-        "sourcePassphrase": "来源 vault 密码"
-      },
-      "review": {
-        "title": "审核导入",
-        "subtitle": "导入前请确认文件和密码信息。",
-        "vaultFile": "vault 文件",
-        "notSelected": "未选择",
-        "sourcePassphraseProvided": "已提供",
-        "sourcePassphraseSame": "与新密码相同",
-        "sourcePassphraseLabel": "来源密码",
+        "subtitle": "为此设备设置密码。",
+        "newPassphrase": "Vault 密码",
         "addMoreLater": "您可以稍后在「管理账户」中添加更多账户。"
       },
       "actions": {
@@ -595,9 +585,10 @@
         "fileTooLarge": "所选文件过大，不是有效的 vault 文件。",
         "selectFile": "请选择 vault 文件。",
         "passphraseRequired": "请输入密码。",
-        "importFailed": "导入网页钱包 vault 失败。",
+        "invalidSourcePassphrase": "来源 vault 密码无效。",
         "noEntries": "vault 已导入但未找到任何条目。",
-        "generic": "导入 vault 失败。"
+        "generic": "导入 vault 失败。",
+        "invalidFileOrPassphrase": "选择的文件不是 Qubic vault 文件，或者密码不正确。"
       }
     },
     "seedSecurity": {
diff --git a/src/main.tsx b/src/main.tsx
index 63073c96..0c4866b5 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -7,6 +7,14 @@ import { startActionIconThemeSync } from './lib/extension-icons'
 import { startDappSidepanelPresenceHeartbeat } from './lib/dapp/sidepanel-presence'
 import { startDappSessionSync } from './lib/dapp/session-sync'
 import { syncVaultStorageMirror } from './lib/vault'
+import {
+  DAPP_APPROVAL_POPUP_HEIGHT_PX,
+  DAPP_APPROVAL_POPUP_WIDTH_PX,
+  DAPP_APPROVAL_QUERY_PARAM,
+  DAPP_APPROVAL_QUERY_VALUE,
+  TOOLBAR_POPUP_HEIGHT_PX,
+  TOOLBAR_POPUP_WIDTH_PX,
+} from './lib/config/constants'
 
 const applyViewportSizing = () => {
   const html = document.documentElement
@@ -15,30 +23,39 @@ const applyViewportSizing = () => {
   const pathname = window.location.pathname
   const isPopup = pathname.endsWith('popup.html')
   const isSidepanel = pathname.endsWith('sidepanel.html')
+  const isDappApproval =
+    isPopup &&
+    new URLSearchParams(window.location.search).get(DAPP_APPROVAL_QUERY_PARAM) ===
+      DAPP_APPROVAL_QUERY_VALUE
 
   body.dataset.view = isPopup ? 'popup' : isSidepanel ? 'sidepanel' : 'other'
 
   if (isPopup) {
-    html.style.width = '360px'
-    html.style.height = '600px'
-    html.style.maxHeight = '600px'
-    html.style.minWidth = '360px'
-    html.style.minHeight = '600px'
+    const width = isDappApproval ? DAPP_APPROVAL_POPUP_WIDTH_PX : TOOLBAR_POPUP_WIDTH_PX
+    const height = isDappApproval ? DAPP_APPROVAL_POPUP_HEIGHT_PX : TOOLBAR_POPUP_HEIGHT_PX
+    const widthPx = `${width}px`
+    const heightPx = `${height}px`
+
+    html.style.width = widthPx
+    html.style.height = heightPx
+    html.style.maxHeight = heightPx
+    html.style.minWidth = widthPx
+    html.style.minHeight = heightPx
     html.style.overflow = 'hidden'
 
-    body.style.width = '360px'
-    body.style.height = '600px'
-    body.style.maxHeight = '600px'
-    body.style.minWidth = '360px'
-    body.style.minHeight = '600px'
+    body.style.width = widthPx
+    body.style.height = heightPx
+    body.style.maxHeight = heightPx
+    body.style.minWidth = widthPx
+    body.style.minHeight = heightPx
     body.style.margin = '0'
     body.style.overflow = 'hidden'
 
     if (root) {
-      root.style.width = '360px'
-      root.style.height = '600px'
-      root.style.maxHeight = '600px'
-      root.style.minHeight = '600px'
+      root.style.width = widthPx
+      root.style.height = heightPx
+      root.style.maxHeight = heightPx
+      root.style.minHeight = heightPx
       root.style.overflow = 'hidden'
     }
     return
diff --git a/src/pages/manage-accounts.tsx b/src/pages/manage-accounts.tsx
index 28a85446..823c6ba1 100644
--- a/src/pages/manage-accounts.tsx
+++ b/src/pages/manage-accounts.tsx
@@ -336,9 +336,8 @@ const ManageAccounts = () => {
       setPassphraseError(t('accounts.manage.errors.passphraseRequired'))
       return
     }
-    const passphrase = passphraseInput.trim()
     try {
-      const vault = await openBrowserVault(passphrase, false)
+      const vault = await openBrowserVault(passphraseInput, false)
       const expectedIdentity = vault.list()[0]?.identity
       if (expectedIdentity) {
         await vault.getSeed(expectedIdentity)
@@ -350,19 +349,19 @@ const ManageAccounts = () => {
       const action = pendingAction
       setPendingAction(null)
       if (action.type === 'load') {
-        await loadAccounts(passphrase)
+        await loadAccounts(passphraseInput)
         return
       }
       if (action.type === 'remove') {
-        await handleRemove(action.account, passphrase)
+        await handleRemove(action.account, passphraseInput)
         return
       }
       if (action.type === 'reveal') {
-        await handleRevealSeed(action.account, passphrase)
+        await handleRevealSeed(action.account, passphraseInput)
         return
       }
       if (action.type === 'rename') {
-        await handleRename(action.account, action.name, passphrase)
+        await handleRename(action.account, action.name, passphraseInput)
       }
     } catch (error) {
       if (
diff --git a/src/pages/onboarding/create-wallet.tsx b/src/pages/onboarding/create-wallet.tsx
index 42af644d..e19f06aa 100644
--- a/src/pages/onboarding/create-wallet.tsx
+++ b/src/pages/onboarding/create-wallet.tsx
@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Button } from '@/components/ui/button'
 import { generateSeed, isSeedLike } from '@/lib/seed'
+import { validatePassphraseStrength } from '@/lib/passphrase'
 import { setUnlocked } from '@/lib/lock'
 import {
   openBrowserVault,
@@ -112,9 +113,20 @@ const CreateWallet = ({
       }
     }
 
-    if (step === 2 && !passphrase.trim()) {
-      setStatus(t('onboarding.errors.passphraseRequired'))
-      return
+    if (step === 2) {
+      const validation = validatePassphraseStrength(passphrase, {
+        requireMinLength: variant !== 'add-address',
+      })
+      if (!validation.valid) {
+        setStatus(
+          t(
+            validation.reason === 'required'
+              ? 'onboarding.errors.passphraseRequired'
+              : 'onboarding.errors.passphraseTooShort',
+          ),
+        )
+        return
+      }
     }
     if (step === 2 && variant !== 'add-address') {
       if (!confirmPassphrase.trim()) {
@@ -125,17 +137,13 @@ const CreateWallet = ({
         setStatus(t('onboarding.errors.passphraseMismatch'))
         return
       }
-      if (passphrase.length < 12) {
-        setStatus(t('onboarding.errors.passphraseTooShort'))
-        return
-      }
     }
     if (step === 2 && variant === 'add-address') {
       if (isAccountNameTaken(name)) {
         setStatus(t('accounts.manage.errors.nameDuplicate'))
         return
       }
-      const result = await validateVaultPassphrase(passphrase.trim())
+      const result = await validateVaultPassphrase(passphrase)
       if (!result.valid) {
         setStatus(
           result.reason === 'invalid'
@@ -168,8 +176,17 @@ const CreateWallet = ({
       return
     }
 
-    if (!passphrase.trim()) {
-      setStatus(t('onboarding.errors.passphraseRequired'))
+    const validation = validatePassphraseStrength(passphrase, {
+      requireMinLength: variant !== 'add-address',
+    })
+    if (!validation.valid) {
+      setStatus(
+        t(
+          validation.reason === 'required'
+            ? 'onboarding.errors.passphraseRequired'
+            : 'onboarding.errors.passphraseTooShort',
+        ),
+      )
       setStep(2)
       return
     }
@@ -184,11 +201,6 @@ const CreateWallet = ({
         setStep(2)
         return
       }
-      if (passphrase.length < 12) {
-        setStatus(t('onboarding.errors.passphraseTooShort'))
-        setStep(2)
-        return
-      }
     }
 
     const cachedAccounts = getCachedAccounts()
diff --git a/src/pages/onboarding/import-seed.tsx b/src/pages/onboarding/import-seed.tsx
index db18362b..5da7e356 100644
--- a/src/pages/onboarding/import-seed.tsx
+++ b/src/pages/onboarding/import-seed.tsx
@@ -9,6 +9,7 @@ import { Label } from '@/components/ui/label'
 import { Textarea } from '@/components/ui/textarea'
 import { PasswordInput } from '@/components/ui/password-input'
 import { isSeedLike } from '@/lib/seed'
+import { validatePassphraseStrength } from '@/lib/passphrase'
 import {
   getCachedAccounts,
   getSuggestedNextAccountName,
@@ -102,16 +103,27 @@ const ImportSeed = ({
       }
     }
 
-    if (step === 2 && !passphrase.trim()) {
-      setStatus(t('onboarding.errors.passphraseRequired'))
-      return
+    if (step === 2) {
+      const validation = validatePassphraseStrength(passphrase, {
+        requireMinLength: variant !== 'add-address',
+      })
+      if (!validation.valid) {
+        setStatus(
+          t(
+            validation.reason === 'required'
+              ? 'onboarding.errors.passphraseRequired'
+              : 'onboarding.errors.passphraseTooShort',
+          ),
+        )
+        return
+      }
     }
     if (step === 2 && variant === 'add-address') {
       if (isAccountNameTaken(name)) {
         setStatus(t('accounts.manage.errors.nameDuplicate'))
         return
       }
-      const result = await validateVaultPassphrase(passphrase.trim())
+      const result = await validateVaultPassphrase(passphrase)
       if (!result.valid) {
         setStatus(
           result.reason === 'invalid'
@@ -144,8 +156,17 @@ const ImportSeed = ({
       return
     }
 
-    if (!passphrase.trim()) {
-      setStatus(t('onboarding.errors.passphraseRequired'))
+    const validation = validatePassphraseStrength(passphrase, {
+      requireMinLength: variant !== 'add-address',
+    })
+    if (!validation.valid) {
+      setStatus(
+        t(
+          validation.reason === 'required'
+            ? 'onboarding.errors.passphraseRequired'
+            : 'onboarding.errors.passphraseTooShort',
+        ),
+      )
       setStep(2)
       return
     }
@@ -229,7 +250,7 @@ const ImportSeed = ({
                   rows={3}
                   value={seed}
                   onChange={(event) => handleSeedChange(event.target.value)}
-                  aria-invalid={!isSeedValid}
+                  aria-invalid={seed.length > 0 && !isSeedValid}
                 />
                 <p className={`text-xs ${isSeedValid ? 'text-success' : 'text-muted-foreground'}`}>
                   {seedValidationMessage}
diff --git a/src/pages/onboarding/import-vault.tsx b/src/pages/onboarding/import-vault.tsx
index dd04f2e4..2edddcdb 100644
--- a/src/pages/onboarding/import-vault.tsx
+++ b/src/pages/onboarding/import-vault.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useState } from 'react'
+import { VaultInvalidPassphraseError } from '@qubic-labs/sdk'
 import { ArrowLeftIcon, ArrowRightIcon, FileJsonIcon, UploadCloudIcon } from 'lucide-react'
 import { useNavigate } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
@@ -13,16 +14,24 @@ import { QubicVault } from '@qubic-lib/qubic-ts-vault-library/dist/vault.js'
 import { getWatchOnlyAccounts, saveCachedAccounts, saveWatchOnlyAccounts } from '@/lib/accounts'
 import FlowHeader from '@/components/onboarding/flow-header'
 
-const TOTAL_STEPS = 3
+const TOTAL_STEPS = 2
 const MAX_VAULT_FILE_SIZE = 102_400
 
+const isWebWalletVaultFile = (fileText: string) => {
+  try {
+    const data = JSON.parse(fileText)
+    return !!(data.salt && data.iv && data.cipher)
+  } catch {
+    return false
+  }
+}
+
 const ImportVault = () => {
   const navigate = useNavigate()
   const { t } = useTranslation()
   const [step, setStep] = useState(1)
   const [file, setFile] = useState<File | null>(null)
   const [passphrase, setPassphrase] = useState('')
-  const [sourcePassphrase, setSourcePassphrase] = useState('')
   const [status, setStatus] = useState<string | null>(null)
   const [isSaving, setIsSaving] = useState(false)
   const [isDragging, setIsDragging] = useState(false)
@@ -30,7 +39,6 @@ const ImportVault = () => {
 
   const clearSensitiveState = () => {
     setPassphrase('')
-    setSourcePassphrase('')
     setFile(null)
   }
 
@@ -42,11 +50,6 @@ const ImportVault = () => {
       return
     }
 
-    if (step === 2 && !passphrase.trim()) {
-      setStatus(t('onboarding.importVault.errors.passphraseRequired'))
-      return
-    }
-
     setStep((current) => Math.min(current + 1, TOTAL_STEPS))
   }
 
@@ -96,21 +99,20 @@ const ImportVault = () => {
       setIsSaving(true)
 
       const fileText = await file.text()
-      let isWebWalletVault = false
-      try {
-        const data = JSON.parse(fileText)
-        isWebWalletVault = !!(data.salt && data.iv && data.cipher)
-      } catch {
-        // Not valid JSON — treat as SDK format
-      }
+      const isWebWalletVault = isWebWalletVaultFile(fileText)
 
       if (isWebWalletVault) {
         const qubicVault = new QubicVault()
-        const importPassphrase = sourcePassphrase.trim() || passphrase.trim()
 
-        const success = await qubicVault.importAndUnlock(true, importPassphrase, null, file, false)
-        if (!success) {
-          setStatus(t('onboarding.importVault.errors.importFailed'))
+        let unlockSucceeded = false
+        try {
+          unlockSucceeded = await qubicVault.importAndUnlock(true, passphrase, null, file, false)
+        } catch {
+          // SDK rejects with a string on wrong password — fall through to the check below
+        }
+        if (!unlockSucceeded) {
+          setStatus(t('onboarding.importVault.errors.invalidFileOrPassphrase'))
+          setStep(2)
           setIsSaving(false)
           return
         }
@@ -128,7 +130,7 @@ const ImportVault = () => {
           return
         }
 
-        const vault = await openBrowserVault(passphrase.trim(), true)
+        const vault = await openBrowserVault(passphrase, true)
         const watchOnlyAccounts = getWatchOnlyAccounts()
 
         for (const seed of seeds) {
@@ -157,11 +159,18 @@ const ImportVault = () => {
         clearSensitiveState()
         navigate('/home')
       } else {
-        const vault = await openBrowserVault(passphrase.trim(), true)
-        await vault.importEncrypted(fileText, {
-          mode: 'merge',
-          sourcePassphrase: sourcePassphrase.trim() || passphrase.trim(),
-        })
+        const vault = await openBrowserVault(passphrase, true)
+        try {
+          await vault.importEncrypted(fileText, {
+            mode: 'merge',
+            sourcePassphrase: passphrase,
+          })
+        } catch {
+          setStatus(t('onboarding.importVault.errors.invalidFileOrPassphrase'))
+          setStep(2)
+          setIsSaving(false)
+          return
+        }
         await vault.save()
         saveCachedAccounts(vault.list().map((e) => ({ name: e.name, identity: e.identity })))
 
@@ -178,7 +187,13 @@ const ImportVault = () => {
         navigate('/home')
       }
     } catch (error) {
-      setStatus(error instanceof Error ? error.message : t('onboarding.importVault.errors.generic'))
+      setStatus(
+        error instanceof VaultInvalidPassphraseError
+          ? t('onboarding.importVault.errors.invalidSourcePassphrase')
+          : error instanceof Error
+            ? error.message
+            : t('onboarding.importVault.errors.generic'),
+      )
       setIsSaving(false)
     }
   }
@@ -266,45 +281,8 @@ const ImportVault = () => {
                   onChange={(event) => setPassphrase(event.target.value)}
                 />
               </div>
-              <div className="space-y-2">
-                <Label htmlFor="source-passphrase">
-                  {t('onboarding.importVault.unlockSecure.sourcePassphrase')}
-                </Label>
-                <PasswordInput
-                  id="source-passphrase"
-                  value={sourcePassphrase}
-                  onChange={(event) => setSourcePassphrase(event.target.value)}
-                />
-              </div>
-            </div>
-          )}
-
-          {step === 3 && (
-            <div className="space-y-4">
-              <div className="space-y-1">
-                <h3 className="text-sm font-semibold">
-                  {t('onboarding.importVault.review.title')}
-                </h3>
-                <p className="text-xs text-muted-foreground">
-                  {t('onboarding.importVault.review.subtitle')}
-                </p>
-              </div>
-              <div className="space-y-2 text-sm">
-                <div className="flex items-center justify-between text-xs text-muted-foreground">
-                  <span>{t('onboarding.importVault.review.vaultFile')}</span>
-                  <span className="text-foreground">
-                    {file?.name ?? t('onboarding.importVault.review.notSelected')}
-                  </span>
-                </div>
-                <div className="text-xs text-muted-foreground">
-                  {t('onboarding.importVault.review.sourcePassphraseLabel')}:{' '}
-                  {sourcePassphrase.trim()
-                    ? t('onboarding.importVault.review.sourcePassphraseProvided')
-                    : t('onboarding.importVault.review.sourcePassphraseSame')}
-                </div>
-              </div>
               <p className="text-xs text-muted-foreground">
-                {t('onboarding.importVault.review.addMoreLater')}
+                {t('onboarding.importVault.unlockSecure.addMoreLater')}
               </p>
             </div>
           )}
@@ -318,7 +296,7 @@ const ImportVault = () => {
             {step === 1 ? t('common.back') : t('common.previous')}
           </Button>
           {step < TOTAL_STEPS ? (
-            <Button size="lg" onClick={handleNext} className="flex-1">
+            <Button size="lg" onClick={handleNext} className="flex-1" disabled={isSaving}>
               {t('common.continue')}
               <ArrowRightIcon className="h-5 w-5" />
             </Button>
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index 35ec28a7..7457d5ce 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -26,11 +26,12 @@ import {
   DrawerHeader,
   DrawerTitle,
 } from '@/components/ui/drawer'
-import { Input } from '@/components/ui/input'
+import { PasswordInput } from '@/components/ui/password-input'
 import { Label } from '@/components/ui/label'
 import { lockWallet } from '@/lib/lock'
 import { openBrowserVault } from '@/lib/vault'
 import { exportVaultToWebWalletFormat } from '@/lib/vault-export'
+import { useDrawerAutoFocus } from '@/hooks/use-drawer-auto-focus'
 
 declare const __APP_VERSION__: string
 
@@ -42,6 +43,8 @@ const Settings = () => {
 
   const [exportDrawerOpen, setExportDrawerOpen] = useState(false)
   const [exportPassphrase, setExportPassphrase] = useState('')
+  const { ref: exportPassphraseInputRef, onOpenAutoFocus: onExportOpenAutoFocus } =
+    useDrawerAutoFocus<HTMLInputElement>()
   const [exportError, setExportError] = useState('')
   const [exporting, setExporting] = useState(false)
 
@@ -63,8 +66,8 @@ const Settings = () => {
     setExportError('')
 
     try {
-      const vault = await openBrowserVault(exportPassphrase.trim(), false)
-      const encryptedVault = await exportVaultToWebWalletFormat(vault, exportPassphrase.trim())
+      const vault = await openBrowserVault(exportPassphrase, false)
+      const encryptedVault = await exportVaultToWebWalletFormat(vault, exportPassphrase)
 
       const json = JSON.stringify(encryptedVault, null, 2)
       const blob = new Blob([new TextEncoder().encode(json)], {
@@ -202,16 +205,19 @@ const Settings = () => {
           }
         }}
       >
-        <DrawerContent className="max-h-[90vh] border-none bg-background">
+        <DrawerContent
+          className="max-h-[90vh] border-none bg-background"
+          onOpenAutoFocus={onExportOpenAutoFocus}
+        >
           <DrawerHeader>
             <DrawerTitle>{t('settings.exportVault.drawerTitle')}</DrawerTitle>
             <DrawerDescription>{t('settings.exportVault.drawerDescription')}</DrawerDescription>
           </DrawerHeader>
           <div className="app-scrollbar min-h-0 flex-1 space-y-2 overflow-y-auto px-4 pb-2">
             <Label htmlFor="export-passphrase">{t('settings.exportVault.passphrase')}</Label>
-            <Input
+            <PasswordInput
+              ref={exportPassphraseInputRef}
               id="export-passphrase"
-              type="password"
               value={exportPassphrase}
               onChange={(event) => {
                 setExportPassphrase(event.target.value)
diff --git a/src/pages/settings/security.tsx b/src/pages/settings/security.tsx
index 854d065c..9b3755d6 100644
--- a/src/pages/settings/security.tsx
+++ b/src/pages/settings/security.tsx
@@ -22,7 +22,7 @@ import {
   DrawerHeader,
   DrawerTitle,
 } from '@/components/ui/drawer'
-import { Input } from '@/components/ui/input'
+import { PasswordInput } from '@/components/ui/password-input'
 import { Label } from '@/components/ui/label'
 import {
   Select,
@@ -207,9 +207,8 @@ const Security = () => {
           <div className="app-scrollbar min-h-0 flex-1 space-y-3 overflow-y-auto px-4 pb-2">
             <div className="space-y-2">
               <Label htmlFor="current-passphrase">{t('settings.security.currentPassphrase')}</Label>
-              <Input
+              <PasswordInput
                 id="current-passphrase"
-                type="password"
                 value={currentPassphrase}
                 onChange={(event) => {
                   setCurrentPassphrase(event.target.value)
@@ -219,9 +218,8 @@ const Security = () => {
             </div>
             <div className="space-y-2">
               <Label htmlFor="new-passphrase">{t('settings.security.newPassphrase')}</Label>
-              <Input
+              <PasswordInput
                 id="new-passphrase"
-                type="password"
                 value={newPassphrase}
                 onChange={(event) => {
                   setNewPassphrase(event.target.value)
@@ -232,9 +230,8 @@ const Security = () => {
             </div>
             <div className="space-y-2">
               <Label htmlFor="confirm-passphrase">{t('settings.security.confirmPassphrase')}</Label>
-              <Input
+              <PasswordInput
                 id="confirm-passphrase"
-                type="password"
                 value={confirmPassphrase}
                 onChange={(event) => {
                   setConfirmPassphrase(event.target.value)
diff --git a/src/pages/settings/verify-message.tsx b/src/pages/settings/verify-message.tsx
index 58329774..c8ad9db6 100644
--- a/src/pages/settings/verify-message.tsx
+++ b/src/pages/settings/verify-message.tsx
@@ -93,6 +93,7 @@ const VerifyMessage = () => {
             rows={8}
             className="resize-none font-mono text-xs"
             disabled={verifying}
+            autoFocus
           />
           {hasInput && (
             <div className="flex justify-end">
diff --git a/src/pages/sign-message.tsx b/src/pages/sign-message.tsx
index cb77949c..b885906d 100644
--- a/src/pages/sign-message.tsx
+++ b/src/pages/sign-message.tsx
@@ -111,6 +111,7 @@ const SignMessage = () => {
               placeholder={t('signMessage.messagePlaceholder')}
               className="resize-none"
               disabled={isWatchOnly || signing}
+              autoFocus
             />
           </div>
 
diff --git a/src/router/app-router.tsx b/src/router/app-router.tsx
index 712dad23..c476ce08 100644
--- a/src/router/app-router.tsx
+++ b/src/router/app-router.tsx
@@ -48,6 +48,7 @@ const AppRouter = () => {
   const location = useLocation()
   const isOnboarded = hasAccounts()
   const [isLocked, setIsLocked] = useState(() => isWalletLocked())
+  const currentlyLocked = isOnboarded ? isWalletLocked() : isLocked
   const lockTimeoutRef = useRef<number | null>(null)
   const hideChrome = location.pathname === '/unlock'
   const routeKey = `${location.pathname}${location.search}`
@@ -214,7 +215,7 @@ const AppRouter = () => {
     )
   }
 
-  if (isLocked && location.pathname !== '/unlock') {
+  if (currentlyLocked && location.pathname !== '/unlock') {
     return <Navigate to="/unlock" replace />
   }