diff --git a/package.json b/package.json
index 7e198b0d..ed70e4d2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "lume",
   "description": "the communication app",
   "private": true,
-  "version": "2.2.1",
+  "version": "2.2.3",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d4b942f2..56369375 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "Lume",
-    "version": "2.2.1"
+    "version": "2.2.3"
   },
   "plugins": {
     "fs": {
diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
index 78744aac..4ba02515 100644
--- a/src/app/auth/import.tsx
+++ b/src/app/auth/import.tsx
@@ -45,7 +45,7 @@ export function ImportAccountScreen() {
       const localSigner = NDKPrivateKeySigner.generate();
 
       await ark.createSetting('nsecbunker', '1');
-      await ark.createPrivkey(`${pubkey}-nsecbunker`, localSigner.privateKey);
+      await ark.createPrivkey(`${npub}-nsecbunker`, localSigner.privateKey);
 
       // open nsecbunker web app in default browser
       await open('https://app.nsecbunker.com/keys');
@@ -53,7 +53,7 @@ export function ImportAccountScreen() {
       const bunker = new NDK({
         explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
       });
-      bunker.connect();
+      await bunker.connect();
 
       const remoteSigner = new NDKNip46Signer(bunker, npub, localSigner);
       await remoteSigner.blockUntilReady();
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index d7df1357..6f95c5aa 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -31,16 +31,16 @@ export const NDKInstance = () => {
     try {
       // NIP-46 Signer
       if (nsecbunker) {
-        const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
+        const localSignerPrivkey = await db.secureLoad(`${db.account.id}-nsecbunker`);
         if (!localSignerPrivkey) return null;
 
         const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
         const bunker = new NDK({
           explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
         });
-        bunker.connect();
+        await bunker.connect();
 
-        const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
+        const remoteSigner = new NDKNip46Signer(bunker, db.account.pubkey, localSigner);
         await remoteSigner.blockUntilReady();
 
         return remoteSigner;
diff --git a/src/shared/layouts/new.tsx b/src/shared/layouts/new.tsx
index 877da035..d2b310b9 100644
--- a/src/shared/layouts/new.tsx
+++ b/src/shared/layouts/new.tsx
@@ -22,7 +22,7 @@ export function NewLayout() {
         <div className="col-span-1">
           <Link
             to="/"
-            className="inline-flex h-10 w-10 items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900"
+            className="inline-flex h-10 w-10 items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
           >
             <ArrowLeftIcon className="h-5 w-5" />
           </Link>
diff --git a/src/shared/nip05.tsx b/src/shared/nip05.tsx
index 913ac672..10c7c22c 100644
--- a/src/shared/nip05.tsx
+++ b/src/shared/nip05.tsx
@@ -40,8 +40,9 @@ export const NIP05 = memo(function NIP05({
 
         const data: NIP05 = await res.json();
         if (data.names) {
-          if (data.names[localPath.toLowerCase()] !== pubkey) return false;
-          return true;
+          if (data.names[localPath.toLowerCase()] === pubkey) return true;
+          if (data.names[localPath] === pubkey) return true;
+          return false;
         }
         return false;
       } catch (e) {
@@ -60,17 +61,13 @@ export const NIP05 = memo(function NIP05({
 
   return (
     <div className="inline-flex items-center gap-1">
-      <p className={twMerge('text-sm font-medium', className)}>{nip05}</p>
+      <p className={twMerge('text-sm font-medium', className)}>
+        {nip05.startsWith('_@') ? nip05.replace('_@', '') : nip05}
+      </p>
       {data === true ? (
-        <div className="inline-flex h-5 w-max shrink-0 items-center justify-center gap-1 rounded-full bg-teal-500 pl-0.5 pr-1.5 text-xs font-medium text-white">
-          <VerifiedIcon className="h-4 w-4" />
-          Verified
-        </div>
+        <VerifiedIcon className="h-4 w-4 text-teal-500" />
       ) : (
-        <div className="inline-flex h-5 w-max shrink-0 items-center justify-center gap-1.5 rounded-full bg-red-500 pl-0.5 pr-1.5 text-xs font-medium text-white">
-          <UnverifiedIcon className="h-4 w-4" />
-          Unverified
-        </div>
+        <UnverifiedIcon className="h-4 w-4 text-red-500" />
       )}
     </div>
   );