diff --git a/src/app/components/UserMenu/index.tsx b/src/app/components/UserMenu/index.tsx
index 6afaee66b4..cb442301c2 100644
--- a/src/app/components/UserMenu/index.tsx
+++ b/src/app/components/UserMenu/index.tsx
@@ -1,4 +1,5 @@
 import {
+  AddressBookIcon,
   GearIcon,
   GlobeIcon,
   LockIcon,
@@ -80,6 +81,7 @@ export default function UserMenu() {
           <ReceiveIcon className="w-6 h-6 -ml-0.5 mr-2 text-gray-700 dark:text-neutral-300" />
           {tCommon("actions.receive")}
         </Menu.ItemButton>
+        <Menu.Divider />
         <Menu.ItemButton
           onClick={() => {
             openOptions("settings");
@@ -88,7 +90,14 @@ export default function UserMenu() {
           <GearIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
           {tCommon("settings")}
         </Menu.ItemButton>
-        <Menu.Divider />
+        <Menu.ItemButton
+          onClick={() => {
+            openOptions("accounts");
+          }}
+        >
+          <AddressBookIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
+          {tCommon("accounts")}
+        </Menu.ItemButton>
         <Menu.ItemButton
           onClick={() => {
             utils.openUrl("https://feedback.getalby.com");
diff --git a/src/app/router/Options/Options.tsx b/src/app/router/Options/Options.tsx
index 3b36cbae14..c8f34b7f98 100644
--- a/src/app/router/Options/Options.tsx
+++ b/src/app/router/Options/Options.tsx
@@ -1,6 +1,7 @@
 import Container from "@components/Container";
 import Navbar from "@components/Navbar";
 import Accounts from "@screens/Accounts";
+import ShowAccount from "@screens/Accounts/Show";
 import ConfirmPayment from "@screens/ConfirmPayment";
 import Keysend from "@screens/Keysend";
 import LNURLAuth from "@screens/LNURLAuth";
@@ -8,8 +9,8 @@ import LNURLChannel from "@screens/LNURLChannel";
 import LNURLPay from "@screens/LNURLPay";
 import LNURLWithdraw from "@screens/LNURLWithdraw";
 import TestConnection from "@screens/Options/TestConnection";
-import Publisher from "@screens/Publisher";
 import Publishers from "@screens/Publishers";
+import ShowPublisher from "@screens/Publishers/Show";
 import Receive from "@screens/Receive";
 import Send from "@screens/Send";
 import Settings from "@screens/Settings";
@@ -46,7 +47,7 @@ function Options() {
               <Route index element={<Discover />} />
             </Route>
             <Route path="publishers">
-              <Route path=":id" element={<Publisher />} />
+              <Route path=":id" element={<ShowPublisher />} />
               <Route index element={<Publishers />} />
             </Route>
             <Route path="send" element={<Send />} />
@@ -59,6 +60,7 @@ function Options() {
             <Route path="lnurlAuth" element={<LNURLAuth />} />
             <Route path="settings" element={<Settings />} />
             <Route path="accounts">
+              <Route path=":id" element={<ShowAccount />} />
               <Route
                 path="new"
                 element={
diff --git a/src/app/screens/Accounts/Show/index.tsx b/src/app/screens/Accounts/Show/index.tsx
new file mode 100644
index 0000000000..32cc9dc60f
--- /dev/null
+++ b/src/app/screens/Accounts/Show/index.tsx
@@ -0,0 +1,620 @@
+import {
+  CaretLeftIcon,
+  ExportIcon,
+} from "@bitcoin-design/bitcoin-icons-react/filled";
+import {
+  CopyIcon,
+  CrossIcon,
+  HiddenIcon,
+  VisibleIcon,
+} from "@bitcoin-design/bitcoin-icons-react/outline";
+import Button from "@components/Button";
+import Container from "@components/Container";
+import Header from "@components/Header";
+import IconButton from "@components/IconButton";
+import Loading from "@components/Loading";
+import Setting from "@components/Setting";
+import TextField from "@components/form/TextField";
+import Avvvatars from "avvvatars-react";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
+import type { FormEvent } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import Modal from "react-modal";
+import QRCode from "react-qr-code";
+import { useNavigate, useParams } from "react-router-dom";
+import { toast } from "react-toastify";
+import { useAccount } from "~/app/context/AccountContext";
+import { useAccounts } from "~/app/context/AccountsContext";
+import { useSettings } from "~/app/context/SettingsContext";
+import api, { GetAccountRes } from "~/common/lib/api";
+import msg from "~/common/lib/msg";
+import nostrlib from "~/common/lib/nostr";
+import Nostr from "~/extension/background-script/nostr";
+import type { Account } from "~/types";
+
+type AccountAction = Omit<Account, "connector" | "config" | "nostrPrivateKey">;
+dayjs.extend(relativeTime);
+
+function AccountScreen() {
+  const auth = useAccount();
+  const { accounts, getAccounts } = useAccounts();
+  const { t } = useTranslation("translation", {
+    keyPrefix: "accounts.account_view",
+  });
+  const { t: tCommon } = useTranslation("common");
+  const { isLoading: isLoadingSettings } = useSettings();
+
+  const hasFetchedData = useRef(false);
+  const [account, setAccount] = useState<GetAccountRes | null>(null);
+  const { id } = useParams();
+  const navigate = useNavigate();
+
+  const [lndHubData, setLndHubData] = useState({
+    login: "",
+    password: "",
+    url: "",
+    lnAddress: "",
+  });
+  const [accountName, setAccountName] = useState("");
+
+  const [currentPrivateKey, setCurrentPrivateKey] = useState("");
+  const [nostrPrivateKey, setNostrPrivateKey] = useState("");
+  const [nostrPublicKey, setNostrPublicKey] = useState("");
+  const [nostrPrivateKeyVisible, setNostrPrivateKeyVisible] = useState(false);
+  const [privateKeyCopyLabel, setPrivateKeyCopyLabel] = useState(
+    tCommon("actions.copy") as string
+  );
+  const [publicKeyCopyLabel, setPublicKeyCopyLabel] = useState(
+    tCommon("actions.copy") as string
+  );
+
+  const [exportLoading, setExportLoading] = useState(false);
+  const [exportModalIsOpen, setExportModalIsOpen] = useState(false);
+  const [nostrKeyModalIsOpen, setNostrKeyModalIsOpen] = useState(false);
+
+  const fetchData = useCallback(async () => {
+    try {
+      if (id) {
+        const response = await msg.request<GetAccountRes>("getAccount", {
+          id,
+        });
+        setAccount(response);
+        setAccountName(response.name);
+
+        const priv = (await msg.request("nostr/getPrivateKey", {
+          id,
+        })) as string;
+        if (priv) {
+          setCurrentPrivateKey(priv);
+        }
+      }
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) toast.error(`Error: ${e.message}`);
+    }
+  }, [id]);
+
+  function closeExportModal() {
+    setExportModalIsOpen(false);
+  }
+
+  function closeNostrKeyModal() {
+    setNostrKeyModalIsOpen(false);
+  }
+
+  function generatePublicKey(priv: string) {
+    const nostr = new Nostr(priv);
+    const pubkeyHex = nostr.getPublicKey();
+    return nostrlib.hexToNip19(pubkeyHex, "npub");
+  }
+
+  async function generateNostrPrivateKey(random?: boolean) {
+    const selectedAccount = await auth.fetchAccountInfo();
+
+    if (!random && selectedAccount?.id !== id) {
+      alert(
+        `Please match the account in the account dropdown at the top with this account to derive keys.`
+      );
+      closeNostrKeyModal();
+      return;
+    }
+    // check with current selected account
+    const result = await msg.request(
+      "nostr/generatePrivateKey",
+      random
+        ? {
+            type: "random",
+          }
+        : undefined
+    );
+    saveNostrPrivateKey(result.privateKey as string);
+    closeNostrKeyModal();
+  }
+
+  async function saveNostrPrivateKey(nostrPrivateKey: string) {
+    nostrPrivateKey = nostrlib.normalizeToHex(nostrPrivateKey);
+
+    if (nostrPrivateKey === currentPrivateKey) return;
+
+    if (currentPrivateKey && !confirm(t("nostr.private_key.warning"))) {
+      return;
+    }
+
+    try {
+      if (!account) {
+        // type guard
+        throw new Error("No account available");
+      }
+
+      // Validate the private key before saving
+      nostrPrivateKey && generatePublicKey(nostrPrivateKey);
+      nostrPrivateKey && nostrlib.hexToNip19(nostrPrivateKey, "nsec");
+
+      await msg.request("nostr/setPrivateKey", {
+        id: account.id,
+        privateKey: nostrPrivateKey,
+      });
+
+      if (nostrPrivateKey) {
+        toast.success(t("nostr.private_key.success"));
+      } else {
+        toast.success(t("nostr.private_key.successfully_removed"));
+      }
+      setCurrentPrivateKey(nostrPrivateKey);
+    } catch (e) {
+      if (e instanceof Error) toast.error(e.message);
+    }
+  }
+
+  async function updateAccountName({ id, name }: AccountAction) {
+    await msg.request("editAccount", {
+      name,
+      id,
+    });
+
+    auth.fetchAccountInfo(); // Update active account name
+    getAccounts(); // update all accounts
+  }
+
+  async function exportAccount({ id, name }: AccountAction) {
+    setExportLoading(true);
+    setExportModalIsOpen(true);
+    setLndHubData(
+      await msg.request("accountDecryptedDetails", {
+        name,
+        id,
+      })
+    );
+    setExportLoading(false);
+  }
+
+  async function selectAccount(accountId: string) {
+    auth.setAccountId(accountId);
+    await api.selectAccount(accountId);
+    auth.fetchAccountInfo({ accountId });
+  }
+
+  async function removeAccount({ id, name }: AccountAction) {
+    if (window.confirm(t("remove.confirm", { name }))) {
+      let nextAccountId;
+      let accountIds = Object.keys(accounts);
+      if (auth.account?.id === id && accountIds.length > 1) {
+        nextAccountId = accountIds.filter((accountId) => accountId !== id)[0];
+      }
+
+      await api.removeAccount(id);
+      accountIds = accountIds.filter((accountId) => accountId !== id);
+
+      if (accountIds.length > 0) {
+        getAccounts();
+        if (nextAccountId) selectAccount(nextAccountId);
+        navigate("/accounts", { replace: true });
+      } else {
+        window.close();
+      }
+    }
+  }
+
+  useEffect(() => {
+    // Run once.
+    if (!isLoadingSettings && !hasFetchedData.current) {
+      fetchData();
+      hasFetchedData.current = true;
+    }
+  }, [fetchData, isLoadingSettings]);
+
+  useEffect(() => {
+    setNostrPublicKey(
+      currentPrivateKey ? generatePublicKey(currentPrivateKey) : ""
+    );
+    setNostrPrivateKey(
+      currentPrivateKey ? nostrlib.hexToNip19(currentPrivateKey, "nsec") : ""
+    );
+  }, [currentPrivateKey]);
+
+  return !account ? (
+    <div className="flex justify-center mt-5">
+      <Loading />
+    </div>
+  ) : (
+    <div>
+      <Header
+        title={t("title1")}
+        headerLeft={
+          <IconButton
+            onClick={() => navigate(-1)}
+            icon={<CaretLeftIcon className="w-4 h-4" />}
+          />
+        }
+      />
+      <div className="border-b border-gray-200 dark:border-neutral-500">
+        <div className="flex-col justify-center p-4 flex items-center bg-white dark:bg-surface-02dp">
+          <Avvvatars value={account.name} style={"shape"} size={80} shadow />
+          <div className="flex flex-col overflow-hidden w-full text-center">
+            <h2
+              title={account.name}
+              className="text-xl font-semibold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap leading-1 my-2"
+            >
+              {account.name}
+            </h2>
+            <div
+              title={account.connector}
+              className="text-gray-500 dark:text-gray-400 mb-2 flex justify-center items-center"
+            >
+              {account.connector}
+              {account.connector === "lndhub" && (
+                <>
+                  <div className="mx-2 font-black text-sm">&middot;</div>
+                  <div
+                    className="text-sm font-medium flex items-center text-gray-500 hover:text-black transition-color duration-200 dark:hover:text-white cursor-pointer"
+                    onClick={() =>
+                      exportAccount({
+                        id: account.id,
+                        name: account.name,
+                      })
+                    }
+                  >
+                    <p>{t("actions.export")}</p>
+                    <ExportIcon className="h-6 w-6" />
+                  </div>
+                </>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <Container>
+        <div className="flex justify-between items-center pt-8 pb-4">
+          <h2 className="text-2xl font-bold dark:text-white">{t("title2")}</h2>
+
+          <Modal
+            ariaHideApp={false}
+            closeTimeoutMS={200}
+            isOpen={exportModalIsOpen}
+            onRequestClose={closeExportModal}
+            contentLabel={t("export.screen_reader")}
+            overlayClassName="bg-black bg-opacity-25 fixed inset-0 flex justify-center items-center p-5"
+            className="rounded-lg bg-white w-full max-w-lg"
+          >
+            <div className="p-5 flex justify-between dark:bg-surface-02dp">
+              <h2 className="text-2xl font-bold dark:text-white">
+                {t("export.title")}
+              </h2>
+              <button onClick={closeExportModal}>
+                <CrossIcon className="w-6 h-6 dark:text-white" />
+              </button>
+            </div>
+
+            {exportLoading && (
+              <div className="p-5 flex justify-center items-center space-x-2 dark:text-white">
+                <Loading />
+                <span>{t("export.waiting")}</span>
+              </div>
+            )}
+            {!exportLoading && (
+              <div className="p-5 border-t border-b border-gray-200 dark:bg-surface-02dp dark:border-neutral-500">
+                {lndHubData.lnAddress && (
+                  <div className="dark:text-white mb-6">
+                    <p>
+                      <strong>{t("export.your_ln_address")}</strong>
+                    </p>
+                    {lndHubData.lnAddress && <p>{lndHubData.lnAddress}</p>}
+                  </div>
+                )}
+                <div className="flex justify-center space-x-3 items-center dark:text-white">
+                  <div className="flex-1">
+                    <p>
+                      <strong>{t("export.tip_mobile")}</strong>
+                    </p>
+                    <p>{t("export.scan_qr")}</p>
+                  </div>
+                  <div className="float-right">
+                    <QRCode
+                      value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
+                      level="M"
+                      size={130}
+                    />
+                  </div>
+                </div>
+                <div className="mt-6">
+                  <TextField
+                    id="uri"
+                    label={t("export.export_uri")}
+                    type="text"
+                    readOnly
+                    value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
+                  />
+                </div>
+              </div>
+            )}
+          </Modal>
+        </div>
+
+        <div>
+          <div className="shadow bg-white sm:rounded-md sm:overflow-hidden px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
+            <form
+              onSubmit={(e: FormEvent) => {
+                e.preventDefault();
+                updateAccountName({
+                  id: account.id,
+                  name: accountName,
+                });
+                const updatedAccount = account;
+                updatedAccount.name = accountName;
+                setAccount(updatedAccount);
+              }}
+              className="my-4 flex justify-between items-end"
+            >
+              <div className="w-7/12">
+                <TextField
+                  id="name"
+                  label={t("name.title")}
+                  type="text"
+                  value={accountName}
+                  onChange={(event) => {
+                    setAccountName(event.target.value);
+                  }}
+                />
+              </div>
+              <div className="w-1/5 flex-none mx-4 d-none"></div>
+              <div className="w-1/5 flex-none">
+                <Button
+                  type="submit"
+                  label={tCommon("actions.save")}
+                  disabled={account.name === accountName}
+                  primary
+                  fullWidth
+                />
+              </div>
+            </form>
+          </div>
+          <h2 className="text-2xl mt-12 font-bold dark:text-white">
+            {t("nostr.title")}
+          </h2>
+          <p className="mb-6 text-gray-500 dark:text-neutral-500 text-sm">
+            <a
+              href="https://github.com/nostr-protocol/nostr"
+              target="_blank"
+              rel="noreferrer noopener"
+              className="underline"
+            >
+              {t("nostr.title")}
+            </a>{" "}
+            {t("nostr.hint")}
+          </p>
+          <div className="shadow bg-white sm:rounded-md sm:overflow-hidden px-6 py-2 dark:bg-surface-02dp">
+            <div className="py-4 flex justify-between items-center">
+              <div>
+                <span className="text-gray-900 dark:text-white font-medium">
+                  {t("nostr.private_key.title")}
+                </span>
+                <p className="text-gray-500 mr-1 dark:text-neutral-500 text-sm">
+                  <Trans
+                    i18nKey={"nostr.private_key.subtitle"}
+                    t={t}
+                    components={[
+                      // eslint-disable-next-line react/jsx-key
+                      <a
+                        className="underline"
+                        target="_blank"
+                        rel="noreferrer noopener"
+                        href="https://guides.getalby.com/overall-guide/alby-browser-extension/features/nostr"
+                      ></a>,
+                    ]}
+                  />
+                </p>
+              </div>
+              <div className="w-1/5 flex-none ml-6">
+                <Button
+                  label={t("nostr.actions.generate")}
+                  onClick={() => setNostrKeyModalIsOpen(true)}
+                  fullWidth
+                />
+              </div>
+            </div>
+            <form
+              onSubmit={(e: FormEvent) => {
+                e.preventDefault();
+                saveNostrPrivateKey(nostrPrivateKey);
+              }}
+              className="mb-4 flex justify-between items-end"
+            >
+              <div className="w-7/12">
+                <TextField
+                  id="nostrPrivateKey"
+                  label={t("nostr.private_key.label")}
+                  type={nostrPrivateKeyVisible ? "text" : "password"}
+                  value={nostrPrivateKey}
+                  onChange={(event) => {
+                    setNostrPrivateKey(event.target.value);
+                  }}
+                  endAdornment={
+                    <button
+                      type="button"
+                      tabIndex={-1}
+                      className="flex justify-center items-center w-10 h-8"
+                      onClick={() => {
+                        setNostrPrivateKeyVisible(!nostrPrivateKeyVisible);
+                      }}
+                    >
+                      {nostrPrivateKeyVisible ? (
+                        <HiddenIcon className="h-6 w-6" />
+                      ) : (
+                        <VisibleIcon className="h-6 w-6" />
+                      )}
+                    </button>
+                  }
+                />
+              </div>
+              <div className="w-1/5 flex-none mx-4">
+                <Button
+                  icon={<CopyIcon className="w-6 h-6 mr-2" />}
+                  label={privateKeyCopyLabel}
+                  onClick={async () => {
+                    try {
+                      navigator.clipboard.writeText(nostrPrivateKey);
+                      setPrivateKeyCopyLabel(tCommon("copied"));
+                      setTimeout(() => {
+                        setPrivateKeyCopyLabel(tCommon("actions.copy"));
+                      }, 1000);
+                    } catch (e) {
+                      if (e instanceof Error) {
+                        toast.error(e.message);
+                      }
+                    }
+                  }}
+                  fullWidth
+                />
+              </div>
+              <div className="w-1/5 flex-none">
+                <Button
+                  type="submit"
+                  label={tCommon("actions.save")}
+                  disabled={
+                    nostrlib.normalizeToHex(nostrPrivateKey) ===
+                    currentPrivateKey
+                  }
+                  primary
+                  fullWidth
+                />
+              </div>
+            </form>
+
+            <div className="mb-4 flex justify-between items-end">
+              <div className="w-7/12">
+                <TextField
+                  id="nostrPublicKey"
+                  label={t("nostr.public_key.label")}
+                  type="text"
+                  value={nostrPublicKey}
+                  disabled
+                />
+              </div>
+              <div className="w-1/5 flex-none mx-4">
+                <Button
+                  icon={<CopyIcon className="w-6 h-6 mr-2" />}
+                  label={publicKeyCopyLabel}
+                  onClick={async () => {
+                    try {
+                      navigator.clipboard.writeText(nostrPublicKey);
+                      setPublicKeyCopyLabel(tCommon("copied"));
+                      setTimeout(() => {
+                        setPublicKeyCopyLabel(tCommon("actions.copy"));
+                      }, 1000);
+                    } catch (e) {
+                      if (e instanceof Error) {
+                        toast.error(e.message);
+                      }
+                    }
+                  }}
+                  fullWidth
+                />
+              </div>
+              <div className="w-1/5 flex-none d-none"></div>
+            </div>
+          </div>
+
+          <div className="relative flex py-5 mt-12 items-center">
+            <div className="flex-grow border-t border-gray-300 dark:border-gray-700"></div>
+            <span className="flex-shrink mx-4 text-gray-500 dark:text-gray-400 fw-bold">
+              ⛔️ Danger Zone
+            </span>
+            <div className="flex-grow border-t border-gray-300 dark:border-gray-700"></div>
+          </div>
+          <div className="shadow bg-white sm:rounded-md sm:overflow-hidden mb-5 px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
+            <Setting title={t("remove.title")} subtitle={t("remove.subtitle")}>
+              <div className="w-64">
+                <Button
+                  onClick={() => {
+                    removeAccount({
+                      id: account.id,
+                      name: account.name,
+                    });
+                  }}
+                  label={t("actions.remove_account")}
+                  fullWidth
+                />
+              </div>
+            </Setting>
+          </div>
+
+          <Modal
+            ariaHideApp={false}
+            closeTimeoutMS={200}
+            isOpen={nostrKeyModalIsOpen}
+            onRequestClose={closeNostrKeyModal}
+            contentLabel={t("nostr.generate_keys.screen_reader")}
+            overlayClassName="bg-black bg-opacity-25 fixed inset-0 flex justify-center items-center p-5"
+            className="rounded-lg bg-white w-full max-w-lg"
+          >
+            <div className="p-5 flex justify-between dark:bg-surface-02dp">
+              <h2 className="text-2xl font-bold dark:text-white">
+                {t("nostr.generate_keys.title")}
+              </h2>
+              <button onClick={closeNostrKeyModal}>
+                <CrossIcon className="w-6 h-6 dark:text-white" />
+              </button>
+            </div>
+            <div className="p-5 border-t border-b dark:text-white border-gray-200 dark:bg-surface-02dp dark:border-neutral-500">
+              <Trans
+                i18nKey={"nostr.generate_keys.hint"}
+                t={t}
+                components={[
+                  // eslint-disable-next-line react/jsx-key
+                  <a
+                    className="underline"
+                    target="_blank"
+                    rel="noreferrer noopener"
+                    href="https://guides.getalby.com/overall-guide/alby-browser-extension/features/nostr"
+                  ></a>,
+                ]}
+              />
+            </div>
+            <div className="p-4 dark:bg-surface-02dp">
+              <div className="flex flex-row justify-between">
+                <Button
+                  type="submit"
+                  onClick={() => generateNostrPrivateKey(true)}
+                  label={t("nostr.generate_keys.actions.random_keys")}
+                  primary
+                  halfWidth
+                />
+                <Button
+                  type="submit"
+                  onClick={() => generateNostrPrivateKey()}
+                  label={t("nostr.generate_keys.actions.derived_keys")}
+                  halfWidth
+                />
+              </div>
+            </div>
+          </Modal>
+        </div>
+      </Container>
+    </div>
+  );
+}
+
+export default AccountScreen;
diff --git a/src/app/screens/Accounts/index.test.tsx b/src/app/screens/Accounts/index.test.tsx
index cb9887287a..8e8742c47d 100644
--- a/src/app/screens/Accounts/index.test.tsx
+++ b/src/app/screens/Accounts/index.test.tsx
@@ -1,5 +1,7 @@
 import { render, screen } from "@testing-library/react";
+import { I18nextProvider } from "react-i18next";
 import { MemoryRouter } from "react-router-dom";
+import i18n from "~/../tests/unit/helpers/i18n";
 
 import { AccountsProvider } from "../../context/AccountsContext";
 import Accounts from "./index";
@@ -8,9 +10,11 @@ describe("Accounts", () => {
   test("render", async () => {
     render(
       <AccountsProvider>
-        <MemoryRouter>
-          <Accounts />
-        </MemoryRouter>
+        <I18nextProvider i18n={i18n}>
+          <MemoryRouter>
+            <Accounts />
+          </MemoryRouter>
+        </I18nextProvider>
       </AccountsProvider>
     );
     expect(await screen.findByText("Accounts")).toBeInTheDocument();
diff --git a/src/app/screens/Accounts/index.tsx b/src/app/screens/Accounts/index.tsx
index 325c878438..f54b469980 100644
--- a/src/app/screens/Accounts/index.tsx
+++ b/src/app/screens/Accounts/index.tsx
@@ -1,113 +1,21 @@
 import {
-  EllipsisIcon,
+  CaretRightIcon,
   PlusIcon,
 } from "@bitcoin-design/bitcoin-icons-react/filled";
-import { CrossIcon } from "@bitcoin-design/bitcoin-icons-react/outline";
 import Button from "@components/Button";
 import Container from "@components/Container";
-import Loading from "@components/Loading";
-import Menu from "@components/Menu";
-import TextField from "@components/form/TextField";
 import Avvvatars from "avvvatars-react";
-import type { FormEvent } from "react";
-import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import Modal from "react-modal";
-import QRCode from "react-qr-code";
 import { useNavigate } from "react-router-dom";
-import { useAccount } from "~/app/context/AccountContext";
 import { useAccounts } from "~/app/context/AccountsContext";
-import api from "~/common/lib/api";
-import msg from "~/common/lib/msg";
-import type { Account } from "~/types";
-
-type AccountAction = Omit<Account, "connector" | "config">;
 
 function AccountsScreen() {
-  const auth = useAccount();
-  const { accounts, getAccounts } = useAccounts();
+  const { accounts } = useAccounts();
   const navigate = useNavigate();
 
-  const [currentAccountId, setCurrentAccountId] = useState("");
-  const [editModalIsOpen, setEditModalIsOpen] = useState(false);
-  const [exportModalIsOpen, setExportModalIsOpen] = useState(false);
-  const [newAccountName, setNewAccountName] = useState("");
-  const [lndHubData, setLndHubData] = useState({
-    login: "",
-    password: "",
-    url: "",
-    lnAddress: "",
-  });
-  const [loading, setLoading] = useState(false);
   const { t } = useTranslation("translation", {
     keyPrefix: "accounts",
   });
-  const { t: tCommon } = useTranslation("common");
-
-  function closeEditModal() {
-    setEditModalIsOpen(false);
-  }
-
-  function closeExportModal() {
-    setExportModalIsOpen(false);
-  }
-
-  async function selectAccount(accountId: string) {
-    auth.setAccountId(accountId);
-    await api.selectAccount(accountId);
-    auth.fetchAccountInfo({ accountId });
-  }
-
-  async function updateAccountName({ id, name }: AccountAction) {
-    await msg.request("editAccount", {
-      name,
-      id,
-    });
-
-    auth.fetchAccountInfo(); // Update active account name
-    getAccounts(); // update all accounts
-    closeEditModal();
-  }
-
-  async function exportAccount({ id, name }: AccountAction) {
-    setLoading(true);
-    /**
-     * @HACK
-     * @headless-ui/menu restores focus after closing a menu, to the button that opened it.
-     * By slightly delaying opening the modal, react-modal's focus management won't be overruled.
-     * {@link https://github.com/tailwindlabs/headlessui/issues/259}
-     */
-    setTimeout(() => {
-      setExportModalIsOpen(true);
-    }, 50);
-    setLndHubData(
-      await msg.request("accountDecryptedDetails", {
-        name,
-        id,
-      })
-    );
-    setLoading(false);
-  }
-
-  async function removeAccount({ id, name }: AccountAction) {
-    if (window.confirm(t("remove.confirm", { name }))) {
-      let nextAccountId;
-      let accountIds = Object.keys(accounts);
-      if (auth.account?.id === id && accountIds.length > 1) {
-        nextAccountId = accountIds.filter((accountId) => accountId !== id)[0];
-      }
-
-      await api.removeAccount(id);
-      accountIds = accountIds.filter((accountId) => accountId !== id);
-
-      if (accountIds.length > 0) {
-        getAccounts();
-        if (nextAccountId) selectAccount(nextAccountId);
-      } else {
-        window.close();
-      }
-    }
-  }
 
   return (
     <Container>
@@ -122,13 +30,17 @@ function AccountsScreen() {
           />
         </div>
       </div>
-      <div className="shadow border-b border-gray-200 dark:border-neutral-500 sm:rounded-lg bg-white dark:bg-surface-02dp">
+      <div className="shadow overflow-hidden rounded-lg">
         <table className="min-w-full">
-          <tbody className="divide-y divide-gray-200">
+          <tbody className="bg-white divide-y divide-gray-200 dark:divide-white/10 dark:bg-surface-02dp">
             {Object.keys(accounts).map((accountId) => {
               const account = accounts[accountId];
               return (
-                <tr key={accountId}>
+                <tr
+                  key={accountId}
+                  className="cursor-pointer hover:bg-gray-50 transition duration-200 dark:hover:bg-neutral-800"
+                  onClick={() => navigate(`/accounts/${accountId}`)}
+                >
                   <td className="px-6 py-4 whitespace-nowrap">
                     <div className="flex items-center">
                       <div className="w-12 h-12 flex justify-center items-center">
@@ -148,175 +60,14 @@ function AccountsScreen() {
                       </div>
                     </div>
                   </td>
-                  <td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                    <Menu as="div" className="relative">
-                      <Menu.Button className="ml-auto flex items-center transition-color duration-200 rounded border-2 border-gray-200 dark:border-gray-500 hover:border-black dark:hover:border-white text-gray-500 hover:text-black dark:hover:text-white">
-                        <EllipsisIcon className="h-6 w-6 rotate-90" />
-                      </Menu.Button>
-
-                      <Menu.List position="right">
-                        <Menu.ItemButton
-                          onClick={() => {
-                            setCurrentAccountId(accountId);
-                            setNewAccountName(account.name);
-                            /**
-                             * @HACK
-                             * @headless-ui/menu restores focus after closing a menu, to the button that opened it.
-                             * By slightly delaying opening the modal, react-modal's focus management won't be overruled.
-                             * {@link https://github.com/tailwindlabs/headlessui/issues/259}
-                             */
-                            setTimeout(() => {
-                              setEditModalIsOpen(true);
-                            }, 50);
-                          }}
-                        >
-                          {tCommon("actions.edit")}
-                        </Menu.ItemButton>
-
-                        {account.connector === "lndhub" && (
-                          <Menu.ItemButton
-                            onClick={() =>
-                              exportAccount({
-                                id: accountId,
-                                name: account.name,
-                              })
-                            }
-                          >
-                            {tCommon("actions.export")}
-                          </Menu.ItemButton>
-                        )}
-
-                        <Menu.ItemButton
-                          danger
-                          onClick={() =>
-                            removeAccount({
-                              id: accountId,
-                              name: account.name,
-                            })
-                          }
-                        >
-                          {tCommon("actions.remove")}
-                        </Menu.ItemButton>
-                      </Menu.List>
-                    </Menu>
+                  <td className="w-10">
+                    <CaretRightIcon className="h-6 w-6 text-gray-500" />
                   </td>
                 </tr>
               );
             })}
           </tbody>
         </table>
-
-        <Modal
-          ariaHideApp={false}
-          closeTimeoutMS={200}
-          isOpen={editModalIsOpen}
-          onRequestClose={closeEditModal}
-          contentLabel={t("edit.screen_reader")}
-          overlayClassName="bg-black bg-opacity-25 fixed inset-0 flex justify-center items-center p-5"
-          className="rounded-lg bg-white w-full max-w-lg"
-        >
-          <div className="p-5 flex justify-between dark:bg-surface-02dp">
-            <h2 className="text-2xl font-bold dark:text-white">
-              {t("edit.title")}
-            </h2>
-            <button onClick={closeEditModal}>
-              <CrossIcon className="w-6 h-6 dark:text-white" />
-            </button>
-          </div>
-
-          <form
-            onSubmit={(e: FormEvent) => {
-              e.preventDefault();
-              updateAccountName({
-                id: currentAccountId,
-                name: newAccountName,
-              });
-            }}
-          >
-            <div className="p-5 border-t border-b border-gray-200 dark:bg-surface-02dp dark:border-neutral-500">
-              <div className="w-60">
-                <TextField
-                  autoFocus
-                  id="accountName"
-                  label={t("edit.name.label")}
-                  onChange={(e) => setNewAccountName(e.target.value)}
-                  value={newAccountName}
-                />
-              </div>
-            </div>
-
-            <div className="flex justify-end p-5 dark:bg-surface-02dp">
-              <Button
-                label={tCommon("actions.save")}
-                type="submit"
-                primary
-                disabled={newAccountName === ""}
-              />
-            </div>
-          </form>
-        </Modal>
-
-        <Modal
-          ariaHideApp={false}
-          closeTimeoutMS={200}
-          isOpen={exportModalIsOpen}
-          onRequestClose={closeExportModal}
-          contentLabel={t("export.screen_reader")}
-          overlayClassName="bg-black bg-opacity-25 fixed inset-0 flex justify-center items-center p-5"
-          className="rounded-lg bg-white w-full max-w-lg"
-        >
-          <div className="p-5 flex justify-between dark:bg-surface-02dp">
-            <h2 className="text-2xl font-bold dark:text-white">
-              {t("export.title")}
-            </h2>
-            <button onClick={closeExportModal}>
-              <CrossIcon className="w-6 h-6 dark:text-white" />
-            </button>
-          </div>
-
-          {loading && (
-            <div className="p-5 flex justify-center items-center space-x-2 dark:text-white">
-              <Loading />
-              <span>{t("export.waiting")}</span>
-            </div>
-          )}
-          {!loading && (
-            <div className="p-5 border-t border-b border-gray-200 dark:bg-surface-02dp dark:border-neutral-500">
-              {lndHubData.lnAddress && (
-                <div className="dark:text-white mb-6">
-                  <p>
-                    <strong>{t("export.your_ln_address")}</strong>
-                  </p>
-                  {lndHubData.lnAddress && <p>{lndHubData.lnAddress}</p>}
-                </div>
-              )}
-              <div className="flex justify-center space-x-3 items-center dark:text-white">
-                <div className="flex-1">
-                  <p>
-                    <strong>{t("export.tip_mobile")}</strong>
-                  </p>
-                  <p>{t("export.scan_qr")}</p>
-                </div>
-                <div className="float-right">
-                  <QRCode
-                    value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
-                    level="M"
-                    size={130}
-                  />
-                </div>
-              </div>
-              <div className="mt-6">
-                <TextField
-                  id="uri"
-                  label={t("export.export_uri")}
-                  type="text"
-                  readOnly
-                  value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
-                />
-              </div>
-            </div>
-          )}
-        </Modal>
       </div>
     </Container>
   );
diff --git a/src/app/screens/Publisher.tsx b/src/app/screens/Publishers/Show/index.tsx
similarity index 100%
rename from src/app/screens/Publisher.tsx
rename to src/app/screens/Publishers/Show/index.tsx
diff --git a/src/app/screens/Settings.tsx b/src/app/screens/Settings/index.tsx
similarity index 76%
rename from src/app/screens/Settings.tsx
rename to src/app/screens/Settings/index.tsx
index 6321a0b716..0c14b95d31 100644
--- a/src/app/screens/Settings.tsx
+++ b/src/app/screens/Settings/index.tsx
@@ -1,8 +1,4 @@
-import {
-  CrossIcon,
-  HiddenIcon,
-  VisibleIcon,
-} from "@bitcoin-design/bitcoin-icons-react/outline";
+import { CrossIcon } from "@bitcoin-design/bitcoin-icons-react/outline";
 import Button from "@components/Button";
 import Container from "@components/Container";
 import LocaleSwitcher from "@components/LocaleSwitcher/LocaleSwitcher";
@@ -10,18 +6,17 @@ import PasswordForm from "@components/PasswordForm";
 import Setting from "@components/Setting";
 import Input from "@components/form/Input";
 import Select from "@components/form/Select";
-import TextField from "@components/form/TextField";
 import Toggle from "@components/form/Toggle";
 import { Html5Qrcode } from "html5-qrcode";
 import type { FormEvent } from "react";
-import { useState, useEffect } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import Modal from "react-modal";
+import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import { useSettings } from "~/app/context/SettingsContext";
 import { CURRENCIES } from "~/common/constants";
 import msg from "~/common/lib/msg";
-import nostrlib from "~/common/lib/nostr";
 
 const initialFormData = {
   password: "",
@@ -31,24 +26,11 @@ const initialFormData = {
 function Settings() {
   const { t } = useTranslation("translation", { keyPrefix: "settings" });
   const { isLoading, settings, updateSetting } = useSettings();
+  const navigate = useNavigate();
 
   const [modalIsOpen, setModalIsOpen] = useState(false);
   const [formData, setFormData] = useState(initialFormData);
 
-  const [nostrPrivateKey, setNostrPrivateKey] = useState("");
-  const [nostrPrivateKeyVisible, setNostrPrivateKeyVisible] = useState(false);
-
-  const getPrivateKeyFromStorage = async () => {
-    const priv = (await msg.request("nostr/getPrivateKey")) as string;
-    if (priv) {
-      setNostrPrivateKey(nostrlib.hexToNip19(priv, "nsec"));
-    }
-  };
-
-  useEffect(() => {
-    getPrivateKeyFromStorage().catch(console.error);
-  }, []);
-
   const [cameraPermissionsGranted, setCameraPermissionsGranted] =
     useState(false);
 
@@ -56,26 +38,6 @@ function Settings() {
     setModalIsOpen(false);
   }
 
-  async function saveNostrPrivateKey(nostrPrivateKey: string) {
-    const result = await msg.request("nostr/getPrivateKey");
-    const currentPrivateKey = result as unknown as string;
-
-    if (nostrPrivateKey === currentPrivateKey) return;
-
-    if (currentPrivateKey && !confirm(t("nostr.private_key.warning"))) {
-      return;
-    }
-
-    await msg.request("nostr/setPrivateKey", {
-      privateKey: nostrlib.normalizeToHex(nostrPrivateKey),
-    });
-
-    saveSetting({
-      nostrEnabled: !!nostrPrivateKey,
-    });
-    toast.success(t("nostr.private_key.success"));
-  }
-
   async function updateAccountPassword(password: string) {
     await msg.request("changePassword", {
       password: formData.password,
@@ -289,7 +251,7 @@ function Settings() {
         {t("personal_data.description")}
       </p>
 
-      <div className="mb-12 shadow bg-white sm:rounded-md sm:overflow-hidden px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
+      <div className="shadow bg-white sm:rounded-md sm:overflow-hidden px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
         <Setting title={t("name.title")} subtitle={t("name.subtitle")}>
           {!isLoading && (
             <div className="w-64">
@@ -370,14 +332,9 @@ function Settings() {
         </Modal>
       </div>
 
-      <div className="relative flex py-5 mt-5 items-center">
-        <div className="flex-grow border-t border-gray-300 dark:border-gray-700"></div>
-        <span className="flex-shrink mx-4 text-gray-500 dark:text-gray-400 fw-bold">
-          🧪 Alby Lab
-        </span>
-        <div className="flex-grow border-t border-gray-300 dark:border-gray-700"></div>
-      </div>
-      <h2 className="text-2xl font-bold dark:text-white">{t("nostr.title")}</h2>
+      <h2 className="text-2xl mt-12 font-bold dark:text-white">
+        {t("nostr.title")}
+      </h2>
       <p className="mb-6 text-gray-500 dark:text-neutral-500 text-sm">
         <a
           href="https://github.com/nostr-protocol/nostr"
@@ -392,67 +349,15 @@ function Settings() {
       <div className="shadow bg-white sm:rounded-md sm:overflow-hidden px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
         <Setting
           title={t("nostr.private_key.title")}
-          subtitle={
-            <Trans
-              i18nKey={"nostr.private_key.subtitle"}
-              t={t}
-              components={[
-                // eslint-disable-next-line react/jsx-key
-                <a
-                  className="underline"
-                  target="_blank"
-                  rel="noreferrer noopener"
-                  href="https://guides.getalby.com/overall-guide/alby-browser-extension/features/nostr"
-                ></a>,
-              ]}
-            />
-          }
+          subtitle={t("nostr.private_key.subtitle")}
         >
-          <div className="w-96 flex justify-end">
-            <div className="w-96 flex-auto -mt-1 ml-6">
-              <TextField
-                id="nostrPrivateKey"
-                label={""}
-                type={nostrPrivateKeyVisible ? "text" : "password"}
-                value={nostrPrivateKey}
-                onBlur={() => {
-                  saveNostrPrivateKey(nostrPrivateKey);
-                }}
-                onChange={(event) => {
-                  setNostrPrivateKey(event.target.value);
-                }}
-                endAdornment={
-                  <button
-                    type="button"
-                    tabIndex={-1}
-                    className="flex justify-center items-center w-10 h-8"
-                    onClick={() => {
-                      setNostrPrivateKeyVisible(!nostrPrivateKeyVisible);
-                    }}
-                  >
-                    {nostrPrivateKeyVisible ? (
-                      <HiddenIcon className="h-6 w-6" />
-                    ) : (
-                      <VisibleIcon className="h-6 w-6" />
-                    )}
-                  </button>
-                }
-              />
-            </div>
-            {!nostrPrivateKey && (
-              <div className="flex-none ml-2 flex-end">
-                <Button
-                  label={t("nostr.private_key.generate")}
-                  onClick={async () => {
-                    const result = await msg.request(
-                      "nostr/generatePrivateKey"
-                    );
-                    setNostrPrivateKey(result.privateKey as string);
-                    saveNostrPrivateKey(result.privateKey as string);
-                  }}
-                />
-              </div>
-            )}
+          <div className="w-64">
+            <Button
+              label={t("nostr.private_key.go_to")}
+              primary
+              fullWidth
+              onClick={() => navigate(`/accounts`)}
+            />
           </div>
         </Setting>
       </div>
diff --git a/src/app/screens/connectors/ConnectCitadel/index.tsx b/src/app/screens/connectors/ConnectCitadel/index.tsx
index b0ab87f1b9..c1543b9a1e 100644
--- a/src/app/screens/connectors/ConnectCitadel/index.tsx
+++ b/src/app/screens/connectors/ConnectCitadel/index.tsx
@@ -7,7 +7,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectEclair/index.tsx b/src/app/screens/connectors/ConnectEclair/index.tsx
index 6a292ea9bf..c285a0beef 100644
--- a/src/app/screens/connectors/ConnectEclair/index.tsx
+++ b/src/app/screens/connectors/ConnectEclair/index.tsx
@@ -6,7 +6,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectGaloy/index.tsx b/src/app/screens/connectors/ConnectGaloy/index.tsx
index 5c66fa81ee..596e15c2b6 100644
--- a/src/app/screens/connectors/ConnectGaloy/index.tsx
+++ b/src/app/screens/connectors/ConnectGaloy/index.tsx
@@ -3,7 +3,7 @@ import Input from "@components/form/Input";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import axios from "axios";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectLnbits/index.tsx b/src/app/screens/connectors/ConnectLnbits/index.tsx
index e7e99e6a8c..8d0f5a4c24 100644
--- a/src/app/screens/connectors/ConnectLnbits/index.tsx
+++ b/src/app/screens/connectors/ConnectLnbits/index.tsx
@@ -3,7 +3,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectMyNode/index.tsx b/src/app/screens/connectors/ConnectMyNode/index.tsx
index 8d19e4ee30..d2d89b29d2 100644
--- a/src/app/screens/connectors/ConnectMyNode/index.tsx
+++ b/src/app/screens/connectors/ConnectMyNode/index.tsx
@@ -3,7 +3,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx b/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
index 5c9c158fe1..5eaad41e21 100644
--- a/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
+++ b/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
@@ -3,7 +3,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectStart9/index.tsx b/src/app/screens/connectors/ConnectStart9/index.tsx
index 45c1106ef4..02c346b248 100644
--- a/src/app/screens/connectors/ConnectStart9/index.tsx
+++ b/src/app/screens/connectors/ConnectStart9/index.tsx
@@ -3,7 +3,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/app/screens/connectors/ConnectUmbrel/index.tsx b/src/app/screens/connectors/ConnectUmbrel/index.tsx
index f27fa59922..ee703d51e5 100644
--- a/src/app/screens/connectors/ConnectUmbrel/index.tsx
+++ b/src/app/screens/connectors/ConnectUmbrel/index.tsx
@@ -3,7 +3,7 @@ import ConnectorForm from "@components/ConnectorForm";
 import TextField from "@components/form/TextField";
 import ConnectionErrorToast from "@components/toasts/ConnectionErrorToast";
 import { useState } from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import msg from "~/common/lib/msg";
diff --git a/src/common/lib/api.ts b/src/common/lib/api.ts
index 246b604ee5..0c77c2a1bd 100644
--- a/src/common/lib/api.ts
+++ b/src/common/lib/api.ts
@@ -6,6 +6,7 @@ import {
   MakeInvoiceResponse,
 } from "~/extension/background-script/connectors/connector.interface";
 import type {
+  Account,
   AccountInfo,
   Accounts,
   Allowance,
@@ -33,6 +34,10 @@ export interface AccountInfoRes {
   name: string;
 }
 
+export interface GetAccountRes
+  extends Pick<Account, "id" | "connector" | "name"> {
+  nostrEnabled: boolean;
+}
 interface StatusRes {
   configured: boolean;
   unlocked: boolean;
@@ -92,6 +97,7 @@ export const swrGetAccountInfo = async (
   });
 };
 export const getAccounts = () => msg.request<Accounts>("getAccounts");
+export const getAccount = () => msg.request<GetAccountRes>("getAccount");
 export const updateAllowance = () => msg.request<Accounts>("updateAllowance");
 export const selectAccount = (id: string) =>
   msg.request("selectAccount", { id });
@@ -130,6 +136,7 @@ export const getCurrencyRate = async () =>
   msg.request<{ rate: number }>("getCurrencyRate");
 
 export default {
+  getAccount,
   getAccountInfo,
   getAccounts,
   getInfo,
diff --git a/src/extension/background-script/actions/accounts/__tests__/add.test.ts b/src/extension/background-script/actions/accounts/__tests__/add.test.ts
index b245ddc854..d05ed55355 100644
--- a/src/extension/background-script/actions/accounts/__tests__/add.test.ts
+++ b/src/extension/background-script/actions/accounts/__tests__/add.test.ts
@@ -27,6 +27,7 @@ const message: MessageAccountAdd = {
     connector: "lnd",
     config: "123456config",
     name: "purple",
+    nostrPrivateKey: "123456nostr",
   },
   origin: { internal: true },
   prompt: true,
@@ -57,6 +58,7 @@ describe("add account to account-list", () => {
           connector: "lnd",
           config: "secret-config-string-42",
           name: "purple",
+          nostrPrivateKey: "123456nostr",
         },
       },
     });
@@ -77,11 +79,13 @@ describe("add account to account-list", () => {
           config: "abc",
           connector: "lnd",
           name: "BLUE",
+          nostrPrivateKey: "123",
         },
         "666": {
           config: "xyz",
           connector: "lnd",
           name: "GREEN",
+          nostrPrivateKey: "123",
         },
       },
     };
@@ -102,9 +106,20 @@ describe("add account to account-list", () => {
           connector: "lnd",
           config: "secret-config-string-42",
           name: "purple",
+          nostrPrivateKey: "123456nostr",
+        },
+        "666": {
+          config: "xyz",
+          connector: "lnd",
+          name: "GREEN",
+          nostrPrivateKey: "123",
+        },
+        "888": {
+          config: "abc",
+          connector: "lnd",
+          name: "BLUE",
+          nostrPrivateKey: "123",
         },
-        "666": { config: "xyz", connector: "lnd", name: "GREEN" },
-        "888": { config: "abc", connector: "lnd", name: "BLUE" },
       },
     });
 
diff --git a/src/extension/background-script/actions/accounts/__tests__/get.test.ts b/src/extension/background-script/actions/accounts/__tests__/get.test.ts
new file mode 100644
index 0000000000..e70944e78c
--- /dev/null
+++ b/src/extension/background-script/actions/accounts/__tests__/get.test.ts
@@ -0,0 +1,87 @@
+import type { GetAccountRes } from "~/common/lib/api";
+import state from "~/extension/background-script/state";
+import type { MessageAccountGet } from "~/types";
+
+import getAccount from "../get";
+
+jest.mock("~/extension/background-script/state");
+
+const mockState = {
+  getConnector: () => ({
+    getInfo: () => Promise.resolve({ data: { alias: "getalby.com" } }),
+    getBalance: () => Promise.resolve({ data: { balance: 0 } }),
+  }),
+  getAccount: () => ({
+    config:
+      "U2FsdGVkX19YMFK/8YpN5XQbMsmbVmlOJgpZCIRlt25K6ur4EPp4XdRUQC7+ep/m1k8d2yy69QfuGpsgn2SZOv4DQaPsdYTTwjj0mibQG/dkJ9OCp88zXuMpconrmRu5w4uZWEvdg7p5GQfIYJCvTPLUq+1zH3iH0xX7GhlrlQ8=",
+    connector: "lndhub",
+    id: "1e1e8ea6-493e-480b-9855-303d37506e97",
+    name: "Alby",
+  }),
+  currentAccountId: "1e1e8ea6-493e-480b-9855-303d37506e97",
+  accounts: {
+    "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e": {
+      config: "config-123-456",
+      connector: "lndhub",
+      id: "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e",
+      name: "Alby",
+      nostrPrivateKey: "nostr-123-456",
+    },
+    "1e1e8ea6-493e-480b-9855-303d37506e97": {
+      config: "config-123-456",
+      connector: "lndhub",
+      id: "1e1e8ea6-493e-480b-9855-303d37506e97",
+      name: "Alby",
+    },
+  },
+};
+
+describe("account info", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test("get current account info", async () => {
+    const message: MessageAccountGet = {
+      application: "LBE",
+      origin: { internal: true },
+      prompt: true,
+      action: "getAccount",
+    };
+
+    state.getState = jest.fn().mockReturnValue(mockState);
+
+    const result: GetAccountRes = {
+      id: "1e1e8ea6-493e-480b-9855-303d37506e97",
+      name: "Alby",
+      connector: "lndhub",
+      nostrEnabled: false,
+    };
+
+    expect(await getAccount(message)).toStrictEqual({
+      data: result,
+    });
+  });
+  test("get account info by id", async () => {
+    const message: MessageAccountGet = {
+      application: "LBE",
+      origin: { internal: true },
+      prompt: true,
+      args: { id: "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e" },
+      action: "getAccount",
+    };
+
+    state.getState = jest.fn().mockReturnValue(mockState);
+
+    const result: GetAccountRes = {
+      id: "8b7f1dc6-ab87-4c6c-bca5-19fa8632731e",
+      name: "Alby",
+      connector: "lndhub",
+      nostrEnabled: true,
+    };
+
+    expect(await getAccount(message)).toStrictEqual({
+      data: result,
+    });
+  });
+});
diff --git a/src/extension/background-script/actions/accounts/get.ts b/src/extension/background-script/actions/accounts/get.ts
new file mode 100644
index 0000000000..d19cb2f238
--- /dev/null
+++ b/src/extension/background-script/actions/accounts/get.ts
@@ -0,0 +1,29 @@
+import state from "~/extension/background-script/state";
+import type { MessageAccountGet } from "~/types";
+
+const get = async (message: MessageAccountGet) => {
+  const id = message?.args?.id || state.getState().currentAccountId;
+
+  if (!id)
+    return {
+      error: "No account selected.",
+    };
+
+  const accounts = state.getState().accounts;
+  const account = accounts[id];
+
+  if (!account) return;
+
+  const result = {
+    id: account.id,
+    connector: account.connector,
+    name: account.name,
+    nostrEnabled: !!account.nostrPrivateKey,
+  };
+
+  return {
+    data: result,
+  };
+};
+
+export default get;
diff --git a/src/extension/background-script/actions/accounts/index.ts b/src/extension/background-script/actions/accounts/index.ts
index 29142f1621..e41ef2f8f9 100644
--- a/src/extension/background-script/actions/accounts/index.ts
+++ b/src/extension/background-script/actions/accounts/index.ts
@@ -2,10 +2,22 @@ import add from "./add";
 import all from "./all";
 import decryptedDetails from "./decryptedDetails";
 import edit from "./edit";
+import get from "./get";
 import info from "./info";
 import lock from "./lock";
 import remove from "./remove";
 import select from "./select";
 import unlock from "./unlock";
 
-export { all, unlock, lock, add, edit, select, info, remove, decryptedDetails };
+export {
+  all,
+  unlock,
+  lock,
+  add,
+  edit,
+  select,
+  info,
+  remove,
+  get,
+  decryptedDetails,
+};
diff --git a/src/extension/background-script/actions/accounts/select.ts b/src/extension/background-script/actions/accounts/select.ts
index 0fd44ef529..f64e55505b 100644
--- a/src/extension/background-script/actions/accounts/select.ts
+++ b/src/extension/background-script/actions/accounts/select.ts
@@ -14,6 +14,7 @@ const select = async (message: MessageAccountSelect) => {
 
     state.setState({
       account,
+      nostr: null, // reset memoized nostr instance
       connector: null, // reset memoized connector
       currentAccountId: accountId,
     });
diff --git a/src/extension/background-script/actions/nostr/generatePrivateKey.ts b/src/extension/background-script/actions/nostr/generatePrivateKey.ts
index 753bbd8fb4..a7aac8ec25 100644
--- a/src/extension/background-script/actions/nostr/generatePrivateKey.ts
+++ b/src/extension/background-script/actions/nostr/generatePrivateKey.ts
@@ -1,10 +1,33 @@
 import * as secp256k1 from "@noble/secp256k1";
 import Hex from "crypto-js/enc-hex";
 import sha512 from "crypto-js/sha512";
+import type { MessagePrivateKeyGenerate } from "~/types";
 
 import state from "../../state";
 
-const generatePrivateKey = async () => {
+const generatePrivateKey = async (message: MessagePrivateKeyGenerate) => {
+  const type = message?.args?.type;
+
+  const privateKey =
+    type === "random" ? generateRandomKey() : await deriveKey();
+
+  if (privateKey)
+    return {
+      data: {
+        privateKey: secp256k1.utils.bytesToHex(privateKey),
+      },
+    };
+  else
+    return {
+      error: "Error generating private key.",
+    };
+};
+
+const generateRandomKey = () => {
+  return secp256k1.utils.randomPrivateKey();
+};
+
+const deriveKey = async () => {
   const connector = await state.getState().getConnector();
   try {
     const response = await connector.signMessage({
@@ -23,12 +46,7 @@ const generatePrivateKey = async () => {
     // Use SHA-512 to provide enough key material for secp256k1 (> 40 bytes)
     const hash = sha512(keymaterial).toString(Hex);
     const privateKey = secp256k1.utils.hashToPrivateKey(hash);
-
-    return {
-      data: {
-        privateKey: secp256k1.utils.bytesToHex(privateKey),
-      },
-    };
+    return privateKey;
   } catch (e) {
     console.error(e);
   }
diff --git a/src/extension/background-script/actions/nostr/getPrivateKey.ts b/src/extension/background-script/actions/nostr/getPrivateKey.ts
index cf093ae274..714a377c86 100644
--- a/src/extension/background-script/actions/nostr/getPrivateKey.ts
+++ b/src/extension/background-script/actions/nostr/getPrivateKey.ts
@@ -1,9 +1,30 @@
+import { decryptData } from "~/common/lib/crypto";
+import type { MessagePrivateKeyGet } from "~/types";
+
 import state from "../../state";
 
-const getPrivateKey = async () => {
-  const privateKey = state.getState().getNostr().getPrivateKey();
+const getPrivateKey = async (message: MessagePrivateKeyGet) => {
+  const id = message?.args?.id;
+
+  if (!id) {
+    return {
+      data: state.getState().getNostr().privateKey,
+    };
+  }
+
+  const accounts = state.getState().accounts;
+  if (Object.keys(accounts).includes(id)) {
+    const password = state.getState().password as string;
+    const account = accounts[id];
+    if (!account.nostrPrivateKey) return { data: null };
+    const privateKey = decryptData(account.nostrPrivateKey, password);
+    return {
+      data: privateKey,
+    };
+  }
+
   return {
-    data: privateKey,
+    error: "Account does not exist.",
   };
 };
 
diff --git a/src/extension/background-script/actions/nostr/setPrivateKey.ts b/src/extension/background-script/actions/nostr/setPrivateKey.ts
index c7fa543bc7..b6f475951a 100644
--- a/src/extension/background-script/actions/nostr/setPrivateKey.ts
+++ b/src/extension/background-script/actions/nostr/setPrivateKey.ts
@@ -1,10 +1,32 @@
+import { encryptData } from "~/common/lib/crypto";
 import type { MessagePrivateKeySet } from "~/types";
 
 import state from "../../state";
 
 const setPrivateKey = async (message: MessagePrivateKeySet) => {
-  await state.getState().getNostr().setPrivateKey(message.args.privateKey);
-  return {};
+  const id = message.args?.id || state.getState().currentAccountId;
+
+  const password = state.getState().password as string;
+  const privateKey = message.args.privateKey;
+  const accounts = state.getState().accounts;
+
+  if (id && Object.keys(accounts).includes(id)) {
+    const account = accounts[id];
+    account.nostrPrivateKey = privateKey
+      ? encryptData(privateKey, password)
+      : null;
+    accounts[id] = account;
+    state.setState({ accounts });
+    await state.getState().saveToStorage();
+    return {
+      data: {
+        accountId: id,
+      },
+    };
+  }
+  return {
+    error: "No account selected.",
+  };
 };
 
 export default setPrivateKey;
diff --git a/src/extension/background-script/actions/settings/changePassword.ts b/src/extension/background-script/actions/settings/changePassword.ts
index 28d93d59e9..919afca8cb 100644
--- a/src/extension/background-script/actions/settings/changePassword.ts
+++ b/src/extension/background-script/actions/settings/changePassword.ts
@@ -8,7 +8,6 @@ const changePassword = async (message: Message) => {
   const password = state.getState().password as string;
   const newPassword = message.args.password as string;
   const tmpAccounts = { ...accounts };
-  const nostPrivateKey = await state.getState().getNostr().getPrivateKey();
 
   for (const accountId in tmpAccounts) {
     const accountConfig = decryptData(
@@ -16,9 +15,16 @@ const changePassword = async (message: Message) => {
       password
     );
     tmpAccounts[accountId].config = encryptData(accountConfig, newPassword);
+    const accountNostrKey = decryptData(
+      accounts[accountId].nostrPrivateKey as string,
+      password
+    );
+    tmpAccounts[accountId].nostrPrivateKey = encryptData(
+      accountNostrKey,
+      newPassword
+    );
   }
   state.setState({ accounts: tmpAccounts, password: newPassword });
-  await state.getState().getNostr().setPrivateKey(nostPrivateKey);
   // make sure we immediately persist the updated accounts
   await state.getState().saveToStorage();
 
diff --git a/src/extension/background-script/migrations/index.ts b/src/extension/background-script/migrations/index.ts
index ddec35b1dc..81443b33d6 100644
--- a/src/extension/background-script/migrations/index.ts
+++ b/src/extension/background-script/migrations/index.ts
@@ -52,6 +52,19 @@ const migrations = {
       // state is saved with the setMigrated call
     }
   },
+  migrateisUsingGlobalNostrKey: async () => {
+    const { nostrPrivateKey, accounts } = state.getState();
+
+    if (nostrPrivateKey) {
+      Object.values(accounts).map((account) => {
+        if (!account.nostrPrivateKey) account.nostrPrivateKey = nostrPrivateKey;
+      });
+
+      state.setState({
+        accounts,
+      });
+    }
+  },
 };
 
 const migrate = async () => {
@@ -64,6 +77,11 @@ const migrate = async () => {
     await migrations["migrateisUsingLegacyLnurlAuthKeySetting"]();
     await setMigrated("migrateisUsingLegacyLnurlAuthKeySetting");
   }
+  if (shouldMigrate("migrateisUsingGlobalNostrKey")) {
+    console.info("Running migration for: migrateisUsingGlobalNostrKey");
+    await migrations["migrateisUsingGlobalNostrKey"]();
+    await setMigrated("migrateisUsingGlobalNostrKey");
+  }
   if (shouldMigrate("migratedeleteLegacyWeblnPermissions")) {
     console.info("Running migration for: migratedeleteLegacyWeblnPermissions");
     await migrations["migratedeleteLegacyWeblnPermissions"]();
diff --git a/src/extension/background-script/nostr/__test__/nostr.test.ts b/src/extension/background-script/nostr/__test__/nostr.test.ts
index 61d918c9b6..33ec724609 100644
--- a/src/extension/background-script/nostr/__test__/nostr.test.ts
+++ b/src/extension/background-script/nostr/__test__/nostr.test.ts
@@ -12,18 +12,41 @@ const bob = {
   publicKey: "519f5ae2cd7d4b970c4edadb2efc947c9b803838de918d1c5bfd4b9c1a143b72",
 };
 
+const carol = {
+  privateKey:
+    "43a2d71f40dde6fb7588e7962a54b8bbd8dd4bd617a9a5c58b7bf0d8f3482f11",
+  publicKey: "a8c7d70a7d2e2826ce519a0a490fb953464c9d130235c321282983cd73be333f",
+};
+
 describe("nostr", () => {
   test("encrypt & decrypt", async () => {
-    const nostr = new Nostr();
-    nostr.getPrivateKey = jest.fn().mockReturnValue(alice.privateKey);
+    const aliceNostr = new Nostr(alice.privateKey);
 
     const message = "Secret message that is sent from Alice to Bob";
-    const encrypted = nostr.encrypt(bob.publicKey, message);
+    const encrypted = aliceNostr.encrypt(bob.publicKey, message);
 
-    nostr.getPrivateKey = jest.fn().mockReturnValue(bob.privateKey);
+    const bobNostr = new Nostr(bob.privateKey);
 
-    const decrypted = nostr.decrypt(alice.publicKey, encrypted);
+    const decrypted = bobNostr.decrypt(alice.publicKey, encrypted);
 
     expect(decrypted).toMatch(message);
   });
+
+  test("Carol can't decrypt Alice's message for Bob", async () => {
+    const aliceNostr = new Nostr(alice.privateKey);
+
+    const message = "Secret message that is sent from Alice to Bob";
+    const encrypted = aliceNostr.encrypt(bob.publicKey, message);
+
+    const carolNostr = new Nostr(carol.privateKey);
+
+    let decrypted;
+    try {
+      decrypted = carolNostr.decrypt(alice.publicKey, encrypted);
+    } catch (e) {
+      decrypted = "error decrypting message";
+    }
+
+    expect(decrypted).not.toMatch(message);
+  });
 });
diff --git a/src/extension/background-script/nostr/index.ts b/src/extension/background-script/nostr/index.ts
index 4fb1bc9137..007b563e5a 100644
--- a/src/extension/background-script/nostr/index.ts
+++ b/src/extension/background-script/nostr/index.ts
@@ -5,51 +5,33 @@ import { AES } from "crypto-js";
 import Base64 from "crypto-js/enc-base64";
 import Hex from "crypto-js/enc-hex";
 import Utf8 from "crypto-js/enc-utf8";
-import { decryptData, encryptData } from "~/common/lib/crypto";
 import { Event } from "~/extension/ln/nostr/types";
 
-import { signEvent, getEventHash } from "../actions/nostr/helpers";
-import state from "../state";
+import { getEventHash, signEvent } from "../actions/nostr/helpers";
 
 class Nostr {
-  getPrivateKey() {
-    const password = state.getState().password as string;
-    const encryptedKey = state.getState().nostrPrivateKey as string;
-    if (encryptedKey) {
-      try {
-        return decryptData(encryptedKey, password);
-      } catch (e) {
-        console.error("Could not decrypt the Nostr key");
-        console.error(e);
-      }
-    }
+  privateKey: string;
 
-    return null;
+  constructor(privateKey: string) {
+    this.privateKey = privateKey;
   }
 
   getPublicKey() {
     const publicKey = secp256k1.schnorr.getPublicKey(
-      secp256k1.utils.hexToBytes(this.getPrivateKey())
+      secp256k1.utils.hexToBytes(this.privateKey)
     );
     const publicKeyHex = secp256k1.utils.bytesToHex(publicKey);
     return publicKeyHex;
   }
 
-  async setPrivateKey(privateKey: string) {
-    const password = state.getState().password as string;
-
-    state.setState({ nostrPrivateKey: encryptData(privateKey, password) });
-    await state.getState().saveToStorage();
-  }
-
   async signEvent(event: Event): Promise<Event> {
-    const signature = await signEvent(event, this.getPrivateKey());
+    const signature = await signEvent(event, this.privateKey);
     event.sig = signature;
     return event;
   }
 
   encrypt(pubkey: string, text: string) {
-    const key = secp256k1.getSharedSecret(this.getPrivateKey(), "02" + pubkey);
+    const key = secp256k1.getSharedSecret(this.privateKey, "02" + pubkey);
     const normalizedKey = Buffer.from(key.slice(1, 33));
     const hexNormalizedKey = secp256k1.utils.bytesToHex(normalizedKey);
     const hexKey = Hex.parse(hexNormalizedKey);
@@ -65,7 +47,7 @@ class Nostr {
 
   decrypt(pubkey: string, ciphertext: string) {
     const [cip, iv] = ciphertext.split("?iv=");
-    const key = secp256k1.getSharedSecret(this.getPrivateKey(), "02" + pubkey);
+    const key = secp256k1.getSharedSecret(this.privateKey, "02" + pubkey);
     const normalizedKey = Buffer.from(key.slice(1, 33));
     const hexNormalizedKey = secp256k1.utils.bytesToHex(normalizedKey);
     const hexKey = Hex.parse(hexNormalizedKey);
diff --git a/src/extension/background-script/router.ts b/src/extension/background-script/router.ts
index 5dba8ab46f..7cdf113039 100644
--- a/src/extension/background-script/router.ts
+++ b/src/extension/background-script/router.ts
@@ -38,6 +38,7 @@ const routes = {
   addAccount: accounts.add,
   editAccount: accounts.edit,
   getAccounts: accounts.all,
+  getAccount: accounts.get,
   removeAccount: accounts.remove,
   selectAccount: accounts.select,
   setPassword: setup.setPassword,
diff --git a/src/extension/background-script/state.ts b/src/extension/background-script/state.ts
index 0d5d4adf15..c02b39f8db 100644
--- a/src/extension/background-script/state.ts
+++ b/src/extension/background-script/state.ts
@@ -110,8 +110,13 @@ const state = createState<State>((set, get) => ({
     if (get().nostr) {
       return get().nostr as Nostr;
     }
+    const currentAccountId = get().currentAccountId as string;
+    const account = get().accounts[currentAccountId];
+
+    const password = get().password as string;
+    const privateKey = decryptData(account.nostrPrivateKey as string, password);
 
-    const nostr = new Nostr();
+    const nostr = new Nostr(privateKey);
     set({ nostr: nostr });
 
     return nostr;
@@ -121,7 +126,7 @@ const state = createState<State>((set, get) => ({
     if (connector) {
       await connector.unload();
     }
-    set({ password: null, connector: null, account: null });
+    set({ password: null, connector: null, account: null, nostr: null });
   },
   isUnlocked: () => {
     return get().password !== null;
diff --git a/src/extension/content-script/onstart.ts b/src/extension/content-script/onstart.ts
index b0154ae2fa..70e0a163cb 100644
--- a/src/extension/content-script/onstart.ts
+++ b/src/extension/content-script/onstart.ts
@@ -14,7 +14,7 @@ async function onstart() {
   injectScript(browser.runtime.getURL("js/inpageScriptWebLN.bundle.js"));
 
   // window.nostr
-  const nostrEnabled = (await api.getSettings()).nostrEnabled;
+  const nostrEnabled = (await api.getAccount()).nostrEnabled;
   if (nostrEnabled) {
     injectScript(browser.runtime.getURL("js/inpageScriptNostr.bundle.js"));
   }
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index e70c8014c1..d2e0a6f4cb 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -374,27 +374,61 @@
     },
     "accounts": {
       "title": "Accounts",
-      "actions": {
-        "add_account": "Add account"
-      },
-      "edit": {
-        "title": "Edit Account",
+      "account_view": {
+        "title1": "Account Information",
+        "title2": "Edit Account",
         "name": {
-          "label": "Name"
+          "title": "Name",
+          "placeholder": "Account Name"
+        },
+        "export": {
+          "title": "Export Account",
+          "screen_reader": "Export account details",
+          "waiting": "waiting for LndHub data...",
+          "your_ln_address": "Your Lightning Address:",
+          "tip_mobile": "Tip: Use this wallet with your mobile device",
+          "export_uri": "LNDHub Credentials URI",
+          "scan_qr": "Import this wallet into Zeus or BlueWallet by scanning the QRCode."
+        },
+        "nostr": {
+          "title": "Nostr",
+          "hint": "is a simple and open protocol that aims to create censorship-resistant social networks. Nostr works with cryptographic keys. To publish something you sign it with your key and send it to multiple relays. You can use Alby to manage your Nostr key. Many Nostr applications will then allow you to simply use the key from the Alby extension.",
+          "private_key": {
+            "title": "Manage your keys",
+            "subtitle": "Paste your private key or generate a new one. Make sure you backup your private key before you generate a new one. <0>Learn more »</0>",
+            "warning": "This will delete your old private key. Are you sure?",
+            "success": "Private key encrypted & saved successfully.",
+            "successfully_removed": "Private key removed successfully.",
+            "label": "Private Key"
+          },
+          "public_key": {
+            "label": "Public Key"
+          },
+          "generate_keys": {
+            "title": "Generate new Nostr keys",
+            "screen_reader": "Generate new nostr keys for your account",
+            "hint": "You can generate a random set of Nostr keys or derive keys from this account details (using a signed canonical phrase). <0>Learn more »</0>",
+            "actions": {
+              "random_keys": "Generate random keys",
+              "derived_keys": "Derive keys from account"
+            }
+          },
+          "actions": {
+            "generate": "Generate new keys"
+          }
         },
-        "screen_reader": "Edit account name"
-      },
-      "export": {
-        "title": "Export Account",
-        "screen_reader": "Export account details",
-        "waiting": "waiting for LndHub data...",
-        "your_ln_address": "Your Lightning Address:",
-        "tip_mobile": "Tip: Use this wallet with your mobile device",
-        "export_uri": "LNDHub Credentials URI",
-        "scan_qr": "Import this wallet into Zeus or BlueWallet by scanning the QRCode."
+        "remove": {
+          "title": "Remove This Account",
+          "subtitle": "All the linked allowances will be deleted. Please be certain.",
+          "confirm": "Are you sure you want to remove account: {{name}}? \nThis can not be undone. If you used this account to login to websites you might lose access to those."
+        },
+        "actions": {
+          "remove_account": "Remove account",
+          "export": "Export"
+        }
       },
-      "remove": {
-        "confirm": "Are you sure you want to remove account: {{name}}? \nThis can not be undone. If you used this account to login to websites you might lose access to those."
+      "actions": {
+        "add_account": "Add account"
       }
     },
     "enable": {
@@ -512,10 +546,8 @@
         "hint": "is a simple and open protocol that aims to create censorship-resistant social networks. Nostr works with cryptographic keys. To publish something you sign it with your key and send it to multiple relays. You can use Alby to manage your Nostr key. Many Nostr applications will then allow you to simply use the key from the Alby extension.",
         "private_key": {
           "title": "Private key",
-          "subtitle": "Paste your private key or generate a new one. Generating a key will create a new key based on the current account you use. It can be re-generated, but please make sure you backup this private key. <0>Learn more »</0>",
-          "generate": "Generate",
-          "warning": "This will delete your old private key. Are you sure?",
-          "success": "Private key encrypted & saved successfully."
+          "subtitle": "This section is moved to accounts page as keys are account specific now.",
+          "go_to": "Go To Accounts"
         }
       }
     },
@@ -704,6 +736,7 @@
     "success": "Success",
     "error": "Error",
     "settings": "Settings",
+    "accounts": "Accounts",
     "discover": "Discover",
     "websites": "Websites",
     "sats_one": "sat",
diff --git a/src/types.ts b/src/types.ts
index 51c752d90f..788478993b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -16,6 +16,7 @@ export interface Account {
   connector: ConnectorType;
   config: string;
   name: string;
+  nostrPrivateKey?: string | null;
 }
 
 export interface Accounts {
@@ -166,6 +167,11 @@ export interface MessagePaymentAll extends MessageDefault {
   };
 }
 
+export interface MessageAccountGet extends MessageDefault {
+  args?: { id?: Account["id"] };
+  action: "getAccount";
+}
+
 export interface MessageAccountRemove extends MessageDefault {
   args?: { id: Account["id"] };
   action: "removeAccount";
@@ -372,8 +378,23 @@ export interface MessagePublicKeyGet extends MessageDefault {
   action: "getPublicKeyOrPrompt";
 }
 
+export interface MessagePrivateKeyGet extends MessageDefault {
+  args?: {
+    id?: Account["id"];
+  };
+  action: "getPrivateKey";
+}
+
+export interface MessagePrivateKeyGenerate extends MessageDefault {
+  args?: {
+    type?: "random";
+  };
+  action: "generatePrivateKey";
+}
+
 export interface MessagePrivateKeySet extends MessageDefault {
   args: {
+    id?: Account["id"];
     privateKey: string;
   };
   action: "setPrivateKey";