diff --git a/bun.lock b/bun.lock
index 24cbf50..ebcf2f2 100644
--- a/bun.lock
+++ b/bun.lock
@@ -5,6 +5,7 @@
     "": {
       "name": "seedpgp-web",
       "dependencies": {
+        "html5-qrcode": "^2.3.8",
         "lucide-react": "^0.462.0",
         "openpgp": "^6.3.0",
         "qrcode": "^1.5.4",
@@ -195,7 +196,7 @@
 
     "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="],
 
-    "@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
+    "@types/bun": ["@types/bun@1.3.7", "", { "dependencies": { "bun-types": "1.3.7" } }, "sha512-lmNuMda+Z9b7tmhA0tohwy8ZWFSnmQm1UDWXtH5r9F7wZCfkeO3Jx7wKQ1EOiKq43yHts7ky6r8SDJQWRNupkA=="],
 
     "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
 
@@ -223,7 +224,7 @@
 
     "autoprefixer": ["autoprefixer@10.4.23", "", { "dependencies": { "browserslist": "^4.28.1", "caniuse-lite": "^1.0.30001760", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": { "autoprefixer": "bin/autoprefixer" } }, "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA=="],
 
-    "baseline-browser-mapping": ["baseline-browser-mapping@2.9.18", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-e23vBV1ZLfjb9apvfPk4rHVu2ry6RIr2Wfs+O324okSidrX7pTAnEJPCh/O5BtRlr7QtZI7ktOP3vsqr7Z5XoA=="],
+    "baseline-browser-mapping": ["baseline-browser-mapping@2.9.19", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg=="],
 
     "binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
 
@@ -231,7 +232,7 @@
 
     "browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="],
 
-    "bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
+    "bun-types": ["bun-types@1.3.7", "", { "dependencies": { "@types/node": "*" } }, "sha512-qyschsA03Qz+gou+apt6HNl6HnI+sJJLL4wLDke4iugsE6584CMupOtTY1n+2YC9nGVrEKUlTs99jjRLKgWnjQ=="],
 
     "camelcase": ["camelcase@5.3.1", "", {}, "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="],
 
@@ -297,6 +298,8 @@
 
     "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
 
+    "html5-qrcode": ["html5-qrcode@2.3.8", "", {}, "sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ=="],
+
     "is-binary-path": ["is-binary-path@2.1.0", "", { "dependencies": { "binary-extensions": "^2.0.0" } }, "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="],
 
     "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="],
@@ -459,12 +462,8 @@
 
     "yargs-parser": ["yargs-parser@18.1.3", "", { "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } }, "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="],
 
-    "@types/qrcode/@types/node": ["@types/node@24.10.9", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw=="],
-
     "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
-    "bun-types/@types/node": ["@types/node@24.10.9", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw=="],
-
     "chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -472,9 +471,5 @@
     "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
     "readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
-
-    "@types/qrcode/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
-
-    "bun-types/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
   }
 }
diff --git a/package.json b/package.json
index db56fb9..6d7184a 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "html5-qrcode": "^2.3.8",
     "lucide-react": "^0.462.0",
     "openpgp": "^6.3.0",
     "qrcode": "^1.5.4",
diff --git a/src/App.tsx b/src/App.tsx
index 4684668..b58d463 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -14,17 +14,22 @@ import {
 } from 'lucide-react';
 import { PgpKeyInput } from './components/PgpKeyInput';
 import { QrDisplay } from './components/QrDisplay';
+import QRScanner from './components/QRScanner';
 import { validateBip39Mnemonic } from './lib/bip39';
 import { buildPlaintext, encryptToSeedPgp, decryptSeedPgp } from './lib/seedpgp';
 import type { SeedPgpPlaintext } from './lib/types';
 import * as openpgp from 'openpgp';
+
 console.log("OpenPGP.js version:", openpgp.config.versionString);
 
 function App() {
   const [activeTab, setActiveTab] = useState<'backup' | 'restore'>('backup');
   const [mnemonic, setMnemonic] = useState('');
-  const [messagePassword, setMessagePassword] = useState('');
-  const [pgpKeyInput, setPgpKeyInput] = useState('');
+  const [backupMessagePassword, setBackupMessagePassword] = useState('');
+  const [restoreMessagePassword, setRestoreMessagePassword] = useState('');
+
+  const [publicKeyInput, setPublicKeyInput] = useState('');
+  const [privateKeyInput, setPrivateKeyInput] = useState('');
   const [privateKeyPassphrase, setPrivateKeyPassphrase] = useState('');
   const [hasBip39Passphrase, setHasBip39Passphrase] = useState(false);
   const [qrPayload, setQrPayload] = useState('');
@@ -35,6 +40,7 @@ function App() {
   const [loading, setLoading] = useState(false);
   const [showMnemonic, setShowMnemonic] = useState(false);
   const [copied, setCopied] = useState(false);
+  const [showQRScanner, setShowQRScanner] = useState(false);
 
   const copyToClipboard = async (text: string) => {
     try {
@@ -42,7 +48,6 @@ function App() {
       setCopied(true);
       window.setTimeout(() => setCopied(false), 1500);
     } catch {
-      // Fallback for environments where Clipboard API is blocked
       const ta = document.createElement("textarea");
       ta.value = text;
       ta.style.position = "fixed";
@@ -57,7 +62,6 @@ function App() {
     }
   };
 
-
   const handleBackup = async () => {
     setLoading(true);
     setError('');
@@ -74,8 +78,8 @@ function App() {
 
       const result = await encryptToSeedPgp({
         plaintext,
-        publicKeyArmored: pgpKeyInput || undefined,
-        messagePassword: messagePassword || undefined,
+        publicKeyArmored: publicKeyInput || undefined,
+        messagePassword: backupMessagePassword || undefined,  // Changed
       });
 
       setQrPayload(result.framed);
@@ -97,11 +101,12 @@ function App() {
     try {
       const result = await decryptSeedPgp({
         frameText: restoreInput,
-        privateKeyArmored: pgpKeyInput || undefined,
+        privateKeyArmored: privateKeyInput || undefined,
         privateKeyPassphrase: privateKeyPassphrase || undefined,
-        messagePassword: messagePassword || undefined,
+        messagePassword: restoreMessagePassword || undefined,  // Changed
       });
 
+
       setRestoredData(result);
     } catch (e) {
       setError(e instanceof Error ? e.message : 'Decryption failed');
@@ -110,296 +115,322 @@ function App() {
     }
   };
 
+
   return (
-    <div className="min-h-screen bg-gradient-to-br from-slate-50 to-slate-100 text-slate-900 p-4 md:p-8">
-      <div className="max-w-5xl mx-auto bg-white rounded-2xl shadow-2xl overflow-hidden border border-slate-200">
+    <>
+      <div className="min-h-screen bg-gradient-to-br from-slate-50 to-slate-100 text-slate-900 p-4 md:p-8">
+        <div className="max-w-5xl mx-auto bg-white rounded-2xl shadow-2xl overflow-hidden border border-slate-200">
 
-        {/* Header */}
-        <div className="bg-gradient-to-r from-slate-900 to-slate-800 p-6 text-white flex items-center justify-between">
-          <div className="flex items-center gap-3">
-            <div className="p-2 bg-blue-600 rounded-lg shadow-lg">
-              <Shield size={28} />
-            </div>
-            <div>
-              <h1 className="text-2xl font-bold tracking-tight">
-                SeedPGP <span className="text-blue-400 font-mono text-base ml-2">v1.1</span>
-              </h1>
-              <p className="text-xs text-slate-400 mt-0.5">OpenPGP-secured BIP39 backup</p>
-            </div>
-          </div>
-          <div className="flex bg-slate-800/50 rounded-lg p-1 backdrop-blur">
-            <button
-              onClick={() => {
-                setActiveTab('backup');
-                setError('');
-                setQrPayload('');
-                setRestoredData(null);
-              }}
-              className={`px-5 py-2 rounded-md text-sm font-semibold transition-all ${activeTab === 'backup'
-                ? 'bg-white text-slate-900 shadow-lg'
-                : 'text-slate-300 hover:text-white hover:bg-slate-700/50'
-                }`}
-            >
-              Backup
-            </button>
-            <button
-              onClick={() => {
-                setActiveTab('restore');
-                setError('');
-                setQrPayload('');
-                setRestoredData(null);
-              }}
-              className={`px-5 py-2 rounded-md text-sm font-semibold transition-all ${activeTab === 'restore'
-                ? 'bg-white text-slate-900 shadow-lg'
-                : 'text-slate-300 hover:text-white hover:bg-slate-700/50'
-                }`}
-            >
-              Restore
-            </button>
-          </div>
-        </div>
-
-        <div className="p-6 md:p-8 space-y-6">
-          {/* Error Display */}
-          {error && (
-            <div className="p-4 bg-red-50 border-l-4 border-red-500 rounded-r-xl flex gap-3 text-red-800 text-sm items-start animate-in slide-in-from-top-2">
-              <AlertCircle className="shrink-0 mt-0.5" size={20} />
+          {/* Header */}
+          <div className="bg-gradient-to-r from-slate-900 to-slate-800 p-6 text-white flex items-center justify-between">
+            <div className="flex items-center gap-3">
+              <div className="p-2 bg-blue-600 rounded-lg shadow-lg">
+                <Shield size={28} />
+              </div>
               <div>
-                <p className="font-bold mb-1">Error</p>
-                <p className="whitespace-pre-wrap">{error}</p>
+                <h1 className="text-2xl font-bold tracking-tight">
+                  SeedPGP <span className="text-blue-400 font-mono text-base ml-2">v1.2</span>
+                </h1>
+                <p className="text-xs text-slate-400 mt-0.5">OpenPGP-secured BIP39 backup</p>
               </div>
             </div>
-          )}
-
-          {/* Info Banner */}
-          {recipientFpr && activeTab === 'backup' && (
-            <div className="p-3 bg-blue-50 border border-blue-200 rounded-lg flex items-start gap-3 text-blue-800 text-xs animate-in fade-in">
-              <Info size={16} className="shrink-0 mt-0.5" />
-              <div>
-                <strong>Recipient Key:</strong> <code className="bg-blue-100 px-1.5 py-0.5 rounded font-mono">{recipientFpr}</code>
-              </div>
+            <div className="flex bg-slate-800/50 rounded-lg p-1 backdrop-blur">
+              <button
+                onClick={() => {
+                  setActiveTab('backup');
+                  setError('');
+                  setQrPayload('');
+                  setRestoredData(null);
+                }}
+                className={`px-5 py-2 rounded-md text-sm font-semibold transition-all ${activeTab === 'backup'
+                  ? 'bg-white text-slate-900 shadow-lg'
+                  : 'text-slate-300 hover:text-white hover:bg-slate-700/50'
+                  }`}
+              >
+                Backup
+              </button>
+              <button
+                onClick={() => {
+                  setActiveTab('restore');
+                  setError('');
+                  setQrPayload('');
+                  setRestoredData(null);
+                }}
+                className={`px-5 py-2 rounded-md text-sm font-semibold transition-all ${activeTab === 'restore'
+                  ? 'bg-white text-slate-900 shadow-lg'
+                  : 'text-slate-300 hover:text-white hover:bg-slate-700/50'
+                  }`}
+              >
+                Restore
+              </button>
             </div>
-          )}
+          </div>
 
-          {/* Main Content Grid */}
-          <div className="grid gap-6 md:grid-cols-3">
-            <div className="md:col-span-2 space-y-6">
-              {activeTab === 'backup' ? (
-                <>
-                  <div className="space-y-2">
-                    <label className="text-sm font-semibold text-slate-700">BIP39 Mnemonic</label>
-                    <textarea
-                      className="w-full h-32 p-4 bg-slate-50 border border-slate-200 rounded-xl text-sm font-mono focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all resize-none"
-                      placeholder="Enter your 12 or 24 word seed phrase..."
-                      value={mnemonic}
-                      onChange={(e) => setMnemonic(e.target.value)}
-                    />
-                  </div>
+          <div className="p-6 md:p-8 space-y-6">
+            {/* Error Display */}
+            {error && (
+              <div className="p-4 bg-red-50 border-l-4 border-red-500 rounded-r-xl flex gap-3 text-red-800 text-sm items-start animate-in slide-in-from-top-2">
+                <AlertCircle className="shrink-0 mt-0.5" size={20} />
+                <div>
+                  <p className="font-bold mb-1">Error</p>
+                  <p className="whitespace-pre-wrap">{error}</p>
+                </div>
+              </div>
+            )}
 
-                  <PgpKeyInput
-                    label="PGP Public Key (Optional)"
-                    icon={FileKey}
-                    placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----&#10;&#10;Paste or drag & drop your public key..."
-                    value={pgpKeyInput}
-                    onChange={setPgpKeyInput}
-                  />
-                </>
-              ) : (
-                <>
-                  <div className="space-y-2">
-                    <label className="text-sm font-semibold text-slate-700">SEEDPGP1 Payload</label>
-                    <textarea
-                      className="w-full h-32 p-4 bg-slate-50 border border-slate-200 rounded-xl text-xs font-mono focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all resize-none"
-                      placeholder="SEEDPGP1:0:ABCD:..."
-                      value={restoreInput}
-                      onChange={(e) => setRestoreInput(e.target.value)}
-                    />
-                  </div>
+            {/* Info Banner */}
+            {recipientFpr && activeTab === 'backup' && (
+              <div className="p-3 bg-blue-50 border border-blue-200 rounded-lg flex items-start gap-3 text-blue-800 text-xs animate-in fade-in">
+                <Info size={16} className="shrink-0 mt-0.5" />
+                <div>
+                  <strong>Recipient Key:</strong> <code className="bg-blue-100 px-1.5 py-0.5 rounded font-mono">{recipientFpr}</code>
+                </div>
+              </div>
+            )}
 
-                  <PgpKeyInput
-                    label="PGP Private Key (Optional)"
-                    icon={FileKey}
-                    placeholder="-----BEGIN PGP PRIVATE KEY BLOCK-----&#10;&#10;Paste or drag & drop your private key..."
-                    value={pgpKeyInput}
-                    onChange={setPgpKeyInput}
-                  />
-
-                  {pgpKeyInput && (
+            {/* Main Content Grid */}
+            <div className="grid gap-6 md:grid-cols-3">
+              <div className="md:col-span-2 space-y-6">
+                {activeTab === 'backup' ? (
+                  <>
                     <div className="space-y-2">
-                      <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">Private Key Passphrase</label>
-                      <div className="relative">
-                        <Lock className="absolute left-3 top-3 text-slate-400" size={16} />
-                        <input
-                          type="password"
-                          className="w-full pl-10 pr-4 py-2.5 bg-white border border-slate-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all"
-                          placeholder="Unlock private key..."
-                          value={privateKeyPassphrase}
-                          onChange={(e) => setPrivateKeyPassphrase(e.target.value)}
-                        />
+                      <label className="text-sm font-semibold text-slate-700">BIP39 Mnemonic</label>
+                      <textarea
+                        className="w-full h-32 p-4 bg-slate-50 border border-slate-200 rounded-xl text-sm font-mono focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all resize-none"
+                        placeholder="Enter your 12 or 24 word seed phrase..."
+                        value={mnemonic}
+                        onChange={(e) => setMnemonic(e.target.value)}
+                      />
+                    </div>
+
+                    <PgpKeyInput
+                      label="PGP Public Key (Optional)"
+                      icon={FileKey}
+                      placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----&#10;&#10;Paste or drag & drop your public key..."
+                      value={publicKeyInput}
+                      onChange={setPublicKeyInput}
+                    />
+                  </>
+                ) : (
+                  <>
+                    <div className="flex gap-2">
+                      <button
+                        onClick={() => setShowQRScanner(true)}
+                        className="flex-1 py-3 bg-gradient-to-r from-purple-600 to-purple-700 text-white rounded-xl font-semibold flex items-center justify-center gap-2 hover:from-purple-700 hover:to-purple-800 transition-all shadow-lg"
+                      >
+                        <QrCode size={18} />
+                        Scan QR Code
+                      </button>
+                    </div>
+
+                    <div className="space-y-2">
+                      <label className="text-sm font-semibold text-slate-700">SEEDPGP1 Payload</label>
+                      <textarea
+                        className="w-full h-32 p-4 bg-slate-50 border border-slate-200 rounded-xl text-xs font-mono focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all resize-none"
+                        placeholder="SEEDPGP1:0:ABCD:..."
+                        value={restoreInput}
+                        onChange={(e) => setRestoreInput(e.target.value)}
+                      />
+                    </div>
+
+                    <PgpKeyInput
+                      label="PGP Private Key (Optional)"
+                      icon={FileKey}
+                      placeholder="-----BEGIN PGP PRIVATE KEY BLOCK-----&#10;&#10;Paste or drag & drop your private key..."
+                      value={privateKeyInput}
+                      onChange={setPrivateKeyInput}
+                    />
+
+                    {privateKeyInput && (
+                      <div className="space-y-2">
+                        <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">Private Key Passphrase</label>
+                        <div className="relative">
+                          <Lock className="absolute left-3 top-3 text-slate-400" size={16} />
+                          <input
+                            type="password"
+                            className="w-full pl-10 pr-4 py-2.5 bg-white border border-slate-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all"
+                            placeholder="Unlock private key..."
+                            value={privateKeyPassphrase}
+                            onChange={(e) => setPrivateKeyPassphrase(e.target.value)}
+                          />
+                        </div>
                       </div>
+                    )}
+                  </>
+                )}
+              </div>
+
+              {/* Security Panel */}
+              <div className="space-y-6">
+                <div className="p-5 bg-gradient-to-br from-slate-50 to-slate-100 rounded-2xl border-2 border-slate-200 shadow-inner space-y-4">
+                  <h3 className="text-sm font-bold text-slate-800 uppercase tracking-wider flex items-center gap-2">
+                    <Lock size={14} /> Security Options
+                  </h3>
+
+                  <div className="space-y-2">
+                    <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">Message Password</label>
+                    <div className="relative">
+                      <Lock className="absolute left-3 top-3 text-slate-400" size={16} />
+                      <input
+                        type="password"
+                        className="w-full pl-10 pr-4 py-2.5 bg-white border border-slate-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all"
+                        placeholder="Optional password..."
+                        value={activeTab === 'backup' ? backupMessagePassword : restoreMessagePassword}
+                        onChange={(e) => activeTab === 'backup' ? setBackupMessagePassword(e.target.value) : setRestoreMessagePassword(e.target.value)}
+                      />
+                    </div>
+                    <p className="text-[10px] text-slate-500 mt-1">Symmetric encryption password (SKESK)</p>
+                  </div>
+
+
+                  {activeTab === 'backup' && (
+                    <div className="pt-3 border-t border-slate-300">
+                      <label className="flex items-center gap-2 cursor-pointer group">
+                        <input
+                          type="checkbox"
+                          checked={hasBip39Passphrase}
+                          onChange={(e) => setHasBip39Passphrase(e.target.checked)}
+                          className="rounded text-blue-600 focus:ring-2 focus:ring-blue-500 transition-all"
+                        />
+                        <span className="text-xs font-medium text-slate-700 group-hover:text-slate-900 transition-colors">
+                          BIP39 25th word active
+                        </span>
+                      </label>
                     </div>
                   )}
-                </>
-              )}
-            </div>
-
-            {/* Security Panel */}
-            <div className="space-y-6">
-              <div className="p-5 bg-gradient-to-br from-slate-50 to-slate-100 rounded-2xl border-2 border-slate-200 shadow-inner space-y-4">
-                <h3 className="text-sm font-bold text-slate-800 uppercase tracking-wider flex items-center gap-2">
-                  <Lock size={14} /> Security Options
-                </h3>
-
-                <div className="space-y-2">
-                  <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">Message Password</label>
-                  <div className="relative">
-                    <Lock className="absolute left-3 top-3 text-slate-400" size={16} />
-                    <input
-                      type="password"
-                      className="w-full pl-10 pr-4 py-2.5 bg-white border border-slate-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all"
-                      placeholder="Optional password..."
-                      value={messagePassword}
-                      onChange={(e) => setMessagePassword(e.target.value)}
-                    />
-                  </div>
-                  <p className="text-[10px] text-slate-500 mt-1">Symmetric encryption password (SKESK)</p>
                 </div>
 
-                {activeTab === 'backup' && (
-                  <div className="pt-3 border-t border-slate-300">
-                    <label className="flex items-center gap-2 cursor-pointer group">
-                      <input
-                        type="checkbox"
-                        checked={hasBip39Passphrase}
-                        onChange={(e) => setHasBip39Passphrase(e.target.checked)}
-                        className="rounded text-blue-600 focus:ring-2 focus:ring-blue-500 transition-all"
-                      />
-                      <span className="text-xs font-medium text-slate-700 group-hover:text-slate-900 transition-colors">
-                        BIP39 25th word active
-                      </span>
-                    </label>
-                  </div>
+                {/* Action Button */}
+                {activeTab === 'backup' ? (
+                  <button
+                    onClick={handleBackup}
+                    disabled={!mnemonic || loading}
+                    className="w-full py-4 bg-gradient-to-r from-blue-600 to-blue-700 text-white rounded-xl font-bold flex items-center justify-center gap-2 hover:from-blue-700 hover:to-blue-800 transition-all shadow-lg hover:shadow-xl disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:from-blue-600 disabled:hover:to-blue-700"
+                  >
+                    {loading ? (
+                      <RefreshCw className="animate-spin" size={20} />
+                    ) : (
+                      <QrCode size={20} />
+                    )}
+                    {loading ? 'Generating...' : 'Generate QR Backup'}
+                  </button>
+                ) : (
+                  <button
+                    onClick={handleRestore}
+                    disabled={!restoreInput || loading}
+                    className="w-full py-4 bg-gradient-to-r from-slate-800 to-slate-900 text-white rounded-xl font-bold flex items-center justify-center gap-2 hover:from-slate-900 hover:to-black transition-all shadow-lg hover:shadow-xl disabled:opacity-50 disabled:cursor-not-allowed"
+                  >
+                    {loading ? (
+                      <RefreshCw className="animate-spin" size={20} />
+                    ) : (
+                      <Unlock size={20} />
+                    )}
+                    {loading ? 'Decrypting...' : 'Decrypt & Restore'}
+                  </button>
                 )}
               </div>
-
-              {/* Action Button */}
-              {activeTab === 'backup' ? (
-                <button
-                  onClick={handleBackup}
-                  disabled={!mnemonic || loading}
-                  className="w-full py-4 bg-gradient-to-r from-blue-600 to-blue-700 text-white rounded-xl font-bold flex items-center justify-center gap-2 hover:from-blue-700 hover:to-blue-800 transition-all shadow-lg hover:shadow-xl disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:from-blue-600 disabled:hover:to-blue-700"
-                >
-                  {loading ? (
-                    <RefreshCw className="animate-spin" size={20} />
-                  ) : (
-                    <QrCode size={20} />
-                  )}
-                  {loading ? 'Generating...' : 'Generate QR Backup'}
-                </button>
-              ) : (
-                <button
-                  onClick={handleRestore}
-                  disabled={!restoreInput || loading}
-                  className="w-full py-4 bg-gradient-to-r from-slate-800 to-slate-900 text-white rounded-xl font-bold flex items-center justify-center gap-2 hover:from-slate-900 hover:to-black transition-all shadow-lg hover:shadow-xl disabled:opacity-50 disabled:cursor-not-allowed"
-                >
-                  {loading ? (
-                    <RefreshCw className="animate-spin" size={20} />
-                  ) : (
-                    <Unlock size={20} />
-                  )}
-                  {loading ? 'Decrypting...' : 'Decrypt & Restore'}
-                </button>
-              )}
             </div>
-          </div>
 
-          {/* QR Output */}
-          {qrPayload && activeTab === 'backup' && (
-            <div className="pt-6 border-t border-slate-200 space-y-6 animate-in fade-in slide-in-from-bottom-4">
-              <div className="flex justify-center">
-                <QrDisplay value={qrPayload} />
-              </div>
-              <div className="space-y-2">
-                <div className="flex items-center justify-between gap-3">
-                  <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">
-                    Raw payload (copy for backup)
-                  </label>
-
-                  <button
-                    type="button"
-                    onClick={() => copyToClipboard(qrPayload)}
-                    className="inline-flex items-center gap-2 px-3 py-1.5 rounded-lg bg-slate-900 text-white text-xs font-semibold hover:bg-black transition-colors"
-                  >
-                    {copied ? <CheckCircle2 size={14} /> : <QrCode size={14} />}
-                    {copied ? "Copied" : "Copy"}
-                  </button>
+            {/* QR Output */}
+            {qrPayload && activeTab === 'backup' && (
+              <div className="pt-6 border-t border-slate-200 space-y-6 animate-in fade-in slide-in-from-bottom-4">
+                <div className="flex justify-center">
+                  <QrDisplay value={qrPayload} />
                 </div>
+                <div className="space-y-2">
+                  <div className="flex items-center justify-between gap-3">
+                    <label className="text-xs font-bold text-slate-500 uppercase tracking-wider">
+                      Raw payload (copy for backup)
+                    </label>
 
-                <textarea
-                  readOnly
-                  value={qrPayload}
-                  onFocus={(e) => e.currentTarget.select()}
-                  className="w-full h-28 p-3 bg-slate-900 rounded-xl font-mono text-[10px] text-green-400 border border-slate-700 shadow-inner leading-relaxed resize-none focus:outline-none focus:ring-2 focus:ring-blue-500"
-                />
-                <p className="text-[11px] text-slate-500">
-                  Tip: click the box to select all, or use Copy.
-                </p>
-              </div>
+                    <button
+                      type="button"
+                      onClick={() => copyToClipboard(qrPayload)}
+                      className="inline-flex items-center gap-2 px-3 py-1.5 rounded-lg bg-slate-900 text-white text-xs font-semibold hover:bg-black transition-colors"
+                    >
+                      {copied ? <CheckCircle2 size={14} /> : <QrCode size={14} />}
+                      {copied ? "Copied" : "Copy"}
+                    </button>
+                  </div>
 
-            </div>
-          )}
-
-          {/* Restored Mnemonic */}
-          {restoredData && activeTab === 'restore' && (
-            <div className="pt-6 border-t border-slate-200 animate-in zoom-in-95">
-              <div className="p-6 bg-gradient-to-br from-green-50 to-emerald-50 border-2 border-green-300 rounded-2xl shadow-lg">
-                <div className="flex items-center justify-between mb-4">
-                  <span className="font-bold text-green-700 flex items-center gap-2 text-lg">
-                    <CheckCircle2 size={22} /> Mnemonic Recovered
-                  </span>
-                  <button
-                    onClick={() => setShowMnemonic(!showMnemonic)}
-                    className="p-2.5 hover:bg-green-100 rounded-xl transition-all text-green-700 hover:shadow"
-                  >
-                    {showMnemonic ? <EyeOff size={22} /> : <Eye size={22} />}
-                  </button>
-                </div>
-
-                <div className={`p-6 bg-white rounded-xl border-2 border-green-200 shadow-sm transition-all duration-300 ${showMnemonic ? 'blur-0' : 'blur-lg select-none'
-                  }`}>
-                  <p className="font-mono text-center text-lg text-slate-800 tracking-wide leading-relaxed break-words">
-                    {restoredData.w}
+                  <textarea
+                    readOnly
+                    value={qrPayload}
+                    onFocus={(e) => e.currentTarget.select()}
+                    className="w-full h-28 p-3 bg-slate-900 rounded-xl font-mono text-[10px] text-green-400 border border-slate-700 shadow-inner leading-relaxed resize-none focus:outline-none focus:ring-2 focus:ring-blue-500"
+                  />
+                  <p className="text-[11px] text-slate-500">
+                    Tip: click the box to select all, or use Copy.
                   </p>
                 </div>
-
-                {restoredData.pp === 1 && (
-                  <div className="mt-4 p-3 bg-orange-100 border border-orange-300 rounded-lg">
-                    <p className="text-xs text-center text-orange-800 font-bold uppercase tracking-widest flex items-center justify-center gap-2">
-                      <AlertCircle size={14} /> BIP39 Passphrase Required (25th Word)
-                    </p>
-                  </div>
-                )}
-
-                {restoredData.fpr && restoredData.fpr.length > 0 && (
-                  <div className="mt-4 p-3 bg-blue-50 border border-blue-200 rounded-lg">
-                    <p className="text-xs text-blue-800">
-                      <strong>Encrypted for keys:</strong> {restoredData.fpr.join(', ')}
-                    </p>
-                  </div>
-                )}
               </div>
-            </div>
-          )}
+            )}
+
+            {/* Restored Mnemonic */}
+            {restoredData && activeTab === 'restore' && (
+              <div className="pt-6 border-t border-slate-200 animate-in zoom-in-95">
+                <div className="p-6 bg-gradient-to-br from-green-50 to-emerald-50 border-2 border-green-300 rounded-2xl shadow-lg">
+                  <div className="flex items-center justify-between mb-4">
+                    <span className="font-bold text-green-700 flex items-center gap-2 text-lg">
+                      <CheckCircle2 size={22} /> Mnemonic Recovered
+                    </span>
+                    <button
+                      onClick={() => setShowMnemonic(!showMnemonic)}
+                      className="p-2.5 hover:bg-green-100 rounded-xl transition-all text-green-700 hover:shadow"
+                    >
+                      {showMnemonic ? <EyeOff size={22} /> : <Eye size={22} />}
+                    </button>
+                  </div>
+
+                  <div className={`p-6 bg-white rounded-xl border-2 border-green-200 shadow-sm transition-all duration-300 ${showMnemonic ? 'blur-0' : 'blur-lg select-none'
+                    }`}>
+                    <p className="font-mono text-center text-lg text-slate-800 tracking-wide leading-relaxed break-words">
+                      {restoredData.w}
+                    </p>
+                  </div>
+
+                  {restoredData.pp === 1 && (
+                    <div className="mt-4 p-3 bg-orange-100 border border-orange-300 rounded-lg">
+                      <p className="text-xs text-center text-orange-800 font-bold uppercase tracking-widest flex items-center justify-center gap-2">
+                        <AlertCircle size={14} /> BIP39 Passphrase Required (25th Word)
+                      </p>
+                    </div>
+                  )}
+
+                  {restoredData.fpr && restoredData.fpr.length > 0 && (
+                    <div className="mt-4 p-3 bg-blue-50 border border-blue-200 rounded-lg">
+                      <p className="text-xs text-blue-800">
+                        <strong>Encrypted for keys:</strong> {restoredData.fpr.join(', ')}
+                      </p>
+                    </div>
+                  )}
+                </div>
+              </div>
+            )}
+          </div>
+        </div>
+
+        {/* Footer */}
+        <div className="mt-8 text-center text-xs text-slate-500">
+          <p>SeedPGP v1.2 • OpenPGP (RFC 4880) + Base45 (RFC 9285) + CRC16/CCITT-FALSE</p>
+          <p className="mt-1">Never share your private keys or seed phrases. Always verify on an airgapped device.</p>
         </div>
       </div>
 
-      {/* Footer */}
-      <div className="mt-8 text-center text-xs text-slate-500">
-        <p>SeedPGP v1.1 • OpenPGP (RFC 4880) + Base45 (RFC 9285) + CRC16/CCITT-FALSE</p>
-        <p className="mt-1">Never share your private keys or seed phrases. Always verify on an airgapped device.</p>
-      </div>
-    </div>
+      {/* QR Scanner Modal */}
+      {showQRScanner && (
+        <QRScanner
+          onScanSuccess={(scannedText) => {
+            setRestoreInput(scannedText);
+            setShowQRScanner(false);
+            setError('');
+          }}
+          onClose={() => setShowQRScanner(false)}
+        />
+      )}
+    </>
   );
+
 }
 
 export default App;
diff --git a/src/components/QRScanner.tsx b/src/components/QRScanner.tsx
new file mode 100644
index 0000000..731207e
--- /dev/null
+++ b/src/components/QRScanner.tsx
@@ -0,0 +1,224 @@
+import { useState, useRef } from 'react';
+import { Camera, Upload, X, CheckCircle2, AlertCircle, Info } from 'lucide-react';
+import { Html5Qrcode } from 'html5-qrcode';
+
+interface QRScannerProps {
+    onScanSuccess: (scannedText: string) => void;
+    onClose: () => void;
+}
+
+export default function QRScanner({ onScanSuccess, onClose }: QRScannerProps) {
+    const [scanMode, setScanMode] = useState<'camera' | 'file' | null>(null);
+    const [scanning, setScanning] = useState(false);
+    const [error, setError] = useState<string>('');
+    const [success, setSuccess] = useState(false);
+    const html5QrCodeRef = useRef<Html5Qrcode | null>(null);
+    const fileInputRef = useRef<HTMLInputElement>(null);
+
+    const startCamera = async () => {
+        setError('');
+        setScanMode('camera');
+        setScanning(true);
+
+        // Wait for DOM to render the #qr-reader div
+        await new Promise(resolve => setTimeout(resolve, 100));
+
+        try {
+            // Check if we're on HTTPS or localhost
+            if (window.location.protocol !== 'https:' && !window.location.hostname.includes('localhost')) {
+                throw new Error('Camera requires HTTPS or localhost. Use: bun run dev');
+            }
+
+            const html5QrCode = new Html5Qrcode('qr-reader');
+            html5QrCodeRef.current = html5QrCode;
+
+            await html5QrCode.start(
+                { facingMode: 'environment' },
+                {
+                    fps: 10,
+                    qrbox: { width: 250, height: 250 },
+                    aspectRatio: 1.0,
+                },
+                (decodedText) => {
+                    if (decodedText.startsWith('SEEDPGP1:')) {
+                        setSuccess(true);
+                        onScanSuccess(decodedText);
+                        stopCamera();
+                    } else {
+                        setError('QR code found, but not a valid SEEDPGP1 frame');
+                    }
+                },
+                () => {
+                    // Ignore frequent scanning errors
+                }
+            );
+        } catch (err: any) {
+            console.error('Camera error:', err);
+            setError(`Camera failed: ${err.message || 'Permission denied or not available'}`);
+            setScanning(false);
+            setScanMode(null);
+        }
+    };
+
+
+    const stopCamera = async () => {
+        if (html5QrCodeRef.current) {
+            try {
+                await html5QrCodeRef.current.stop();
+                html5QrCodeRef.current.clear();
+            } catch (err) {
+                console.error('Error stopping camera:', err);
+            }
+            html5QrCodeRef.current = null;
+        }
+        setScanning(false);
+        setScanMode(null);
+    };
+
+    const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (!file) return;
+
+        setError('');
+        setScanMode('file');
+        setScanning(true);
+
+        try {
+            const html5QrCode = new Html5Qrcode('qr-reader-file');
+
+            // Try scanning with verbose mode
+            const decodedText = await html5QrCode.scanFile(file, true);
+
+            if (decodedText.startsWith('SEEDPGP1:')) {
+                setSuccess(true);
+                onScanSuccess(decodedText);
+                html5QrCode.clear();
+            } else {
+                setError(`Found QR code, but not SEEDPGP format: ${decodedText.substring(0, 30)}...`);
+            }
+        } catch (err: any) {
+            console.error('File scan error:', err);
+
+            // Provide helpful error messages
+            if (err.message?.includes('No MultiFormat')) {
+                setError('Could not detect QR code in image. Try: 1) Taking a clearer photo, 2) Ensuring good lighting, 3) Screenshot from the Backup tab');
+            } else {
+                setError(`Scan failed: ${err.message || 'Unknown error'}`);
+            }
+        } finally {
+            setScanning(false);
+            // Reset file input so same file can be selected again
+            if (fileInputRef.current) {
+                fileInputRef.current.value = '';
+            }
+        }
+    };
+
+    const handleClose = async () => {
+        await stopCamera();
+        onClose();
+    };
+
+    return (
+        <div className="fixed inset-0 bg-black/60 backdrop-blur-sm z-50 flex items-center justify-center p-4 animate-in fade-in">
+            <div className="bg-white rounded-2xl shadow-2xl max-w-md w-full overflow-hidden animate-in zoom-in-95">
+                {/* Header */}
+                <div className="bg-gradient-to-r from-slate-900 to-slate-800 p-4 text-white flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                        <Camera size={20} />
+                        <h2 className="font-bold text-lg">Scan QR Code</h2>
+                    </div>
+                    <button
+                        onClick={handleClose}
+                        className="p-1.5 hover:bg-white/20 rounded-lg transition-colors"
+                    >
+                        <X size={20} />
+                    </button>
+                </div>
+
+                {/* Content */}
+                <div className="p-6 space-y-4">
+                    {/* Error Display */}
+                    {error && (
+                        <div className="p-3 bg-red-50 border-l-4 border-red-500 rounded-r-lg flex gap-2 text-red-800 text-xs leading-relaxed">
+                            <AlertCircle size={16} className="shrink-0 mt-0.5" />
+                            <p>{error}</p>
+                        </div>
+                    )}
+
+                    {/* Success Display */}
+                    {success && (
+                        <div className="p-3 bg-green-50 border-l-4 border-green-500 rounded-r-lg flex gap-2 text-green-800 text-sm">
+                            <CheckCircle2 size={16} className="shrink-0 mt-0.5" />
+                            <p>QR code scanned successfully!</p>
+                        </div>
+                    )}
+
+                    {/* Mode Selection */}
+                    {!scanMode && (
+                        <div className="space-y-3">
+                            <button
+                                onClick={startCamera}
+                                className="w-full py-4 bg-gradient-to-r from-blue-600 to-blue-700 text-white rounded-xl font-semibold flex items-center justify-center gap-2 hover:from-blue-700 hover:to-blue-800 transition-all shadow-lg"
+                            >
+                                <Camera size={20} />
+                                Use Camera
+                            </button>
+
+                            <button
+                                onClick={() => fileInputRef.current?.click()}
+                                className="w-full py-4 bg-gradient-to-r from-slate-700 to-slate-800 text-white rounded-xl font-semibold flex items-center justify-center gap-2 hover:from-slate-800 hover:to-slate-900 transition-all shadow-lg"
+                            >
+                                <Upload size={20} />
+                                Upload Image
+                            </button>
+
+                            <input
+                                ref={fileInputRef}
+                                type="file"
+                                accept="image/*"
+                                onChange={handleFileUpload}
+                                className="hidden"
+                            />
+
+                            {/* Info Box */}
+                            <div className="pt-4 border-t border-slate-200">
+                                <div className="flex gap-2 text-xs text-slate-600 leading-relaxed">
+                                    <Info size={14} className="shrink-0 mt-0.5 text-blue-600" />
+                                    <div>
+                                        <p><strong>Camera:</strong> Requires HTTPS or localhost</p>
+                                        <p className="mt-1"><strong>Upload:</strong> Screenshot QR from Backup tab for testing</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    )}
+
+                    {/* Camera View */}
+                    {scanMode === 'camera' && scanning && (
+                        <div className="space-y-3">
+                            <div id="qr-reader" className="rounded-lg overflow-hidden border-2 border-slate-200"></div>
+                            <button
+                                onClick={stopCamera}
+                                className="w-full py-3 bg-red-600 text-white rounded-lg font-semibold hover:bg-red-700 transition-colors"
+                            >
+                                Stop Camera
+                            </button>
+                        </div>
+                    )}
+
+                    {/* File Processing View */}
+                    {scanMode === 'file' && scanning && (
+                        <div className="py-8 text-center">
+                            <div className="inline-block animate-spin rounded-full h-8 w-8 border-4 border-slate-200 border-t-blue-600"></div>
+                            <p className="mt-3 text-sm text-slate-600">Processing image...</p>
+                        </div>
+                    )}
+
+                    {/* Hidden div for file scanning */}
+                    <div id="qr-reader-file" className="hidden"></div>
+                </div>
+            </div>
+        </div>
+    );
+}
diff --git a/src/components/QrDisplay.tsx b/src/components/QrDisplay.tsx
index 47f44a4..069c507 100644
--- a/src/components/QrDisplay.tsx
+++ b/src/components/QrDisplay.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { Download } from 'lucide-react';
 import QRCode from 'qrcode';
 
 interface QrDisplayProps {
@@ -11,21 +12,61 @@ export const QrDisplay: React.FC<QrDisplayProps> = ({ value }) => {
     useEffect(() => {
         if (value) {
             QRCode.toDataURL(value, {
-                errorCorrectionLevel: 'Q',
+                errorCorrectionLevel: 'M',
                 type: 'image/png',
                 width: 512,
-                margin: 2,
+                margin: 4,
+                color: {
+                    dark: '#000000',
+                    light: '#FFFFFF'
+                }
             })
                 .then(setDataUrl)
                 .catch(console.error);
         }
     }, [value]);
 
+    const handleDownload = () => {
+        if (!dataUrl) return;
+
+        // Generate filename: SeedPGP_YYYY-MM-DD_HHMMSS.png
+        const now = new Date();
+        const date = now.toISOString().split('T')[0]; // YYYY-MM-DD
+        const time = now.toTimeString().split(' ')[0].replace(/:/g, ''); // HHMMSS
+        const filename = `SeedPGP_${date}_${time}.png`;
+
+        // Create download link
+        const link = document.createElement('a');
+        link.href = dataUrl;
+        link.download = filename;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+    };
+
     if (!dataUrl) return null;
 
     return (
-        <div className="flex items-center justify-center p-4 bg-white rounded-xl border-2 border-slate-200">
-            <img src={dataUrl} alt="SeedPGP QR Code" className="w-64 h-64" />
+        <div className="flex flex-col items-center gap-4">
+            <div className="flex items-center justify-center p-4 bg-white rounded-xl border-2 border-slate-200">
+                <img
+                    src={dataUrl}
+                    alt="SeedPGP QR Code"
+                    className="w-80 h-80"
+                />
+            </div>
+
+            <button
+                onClick={handleDownload}
+                className="inline-flex items-center gap-2 px-4 py-2.5 bg-gradient-to-r from-green-600 to-green-700 text-white rounded-lg font-semibold hover:from-green-700 hover:to-green-800 transition-all shadow-lg hover:shadow-xl"
+            >
+                <Download size={18} />
+                Download QR Code
+            </button>
+
+            <p className="text-xs text-slate-500 text-center max-w-sm">
+                Downloads as: SeedPGP_2026-01-28_231645.png
+            </p>
         </div>
     );
 };