diff --git a/package.json b/package.json
index b1b9765b33..cefca37e89 100644
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
     "puppeteer": "^21.0.3",
     "stream-browserify": "^3.0.0",
     "swc-loader": "^0.2.3",
+    "tailwindcss-3d": "^1.0.0",
     "terser-webpack-plugin": "^5.3.9",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "typescript": "^5.2.2",
diff --git a/scripts/check-changed-translations.js b/scripts/check-changed-translations.js
index afa6f26622..8607a0827b 100644
--- a/scripts/check-changed-translations.js
+++ b/scripts/check-changed-translations.js
@@ -18,7 +18,7 @@ function compareObjects(obj1, obj2, parentPath = "") {
           obj2[key],
           parentPath ? `${parentPath}.${key}` : key
         );
-      } else if (obj1[key] !== obj2[key]) {
+      } else if (obj1[key] !== obj2[key] && obj2[key] !== undefined) {
         const title = `Translation source ${parentPath}.${key} has changed`;
         const message = `Consider running \`node scripts/remove-outdated-translations.js ${parentPath}.${key}\` to reset existing translations.`;
         console.log(
diff --git a/src/app/components/Avatar/index.tsx b/src/app/components/Avatar/index.tsx
index a53718a533..169c28789f 100644
--- a/src/app/components/Avatar/index.tsx
+++ b/src/app/components/Avatar/index.tsx
@@ -1,10 +1,12 @@
 import { useEffect, useRef } from "react";
 import { generateSvgGAvatar } from "~/app/components/Avatar/generator";
+import { classNames } from "~/app/utils";
 
 type Props = {
   name: string;
   size: number;
   url?: string;
+  className?: string;
 };
 
 const Avatar = (props: Props) => {
@@ -20,6 +22,7 @@ const Avatar = (props: Props) => {
 const AvatarImage = (props: Props) => {
   return (
     <div
+      className={classNames("translate-z-0 bg-white", props.className ?? "")}
       style={{
         width: `${props.size}px`,
         height: `${props.size}px`,
@@ -48,11 +51,10 @@ const AvatarSVG = (props: Omit<Props, "url">) => {
 
   return (
     <svg
-      className="rounded-full overflow-hidden"
-      style={{
-        transform:
-          "translateZ(0)" /* Forced GPU render to avoid ugly borders when switching accounts */,
-      }}
+      className={classNames(
+        "rounded-full overflow-hidden translate-z-0",
+        props.className ?? ""
+      )}
       ref={svgRef}
       width={props.size}
       height={props.size}
diff --git a/src/app/components/BalanceBox/index.tsx b/src/app/components/BalanceBox/index.tsx
index 958ac87d0e..a4f59bbf20 100644
--- a/src/app/components/BalanceBox/index.tsx
+++ b/src/app/components/BalanceBox/index.tsx
@@ -29,9 +29,9 @@ function BalanceBox({ className }: Props) {
       </div>
 
       {accountLoading ? (
-        <SkeletonLoader containerClassName="mt-2" className="w-16" />
+        <SkeletonLoader containerClassName="mt-1" className="w-16" />
       ) : (
-        <div className="text-gray-500 mt-2">
+        <div className="text-gray-500 mt-1">
           {balancesDecorated.fiatBalance && (
             <>~{balancesDecorated.fiatBalance}</>
           )}
diff --git a/src/app/components/BudgetControl/index.tsx b/src/app/components/BudgetControl/index.tsx
index 50a7ddd151..bf684228da 100644
--- a/src/app/components/BudgetControl/index.tsx
+++ b/src/app/components/BudgetControl/index.tsx
@@ -10,6 +10,7 @@ type Props = {
   budget: string;
   onBudgetChange: ChangeEventHandler<HTMLInputElement>;
   fiatAmount: string;
+  disabled?: boolean;
 };
 
 function BudgetControl({
@@ -18,6 +19,7 @@ function BudgetControl({
   budget,
   onBudgetChange,
   fiatAmount,
+  disabled = false,
 }: Props) {
   const { t } = useTranslation("components", {
     keyPrefix: "budget_control",
@@ -27,12 +29,13 @@ function BudgetControl({
 
   return (
     <div className="mb-4">
-      <div className="flex items-center">
+      <div className={`flex items-center`}>
         <Checkbox
           id="remember_me"
           name="remember_me"
           checked={remember}
           onChange={onRememberChange}
+          disabled={disabled}
         />
         <label
           htmlFor="remember_me"
diff --git a/src/app/components/Enable/AlbyEnable.tsx b/src/app/components/Enable/AlbyEnable.tsx
new file mode 100644
index 0000000000..f0d77ad086
--- /dev/null
+++ b/src/app/components/Enable/AlbyEnable.tsx
@@ -0,0 +1,99 @@
+import { CheckIcon } from "@bitcoin-design/bitcoin-icons-react/filled";
+import ConfirmOrCancel from "@components/ConfirmOrCancel";
+import Container from "@components/Container";
+import PublisherCard from "@components/PublisherCard";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import ScreenHeader from "~/app/components/ScreenHeader";
+import toast from "~/app/components/Toast";
+import { USER_REJECTED_ERROR } from "~/common/constants";
+import msg from "~/common/lib/msg";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+function AlbyEnableComponent(props: Props) {
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation("translation", {
+    keyPrefix: "alby_enable",
+  });
+  const { t: tCommon } = useTranslation("common");
+
+  const enable = () => {
+    try {
+      setLoading(true);
+      msg.reply({
+        enabled: true,
+        remember: true,
+      });
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) toast.error(`${tCommon("error")}: ${e.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  function reject(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  async function block(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    await msg.request("addBlocklist", {
+      domain: props.origin.domain,
+      host: props.origin.host,
+    });
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  return (
+    <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
+      <ScreenHeader title={t("title")} />
+      <Container justifyBetween maxWidth="sm">
+        <div>
+          <PublisherCard
+            title={props.origin.name}
+            image={props.origin.icon}
+            url={props.origin.host}
+            isSmall={false}
+          />
+
+          <div className="dark:text-white pt-6">
+            <p className="mb-2">{tCommon("enable.allow")}</p>
+
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
+            </div>
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{t("request2")}</p>
+            </div>
+          </div>
+        </div>
+        <div className="text-center flex flex-col">
+          <ConfirmOrCancel
+            disabled={loading}
+            loading={loading}
+            label={tCommon("actions.connect")}
+            onConfirm={enable}
+            onCancel={reject}
+          />
+          <a
+            className="mt-4 underline text-sm text-gray-400 overflow-hidden text-ellipsis whitespace-nowrap"
+            href="#"
+            onClick={block}
+          >
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
+          </a>
+        </div>
+      </Container>
+    </div>
+  );
+}
+
+export default AlbyEnableComponent;
diff --git a/src/app/components/Enable/LiquidEnable.tsx b/src/app/components/Enable/LiquidEnable.tsx
new file mode 100644
index 0000000000..3b34f56655
--- /dev/null
+++ b/src/app/components/Enable/LiquidEnable.tsx
@@ -0,0 +1,99 @@
+import { CheckIcon } from "@bitcoin-design/bitcoin-icons-react/filled";
+import ConfirmOrCancel from "@components/ConfirmOrCancel";
+import Container from "@components/Container";
+import PublisherCard from "@components/PublisherCard";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import ScreenHeader from "~/app/components/ScreenHeader";
+import toast from "~/app/components/Toast";
+import { USER_REJECTED_ERROR } from "~/common/constants";
+import msg from "~/common/lib/msg";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+function LiquidEnableComponent(props: Props) {
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation("translation", {
+    keyPrefix: "liquid_enable",
+  });
+  const { t: tCommon } = useTranslation("common");
+
+  const enable = () => {
+    try {
+      setLoading(true);
+      msg.reply({
+        enabled: true,
+        remember: true,
+      });
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) toast.error(`${tCommon("error")}: ${e.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  function reject(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  async function block(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    await msg.request("addBlocklist", {
+      domain: props.origin.domain,
+      host: props.origin.host,
+    });
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  return (
+    <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
+      <ScreenHeader title={t("title")} />
+      <Container justifyBetween maxWidth="sm">
+        <div>
+          <PublisherCard
+            title={props.origin.name}
+            image={props.origin.icon}
+            url={props.origin.host}
+            isSmall={false}
+          />
+
+          <div className="dark:text-white pt-6">
+            <p className="mb-2">{tCommon("enable.allow")}</p>
+
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
+            </div>
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{t("request2")}</p>
+            </div>
+          </div>
+        </div>
+        <div className="text-center flex flex-col">
+          <ConfirmOrCancel
+            disabled={loading}
+            loading={loading}
+            label={tCommon("actions.connect")}
+            onConfirm={enable}
+            onCancel={reject}
+          />
+          <a
+            className="mt-4 underline text-sm text-gray-400 overflow-hidden text-ellipsis whitespace-nowrap"
+            href="#"
+            onClick={block}
+          >
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
+          </a>
+        </div>
+      </Container>
+    </div>
+  );
+}
+
+export default LiquidEnableComponent;
diff --git a/src/app/screens/Enable/index.tsx b/src/app/components/Enable/NostrEnable.tsx
similarity index 73%
rename from src/app/screens/Enable/index.tsx
rename to src/app/components/Enable/NostrEnable.tsx
index 07a76a6876..8b7d0d0245 100644
--- a/src/app/screens/Enable/index.tsx
+++ b/src/app/components/Enable/NostrEnable.tsx
@@ -2,7 +2,7 @@ import { CheckIcon } from "@bitcoin-design/bitcoin-icons-react/filled";
 import ConfirmOrCancel from "@components/ConfirmOrCancel";
 import Container from "@components/Container";
 import PublisherCard from "@components/PublisherCard";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import ScreenHeader from "~/app/components/ScreenHeader";
 import toast from "~/app/components/Toast";
@@ -13,16 +13,14 @@ import type { OriginData } from "~/types";
 type Props = {
   origin: OriginData;
 };
-
-function Enable(props: Props) {
-  const hasFetchedData = useRef(false);
+function NostrEnableComponent(props: Props) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation("translation", {
-    keyPrefix: "enable",
+    keyPrefix: "nostr_enable",
   });
   const { t: tCommon } = useTranslation("common");
 
-  const enable = useCallback(() => {
+  const enable = () => {
     try {
       setLoading(true);
       msg.reply({
@@ -35,7 +33,7 @@ function Enable(props: Props) {
     } finally {
       setLoading(false);
     }
-  }, [tCommon]);
+  };
 
   function reject(event: React.MouseEvent<HTMLAnchorElement>) {
     event.preventDefault();
@@ -48,32 +46,10 @@ function Enable(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(t("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
-  useEffect(() => {
-    async function getAllowance() {
-      try {
-        const allowance = await msg.request("getAllowance", {
-          domain: props.origin.domain,
-          host: props.origin.host,
-        });
-        if (allowance && allowance.enabled) {
-          enable();
-        }
-      } catch (e) {
-        if (e instanceof Error) console.error(e.message);
-      }
-    }
-
-    // Run once.
-    if (!hasFetchedData.current) {
-      getAllowance();
-      hasFetchedData.current = true;
-    }
-  }, [enable, props.origin.domain, props.origin.host]);
-
   return (
     <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
       <ScreenHeader title={t("title")} />
@@ -87,7 +63,7 @@ function Enable(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{t("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -112,7 +88,7 @@ function Enable(props: Props) {
             href="#"
             onClick={block}
           >
-            {t("block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>
@@ -120,4 +96,4 @@ function Enable(props: Props) {
   );
 }
 
-export default Enable;
+export default NostrEnableComponent;
diff --git a/src/app/components/Enable/WebbtcEnable.tsx b/src/app/components/Enable/WebbtcEnable.tsx
new file mode 100644
index 0000000000..61c8179b8d
--- /dev/null
+++ b/src/app/components/Enable/WebbtcEnable.tsx
@@ -0,0 +1,99 @@
+import { CheckIcon } from "@bitcoin-design/bitcoin-icons-react/filled";
+import ConfirmOrCancel from "@components/ConfirmOrCancel";
+import Container from "@components/Container";
+import PublisherCard from "@components/PublisherCard";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import ScreenHeader from "~/app/components/ScreenHeader";
+import toast from "~/app/components/Toast";
+import { USER_REJECTED_ERROR } from "~/common/constants";
+import msg from "~/common/lib/msg";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+function WebbtcEnableComponent(props: Props) {
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation("translation", {
+    keyPrefix: "webbtc_enable",
+  });
+  const { t: tCommon } = useTranslation("common");
+
+  const enable = () => {
+    try {
+      setLoading(true);
+      msg.reply({
+        enabled: true,
+        remember: true,
+      });
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) toast.error(`${tCommon("error")}: ${e.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  function reject(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  async function block(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    await msg.request("addBlocklist", {
+      domain: props.origin.domain,
+      host: props.origin.host,
+    });
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  return (
+    <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
+      <ScreenHeader title={t("title")} />
+      <Container justifyBetween maxWidth="sm">
+        <div>
+          <PublisherCard
+            title={props.origin.name}
+            image={props.origin.icon}
+            url={props.origin.host}
+            isSmall={false}
+          />
+
+          <div className="dark:text-white pt-6">
+            <p className="mb-2">{tCommon("enable.allow")}</p>
+
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
+            </div>
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{t("request2")}</p>
+            </div>
+          </div>
+        </div>
+        <div className="text-center flex flex-col">
+          <ConfirmOrCancel
+            disabled={loading}
+            loading={loading}
+            label={tCommon("actions.connect")}
+            onConfirm={enable}
+            onCancel={reject}
+          />
+          <a
+            className="mt-4 underline text-sm text-gray-400 overflow-hidden text-ellipsis whitespace-nowrap"
+            href="#"
+            onClick={block}
+          >
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
+          </a>
+        </div>
+      </Container>
+    </div>
+  );
+}
+
+export default WebbtcEnableComponent;
diff --git a/src/app/components/Enable/WeblnEnable.tsx b/src/app/components/Enable/WeblnEnable.tsx
new file mode 100644
index 0000000000..d857ebaaa4
--- /dev/null
+++ b/src/app/components/Enable/WeblnEnable.tsx
@@ -0,0 +1,99 @@
+import { CheckIcon } from "@bitcoin-design/bitcoin-icons-react/filled";
+import ConfirmOrCancel from "@components/ConfirmOrCancel";
+import Container from "@components/Container";
+import PublisherCard from "@components/PublisherCard";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import ScreenHeader from "~/app/components/ScreenHeader";
+import toast from "~/app/components/Toast";
+import { USER_REJECTED_ERROR } from "~/common/constants";
+import msg from "~/common/lib/msg";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+function WeblnEnableComponent(props: Props) {
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation("translation", {
+    keyPrefix: "webln_enable",
+  });
+  const { t: tCommon } = useTranslation("common");
+
+  const enable = () => {
+    try {
+      setLoading(true);
+      msg.reply({
+        enabled: true,
+        remember: true,
+      });
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) toast.error(`${tCommon("error")}: ${e.message}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  function reject(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  async function block(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
+    await msg.request("addBlocklist", {
+      domain: props.origin.domain,
+      host: props.origin.host,
+    });
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
+    msg.error(USER_REJECTED_ERROR);
+  }
+
+  return (
+    <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
+      <ScreenHeader title={t("title")} />
+      <Container justifyBetween maxWidth="sm">
+        <div>
+          <PublisherCard
+            title={props.origin.name}
+            image={props.origin.icon}
+            url={props.origin.host}
+            isSmall={false}
+          />
+
+          <div className="dark:text-white pt-6">
+            <p className="mb-2">{tCommon("enable.allow")}</p>
+
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
+            </div>
+            <div className="mb-2 flex items-center">
+              <CheckIcon className="w-5 h-5 mr-2" />
+              <p className="dark:text-white">{t("request2")}</p>
+            </div>
+          </div>
+        </div>
+        <div className="text-center flex flex-col">
+          <ConfirmOrCancel
+            disabled={loading}
+            loading={loading}
+            label={tCommon("actions.connect")}
+            onConfirm={enable}
+            onCancel={reject}
+          />
+          <a
+            className="mt-4 underline text-sm text-gray-400 overflow-hidden text-ellipsis whitespace-nowrap"
+            href="#"
+            onClick={block}
+          >
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
+          </a>
+        </div>
+      </Container>
+    </div>
+  );
+}
+
+export default WeblnEnableComponent;
diff --git a/src/app/components/Header/index.tsx b/src/app/components/Header/index.tsx
index 70e0eed289..5d3c0ade01 100644
--- a/src/app/components/Header/index.tsx
+++ b/src/app/components/Header/index.tsx
@@ -6,7 +6,7 @@ type Props = {
 
 function Header({ children, headerLeft, headerRight }: Props) {
   return (
-    <div className="bg-white py-2 border-b border-gray-200 dark:bg-surface-01dp dark:border-neutral-700">
+    <div className="bg-white py-[6px] border-b border-gray-200 dark:bg-surface-01dp dark:border-neutral-700">
       <div className="flex justify-between items-center container max-w-screen-lg px-4 mx-auto">
         <div className="w-8 h-8">{headerLeft}</div>
         <h1 className="text-lg font-medium dark:text-white">{children}</h1>
diff --git a/src/app/components/IconButton/index.tsx b/src/app/components/IconButton/index.tsx
index 8a0bc572cb..9e882212c7 100644
--- a/src/app/components/IconButton/index.tsx
+++ b/src/app/components/IconButton/index.tsx
@@ -6,7 +6,7 @@ type Props = {
 function IconButton({ onClick, icon }: Props) {
   return (
     <button
-      className="flex justify-center items-center w-8 h-8 dark:text-white rounded-md border border-gray-300 dark:border-white/10 hover:bg-gray-50 dark:hover:bg-surface-08dp transition-colors duration-200"
+      className="flex justify-center items-center w-8 h-8 dark:text-white rounded-md border border-gray-200 dark:border-neutral-700 hover:bg-gray-50 dark:hover:bg-surface-08dp transition-colors duration-200"
       onClick={onClick}
     >
       {icon}
diff --git a/src/app/components/IconLinkCard/IconLinkCard.tsx b/src/app/components/IconLinkCard/IconLinkCard.tsx
new file mode 100644
index 0000000000..94898f5913
--- /dev/null
+++ b/src/app/components/IconLinkCard/IconLinkCard.tsx
@@ -0,0 +1,35 @@
+import { CaretRightIcon } from "@bitcoin-design/bitcoin-icons-react/outline";
+
+export type IconLinkCardProps = {
+  title: string;
+  description: string;
+  icon: React.ReactNode;
+  onClick: () => void;
+};
+
+export function IconLinkCard({
+  icon,
+  title,
+  description,
+  onClick,
+}: IconLinkCardProps) {
+  return (
+    <div
+      className="shadow rounded-md p-4 bg-white dark:bg-surface-01dp hover:bg-gray-50 dark:hover:bg-surface-02dp text-gray-800 dark:text-neutral-200 cursor-pointer flex flex-row items-center gap-3"
+      onClick={onClick}
+    >
+      <div className="flex-shrink-0 flex justify-center md:px-3">{icon}</div>
+      <div className="flex-grow">
+        <div className="font-medium leading-5 text-sm md:text-base">
+          {title}
+        </div>
+        <div className="text-gray-600 dark:text-neutral-400 text-xs leading-4 md:text-sm">
+          {description}
+        </div>
+      </div>
+      <div className="flex-shrink-0 flex justify-end ">
+        <CaretRightIcon className="w-8" />
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/components/Navbar/Navbar.tsx b/src/app/components/Navbar/Navbar.tsx
index 91be06cfce..56c5a2b3c9 100644
--- a/src/app/components/Navbar/Navbar.tsx
+++ b/src/app/components/Navbar/Navbar.tsx
@@ -7,7 +7,7 @@ type Props = {
 
 export default function Navbar({ children }: Props) {
   return (
-    <div className="py-2 bg-white border-b border-gray-200 dark:bg-surface-01dp dark:border-neutral-700">
+    <div className="py-[6px] bg-white border-b border-gray-200 dark:bg-surface-01dp dark:border-neutral-700">
       <div className="max-w-screen-lg px-4 flex justify-between items-center mx-auto w-full">
         <div className="flex">
           <UserMenu />
diff --git a/src/app/components/QRCode/index.tsx b/src/app/components/QRCode/index.tsx
new file mode 100644
index 0000000000..faf5719506
--- /dev/null
+++ b/src/app/components/QRCode/index.tsx
@@ -0,0 +1,25 @@
+import ReactQRCode from "react-qr-code";
+import { classNames, useTheme } from "~/app/utils";
+
+export type Props = {
+  value: string;
+  size?: number;
+  className?: string;
+};
+
+export default function QRCode({ value, size, className }: Props) {
+  const theme = useTheme();
+  const fgColor = theme === "dark" ? "#FFFFFF" : "#000000";
+  const bgColor = theme === "dark" ? "#000000" : "#FFFFFF";
+
+  return (
+    <ReactQRCode
+      value={value}
+      size={size}
+      className={classNames("rounded-md", className ?? "")}
+      fgColor={fgColor}
+      bgColor={bgColor}
+      level="M"
+    />
+  );
+}
diff --git a/src/app/components/SkeletonLoader/index.tsx b/src/app/components/SkeletonLoader/index.tsx
index 52df819b4a..79820aba3f 100644
--- a/src/app/components/SkeletonLoader/index.tsx
+++ b/src/app/components/SkeletonLoader/index.tsx
@@ -2,17 +2,25 @@ import Skeleton from "react-loading-skeleton";
 import { classNames } from "~/app/utils";
 
 export type Props = {
+  circle?: boolean;
   className?: string;
   containerClassName?: string;
+  opaque?: boolean;
 };
 
-function SkeletonLoader({ className, containerClassName }: Props) {
+function SkeletonLoader({
+  className,
+  containerClassName,
+  circle,
+  opaque = true,
+}: Props) {
   return (
     <Skeleton
-      className={classNames(className ?? "", "opacity-20")}
-      containerClassName={containerClassName}
       baseColor="#AAA"
       highlightColor="#FFF"
+      className={classNames(opaque ? "opacity-20" : "", className ?? "")}
+      containerClassName={containerClassName}
+      circle={circle}
     />
   );
 }
diff --git a/src/app/components/form/Checkbox.tsx b/src/app/components/form/Checkbox.tsx
index 5b94383958..47085f50b6 100644
--- a/src/app/components/form/Checkbox.tsx
+++ b/src/app/components/form/Checkbox.tsx
@@ -3,6 +3,7 @@ function Checkbox({
   name,
   checked,
   onChange,
+  disabled,
 }: React.InputHTMLAttributes<HTMLInputElement>) {
   return (
     <input
@@ -11,6 +12,7 @@ function Checkbox({
       type="checkbox"
       checked={checked}
       onChange={onChange}
+      disabled={disabled}
       className="h-4 w-4 text-primary focus:ring-primary border-gray-300 rounded cursor-pointer"
     />
   );
diff --git a/src/app/screens/Onboard/Prompt/index.tsx b/src/app/components/onboard/index.tsx
similarity index 100%
rename from src/app/screens/Onboard/Prompt/index.tsx
rename to src/app/components/onboard/index.tsx
diff --git a/src/app/hooks/useLightningAddress.ts b/src/app/hooks/useLightningAddress.ts
new file mode 100644
index 0000000000..ff6fd53d94
--- /dev/null
+++ b/src/app/hooks/useLightningAddress.ts
@@ -0,0 +1,30 @@
+import { useEffect, useState } from "react";
+import { useAccount } from "~/app/context/AccountContext";
+import api from "~/common/lib/api";
+
+export const useLightningAddress = () => {
+  const { account } = useAccount();
+  const [lightningAddress, setLightningAddress] = useState("");
+  const [loadingLightningAddress, setLoadingLightningAddress] = useState(false);
+
+  useEffect(() => {
+    // TODO: replace with connector-supported functionality
+    if (account?.connectorType !== "alby") {
+      setLightningAddress("");
+      setLoadingLightningAddress(false);
+      return;
+    }
+    (async () => {
+      setLoadingLightningAddress(true);
+      const response = await api.getAccountInfo();
+      const lightningAddress = response.info.lightning_address;
+      if (lightningAddress) setLightningAddress(lightningAddress);
+      setLoadingLightningAddress(false);
+    })();
+  }, [account?.connectorType]);
+
+  return {
+    loadingLightningAddress,
+    lightningAddress,
+  };
+};
diff --git a/src/app/icons/RedeemIcon.tsx b/src/app/icons/RedeemIcon.tsx
new file mode 100644
index 0000000000..59310689fe
--- /dev/null
+++ b/src/app/icons/RedeemIcon.tsx
@@ -0,0 +1,19 @@
+import { SVGProps } from "react";
+
+const RedeemIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    width="27"
+    height="27"
+    viewBox="0 0 27 27"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M4.6909 6.29089H5.26233H4.6909ZM6.83947 4.14232V4.71375V4.14232ZM6.83947 25.8566V25.2852V25.8566ZM4.6909 23.708H4.11947H4.6909ZM21.8795 23.708H22.4509H21.8795ZM19.7309 25.8566V26.428V25.8566ZM21.8795 6.29089H21.308H21.8795ZM19.7309 4.14232V3.57089V4.14232ZM12.7068 19.5709C12.7068 19.8865 12.9627 20.1423 13.2783 20.1423C13.5939 20.1423 13.8497 19.8865 13.8497 19.5709H12.7068ZM13.8497 9.8566C13.8497 9.54101 13.5939 9.28518 13.2783 9.28518C12.9627 9.28518 12.7068 9.54101 12.7068 9.8566H13.8497ZM17.499 17.2935C17.7247 17.073 17.7289 16.7112 17.5084 16.4854C17.2878 16.2597 16.926 16.2555 16.7003 16.476L17.499 17.2935ZM13.2781 20.6183L12.8788 21.027C13.1008 21.2439 13.4554 21.2439 13.6774 21.027L13.2781 20.6183ZM9.85592 16.476C9.63017 16.2555 9.26839 16.2597 9.04785 16.4854C8.8273 16.7112 8.83152 17.073 9.05726 17.2935L9.85592 16.476ZM25.8566 2.86232H25.2852H25.8566ZM25.8566 6.56518H26.428H25.8566ZM0.71373 6.56518H0.142301H0.71373ZM0.71373 2.86232H1.28516H0.71373ZM2.8623 0.713745V1.28517V0.713745ZM23.708 0.713746V0.142317V0.713746ZM2.8623 8.71375L2.8623 9.28518H2.8623V8.71375ZM23.708 8.71375V8.14232V8.71375ZM21.308 6.29089V23.708H22.4509V6.29089H21.308ZM19.7309 25.2852L6.83947 25.2852V26.428L19.7309 26.428V25.2852ZM5.26232 23.708L5.26233 6.29089H4.11947L4.11947 23.708H5.26232ZM6.83947 4.71375L19.7309 4.71375V3.57089L6.83947 3.57089V4.71375ZM5.26233 6.29089C5.26233 5.41986 5.96844 4.71375 6.83947 4.71375V3.57089C5.33725 3.57089 4.11947 4.78867 4.11947 6.29089H5.26233ZM6.83947 25.2852C5.96843 25.2852 5.26232 24.5791 5.26232 23.708H4.11947C4.11947 25.2102 5.33725 26.428 6.83947 26.428V25.2852ZM21.308 23.708C21.308 24.5791 20.6019 25.2852 19.7309 25.2852V26.428C21.2331 26.428 22.4509 25.2102 22.4509 23.708H21.308ZM22.4509 6.29089C22.4509 4.78868 21.2331 3.57089 19.7309 3.57089V4.71375C20.6019 4.71375 21.308 5.41986 21.308 6.29089H22.4509ZM13.8497 19.5709V9.8566H12.7068V19.5709H13.8497ZM16.7003 16.476L12.8788 20.2095L13.6774 21.027L17.499 17.2935L16.7003 16.476ZM13.6774 20.2095L9.85592 16.476L9.05726 17.2935L12.8788 21.027L13.6774 20.2095ZM25.2852 2.86232V6.56518H26.428V2.86232H25.2852ZM1.28516 6.56518L1.28516 2.86232H0.142302L0.142301 6.56518H1.28516ZM2.8623 1.28517L23.708 1.28517V0.142317L2.8623 0.142317V1.28517ZM4.6909 8.14232H2.8623V9.28518H4.6909V8.14232ZM23.708 8.14232H21.8795V9.28518H23.708V8.14232ZM1.28516 2.86232C1.28516 1.99128 1.99127 1.28517 2.8623 1.28517V0.142317C1.36009 0.142316 0.142302 1.3601 0.142302 2.86232H1.28516ZM0.142301 6.56518C0.142301 8.06739 1.36009 9.28517 2.8623 9.28518L2.8623 8.14232C1.99127 8.14232 1.28516 7.43621 1.28516 6.56518H0.142301ZM25.2852 6.56518C25.2852 7.43621 24.5791 8.14232 23.708 8.14232V9.28518C25.2102 9.28518 26.428 8.06739 26.428 6.56518H25.2852ZM26.428 2.86232C26.428 1.3601 25.2102 0.142317 23.708 0.142317V1.28517C24.579 1.28517 25.2852 1.99129 25.2852 2.86232H26.428Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export default RedeemIcon;
diff --git a/src/app/router/Options/Options.tsx b/src/app/router/Options/Options.tsx
index 005b65a5f7..af4acba192 100644
--- a/src/app/router/Options/Options.tsx
+++ b/src/app/router/Options/Options.tsx
@@ -34,6 +34,7 @@ import NostrSetup from "~/app/screens/Accounts/NostrSetup/NostrSetup";
 import Discover from "~/app/screens/Discover";
 import LNURLRedeem from "~/app/screens/LNURLRedeem";
 import OnChainReceive from "~/app/screens/OnChainReceive";
+import ReceiveInvoice from "~/app/screens/ReceiveInvoice";
 import ScanQRCode from "~/app/screens/ScanQRCode";
 import SendToBitcoinAddress from "~/app/screens/SendToBitcoinAddress";
 import ChooseConnector from "~/app/screens/connectors/ChooseConnector";
@@ -72,6 +73,7 @@ function Options() {
               element={<SendToBitcoinAddress />}
             />
             <Route path="receive" element={<Receive />} />
+            <Route path="receive/invoice" element={<ReceiveInvoice />} />
             <Route path="onChainReceive" element={<OnChainReceive />} />
             <Route path="wallet" element={<DefaultView />} />
             <Route path="transactions">
diff --git a/src/app/router/Popup/Popup.tsx b/src/app/router/Popup/Popup.tsx
index b3278cd1e1..540cf895f1 100644
--- a/src/app/router/Popup/Popup.tsx
+++ b/src/app/router/Popup/Popup.tsx
@@ -10,13 +10,13 @@ import Receive from "@screens/Receive";
 import Send from "@screens/Send";
 import Unlock from "@screens/Unlock";
 import { HashRouter, Outlet, Route, Routes } from "react-router-dom";
+import Toaster from "~/app/components/Toast/Toaster";
 import Providers from "~/app/context/Providers";
 import LNURLRedeem from "~/app/screens/LNURLRedeem";
 import OnChainReceive from "~/app/screens/OnChainReceive";
+import ReceiveInvoice from "~/app/screens/ReceiveInvoice";
 import ScanQRCode from "~/app/screens/ScanQRCode";
 import SendToBitcoinAddress from "~/app/screens/SendToBitcoinAddress";
-
-import Toaster from "~/app/components/Toast/Toaster";
 import RequireAuth from "../RequireAuth";
 
 function Popup() {
@@ -37,6 +37,7 @@ function Popup() {
             <Route path="scanQRCode" element={<ScanQRCode />} />
             <Route path="receive" element={<Receive />} />
             <Route path="onChainReceive" element={<OnChainReceive />} />
+            <Route path="receive/invoice" element={<ReceiveInvoice />} />
             <Route path="lnurlPay" element={<LNURLPay />} />
             <Route path="lnurlChannel" element={<LNURLChannel />} />
             <Route path="lnurlWithdraw" element={<LNURLWithdraw />} />
diff --git a/src/app/router/Prompt/Prompt.tsx b/src/app/router/Prompt/Prompt.tsx
index 3f4b13d4a9..36ffae360c 100644
--- a/src/app/router/Prompt/Prompt.tsx
+++ b/src/app/router/Prompt/Prompt.tsx
@@ -4,7 +4,6 @@ import ConfirmKeysend from "@screens/ConfirmKeysend";
 import ConfirmPayment from "@screens/ConfirmPayment";
 import ConfirmRequestPermission from "@screens/ConfirmRequestPermission";
 import ConfirmSignMessage from "@screens/ConfirmSignMessage";
-import Enable from "@screens/Enable";
 import LNURLAuth from "@screens/LNURLAuth";
 import LNURLChannel from "@screens/LNURLChannel";
 import LNURLPay from "@screens/LNURLPay";
@@ -23,7 +22,11 @@ import Toaster from "~/app/components/Toast/Toaster";
 import Providers from "~/app/context/Providers";
 import RequireAuth from "~/app/router/RequireAuth";
 import BitcoinConfirmGetAddress from "~/app/screens/Bitcoin/ConfirmGetAddress";
-import Onboard from "~/app/screens/Onboard/Prompt";
+import AlbyEnable from "~/app/screens/Enable/AlbyEnable";
+import LiquidEnable from "~/app/screens/Enable/LiquidEnable";
+import NostrEnable from "~/app/screens/Enable/NostrEnable";
+import WebbtcEnable from "~/app/screens/Enable/WebbtcEnable";
+import WeblnEnable from "~/app/screens/Enable/WeblnEnable";
 import type { NavigationState, OriginData } from "~/types";
 
 // Parse out the parameters from the querystring.
@@ -74,23 +77,33 @@ function Prompt() {
             />
             <Route
               path="public/alby/enable"
-              element={<Enable origin={navigationState.origin as OriginData} />} // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
+              element={
+                <AlbyEnable origin={navigationState.origin as OriginData} />
+              } // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
             />
             <Route
               path="public/webln/enable"
-              element={<Enable origin={navigationState.origin as OriginData} />} // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
+              element={
+                <WeblnEnable origin={navigationState.origin as OriginData} />
+              } // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
             />
             <Route
               path="public/liquid/enable"
-              element={<Enable origin={navigationState.origin as OriginData} />} // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
+              element={
+                <LiquidEnable origin={navigationState.origin as OriginData} />
+              } // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
             />
             <Route
               path="public/nostr/enable"
-              element={<Enable origin={navigationState.origin as OriginData} />} // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
+              element={
+                <NostrEnable origin={navigationState.origin as OriginData} />
+              } // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
             />
             <Route
               path="public/webbtc/enable"
-              element={<Enable origin={navigationState.origin as OriginData} />} // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
+              element={
+                <WebbtcEnable origin={navigationState.origin as OriginData} />
+              } // prompt will always have an `origin` set, just the type is optional to support usage via PopUp
             />
             <Route
               path="public/webbtc/confirmGetAddress"
@@ -127,9 +140,6 @@ function Prompt() {
             <Route path="confirmKeysend" element={<ConfirmKeysend />} />
             <Route path="confirmSignMessage" element={<ConfirmSignMessage />} />
             <Route path="confirmAddAccount" element={<ConfirmAddAccount />} />
-            <Route path="public/nostr/onboard" element={<Onboard />} />
-            <Route path="public/liquid/onboard" element={<Onboard />} />
-            <Route path="public/webbtc/onboard" element={<Onboard />} />
             <Route
               path="public/confirmRequestPermission"
               element={<ConfirmRequestPermission />}
@@ -160,7 +170,6 @@ const Layout = () => {
         </div>
         <AccountMenu showOptions={false} />
       </div>
-
       <main className="flex flex-col grow min-h-0">
         <Outlet />
       </main>
diff --git a/src/app/router/connectorRoutes.tsx b/src/app/router/connectorRoutes.tsx
index 25ddfe84b5..09149b1b82 100644
--- a/src/app/router/connectorRoutes.tsx
+++ b/src/app/router/connectorRoutes.tsx
@@ -20,8 +20,8 @@ import btcpay from "/static/assets/icons/btcpay.svg";
 import citadel from "/static/assets/icons/citadel.png";
 import core_ln from "/static/assets/icons/core_ln.svg";
 import eclair from "/static/assets/icons/eclair.jpg";
-import galoyBitcoinBeach from "/static/assets/icons/galoy_bitcoin_beach.png";
 import galoyBitcoinJungle from "/static/assets/icons/galoy_bitcoin_jungle.png";
+import galoyBlink from "/static/assets/icons/galoy_blink.png";
 import kolliderLogo from "/static/assets/icons/kollider.png";
 import lightning_node from "/static/assets/icons/lightning_node.png";
 import lightning_terminal from "/static/assets/icons/lightning_terminal.png";
@@ -63,7 +63,7 @@ interface ConnectorRoute extends Route {
 }
 
 const galoyPaths: { [key: string]: keyof typeof galoyUrls } = {
-  bitcoinBeach: "galoy-bitcoin-beach",
+  blink: "galoy-blink",
   bitcoinJungle: "galoy-bitcoin-jungle",
 };
 
@@ -163,11 +163,11 @@ const connectorMap: { [key: string]: ConnectorRoute } = {
     logo: kolliderLogo,
     children: kolliderConnectorRoutes,
   },
-  [galoyPaths.bitcoinBeach]: {
-    path: galoyPaths.bitcoinBeach,
-    element: <ConnectGaloy instance={galoyPaths.bitcoinBeach} />,
-    title: i18n.t("translation:choose_connector.bitcoin_beach.title"),
-    logo: galoyBitcoinBeach,
+  [galoyPaths.blink]: {
+    path: galoyPaths.blink,
+    element: <ConnectGaloy instance={galoyPaths.blink} />,
+    title: i18n.t("translation:choose_connector.blink.title"),
+    logo: galoyBlink,
   },
   [galoyPaths.bitcoinJungle]: {
     path: galoyPaths.bitcoinJungle,
@@ -262,7 +262,7 @@ function getConnectorRoutes(): ConnectorRoute[] {
     connectorMap["lnd-hub-bluewallet"],
     connectorMap["eclair"],
     connectorMap["btcpay"],
-    connectorMap[galoyPaths.bitcoinBeach],
+    connectorMap[galoyPaths.blink],
     connectorMap[galoyPaths.bitcoinJungle],
     getDistribution("citadel"),
     getDistribution("umbrel"),
diff --git a/src/app/screens/Accounts/Detail/index.tsx b/src/app/screens/Accounts/Detail/index.tsx
index e120192a30..78ded234f9 100644
--- a/src/app/screens/Accounts/Detail/index.tsx
+++ b/src/app/screens/Accounts/Detail/index.tsx
@@ -9,7 +9,6 @@ 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 QRCode from "react-qr-code";
 import { Link, useNavigate, useParams } from "react-router-dom";
 import Alert from "~/app/components/Alert";
 import Badge from "~/app/components/Badge";
@@ -17,6 +16,7 @@ import Hyperlink from "~/app/components/Hyperlink";
 import InputCopyButton from "~/app/components/InputCopyButton";
 import MenuDivider from "~/app/components/Menu/MenuDivider";
 import Modal from "~/app/components/Modal";
+import QRCode from "~/app/components/QRCode";
 import toast from "~/app/components/Toast";
 import Select from "~/app/components/form/Select";
 import Toggle from "~/app/components/form/Toggle";
@@ -286,7 +286,6 @@ function AccountDetail() {
                           <p>{t("export.scan_qr")}</p>
                           <QRCode
                             value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
-                            level="M"
                             size={256}
                           />
                           <div className="w-full">
diff --git a/src/app/screens/Accounts/NostrSettings/index.tsx b/src/app/screens/Accounts/NostrSettings/index.tsx
index 7e09f54b6f..873de7cad6 100644
--- a/src/app/screens/Accounts/NostrSettings/index.tsx
+++ b/src/app/screens/Accounts/NostrSettings/index.tsx
@@ -11,7 +11,7 @@ import PasswordViewAdornment from "~/app/components/PasswordViewAdornment";
 import toast from "~/app/components/Toast";
 import TextField from "~/app/components/form/TextField";
 import api, { GetAccountRes } from "~/common/lib/api";
-import { default as nostr, default as nostrlib } from "~/common/lib/nostr";
+import { default as nostr } from "~/common/lib/nostr";
 
 function NostrSettings() {
   const { t: tCommon } = useTranslation("common");
@@ -33,7 +33,8 @@ function NostrSettings() {
       const priv = await api.nostr.getPrivateKey(id);
       if (priv) {
         setCurrentPrivateKey(priv);
-        setNostrPrivateKey(priv);
+        const nsec = nostr.hexToNip19(priv);
+        setNostrPrivateKey(nsec);
       }
       const accountResponse = await api.getAccount(id);
       setHasMnemonic(accountResponse.hasMnemonic);
@@ -82,15 +83,11 @@ function NostrSettings() {
     }
 
     const derivedNostrPrivateKey = await api.nostr.generatePrivateKey(id);
-    setNostrPrivateKey(derivedNostrPrivateKey);
+    setNostrPrivateKey(nostr.hexToNip19(derivedNostrPrivateKey));
   }
 
   // TODO: simplify this method - would be good to have a dedicated "remove nostr key" button
   async function handleSaveNostrPrivateKey() {
-    if (nostrPrivateKey === currentPrivateKey) {
-      throw new Error("private key hasn't changed");
-    }
-
     if (
       currentPrivateKey &&
       prompt(
@@ -165,9 +162,7 @@ function NostrSettings() {
               </Alert>
             )}
 
-            {hasMnemonic &&
-            currentPrivateKey &&
-            nostrPrivateKey === currentPrivateKey ? (
+            {hasMnemonic && currentPrivateKey ? (
               hasImportedNostrKey ? (
                 <Alert type="warn">
                   {t("nostr.settings.imported_key_warning")}
@@ -216,28 +211,19 @@ function NostrSettings() {
                     onClick={handleDeleteKeys}
                   />
                 )}
-                {hasImportedNostrKey &&
-                  nostrPrivateKey === currentPrivateKey &&
-                  hasMnemonic && (
-                    <Button
-                      outline
-                      label={t("nostr.settings.derive")}
-                      onClick={handleDeriveNostrKeyFromSecretKey}
-                    />
-                  )}
+                {hasImportedNostrKey && hasMnemonic && (
+                  <Button
+                    outline
+                    label={t("nostr.settings.derive")}
+                    onClick={handleDeriveNostrKeyFromSecretKey}
+                  />
+                )}
               </div>
             </div>
           </ContentBox>
           <div className="flex justify-center my-6 gap-4">
             <Button label={tCommon("actions.cancel")} onClick={onCancel} />
-            <Button
-              type="submit"
-              label={tCommon("actions.save")}
-              disabled={
-                nostrlib.normalizeToHex(nostrPrivateKey) === currentPrivateKey
-              }
-              primary
-            />
+            <Button type="submit" label={tCommon("actions.save")} primary />
           </div>
         </Container>
       </form>
diff --git a/src/app/screens/ConfirmKeysend/index.tsx b/src/app/screens/ConfirmKeysend/index.tsx
index 785e039402..34c3de533d 100644
--- a/src/app/screens/ConfirmKeysend/index.tsx
+++ b/src/app/screens/ConfirmKeysend/index.tsx
@@ -160,6 +160,7 @@ function ConfirmKeysend() {
                 }}
                 budget={budget}
                 onBudgetChange={(event) => setBudget(event.target.value)}
+                disabled={loading}
               />
               <ConfirmOrCancel
                 disabled={loading}
diff --git a/src/app/screens/ConfirmPayment/index.tsx b/src/app/screens/ConfirmPayment/index.tsx
index 3badce9ea3..4138f41c76 100644
--- a/src/app/screens/ConfirmPayment/index.tsx
+++ b/src/app/screens/ConfirmPayment/index.tsx
@@ -173,6 +173,7 @@ function ConfirmPayment() {
                   }}
                   budget={budget}
                   onBudgetChange={(event) => setBudget(event.target.value)}
+                  disabled={loading}
                 />
               )}
               <ConfirmOrCancel
@@ -198,7 +199,7 @@ function ConfirmPayment() {
                   })
             }
           />
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               onClick={close}
               label={tCommon("actions.close")}
diff --git a/src/app/screens/Enable/AlbyEnable.tsx b/src/app/screens/Enable/AlbyEnable.tsx
new file mode 100644
index 0000000000..18238c7a8b
--- /dev/null
+++ b/src/app/screens/Enable/AlbyEnable.tsx
@@ -0,0 +1,10 @@
+import AlbyEnableComponent from "~/app/components/Enable/AlbyEnable";
+import { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+
+export default function AlbyEnable(props: Props) {
+  return <AlbyEnableComponent origin={props.origin} />;
+}
diff --git a/src/app/screens/Enable/LiquidEnable.tsx b/src/app/screens/Enable/LiquidEnable.tsx
new file mode 100644
index 0000000000..f7712f67be
--- /dev/null
+++ b/src/app/screens/Enable/LiquidEnable.tsx
@@ -0,0 +1,43 @@
+import { useEffect, useState } from "react";
+import LiquidEnableComponent from "~/app/components/Enable/LiquidEnable";
+import Onboard from "~/app/components/onboard";
+import { useAccount } from "~/app/context/AccountContext";
+import api from "~/common/lib/api";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+
+export default function LiquidEnable(props: Props) {
+  const { account } = useAccount();
+  const [hasMnemonic, setHasMnemonic] = useState(false);
+
+  useEffect(() => {
+    async function fetchAccountInfo() {
+      try {
+        const fetchedAccount = await api.getAccount();
+
+        if (fetchedAccount.hasMnemonic) {
+          setHasMnemonic(true);
+        } else {
+          setHasMnemonic(false);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+
+    fetchAccountInfo();
+  }, [props.origin, account]);
+
+  return (
+    <>
+      {hasMnemonic ? (
+        <LiquidEnableComponent origin={props.origin} />
+      ) : (
+        <Onboard />
+      )}
+    </>
+  );
+}
diff --git a/src/app/screens/Enable/NostrEnable.tsx b/src/app/screens/Enable/NostrEnable.tsx
new file mode 100644
index 0000000000..3e720a239b
--- /dev/null
+++ b/src/app/screens/Enable/NostrEnable.tsx
@@ -0,0 +1,43 @@
+import { useEffect, useState } from "react";
+import NostrEnableComponent from "~/app/components/Enable/NostrEnable";
+import Onboard from "~/app/components/onboard";
+import { useAccount } from "~/app/context/AccountContext";
+import api from "~/common/lib/api";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+
+export default function NostrEnable(props: Props) {
+  const { account } = useAccount();
+  const [hasNostrKeys, setHasNostrKeys] = useState(false);
+
+  useEffect(() => {
+    async function fetchAccountInfo() {
+      try {
+        const fetchedAccount = await api.getAccount();
+
+        if (fetchedAccount.nostrEnabled) {
+          setHasNostrKeys(true);
+        } else {
+          setHasNostrKeys(false);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+
+    fetchAccountInfo();
+  }, [props.origin, account]);
+
+  return (
+    <>
+      {hasNostrKeys ? (
+        <NostrEnableComponent origin={props.origin} />
+      ) : (
+        <Onboard />
+      )}
+    </>
+  );
+}
diff --git a/src/app/screens/Enable/WebbtcEnable.tsx b/src/app/screens/Enable/WebbtcEnable.tsx
new file mode 100644
index 0000000000..99fc52d15e
--- /dev/null
+++ b/src/app/screens/Enable/WebbtcEnable.tsx
@@ -0,0 +1,43 @@
+import { useEffect, useState } from "react";
+import LiquidEnableComponent from "~/app/components/Enable/LiquidEnable";
+import Onboard from "~/app/components/onboard";
+import { useAccount } from "~/app/context/AccountContext";
+import api from "~/common/lib/api";
+import type { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+
+export default function WebbtcEnable(props: Props) {
+  const { account } = useAccount();
+  const [hasMnemonic, setHasMnemonic] = useState(false);
+
+  useEffect(() => {
+    async function fetchAccountInfo() {
+      try {
+        const fetchedAccount = await api.getAccount();
+
+        if (fetchedAccount.hasMnemonic) {
+          setHasMnemonic(true);
+        } else {
+          setHasMnemonic(false);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+
+    fetchAccountInfo();
+  }, [props.origin, account]);
+
+  return (
+    <>
+      {hasMnemonic ? (
+        <LiquidEnableComponent origin={props.origin} />
+      ) : (
+        <Onboard />
+      )}
+    </>
+  );
+}
diff --git a/src/app/screens/Enable/WeblnEnable.tsx b/src/app/screens/Enable/WeblnEnable.tsx
new file mode 100644
index 0000000000..827dd18865
--- /dev/null
+++ b/src/app/screens/Enable/WeblnEnable.tsx
@@ -0,0 +1,10 @@
+import WeblnEnableComponent from "~/app/components/Enable/WeblnEnable";
+import { OriginData } from "~/types";
+
+type Props = {
+  origin: OriginData;
+};
+
+export default function WeblnEnable(props: Props) {
+  return <WeblnEnableComponent origin={props.origin} />;
+}
diff --git a/src/app/screens/Home/DefaultView/index.test.tsx b/src/app/screens/Home/DefaultView/index.test.tsx
index 6ce9e420ea..ebdfd22f10 100644
--- a/src/app/screens/Home/DefaultView/index.test.tsx
+++ b/src/app/screens/Home/DefaultView/index.test.tsx
@@ -1,11 +1,11 @@
-import { AccountsProvider } from "../../../context/AccountsContext";
-import DefaultView from "./index";
 import { render, screen } from "@testing-library/react";
 import { I18nextProvider } from "react-i18next";
 import { MemoryRouter } from "react-router-dom";
 import { settingsFixture as mockSettings } from "~/../tests/fixtures/settings";
 import i18n from "~/../tests/unit/helpers/i18n";
 import { BatteryFixture } from "~/fixtures/battery";
+import { AccountsProvider } from "../../../context/AccountsContext";
+import DefaultView from "./index";
 
 jest.mock("~/common/lib/api", () => ({
   getPayments: () => {
@@ -13,6 +13,20 @@ jest.mock("~/common/lib/api", () => ({
       payments: [],
     };
   },
+  getAccountInfo: () => {
+    return {
+      connectorType: "alby",
+      balance: { balance: 0, currency: "BTC" },
+      currentAccountId: "1234",
+      info: {
+        alias: "🐝 getalby.com",
+        pubkey: undefined,
+        lightning_address: "hello@getalby.com",
+      },
+      name: "hello",
+      avatarUrl: undefined,
+    };
+  },
   getBlocklist: () => {
     return {};
   },
diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx
index 4d04bc88b6..9486887402 100644
--- a/src/app/screens/Home/DefaultView/index.tsx
+++ b/src/app/screens/Home/DefaultView/index.tsx
@@ -13,9 +13,11 @@ import { FC, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import BalanceBox from "~/app/components/BalanceBox";
+import SkeletonLoader from "~/app/components/SkeletonLoader";
 import toast from "~/app/components/Toast";
 import { useAccount } from "~/app/context/AccountContext";
 import { useInvoices } from "~/app/hooks/useInvoices";
+import { useLightningAddress } from "~/app/hooks/useLightningAddress";
 import { useTransactions } from "~/app/hooks/useTransactions";
 import { PublisherLnData } from "~/app/screens/Home/PublisherLnData";
 import api from "~/common/lib/api";
@@ -35,7 +37,7 @@ const DefaultView: FC<Props> = (props) => {
   const { t } = useTranslation("translation", { keyPrefix: "home" });
   const { t: tCommon } = useTranslation("common");
   const { t: tComponents } = useTranslation("components");
-
+  const { loadingLightningAddress, lightningAddress } = useLightningAddress();
   const navigate = useNavigate();
 
   const { account, balancesDecorated, accountLoading } = useAccount();
@@ -115,9 +117,30 @@ const DefaultView: FC<Props> = (props) => {
         <PublisherLnData lnData={props.lnDataFromCurrentTab[0]} />
       )}
       <div className="p-4">
-        <div className="flex space-x-4 mb-4">
-          <BalanceBox />
-        </div>
+        <BalanceBox />
+        {(loadingLightningAddress || lightningAddress) && (
+          <div className="flex justify-center">
+            <a
+              className="cursor-pointer flex flex-row items-center mb-6 px-3 py-1 bg-white dark:bg-surface-01dp border border-gray-200 dark:border-neutral-700 text-gray-800 dark:text-white rounded-full text-xs font-medium hover:border-primary hover:bg-yellow-50 dark:hover:border-primary dark:hover:dark:bg-surface-16dp transition-all duration-250 select-none"
+              onClick={() => {
+                navigator.clipboard.writeText(lightningAddress);
+                toast.success(tCommon("actions.copied_to_clipboard"));
+              }}
+            >
+              {loadingLightningAddress && (
+                <>
+                  ⚡️&nbsp;
+                  <SkeletonLoader className="w-32" />
+                </>
+              )}
+              {!loadingLightningAddress && (
+                <>
+                  <span>⚡️ {lightningAddress}</span>
+                </>
+              )}
+            </a>
+          </div>
+        )}
         <div className="flex mb-6 lg:mb-12 space-x-4">
           <Button
             fullWidth
diff --git a/src/app/screens/Keysend/index.tsx b/src/app/screens/Keysend/index.tsx
index 376e576d72..8f2cec79e7 100644
--- a/src/app/screens/Keysend/index.tsx
+++ b/src/app/screens/Keysend/index.tsx
@@ -157,7 +157,7 @@ function Keysend() {
                   })
             }
           />
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               onClick={close}
               label={tCommon("actions.close")}
diff --git a/src/app/screens/LNURLAuth/index.tsx b/src/app/screens/LNURLAuth/index.tsx
index 0956e7a3f2..6d9e71b406 100644
--- a/src/app/screens/LNURLAuth/index.tsx
+++ b/src/app/screens/LNURLAuth/index.tsx
@@ -124,7 +124,7 @@ function LNURLAuth() {
       ) : (
         <Container justifyBetween maxWidth="sm">
           <ResultCard isSuccess message={successMessage} />
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               onClick={close}
               label={tCommon("actions.close")}
diff --git a/src/app/screens/LNURLChannel/index.tsx b/src/app/screens/LNURLChannel/index.tsx
index 24285bb738..48d808ea34 100644
--- a/src/app/screens/LNURLChannel/index.tsx
+++ b/src/app/screens/LNURLChannel/index.tsx
@@ -125,7 +125,7 @@ function LNURLChannel() {
       ) : (
         <Container justifyBetween maxWidth="sm">
           <ResultCard isSuccess message={successMessage} />
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               onClick={close}
               label={tCommon("actions.close")}
diff --git a/src/app/screens/LNURLPay/index.tsx b/src/app/screens/LNURLPay/index.tsx
index 35d26a0326..bc68de8724 100644
--- a/src/app/screens/LNURLPay/index.tsx
+++ b/src/app/screens/LNURLPay/index.tsx
@@ -406,117 +406,123 @@ function LNURLPay() {
         {!successAction ? (
           <>
             <div className="grow overflow-y-auto no-scrollbar">
-              <Container maxWidth="sm">
+              <Container justifyBetween maxWidth="sm">
                 <PublisherCard
                   title={navState.origin?.name}
                   description={getRecipient()}
                   image={navState.origin?.icon || getImage()}
                 />
-                <form onSubmit={handleSubmit}>
-                  <fieldset disabled={loadingConfirm}>
-                    <dl className="mt-4 overflow-hidden">
-                      <>
-                        {formattedMetadata(details.metadata).map(
-                          ([dt, dd], i) => (
-                            <Fragment key={`element-${i}`}>
-                              <Dt>{dt}</Dt>
-                              <Dd>{dd}</Dd>
-                            </Fragment>
-                          )
-                        )}
-                        {details.minSendable === details.maxSendable && (
-                          <>
-                            <Dt>{t("amount.label")}</Dt>
-                            <Dd>
-                              {getFormattedSats(
-                                Math.floor(+details.minSendable / 1000)
-                              )}
-                            </Dd>
-                          </>
-                        )}
-                      </>
-                    </dl>
-                    {details && details.minSendable !== details.maxSendable && (
-                      <div>
-                        <DualCurrencyField
-                          autoFocus
-                          id="amount"
-                          label={t("amount.label")}
-                          min={amountMin}
-                          max={amountMax}
-                          rangeExceeded={rangeExceeded}
-                          value={valueSat}
-                          onChange={(e) => setValueSat(e.target.value)}
-                          fiatValue={fiatValue}
-                          hint={`${tCommon("balance")}: ${auth
-                            ?.balancesDecorated?.accountBalance}`}
-                          amountExceeded={amountExceeded}
-                        />
-                        <SatButtons
-                          min={amountMin}
-                          max={amountMax}
-                          onClick={setValueSat}
-                          disabled={loadingConfirm}
-                        />
-                      </div>
-                    )}
-
-                    {showCommentField() && (
-                      <div className="mt-4">
-                        <TextField
-                          id="comment"
-                          label={t("comment.label")}
-                          placeholder={tCommon("optional")}
-                          onChange={(e) => {
-                            setComment(e.target.value);
-                          }}
-                        />
-                      </div>
-                    )}
-
-                    {(showNameField() || showEmailField()) && (
-                      <div className="flex justify-center mt-4">
-                        <Hyperlink onClick={toggleShowMoreFields}>
-                          {tCommon("actions.more")}{" "}
-                          {showMoreFields ? (
-                            <CaretUpIcon className="h-4 w-4 inline-flex" />
-                          ) : (
-                            <CaretDownIcon className="h-4 w-4 inline-flex" />
+                <form onSubmit={handleSubmit} className="h-full">
+                  <fieldset
+                    disabled={loadingConfirm}
+                    className="h-full flex flex-col justify-between"
+                  >
+                    <div>
+                      <dl className="mt-4 overflow-hidden">
+                        <>
+                          {formattedMetadata(details.metadata).map(
+                            ([dt, dd], i) => (
+                              <Fragment key={`element-${i}`}>
+                                <Dt>{dt}</Dt>
+                                <Dd>{dd}</Dd>
+                              </Fragment>
+                            )
+                          )}
+                          {details.minSendable === details.maxSendable && (
+                            <>
+                              <Dt>{t("amount.label")}</Dt>
+                              <Dd>
+                                {getFormattedSats(
+                                  Math.floor(+details.minSendable / 1000)
+                                )}
+                              </Dd>
+                            </>
                           )}
-                        </Hyperlink>
-                      </div>
-                    )}
-
-                    {showMoreFields && (
-                      <div className="mb-4">
-                        {showNameField() && (
-                          <div className="mt-4">
-                            <TextField
-                              id="name"
-                              label={t("name.label")}
-                              placeholder={tCommon("optional")}
-                              value={userName}
-                              onChange={(e) => {
-                                setUserName(e.target.value);
-                              }}
+                        </>
+                      </dl>
+                      {details &&
+                        details.minSendable !== details.maxSendable && (
+                          <div>
+                            <DualCurrencyField
+                              autoFocus
+                              id="amount"
+                              label={t("amount.label")}
+                              min={amountMin}
+                              max={amountMax}
+                              rangeExceeded={rangeExceeded}
+                              value={valueSat}
+                              onChange={(e) => setValueSat(e.target.value)}
+                              fiatValue={fiatValue}
+                              hint={`${tCommon("balance")}: ${auth
+                                ?.balancesDecorated?.accountBalance}`}
+                              amountExceeded={amountExceeded}
                             />
-                          </div>
-                        )}
-                        {showEmailField() && (
-                          <div className="mt-4">
-                            <TextField
-                              id="email"
-                              label={t("email.label")}
-                              placeholder={tCommon("optional")}
-                              value={userEmail}
-                              onChange={(e) => {
-                                setUserEmail(e.target.value);
-                              }}
+                            <SatButtons
+                              min={amountMin}
+                              max={amountMax}
+                              onClick={setValueSat}
+                              disabled={loadingConfirm}
                             />
                           </div>
                         )}
-                      </div>
-                    )}
+
+                      {showCommentField() && (
+                        <div className="mt-4">
+                          <TextField
+                            id="comment"
+                            label={t("comment.label")}
+                            placeholder={tCommon("optional")}
+                            onChange={(e) => {
+                              setComment(e.target.value);
+                            }}
+                          />
+                        </div>
+                      )}
+
+                      {(showNameField() || showEmailField()) && (
+                        <div className="flex justify-center mt-4">
+                          <Hyperlink onClick={toggleShowMoreFields}>
+                            {tCommon("actions.more")}{" "}
+                            {showMoreFields ? (
+                              <CaretUpIcon className="h-4 w-4 inline-flex" />
+                            ) : (
+                              <CaretDownIcon className="h-4 w-4 inline-flex" />
+                            )}
+                          </Hyperlink>
+                        </div>
+                      )}
+
+                      {showMoreFields && (
+                        <div className="mb-4">
+                          {showNameField() && (
+                            <div className="mt-4">
+                              <TextField
+                                id="name"
+                                label={t("name.label")}
+                                placeholder={tCommon("optional")}
+                                value={userName}
+                                onChange={(e) => {
+                                  setUserName(e.target.value);
+                                }}
+                              />
+                            </div>
+                          )}
+                          {showEmailField() && (
+                            <div className="mt-4">
+                              <TextField
+                                id="email"
+                                label={t("email.label")}
+                                placeholder={tCommon("optional")}
+                                value={userEmail}
+                                onChange={(e) => {
+                                  setUserEmail(e.target.value);
+                                }}
+                              />
+                            </div>
+                          )}
+                        </div>
+                      )}
+                    </div>
                     <div className="mt-2 dark:border-white/10">
                       <ConfirmOrCancel
                         isFocused={false}
diff --git a/src/app/screens/LNURLRedeem/index.tsx b/src/app/screens/LNURLRedeem/index.tsx
index 75bf9f422c..7417e676ed 100644
--- a/src/app/screens/LNURLRedeem/index.tsx
+++ b/src/app/screens/LNURLRedeem/index.tsx
@@ -92,7 +92,7 @@ function LNURLRedeem() {
               endAdornment={<QrcodeAdornment route="lnurlRedeem" />}
             />
           </div>
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               type="submit"
               label={t("actions.withdraw")}
diff --git a/src/app/screens/LNURLWithdraw/index.tsx b/src/app/screens/LNURLWithdraw/index.tsx
index 0a4cb9dab8..7acdbd9e7f 100644
--- a/src/app/screens/LNURLWithdraw/index.tsx
+++ b/src/app/screens/LNURLWithdraw/index.tsx
@@ -164,7 +164,7 @@ function LNURLWithdraw() {
       ) : (
         <Container justifyBetween maxWidth="sm">
           <ResultCard isSuccess message={successMessage} />
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               onClick={close}
               label={tCommon("actions.close")}
diff --git a/src/app/screens/Receive/index.tsx b/src/app/screens/Receive/index.tsx
index 83f0a884c1..170515e065 100644
--- a/src/app/screens/Receive/index.tsx
+++ b/src/app/screens/Receive/index.tsx
@@ -1,62 +1,34 @@
 import {
+  BitcoinCircleIcon,
   CaretLeftIcon,
-  CheckIcon,
-} from "@bitcoin-design/bitcoin-icons-react/filled";
-import { CopyIcon } from "@bitcoin-design/bitcoin-icons-react/outline";
-import Button from "@components/Button";
+  CopyIcon,
+  LightningIcon,
+} from "@bitcoin-design/bitcoin-icons-react/outline";
 import Container from "@components/Container";
 import Header from "@components/Header";
 import IconButton from "@components/IconButton";
-import Loading from "@components/Loading";
-import DualCurrencyField from "@components/form/DualCurrencyField";
-import TextField from "@components/form/TextField";
-import { useEffect, useRef, useState } from "react";
-import Confetti from "react-confetti";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import QRCode from "react-qr-code";
 import { useNavigate } from "react-router-dom";
+import Avatar from "~/app/components/Avatar";
+import QRCode from "~/app/components/QRCode";
+import SkeletonLoader from "~/app/components/SkeletonLoader";
 import toast from "~/app/components/Toast";
 import { useAccount } from "~/app/context/AccountContext";
-import { useSettings } from "~/app/context/SettingsContext";
+import RedeemIcon from "~/app/icons/RedeemIcon";
 import { isAlbyLNDHubAccount, isAlbyOAuthAccount } from "~/app/utils";
 import api from "~/common/lib/api";
-import msg from "~/common/lib/msg";
-import { poll } from "~/common/utils/helpers";
+import { IconLinkCard } from "../../components/IconLinkCard/IconLinkCard";
 
 function Receive() {
+  const auth = useAccount();
+  const navigate = useNavigate();
   const { t } = useTranslation("translation", { keyPrefix: "receive" });
   const { t: tCommon } = useTranslation("common");
 
-  const auth = useAccount();
-  const {
-    isLoading: isLoadingSettings,
-    settings,
-    getFormattedFiat,
-  } = useSettings();
-  const showFiat = !isLoadingSettings && settings.showFiat;
+  const [loadingLightningAddress, setLoadingLightningAddress] = useState(true);
 
-  const navigate = useNavigate();
-  const [formData, setFormData] = useState({
-    amount: "0",
-    description: "",
-    expiration: "",
-  });
-  const [loadingInvoice, setLoadingInvoice] = useState(false);
-  const [loadingLightningAddress, setLoadingLightningAddress] = useState(false);
-  const [invoice, setInvoice] = useState<{
-    paymentRequest: string;
-    rHash: string;
-  } | null>();
-  const [copyInvoiceLabel, setCopyInvoiceLabel] = useState(
-    tCommon("actions.copy_invoice") as string
-  );
-  const [copyLightningAddressLabel, setCopyLightningAddressLabel] = useState(
-    t("actions.copy_lightning_address") as string
-  );
   const [lightningAddress, setLightningAddress] = useState("");
-  const [paid, setPaid] = useState(false);
-  const [pollingForPayment, setPollingForPayment] = useState(false);
-  const mounted = useRef(false);
   const isAlbyLNDHubUser = isAlbyLNDHubAccount(
     auth.account?.alias,
     auth.account?.connectorType
@@ -65,185 +37,16 @@ function Receive() {
   const isAlbyUser = isAlbyOAuthUser || isAlbyLNDHubUser;
 
   useEffect(() => {
-    mounted.current = true;
-
-    return () => {
-      mounted.current = false;
-    };
-  }, []);
-
-  const [fiatAmount, setFiatAmount] = useState("");
-
-  useEffect(() => {
-    if (formData.amount !== "" && showFiat) {
-      (async () => {
-        const res = await getFormattedFiat(formData.amount);
-        setFiatAmount(res);
-      })();
-    }
-  }, [formData, showFiat, getFormattedFiat]);
-
-  function handleChange(
-    event: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>
-  ) {
-    setFormData({
-      ...formData,
-      [event.target.name]: event.target.value.trim(),
-    });
-  }
+    (async () => {
+      if (!auth.account) return;
+      const accountInfo = await api.swr.getAccountInfo(auth.account.id);
 
-  function checkPayment(paymentHash: string) {
-    setPollingForPayment(true);
-    poll({
-      fn: () =>
-        msg.request("checkPayment", { paymentHash }) as Promise<{
-          paid: boolean;
-        }>,
-      validate: (payment) => payment.paid,
-      interval: 3000,
-      maxAttempts: 20,
-      shouldStopPolling: () => !mounted.current,
-    })
-      .then(() => {
-        setPaid(true);
-        auth.fetchAccountInfo(); // Update balance.
-      })
-      .catch((err) => console.error(err))
-      .finally(() => {
-        setPollingForPayment(false);
-      });
-  }
+      const lightningAddress = accountInfo.lightningAddress;
+      if (lightningAddress) setLightningAddress(lightningAddress);
 
-  function setDefaults() {
-    setFormData({
-      amount: "0",
-      description: "",
-      expiration: "",
-    });
-    setPaid(false);
-    setPollingForPayment(false);
-    setInvoice(null);
-  }
-
-  async function createInvoice() {
-    try {
-      setLoadingInvoice(true);
-      const response = await api.makeInvoice({
-        amount: formData.amount,
-        memo: formData.description,
-      });
-      setInvoice(response);
-      checkPayment(response.rHash);
-    } catch (e) {
-      if (e instanceof Error) {
-        toast.error(e.message);
-      }
-    } finally {
-      setLoadingInvoice(false);
-    }
-  }
-
-  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    createInvoice();
-  }
-
-  async function getLightningAddress() {
-    setLoadingLightningAddress(true);
-    const response = await api.getAccountInfo();
-    const lightningAddress = response.info.lightning_address;
-    if (lightningAddress) setLightningAddress(lightningAddress);
-    setLoadingLightningAddress(false);
-  }
-
-  useEffect(() => {
-    getLightningAddress();
-  }, []);
-
-  function renderInvoice() {
-    if (!invoice) return null;
-    return (
-      <>
-        <div className="relative p-8 bg-white rounded-lg shadow-sm ring-1 ring-black ring-opacity-5 flex justify-center items-center overflow-hidden">
-          <QRCode value={invoice.paymentRequest.toUpperCase()} level="M" />
-          {paid && (
-            <div className="absolute inset-0 flex justify-center items-center bg-white/90">
-              <div className="text-center">
-                <div className="inline-block bg-green-bitcoin p-1 rounded-full mb-2">
-                  <CheckIcon className="w-7 h-7 text-white" />
-                </div>
-                <p className="text-lg font-bold">{t("success")}</p>
-              </div>
-            </div>
-          )}
-        </div>
-        {paid && (
-          <div className="my-4">
-            <Button
-              type="submit"
-              label={tCommon("actions.receive_again")}
-              primary
-              fullWidth
-              onClick={() => {
-                setDefaults();
-                navigate("/receive");
-              }}
-            />
-          </div>
-        )}
-        {!paid && (
-          <>
-            <div className="mt-8 mb-4 flex justify-center">
-              <Button
-                onClick={async () => {
-                  try {
-                    navigator.clipboard.writeText(invoice.paymentRequest);
-                    setCopyInvoiceLabel(tCommon("copied"));
-                    setTimeout(() => {
-                      setCopyInvoiceLabel(tCommon("actions.copy_invoice"));
-                    }, 1000);
-                  } catch (e) {
-                    if (e instanceof Error) {
-                      toast.error(e.message);
-                    }
-                  }
-                }}
-                icon={<CopyIcon className="w-6 h-6 mr-2" />}
-                label={copyInvoiceLabel}
-              />
-            </div>
-
-            <div className="flex justify-center">
-              {pollingForPayment && (
-                <div className="flex items-center space-x-2 dark:text-white">
-                  <Loading />
-                  <span>{t("payment.waiting")}</span>
-                </div>
-              )}
-
-              {!pollingForPayment && (
-                <Button
-                  onClick={() => checkPayment(invoice.rHash)}
-                  label={t("payment.status")}
-                />
-              )}
-            </div>
-          </>
-        )}
-        {paid && (
-          <Confetti
-            width={window.innerWidth}
-            height={window.innerHeight}
-            recycle={false}
-            onConfettiComplete={(confetti) => {
-              confetti && confetti.reset();
-            }}
-            style={{ pointerEvents: "none" }}
-          />
-        )}
-      </>
-    );
-  }
+      setLoadingLightningAddress(false);
+    })();
+  }, [auth.account]);
 
   return (
     <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
@@ -251,7 +54,7 @@ function Receive() {
         headerLeft={
           <IconButton
             onClick={() => {
-              invoice ? setDefaults() : navigate(-1);
+              navigate(-1);
             }}
             icon={<CaretLeftIcon className="w-4 h-4" />}
           />
@@ -259,114 +62,97 @@ function Receive() {
       >
         {t("title")}
       </Header>
-      {invoice ? (
-        <Container maxWidth="sm">{renderInvoice()}</Container>
-      ) : (
-        <div className="pt-4">
-          <form onSubmit={handleSubmit}>
-            <fieldset disabled={loadingInvoice}>
-              <Container justifyBetween maxWidth="sm">
-                <div>
-                  <div className="mb-4">
-                    <DualCurrencyField
-                      id="amount"
-                      min={0}
-                      label={t("amount.label")}
-                      placeholder={t("amount.placeholder")}
-                      fiatValue={fiatAmount}
-                      onChange={handleChange}
-                      autoFocus
-                    />
-                  </div>
 
-                  <div className="mb-4">
-                    <TextField
-                      id="description"
-                      label={t("description.label")}
-                      placeholder={t("description.placeholder")}
-                      onChange={handleChange}
-                    />
+      <div className="pt-4">
+        <Container justifyBetween maxWidth="sm">
+          <div className="flex flex-col gap-2 md:gap-3">
+            {isAlbyOAuthUser && (
+              <div className="bg-white dark:bg-surface-01dp border-gray-200 dark:border-neutral-700 rounded border p-4 flex flex-col justify-center items-center gap-1 text-gray-800 dark:text-neutral-200">
+                <>
+                  <div className="relative flex flex-grid">
+                    <div className="w-32 h-32 md:w-48 md:h-48">
+                      {loadingLightningAddress ? (
+                        <SkeletonLoader className="w-32 h-32 relative -top-1" />
+                      ) : (
+                        <>
+                          <QRCode
+                            className="block md:hidden"
+                            value={`lightning:${lightningAddress}`}
+                            size={128}
+                          />
+                          <QRCode
+                            className="hidden md:block"
+                            value={`lightning:${lightningAddress}`}
+                            size={192}
+                          />
+                        </>
+                      )}
+                      {!auth.accountLoading && auth.account ? (
+                        <Avatar
+                          size={40}
+                          className="border-4 border-white rounded-full absolute inset-1/2 transform -translate-x-1/2 -translate-y-1/2 z-10"
+                          url={auth.account.avatarUrl}
+                          name={auth.account.id}
+                        />
+                      ) : (
+                        auth.accountLoading && (
+                          <SkeletonLoader
+                            circle
+                            opaque={false}
+                            className="w-[40px] h-[40px] border-4 border-white rounded-full absolute inset-1/2 transform -translate-x-1/2 -translate-y-1/2 z-10 opacity-100"
+                          />
+                        )
+                      )}
+                    </div>
                   </div>
-                </div>
-                <Button
-                  type="submit"
-                  label={t("actions.create_invoice")}
-                  fullWidth
-                  primary
-                  loading={loadingInvoice}
-                  disabled={loadingInvoice}
-                />
-              </Container>
-            </fieldset>
-          </form>
-          <div>
-            <Container justifyBetween maxWidth="sm">
-              <div className="relative flex  items-center mb-4">
-                <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">
-                  {tCommon("or")}
-                </span>
-                <div className="flex-grow border-t  border-gray-300 dark:border-gray-700"></div>
-              </div>
-              <div className="mb-4">
-                <Button
-                  type="button"
-                  label={t("redeem_lnurl")}
-                  fullWidth
-                  onClick={() => {
-                    navigate("/lnurlRedeem");
-                  }}
-                />
+                  <div className="mt-1 text-xs md:text-sm leading-4 font-medium">
+                    {loadingLightningAddress ? (
+                      <SkeletonLoader className="w-40 relative" />
+                    ) : (
+                      <a
+                        className="flex flex-row items-center cursor-pointer"
+                        onClick={() => {
+                          navigator.clipboard.writeText(lightningAddress);
+                          toast.success(tCommon("copied"));
+                        }}
+                      >
+                        {lightningAddress}
+                        <CopyIcon className="w-4 h-4" />
+                      </a>
+                    )}
+                  </div>
+                </>
               </div>
-
-              {isAlbyOAuthUser && (
-                <div className="mb-4">
-                  <Button
-                    type="button"
-                    label={copyLightningAddressLabel}
-                    disabled={loadingLightningAddress}
-                    fullWidth
-                    onClick={async () => {
-                      try {
-                        if (!lightningAddress) {
-                          throw new Error(
-                            "User does not have a lightning address"
-                          );
-                        }
-                        navigator.clipboard.writeText(lightningAddress);
-                        setCopyLightningAddressLabel(tCommon("copied"));
-                        setTimeout(() => {
-                          setCopyLightningAddressLabel(
-                            t("actions.copy_lightning_address")
-                          );
-                        }, 1000);
-                      } catch (e) {
-                        if (e instanceof Error) {
-                          toast.error(e.message);
-                        }
-                      }
-                    }}
-                    icon={<CopyIcon className="w-6 h-6 mr-2" />}
-                  />
-                </div>
-              )}
-
-              {isAlbyUser && (
-                <div className="mb-4">
-                  <Button
-                    type="button"
-                    label={t("receive_via_bitcoin_address")}
-                    fullWidth
-                    onClick={() => {
-                      navigate("/onChainReceive");
-                    }}
-                  />
-                </div>
-              )}
-            </Container>
+            )}
+            <IconLinkCard
+              title={t("actions.invoice.title")}
+              description={t("actions.invoice.description")}
+              icon={<LightningIcon className="w-8" />}
+              onClick={() => {
+                navigate("/receive/invoice");
+              }}
+            />
+            {isAlbyUser && (
+              <IconLinkCard
+                title={t("actions.bitcoin_address.title")}
+                description={t("actions.bitcoin_address.description")}
+                icon={<BitcoinCircleIcon className="w-8" />}
+                onClick={() => {
+                  navigate("/onChainReceive");
+                }}
+              />
+            )}
+            <IconLinkCard
+              title={t("actions.redeem.title")}
+              description={t("actions.redeem.description")}
+              icon={<RedeemIcon className="w-8" />}
+              onClick={() => {
+                navigate("/lnurlRedeem");
+              }}
+            />
           </div>
-        </div>
-      )}
+        </Container>
+      </div>
     </div>
   );
 }
diff --git a/src/app/screens/Receive/index.test.tsx b/src/app/screens/ReceiveInvoice/index.test.tsx
similarity index 95%
rename from src/app/screens/Receive/index.test.tsx
rename to src/app/screens/ReceiveInvoice/index.test.tsx
index ee0ac75f7d..d0a10dbcf0 100644
--- a/src/app/screens/Receive/index.test.tsx
+++ b/src/app/screens/ReceiveInvoice/index.test.tsx
@@ -5,7 +5,7 @@ import { settingsFixture as mockSettings } from "~/../tests/fixtures/settings";
 import { SettingsProvider } from "~/app/context/SettingsContext";
 import api from "~/common/lib/api";
 
-import Receive from "./index";
+import ReceiveInvoice from "../ReceiveInvoice";
 
 jest.mock("~/common/lib/api", () => {
   const original = jest.requireActual("~/common/lib/api");
@@ -31,7 +31,7 @@ describe("Receive", () => {
       render(
         <MemoryRouter>
           <SettingsProvider>
-            <Receive />
+            <ReceiveInvoice />
           </SettingsProvider>
         </MemoryRouter>
       );
diff --git a/src/app/screens/ReceiveInvoice/index.tsx b/src/app/screens/ReceiveInvoice/index.tsx
new file mode 100644
index 0000000000..e0dfe387eb
--- /dev/null
+++ b/src/app/screens/ReceiveInvoice/index.tsx
@@ -0,0 +1,287 @@
+import {
+  CaretLeftIcon,
+  CheckIcon,
+  CopyIcon,
+} 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 DualCurrencyField from "@components/form/DualCurrencyField";
+import TextField from "@components/form/TextField";
+import { useEffect, useRef, useState } from "react";
+import Confetti from "react-confetti";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import QRCode from "~/app/components/QRCode";
+import toast from "~/app/components/Toast";
+import { useAccount } from "~/app/context/AccountContext";
+import { useSettings } from "~/app/context/SettingsContext";
+import api from "~/common/lib/api";
+import msg from "~/common/lib/msg";
+import { poll } from "~/common/utils/helpers";
+
+function ReceiveInvoice() {
+  const { t } = useTranslation("translation", { keyPrefix: "receive" });
+  const { t: tCommon } = useTranslation("common");
+
+  const auth = useAccount();
+  const {
+    isLoading: isLoadingSettings,
+    settings,
+    getFormattedFiat,
+  } = useSettings();
+  const showFiat = !isLoadingSettings && settings.showFiat;
+
+  const navigate = useNavigate();
+
+  const [formData, setFormData] = useState({
+    amount: "0",
+    description: "",
+    expiration: "",
+  });
+  const [loadingInvoice, setLoadingInvoice] = useState(false);
+  const [invoice, setInvoice] = useState<{
+    paymentRequest: string;
+    rHash: string;
+  } | null>();
+  const [copyInvoiceLabel, setCopyInvoiceLabel] = useState(
+    tCommon("actions.copy_invoice") as string
+  );
+
+  const [paid, setPaid] = useState(false);
+  const [pollingForPayment, setPollingForPayment] = useState(false);
+  const mounted = useRef(false);
+
+  useEffect(() => {
+    mounted.current = true;
+
+    return () => {
+      mounted.current = false;
+    };
+  }, []);
+
+  const [fiatAmount, setFiatAmount] = useState("");
+
+  useEffect(() => {
+    if (formData.amount !== "" && showFiat) {
+      (async () => {
+        const res = await getFormattedFiat(formData.amount);
+        setFiatAmount(res);
+      })();
+    }
+  }, [formData, showFiat, getFormattedFiat]);
+
+  function handleChange(
+    event: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>
+  ) {
+    setFormData({
+      ...formData,
+      [event.target.name]: event.target.value.trim(),
+    });
+  }
+
+  function checkPayment(paymentHash: string) {
+    setPollingForPayment(true);
+    poll({
+      fn: () =>
+        msg.request("checkPayment", { paymentHash }) as Promise<{
+          paid: boolean;
+        }>,
+      validate: (payment) => payment.paid,
+      interval: 3000,
+      maxAttempts: 20,
+      shouldStopPolling: () => !mounted.current,
+    })
+      .then(() => {
+        setPaid(true);
+        auth.fetchAccountInfo(); // Update balance.
+      })
+      .catch((err) => console.error(err))
+      .finally(() => {
+        setPollingForPayment(false);
+      });
+  }
+
+  function setDefaults() {
+    setFormData({
+      amount: "0",
+      description: "",
+      expiration: "",
+    });
+    setPaid(false);
+    setPollingForPayment(false);
+    setInvoice(null);
+  }
+
+  async function createInvoice() {
+    try {
+      setLoadingInvoice(true);
+      const response = await api.makeInvoice({
+        amount: formData.amount,
+        memo: formData.description,
+      });
+      setInvoice(response);
+      checkPayment(response.rHash);
+    } catch (e) {
+      if (e instanceof Error) {
+        toast.error(e.message);
+      }
+    } finally {
+      setLoadingInvoice(false);
+    }
+  }
+
+  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    createInvoice();
+  }
+
+  function renderInvoice() {
+    if (!invoice) return null;
+    return (
+      <>
+        <div className="mt-4 relative p-8 bg-white rounded-lg shadow-sm ring-1 ring-black ring-opacity-5 flex justify-center items-center overflow-hidden">
+          <QRCode value={invoice.paymentRequest.toUpperCase()} />
+          {paid && (
+            <div className="absolute inset-0 flex justify-center items-center bg-white/90">
+              <div className="text-center">
+                <div className="inline-block bg-green-bitcoin p-1 rounded-full mb-2">
+                  <CheckIcon className="w-7 h-7 text-white" />
+                </div>
+                <p className="text-lg font-bold">{t("success")}</p>
+              </div>
+            </div>
+          )}
+        </div>
+        {paid && (
+          <div className="mt-4">
+            <Button
+              type="submit"
+              label={tCommon("actions.receive_again")}
+              primary
+              fullWidth
+              onClick={() => {
+                setDefaults();
+                navigate("/receive/invoice");
+              }}
+            />
+          </div>
+        )}
+        {!paid && (
+          <>
+            <div className="mt-8 mb-4 flex justify-center">
+              <Button
+                onClick={async () => {
+                  try {
+                    navigator.clipboard.writeText(invoice.paymentRequest);
+                    setCopyInvoiceLabel(tCommon("copied"));
+                    setTimeout(() => {
+                      setCopyInvoiceLabel(tCommon("actions.copy_invoice"));
+                    }, 1000);
+                  } catch (e) {
+                    if (e instanceof Error) {
+                      toast.error(e.message);
+                    }
+                  }
+                }}
+                icon={<CopyIcon className="w-6 h-6 mr-2" />}
+                label={copyInvoiceLabel}
+                primary
+              />
+            </div>
+
+            <div className="flex justify-center">
+              {pollingForPayment && (
+                <div className="flex items-center space-x-2 dark:text-white">
+                  <Loading />
+                  <span>{t("payment.waiting")}</span>
+                </div>
+              )}
+
+              {!pollingForPayment && (
+                <Button
+                  onClick={() => checkPayment(invoice.rHash)}
+                  label={t("payment.status")}
+                />
+              )}
+            </div>
+          </>
+        )}
+        {paid && (
+          <Confetti
+            width={window.innerWidth}
+            height={window.innerHeight}
+            recycle={false}
+            onConfettiComplete={(confetti) => {
+              confetti && confetti.reset();
+            }}
+            style={{ pointerEvents: "none" }}
+          />
+        )}
+      </>
+    );
+  }
+
+  return (
+    <div className="h-full flex flex-col overflow-y-auto no-scrollbar">
+      <Header
+        headerLeft={
+          <IconButton
+            onClick={() => {
+              invoice ? setDefaults() : navigate(-1);
+            }}
+            icon={<CaretLeftIcon className="w-4 h-4" />}
+          />
+        }
+      >
+        {t("title")}
+      </Header>
+      {invoice ? (
+        <Container maxWidth="sm">{renderInvoice()}</Container>
+      ) : (
+        <div className="pt-4">
+          <form onSubmit={handleSubmit}>
+            <fieldset disabled={loadingInvoice}>
+              <Container justifyBetween maxWidth="sm">
+                <div>
+                  <div className="mb-4">
+                    <DualCurrencyField
+                      id="amount"
+                      min={0}
+                      label={t("amount.label")}
+                      placeholder={t("amount.placeholder")}
+                      fiatValue={fiatAmount}
+                      onChange={handleChange}
+                      autoFocus
+                    />
+                  </div>
+
+                  <div className="mb-4">
+                    <TextField
+                      id="description"
+                      label={t("description.label")}
+                      placeholder={t("description.placeholder")}
+                      onChange={handleChange}
+                    />
+                  </div>
+                </div>
+                <Button
+                  type="submit"
+                  label={t("actions.create_invoice")}
+                  fullWidth
+                  primary
+                  loading={loadingInvoice}
+                  disabled={loadingInvoice}
+                />
+              </Container>
+            </fieldset>
+          </form>
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default ReceiveInvoice;
diff --git a/src/app/screens/Send/index.tsx b/src/app/screens/Send/index.tsx
index 4c31a1f3b3..e5f52d95d7 100644
--- a/src/app/screens/Send/index.tsx
+++ b/src/app/screens/Send/index.tsx
@@ -154,7 +154,7 @@ function Send() {
               endAdornment={<QrcodeAdornment route="send" />}
             />
           </div>
-          <div className="my-4">
+          <div className="mt-4">
             <Button
               type="submit"
               label={tCommon("actions.continue")}
diff --git a/src/app/screens/connectors/ConnectGaloy/index.tsx b/src/app/screens/connectors/ConnectGaloy/index.tsx
index 2846baad8c..93c3be66d7 100644
--- a/src/app/screens/connectors/ConnectGaloy/index.tsx
+++ b/src/app/screens/connectors/ConnectGaloy/index.tsx
@@ -9,18 +9,16 @@ import { useNavigate } from "react-router-dom";
 import toast from "~/app/components/Toast";
 import msg from "~/common/lib/msg";
 
-import galoyBitcoinBeach from "/static/assets/icons/galoy_bitcoin_beach.png";
 import galoyBitcoinJungle from "/static/assets/icons/galoy_bitcoin_jungle.png";
+import galoyBlink from "/static/assets/icons/galoy_blink.png";
 
 export const galoyUrls = {
-  "galoy-bitcoin-beach": {
-    i18nPrefix: "bitcoin_beach",
-    label: "Bitcoin Beach Wallet",
-    website: "https://galoy.io/bitcoin-beach-wallet/",
-    logo: galoyBitcoinBeach,
-    url:
-      process.env.BITCOIN_BEACH_GALOY_URL ||
-      "https://api.mainnet.galoy.io/graphql",
+  "galoy-blink": {
+    i18nPrefix: "blink",
+    label: "Blink Wallet",
+    website: "https://www.blink.sv/",
+    logo: galoyBlink,
+    url: process.env.BLINK_GALOY_URL || "https://api.mainnet.galoy.io/graphql",
   },
   "galoy-bitcoin-jungle": {
     i18nPrefix: "bitcoin_jungle",
diff --git a/src/common/lib/api.ts b/src/common/lib/api.ts
index 1af9c725ef..3211403022 100644
--- a/src/common/lib/api.ts
+++ b/src/common/lib/api.ts
@@ -108,6 +108,7 @@ export const swrGetAccountInfo = async (
           connectorType,
           currency: currency || "BTC", // set default currency for every account
           avatarUrl,
+          lightningAddress: response.info.lightning_address,
         };
         storeAccounts({
           ...accountsCache,
diff --git a/src/extension/background-script/actions/accounts/select.ts b/src/extension/background-script/actions/accounts/select.ts
index df960eb189..f7b8a72c1f 100644
--- a/src/extension/background-script/actions/accounts/select.ts
+++ b/src/extension/background-script/actions/accounts/select.ts
@@ -47,20 +47,22 @@ export default select;
 // Send a notification message to the content script
 // which will then be posted to the window so websites can sync with the switched account
 async function notifyAccountChanged() {
-  try {
-    const tabs = await browser.tabs.query({});
-    // Send message to tabs with URLs starting with "http" or "https"
+  const tabs = await browser.tabs.query({});
+  // Send message to tabs with URLs starting with "http" or "https"
+  if (tabs) {
     const validTabs = tabs.filter((tab) => {
       const currentUrl = tab.url || "";
       return currentUrl.startsWith("http") || currentUrl.startsWith("https");
     });
 
     for (const tab of validTabs) {
-      if (tab.id) {
-        await browser.tabs.sendMessage(tab.id, { action: "accountChanged" });
+      try {
+        if (tab.id) {
+          await browser.tabs.sendMessage(tab.id, { action: "accountChanged" });
+        }
+      } catch (error) {
+        console.error("Failed to notify account changed", error);
       }
     }
-  } catch (error) {
-    console.error("Failed to notify account changed", error);
   }
 }
diff --git a/src/extension/background-script/actions/allowances/enable.ts b/src/extension/background-script/actions/alby/enable.ts
similarity index 100%
rename from src/extension/background-script/actions/allowances/enable.ts
rename to src/extension/background-script/actions/alby/enable.ts
diff --git a/src/extension/background-script/actions/alby/index.ts b/src/extension/background-script/actions/alby/index.ts
new file mode 100644
index 0000000000..e9478e1569
--- /dev/null
+++ b/src/extension/background-script/actions/alby/index.ts
@@ -0,0 +1,2 @@
+import enable from "./enable";
+export { enable };
diff --git a/src/extension/background-script/actions/allowances/__tests__/enable.test.ts b/src/extension/background-script/actions/allowances/__tests__/enable.test.ts
index d84e67197d..e8b957b5d2 100644
--- a/src/extension/background-script/actions/allowances/__tests__/enable.test.ts
+++ b/src/extension/background-script/actions/allowances/__tests__/enable.test.ts
@@ -4,7 +4,7 @@ import state from "~/extension/background-script/state";
 import { allowanceFixture } from "~/fixtures/allowances";
 import type { DbAllowance, MessageAllowanceEnable, Sender } from "~/types";
 
-import enableAllowance from "../enable";
+import enableAllowance from "../../webln/enable";
 
 jest.mock("~/extension/background-script/state");
 
diff --git a/src/extension/background-script/actions/allowances/index.ts b/src/extension/background-script/actions/allowances/index.ts
index 072d493211..bc39862c9d 100644
--- a/src/extension/background-script/actions/allowances/index.ts
+++ b/src/extension/background-script/actions/allowances/index.ts
@@ -1,9 +1,8 @@
 import add from "./add";
 import deleteAllowance from "./delete";
-import enable from "./enable";
 import get from "./get";
 import getById from "./getById";
 import list from "./list";
 import updateAllowance from "./update";
 
-export { add, deleteAllowance, enable, get, getById, list, updateAllowance };
+export { add, deleteAllowance, get, getById, list, updateAllowance };
diff --git a/src/extension/background-script/actions/liquid/enable.ts b/src/extension/background-script/actions/liquid/enable.ts
new file mode 100644
index 0000000000..b560416bbf
--- /dev/null
+++ b/src/extension/background-script/actions/liquid/enable.ts
@@ -0,0 +1,78 @@
+import utils from "~/common/lib/utils";
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+import { ExtensionIcon, setIcon } from "../setup/setIcon";
+
+const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const account = await state.getState().getAccount();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  if (isUnlocked && allowance && allowance.enabled && account?.mnemonic) {
+    return {
+      data: { enabled: true },
+    };
+  } else {
+    try {
+      const response = await utils.openPrompt<{
+        enabled: boolean;
+        remember: boolean;
+      }>(message);
+
+      if (response.data.enabled && sender.tab) {
+        await setIcon(ExtensionIcon.Active, sender.tab.id as number); // highlight the icon when enabled
+      }
+
+      // if the response should be saved/remembered we update the allowance for the domain
+      // as this returns a promise we must wait until it resolves
+      if (response.data.enabled && response.data.remember) {
+        if (allowance) {
+          if (!allowance.id) {
+            return { data: { error: "id is missing" } };
+          }
+          await db.allowances.update(allowance.id, {
+            enabled: true,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+          });
+        } else {
+          await db.allowances.add({
+            host: host,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+            enabled: true,
+            lastPaymentAt: 0,
+            totalBudget: 0,
+            remainingBudget: 0,
+            createdAt: Date.now().toString(),
+            lnurlAuth: false,
+            tag: "",
+          });
+        }
+        await db.saveToStorage();
+      }
+      return {
+        data: {
+          enabled: response.data.enabled,
+          remember: response.data.remember,
+        },
+      };
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) {
+        return { error: e.message };
+      }
+    }
+  }
+};
+
+export default enable;
diff --git a/src/extension/background-script/actions/liquid/index.ts b/src/extension/background-script/actions/liquid/index.ts
index 27255b8e1d..e1e48d8bd0 100644
--- a/src/extension/background-script/actions/liquid/index.ts
+++ b/src/extension/background-script/actions/liquid/index.ts
@@ -1,3 +1,4 @@
+import enable from "./enable";
 import fetchAssetRegistry from "./fetchAssetRegistry";
 import getAddressOrPrompt from "./getAddressOrPrompt";
 import getPsetPreview from "./getPsetPreview";
@@ -5,6 +6,7 @@ import signPset from "./signPset";
 import signPsetWithPrompt from "./signPsetWithPrompt";
 
 export {
+  enable,
   fetchAssetRegistry,
   getAddressOrPrompt,
   getPsetPreview,
diff --git a/src/extension/background-script/actions/ln/__tests__/request.test.ts b/src/extension/background-script/actions/ln/__tests__/request.test.ts
index 0d67f6ac43..54ef0cf737 100644
--- a/src/extension/background-script/actions/ln/__tests__/request.test.ts
+++ b/src/extension/background-script/actions/ln/__tests__/request.test.ts
@@ -45,7 +45,7 @@ const permissionInDB = {
   allowanceId: allowanceInDB.id,
   createdAt: "1487076708000",
   host: allowanceInDB.host,
-  method: "webln/lnd/makeinvoice",
+  method: "webln/lnd/listchannels",
   blocked: false,
   enabled: true,
 };
@@ -54,7 +54,7 @@ const message: MessageGenericRequest = {
   action: "request",
   origin: { host: allowanceInDB.host } as OriginData,
   args: {
-    method: "makeInvoice",
+    method: "listchannels",
     params: {},
   },
 };
@@ -68,9 +68,8 @@ const fullConnector = {
   requestMethod: jest.fn(() => Promise.resolve(requestResponse)),
   supportedMethods: [
     // saved and compared in lowercase
-    "getinfo",
-    "makeinvoice",
-    "sendpayment",
+    "request.listchannels",
+    "request.listpeers",
   ],
 } as unknown as Connector;
 
@@ -91,14 +90,14 @@ describe("ln request", () => {
     test("if connector does not support requestMethod", async () => {
       connector = {
         ...fullConnector,
-        supportedMethods: ["getinfo"],
+        supportedMethods: ["request.routermc"],
       };
 
       const result = await request(message);
 
       expect(console.error).toHaveBeenCalledTimes(1);
       expect(result).toStrictEqual({
-        error: "makeinvoice is not supported by your account",
+        error: "listchannels is not supported by your account",
       });
     });
 
@@ -203,7 +202,7 @@ describe("ln request", () => {
         args: {
           requestPermission: {
             method: message.args.method.toLowerCase(),
-            description: "lnd.makeinvoice",
+            description: "lnd.listchannels",
           },
         },
         origin: message.origin,
@@ -230,7 +229,7 @@ describe("ln request", () => {
         args: {
           requestPermission: {
             method: message.args.method.toLowerCase(),
-            description: "lnd.makeinvoice",
+            description: "lnd.listchannels",
           },
         },
         origin: message.origin,
@@ -252,36 +251,36 @@ describe("ln request", () => {
       // prepare DB with a permission
       await db.permissions.bulkAdd([permissionInDB]);
 
-      const messageWithGetInfo = {
+      const listPeersMessage = {
         ...message,
         args: {
           ...message.args,
-          method: "getInfo",
+          method: "listpeers",
         },
       };
 
       expect(await db.permissions.toArray()).toHaveLength(1);
       expect(
-        await db.permissions.get({ method: "webln/lnd/getinfo" })
+        await db.permissions.get({ method: "webln/lnd/listpeers" })
       ).toBeUndefined();
 
-      const result = await request(messageWithGetInfo);
+      const result = await request(listPeersMessage);
 
       expect(utils.openPrompt).toHaveBeenCalledTimes(1);
 
       expect(connector.requestMethod).toHaveBeenCalledWith(
-        messageWithGetInfo.args.method.toLowerCase(),
-        messageWithGetInfo.args.params
+        listPeersMessage.args.method.toLowerCase(),
+        listPeersMessage.args.params
       );
 
       expect(await db.permissions.toArray()).toHaveLength(2);
 
       const addedPermission = await db.permissions.get({
-        method: "webln/lnd/getinfo",
+        method: "webln/lnd/listchannels",
       });
       expect(addedPermission).toEqual(
         expect.objectContaining({
-          method: "webln/lnd/getinfo",
+          method: "webln/lnd/listchannels",
           enabled: true,
           allowanceId: allowanceInDB.id,
           host: allowanceInDB.host,
@@ -303,13 +302,13 @@ describe("ln request", () => {
         ...message,
         args: {
           ...message.args,
-          method: "sendPayment",
+          method: "listpeers",
         },
       };
 
       expect(await db.permissions.toArray()).toHaveLength(1);
       expect(
-        await db.permissions.get({ method: "webln/lnd/sendpayment" })
+        await db.permissions.get({ method: "webln/lnd/listpeers" })
       ).toBeUndefined();
 
       const result = await request(messageWithOtherPermission);
@@ -320,7 +319,7 @@ describe("ln request", () => {
 
       expect(await db.permissions.toArray()).toHaveLength(1);
       expect(
-        await db.permissions.get({ method: "webln/lnd/sendpayment" })
+        await db.permissions.get({ method: "webln/lnd/listpeers" })
       ).toBeUndefined();
 
       expect(result).toHaveProperty("error");
@@ -333,31 +332,31 @@ describe("ln request", () => {
       // prepare DB with a permission
       await db.permissions.bulkAdd([permissionInDB]);
 
-      const messageWithOtherPermission = {
+      const listPeersMessage = {
         ...message,
         args: {
           ...message.args,
-          method: "sendPayment",
+          method: "listpeers",
         },
       };
 
       expect(await db.permissions.toArray()).toHaveLength(1);
       expect(
-        await db.permissions.get({ method: "webln/lnd/sendpayment" })
+        await db.permissions.get({ method: "webln/lnd/listpeers" })
       ).toBeUndefined();
 
-      const result = await request(messageWithOtherPermission);
+      const result = await request(listPeersMessage);
 
       expect(utils.openPrompt).toHaveBeenCalledTimes(1);
 
       expect(connector.requestMethod).toHaveBeenCalledWith(
-        messageWithOtherPermission.args.method.toLowerCase(),
-        messageWithOtherPermission.args.params
+        listPeersMessage.args.method.toLowerCase(),
+        listPeersMessage.args.params
       );
 
       expect(await db.permissions.toArray()).toHaveLength(1);
       expect(
-        await db.permissions.get({ method: "webln/lnd/sendpayment" })
+        await db.permissions.get({ method: "webln/lnd/listpeers" })
       ).toBeUndefined();
 
       expect(result).toStrictEqual(requestResponse);
diff --git a/src/extension/background-script/actions/ln/request.ts b/src/extension/background-script/actions/ln/request.ts
index a57814244f..544e1c9952 100644
--- a/src/extension/background-script/actions/ln/request.ts
+++ b/src/extension/background-script/actions/ln/request.ts
@@ -25,6 +25,7 @@ const request = async (
     }
 
     const methodInLowerCase = args.method.toLowerCase();
+    const requestMethodName = `request.${methodInLowerCase}`;
 
     // Check if the current connector support the call
     // connectors maybe do not support `requestMethod` at all
@@ -34,7 +35,7 @@ const request = async (
     const supportedMethods = connector.supportedMethods || []; // allow the connector to control which methods can be called
     if (
       !connector.requestMethod ||
-      !supportedMethods.includes(methodInLowerCase)
+      !supportedMethods.includes(requestMethodName)
     ) {
       throw new Error(`${methodInLowerCase} is not supported by your account`);
     }
@@ -60,7 +61,7 @@ const request = async (
     const hasPermission = await hasPermissionFor(weblnMethod, origin.host);
 
     // request method is allowed to be called
-    if (hasPermission && supportedMethods.includes(methodInLowerCase)) {
+    if (hasPermission) {
       const response = await connector.requestMethod(
         methodInLowerCase,
         args.params
diff --git a/src/extension/background-script/actions/nostr/enable.ts b/src/extension/background-script/actions/nostr/enable.ts
new file mode 100644
index 0000000000..d8c9fa8d98
--- /dev/null
+++ b/src/extension/background-script/actions/nostr/enable.ts
@@ -0,0 +1,84 @@
+import utils from "~/common/lib/utils";
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+import { ExtensionIcon, setIcon } from "../setup/setIcon";
+
+const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const account = await state.getState().getAccount();
+  const allowance = await db.allowances
+
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  if (
+    isUnlocked &&
+    allowance &&
+    allowance.enabled &&
+    account?.nostrPrivateKey
+  ) {
+    return {
+      data: { enabled: true },
+    };
+  } else {
+    try {
+      const response = await utils.openPrompt<{
+        enabled: boolean;
+        remember: boolean;
+      }>(message);
+
+      if (response.data.enabled && sender.tab) {
+        await setIcon(ExtensionIcon.Active, sender.tab.id as number); // highlight the icon when enabled
+      }
+
+      // if the response should be saved/remembered we update the allowance for the domain
+      // as this returns a promise we must wait until it resolves
+      if (response.data.enabled && response.data.remember) {
+        if (allowance) {
+          if (!allowance.id) {
+            return { data: { error: "id is missing" } };
+          }
+          await db.allowances.update(allowance.id, {
+            enabled: true,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+          });
+        } else {
+          await db.allowances.add({
+            host: host,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+            enabled: true,
+            lastPaymentAt: 0,
+            totalBudget: 0,
+            remainingBudget: 0,
+            createdAt: Date.now().toString(),
+            lnurlAuth: false,
+            tag: "",
+          });
+        }
+        await db.saveToStorage();
+      }
+      return {
+        data: {
+          enabled: response.data.enabled,
+          remember: response.data.remember,
+        },
+      };
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) {
+        return { error: e.message };
+      }
+    }
+  }
+};
+
+export default enable;
diff --git a/src/extension/background-script/actions/nostr/index.ts b/src/extension/background-script/actions/nostr/index.ts
index cf1e1d38f5..54ae6b8c47 100644
--- a/src/extension/background-script/actions/nostr/index.ts
+++ b/src/extension/background-script/actions/nostr/index.ts
@@ -1,6 +1,7 @@
 import getPublicKey from "~/extension/background-script/actions/nostr/getPublicKey";
 
 import decryptOrPrompt from "./decryptOrPrompt";
+import enable from "./enable";
 import encryptOrPrompt from "./encryptOrPrompt";
 import generatePrivateKey from "./generatePrivateKey";
 import getPrivateKey from "./getPrivateKey";
@@ -13,6 +14,7 @@ import signSchnorrOrPrompt from "./signSchnorrOrPrompt";
 
 export {
   decryptOrPrompt,
+  enable,
   encryptOrPrompt,
   generatePrivateKey,
   getPrivateKey,
diff --git a/src/extension/background-script/actions/webbtc/enable.ts b/src/extension/background-script/actions/webbtc/enable.ts
new file mode 100644
index 0000000000..b560416bbf
--- /dev/null
+++ b/src/extension/background-script/actions/webbtc/enable.ts
@@ -0,0 +1,78 @@
+import utils from "~/common/lib/utils";
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+import { ExtensionIcon, setIcon } from "../setup/setIcon";
+
+const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const account = await state.getState().getAccount();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  if (isUnlocked && allowance && allowance.enabled && account?.mnemonic) {
+    return {
+      data: { enabled: true },
+    };
+  } else {
+    try {
+      const response = await utils.openPrompt<{
+        enabled: boolean;
+        remember: boolean;
+      }>(message);
+
+      if (response.data.enabled && sender.tab) {
+        await setIcon(ExtensionIcon.Active, sender.tab.id as number); // highlight the icon when enabled
+      }
+
+      // if the response should be saved/remembered we update the allowance for the domain
+      // as this returns a promise we must wait until it resolves
+      if (response.data.enabled && response.data.remember) {
+        if (allowance) {
+          if (!allowance.id) {
+            return { data: { error: "id is missing" } };
+          }
+          await db.allowances.update(allowance.id, {
+            enabled: true,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+          });
+        } else {
+          await db.allowances.add({
+            host: host,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+            enabled: true,
+            lastPaymentAt: 0,
+            totalBudget: 0,
+            remainingBudget: 0,
+            createdAt: Date.now().toString(),
+            lnurlAuth: false,
+            tag: "",
+          });
+        }
+        await db.saveToStorage();
+      }
+      return {
+        data: {
+          enabled: response.data.enabled,
+          remember: response.data.remember,
+        },
+      };
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) {
+        return { error: e.message };
+      }
+    }
+  }
+};
+
+export default enable;
diff --git a/src/extension/background-script/actions/webbtc/index.ts b/src/extension/background-script/actions/webbtc/index.ts
index ece0f0d4f7..18779f9280 100644
--- a/src/extension/background-script/actions/webbtc/index.ts
+++ b/src/extension/background-script/actions/webbtc/index.ts
@@ -1,5 +1,6 @@
+import enable from "./enable";
 import getAddress from "./getAddress";
 import getAddressOrPrompt from "./getAddressOrPrompt";
 import getInfo from "./getInfo";
 
-export { getAddress, getAddressOrPrompt, getInfo };
+export { enable, getAddress, getAddressOrPrompt, getInfo };
diff --git a/src/extension/background-script/actions/webln/enable.ts b/src/extension/background-script/actions/webln/enable.ts
new file mode 100644
index 0000000000..ceb6665d07
--- /dev/null
+++ b/src/extension/background-script/actions/webln/enable.ts
@@ -0,0 +1,77 @@
+import utils from "~/common/lib/utils";
+import { getHostFromSender } from "~/common/utils/helpers";
+import db from "~/extension/background-script/db";
+import type { MessageAllowanceEnable, Sender } from "~/types";
+
+import state from "../../state";
+import { ExtensionIcon, setIcon } from "../setup/setIcon";
+
+const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
+  const host = getHostFromSender(sender);
+  if (!host) return;
+
+  const isUnlocked = await state.getState().isUnlocked();
+  const allowance = await db.allowances
+    .where("host")
+    .equalsIgnoreCase(host)
+    .first();
+
+  if (isUnlocked && allowance && allowance.enabled) {
+    return {
+      data: { enabled: true },
+    };
+  } else {
+    try {
+      const response = await utils.openPrompt<{
+        enabled: boolean;
+        remember: boolean;
+      }>(message);
+
+      if (response.data.enabled && sender.tab) {
+        await setIcon(ExtensionIcon.Active, sender.tab.id as number); // highlight the icon when enabled
+      }
+
+      // if the response should be saved/remembered we update the allowance for the domain
+      // as this returns a promise we must wait until it resolves
+      if (response.data.enabled && response.data.remember) {
+        if (allowance) {
+          if (!allowance.id) {
+            return { data: { error: "id is missing" } };
+          }
+          await db.allowances.update(allowance.id, {
+            enabled: true,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+          });
+        } else {
+          await db.allowances.add({
+            host: host,
+            name: message.origin.name,
+            imageURL: message.origin.icon,
+            enabled: true,
+            lastPaymentAt: 0,
+            totalBudget: 0,
+            remainingBudget: 0,
+            createdAt: Date.now().toString(),
+            lnurlAuth: false,
+            tag: "",
+          });
+        }
+        await db.saveToStorage();
+      }
+      return {
+        data: {
+          enabled: response.data.enabled,
+          remember: response.data.remember,
+        },
+      };
+    } catch (e) {
+      console.error(e);
+      if (e instanceof Error) {
+        return { error: e.message };
+      }
+    }
+  }
+};
+
+export default enable;
diff --git a/src/extension/background-script/actions/webln/index.ts b/src/extension/background-script/actions/webln/index.ts
index 16cb886fbd..faa8513fec 100644
--- a/src/extension/background-script/actions/webln/index.ts
+++ b/src/extension/background-script/actions/webln/index.ts
@@ -1,3 +1,4 @@
+import enable from "./enable";
 import getBalanceOrPrompt from "./getBalanceOrPrompt";
 import keysendOrPrompt from "./keysendOrPrompt";
 import lnurl from "./lnurl";
@@ -6,10 +7,11 @@ import { sendPaymentOrPrompt } from "./sendPaymentOrPrompt";
 import signMessageOrPrompt from "./signMessageOrPrompt";
 
 export {
-  sendPaymentOrPrompt,
+  enable,
+  getBalanceOrPrompt,
   keysendOrPrompt,
-  signMessageOrPrompt,
-  makeInvoiceOrPrompt,
   lnurl,
-  getBalanceOrPrompt,
+  makeInvoiceOrPrompt,
+  sendPaymentOrPrompt,
+  signMessageOrPrompt,
 };
diff --git a/src/extension/background-script/connectors/alby.ts b/src/extension/background-script/connectors/alby.ts
index 890956c6a3..260feebfcb 100644
--- a/src/extension/background-script/connectors/alby.ts
+++ b/src/extension/background-script/connectors/alby.ts
@@ -89,7 +89,7 @@ export default class Alby implements Connector {
       (invoice, index): ConnectorInvoice => ({
         custom_records: invoice.custom_records,
         id: `${invoice.payment_request}-${index}`,
-        memo: invoice.memo,
+        memo: invoice.comment || invoice.memo,
         preimage: "", // alby wallet api doesn't support preimage (yet)
         settled: invoice.settled,
         settleDate: new Date(invoice.settled_at).getTime(),
diff --git a/src/extension/background-script/router.ts b/src/extension/background-script/router.ts
index ed63b54de8..1cd1b50b4e 100644
--- a/src/extension/background-script/router.ts
+++ b/src/extension/background-script/router.ts
@@ -1,4 +1,5 @@
 import * as accounts from "./actions/accounts";
+import * as alby from "./actions/alby";
 import * as allowances from "./actions/allowances";
 import * as blocklist from "./actions/blocklist";
 import * as cache from "./actions/cache";
@@ -84,17 +85,17 @@ const routes = {
   // Public calls that are accessible from the inpage script (through the content script)
   public: {
     webbtc: {
-      onboard: onboard.prompt,
-      enable: allowances.enable,
+      enable: webbtc.enable,
       getInfo: webbtc.getInfo,
       getAddressOrPrompt: webbtc.getAddressOrPrompt,
     },
     alby: {
-      enable: allowances.enable,
+      enable: alby.enable,
       addAccount: accounts.promptAdd,
     },
     webln: {
-      enable: allowances.enable,
+      onboard: onboard.prompt,
+      enable: webln.enable,
       getInfo: ln.getInfo,
       sendPaymentOrPrompt: webln.sendPaymentOrPrompt,
       keysendOrPrompt: webln.keysendOrPrompt,
@@ -105,14 +106,12 @@ const routes = {
       request: ln.request,
     },
     liquid: {
-      onboard: onboard.prompt,
-      enable: allowances.enable,
+      enable: liquid.enable,
       getAddressOrPrompt: liquid.getAddressOrPrompt,
       signPsetWithPrompt: liquid.signPsetWithPrompt,
     },
     nostr: {
-      onboard: onboard.prompt,
-      enable: allowances.enable,
+      enable: nostr.enable,
       getPublicKeyOrPrompt: nostr.getPublicKeyOrPrompt,
       signEventOrPrompt: nostr.signEventOrPrompt,
       signSchnorrOrPrompt: nostr.signSchnorrOrPrompt,
diff --git a/src/extension/content-script/liquid.js b/src/extension/content-script/liquid.js
index c46f09743d..0d1f5e147a 100644
--- a/src/extension/content-script/liquid.js
+++ b/src/extension/content-script/liquid.js
@@ -1,6 +1,5 @@
 import browser from "webextension-polyfill";
 
-import api from "~/common/lib/api";
 import getOriginData from "./originData";
 import shouldInject from "./shouldInject";
 
@@ -16,7 +15,6 @@ const disabledCalls = ["liquid/enable"];
 
 let isEnabled = false; // store if liquid is enabled for this content page
 let isRejected = false; // store if the liquid enable call failed. if so we do not prompt again
-let account = null;
 
 const SCOPE = "liquid";
 
@@ -68,14 +66,6 @@ async function init() {
         origin: getOriginData(),
       };
 
-      // Overrides the enable action so the user can go through onboarding to setup their keys
-      if (!account) {
-        account = await api.getAccount();
-        if (!account.hasMnemonic) {
-          messageWithOrigin.action = `public/liquid/onboard`;
-        }
-      }
-
       const replyFunction = (response) => {
         if (ev.data.action === `${SCOPE}/enable`) {
           isEnabled = response.data?.enabled;
diff --git a/src/extension/content-script/nostr.js b/src/extension/content-script/nostr.js
index 4b007b32c2..92ff55266c 100644
--- a/src/extension/content-script/nostr.js
+++ b/src/extension/content-script/nostr.js
@@ -1,6 +1,5 @@
 import browser from "webextension-polyfill";
 
-import api from "~/common/lib/api";
 import getOriginData from "./originData";
 import shouldInject from "./shouldInject";
 
@@ -23,7 +22,6 @@ const disabledCalls = ["nostr/enable"];
 
 let isEnabled = false; // store if nostr is enabled for this content page
 let isRejected = false; // store if the nostr enable call failed. if so we do not prompt again
-let account = null;
 
 async function init() {
   const inject = await shouldInject();
@@ -84,14 +82,7 @@ async function init() {
         origin: getOriginData(),
       };
 
-      // Overrides the enable action so the user can go through onboarding to setup their keys
-      if (!account) {
-        account = await api.getAccount();
-        if (!account.nostrEnabled) {
-          messageWithOrigin.action = ev.data.action = `public/nostr/onboard`;
-        }
-      }
-
+      // we don't handle onboard in content script. hence we will be resolving original call nostr/enable with an error hence we need reload the next time we execute the call
       const replyFunction = (response) => {
         if (ev.data.action === "nostr/enable") {
           isEnabled = response.data?.enabled;
diff --git a/src/extension/content-script/webbtc.js b/src/extension/content-script/webbtc.js
index 7b361f754e..db2ff09d87 100644
--- a/src/extension/content-script/webbtc.js
+++ b/src/extension/content-script/webbtc.js
@@ -1,6 +1,5 @@
 import browser from "webextension-polyfill";
 
-import api from "~/common/lib/api";
 import getOriginData from "./originData";
 import shouldInject from "./shouldInject";
 // WebBTC calls that can be executed from the WebBTC Provider.
@@ -15,7 +14,7 @@ const disabledCalls = ["webbtc/enable"];
 
 let isEnabled = false; // store if webbtc is enabled for this content page
 let isRejected = false; // store if the webbtc enable call failed. if so we do not prompt again
-let account = null;
+
 const SCOPE = "webbtc";
 
 async function init() {
@@ -66,14 +65,6 @@ async function init() {
         origin: getOriginData(),
       };
 
-      // Overrides the enable action so the user can go through onboarding to setup their keys
-      if (!account) {
-        account = await api.getAccount();
-        if (!account.hasMnemonic) {
-          messageWithOrigin.action = `public/webbtc/onboard`;
-        }
-      }
-
       const replyFunction = (response) => {
         if (ev.data.action === `${SCOPE}/enable`) {
           isEnabled = response.data?.enabled;
diff --git a/src/extension/content-script/webln.js b/src/extension/content-script/webln.js
index d119c06001..21b51e9f99 100644
--- a/src/extension/content-script/webln.js
+++ b/src/extension/content-script/webln.js
@@ -49,7 +49,7 @@ async function init() {
   // message listener to listen to inpage webln/webbtc calls
   // those calls get passed on to the background script
   // (the inpage script can not do that directly, but only the inpage script can make webln available to the page)
-  window.addEventListener("message", (ev) => {
+  window.addEventListener("message", async (ev) => {
     // Only accept messages from the current window
     if (
       ev.source !== window ||
@@ -93,6 +93,8 @@ async function init() {
         // if it is the enable call we store if webln is enabled for this content script
         if (ev.data.action === "webln/enable") {
           isEnabled = response.data?.enabled;
+          const enabledEvent = new Event("webln:enabled");
+          window.dispatchEvent(enabledEvent);
           if (response.error) {
             console.error(response.error);
             console.info("Enable was rejected ignoring further webln calls");
diff --git a/src/i18n/locales/cs/translation.json b/src/i18n/locales/cs/translation.json
index 7cb6d91985..c04c797a46 100644
--- a/src/i18n/locales/cs/translation.json
+++ b/src/i18n/locales/cs/translation.json
@@ -167,10 +167,10 @@
           "placeholder": "onion-adresa-vaseho-uzlu:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink",
         "page": {
-          "title": "Připojení k <0>Bitcoin Beach Wallet</0>"
+          "title": "Připojení k <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/da/translation.json b/src/i18n/locales/da/translation.json
index d575782581..2e99842934 100644
--- a/src/i18n/locales/da/translation.json
+++ b/src/i18n/locales/da/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "din-nodes-onion-adresse:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Opret forbindelse til <0>Bitcoin Beach Wallet</0>"
+          "title": "Opret forbindelse til <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json
index 7a0c3ad47c..a61a9741b2 100644
--- a/src/i18n/locales/de/translation.json
+++ b/src/i18n/locales/de/translation.json
@@ -173,10 +173,10 @@
         },
         "title": "Start9"
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Verbinden mit <0>Bitcoin Beach Wallet</0>"
+          "title": "Verbinden mit <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
index aa7369206e..b3286d7d8e 100644
--- a/src/i18n/locales/en/translation.json
+++ b/src/i18n/locales/en/translation.json
@@ -218,10 +218,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Connect to <0>Bitcoin Beach Wallet</0>"
+          "title": "Connect to <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
@@ -528,13 +528,27 @@
         "add_account": "Add account"
       }
     },
-    "enable": {
-      "title": "Connect",
-      "allow": "Allow this website to:",
-      "request1": "Request approval for transactions",
-      "request2": "Request invoices and lightning information",
-      "block_and_ignore": "Block and ignore {{host}}",
-      "block_added": "Added {{host}} to the blocklist, please reload the website."
+    "webln_enable": {
+      "title": "Connect to WebLN",
+
+      "request2": "Request invoices and lightning information"
+    },
+    "alby_enable": {
+      "title": "Connect to Alby",
+      "request2": "Request invoices and alby information"
+    },
+    "nostr_enable": {
+      "title": "Connect to Nostr",
+      "request1": "Request to read your Nostr public key",
+      "request2": "Sign events using your Nostr private key"
+    },
+    "liquid_enable": {
+      "title": "Connect to Liquid",
+      "request2": "Request invoices and liquid information"
+    },
+    "webbtc_enable": {
+      "title": "Connect to WebBTC",
+      "request2": "Request invoices and liquid information"
     },
     "unlock": {
       "unlock_to_continue": "Unlock to continue",
@@ -717,7 +731,18 @@
       "title": "Receive",
       "actions": {
         "create_invoice": "Create Invoice",
-        "copy_lightning_address": "Copy Lightning Address"
+        "invoice": {
+          "title": "Lightning invoice",
+          "description": "Request instant and specific amount payments"
+        },
+        "bitcoin_address": {
+          "title": "Bitcoin address",
+          "description": "Receive via bitcoin address using a swap service"
+        },
+        "redeem": {
+          "title": "Redeem",
+          "description": "Withdraw a bitcoin voucher via LNURL code"
+        }
       },
       "amount": {
         "label": "Amount",
@@ -731,9 +756,7 @@
       "payment": {
         "waiting": "waiting for payment...",
         "status": "Check payment status"
-      },
-      "redeem_lnurl": "Redeem LNURL",
-      "receive_via_bitcoin_address": "Receive via bitcoin address"
+      }
     },
     "on_chain": {
       "title": "Receive via bitcoin address",
@@ -997,6 +1020,7 @@
       "remove": "Remove",
       "copy": "Copy",
       "copy_clipboard": "Copy to clipboard",
+      "copied_to_clipboard": "Copied to clipboard",
       "paste": "Paste",
       "paste_clipboard": "Paste from clipboard",
       "copy_invoice": "Copy Invoice",
@@ -1028,6 +1052,12 @@
       "between": "between {{min}} and {{max}}",
       "lessThanOrEqual": "≤ {{max}}",
       "greaterOrEqual": "≥ {{min}}"
+    },
+    "enable": {
+      "allow": "Allow this website to:",
+      "block_added": "Added {{host}} to the blocklist, please reload the website.",
+      "request1": "Request approval for transactions",
+      "block_and_ignore": "Block and ignore {{host}}"
     }
   },
   "components": {
diff --git a/src/i18n/locales/eo/translation.json b/src/i18n/locales/eo/translation.json
index a7f602f2ee..eb3667c7e8 100644
--- a/src/i18n/locales/eo/translation.json
+++ b/src/i18n/locales/eo/translation.json
@@ -166,7 +166,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""
diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json
index c0a694e288..094446f51f 100644
--- a/src/i18n/locales/es/translation.json
+++ b/src/i18n/locales/es/translation.json
@@ -145,10 +145,10 @@
           "placeholder": "tu-nodo-direccion onion:puerto"
         }
       },
-      "bitcoin_beach": {
-        "title": "Billetera de Bitcoin Beach",
+      "blink": {
+        "title": "Billetera de Blink",
         "page": {
-          "title": "Conecta a <0>La cartera Bitcoin Beach</0>"
+          "title": "Conecta a <0>La cartera Blink</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/fa/translation.json b/src/i18n/locales/fa/translation.json
index 0f4ff4937b..681564dff9 100644
--- a/src/i18n/locales/fa/translation.json
+++ b/src/i18n/locales/fa/translation.json
@@ -218,10 +218,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "کیف پول Bitcoin Beach",
+      "blink": {
+        "title": "کیف پول Blink",
         "page": {
-          "title": "اتصال به <0>Bitcoin Beach Wallet</0>"
+          "title": "اتصال به <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/fi/translation.json b/src/i18n/locales/fi/translation.json
index 9e493581bd..82e4b08ec0 100644
--- a/src/i18n/locales/fi/translation.json
+++ b/src/i18n/locales/fi/translation.json
@@ -166,10 +166,10 @@
           "placeholder": "solmusi-sipuli-osoite:portti"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach -lompakko",
+      "blink": {
+        "title": "Bitcoin Blink -lompakko",
         "page": {
-          "title": "Yhdistä <0>Bitcoin Beach -lompakkoon</0>"
+          "title": "Yhdistä <0>Blink -lompakkoon</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json
index cf47ec4e71..5e9bc45f6c 100644
--- a/src/i18n/locales/fr/translation.json
+++ b/src/i18n/locales/fr/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "adresse-de-votre-node-onion:port"
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "Portefeuille de plage Bitcoin",
         "page": {
-          "title": "Connectez-vous à <0>Bitcoin Beach Wallet</0>"
+          "title": "Connectez-vous à <0>Bitcoin Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/hi/translation.json b/src/i18n/locales/hi/translation.json
index 34254c0d8b..cff0d2f372 100644
--- a/src/i18n/locales/hi/translation.json
+++ b/src/i18n/locales/hi/translation.json
@@ -215,10 +215,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "<0>Bitcoin Beach Wallet</0 से कनेक्ट करें>"
+          "title": "<0>Blink Wallet</0 से कनेक्ट करें>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json
index 0c222bd82e..353c48fa09 100644
--- a/src/i18n/locales/id/translation.json
+++ b/src/i18n/locales/id/translation.json
@@ -214,10 +214,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Sambungkan dengan <0>Bitcoin Beach Wallet</0>"
+          "title": "Sambungkan dengan <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json
index bb1d989026..bafdadfbfd 100644
--- a/src/i18n/locales/it/translation.json
+++ b/src/i18n/locales/it/translation.json
@@ -167,10 +167,10 @@
           "placeholder": "indirizzo-onion-del-tuo-nodo:porta"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Connetti il tuo <0>Bitcoin Beach Wallet</0>"
+          "title": "Connetti il tuo <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/ja/translation.json b/src/i18n/locales/ja/translation.json
index d7a3670ede..a11797494e 100644
--- a/src/i18n/locales/ja/translation.json
+++ b/src/i18n/locales/ja/translation.json
@@ -215,11 +215,11 @@
         },
         "title": "RaspiBlitz"
       },
-      "bitcoin_beach": {
+      "blink": {
         "page": {
-          "title": "<0>Bitcoin Beach Wallet</0>に接続"
+          "title": "<0>Blink Wallet</0>に接続"
         },
-        "title": "Bitcoin Beach Wallet"
+        "title": "Blink Wallet"
       },
       "title": "ライトニング・ウォレットを接続",
       "description": "外部のライトニング・ウォレットまたはノードに接続",
diff --git a/src/i18n/locales/mr/translation.json b/src/i18n/locales/mr/translation.json
index 8f366258d7..f84cb6b428 100644
--- a/src/i18n/locales/mr/translation.json
+++ b/src/i18n/locales/mr/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "<0>Bitcoin Beach Wallet ला कनेक्ट करा</0>"
+          "title": "<0>Blink Wallet ला कनेक्ट करा</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/nl/translation.json b/src/i18n/locales/nl/translation.json
index 8a5f5ef463..aee9bda3c2 100644
--- a/src/i18n/locales/nl/translation.json
+++ b/src/i18n/locales/nl/translation.json
@@ -167,7 +167,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""
diff --git a/src/i18n/locales/pl/translation.json b/src/i18n/locales/pl/translation.json
index c589b0d0e6..2cf14c6c9a 100644
--- a/src/i18n/locales/pl/translation.json
+++ b/src/i18n/locales/pl/translation.json
@@ -214,10 +214,10 @@
           "placeholder": "adres-onion-twojego-wezla:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Portfel Bitcoin Beach",
+      "blink": {
+        "title": "Portfel Blink",
         "page": {
-          "title": "Podłącz do <0>Bitcoin Beach Wallet</0>"
+          "title": "Podłącz do <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json
index 0efa6c0649..4d523b3acb 100644
--- a/src/i18n/locales/pt_BR/translation.json
+++ b/src/i18n/locales/pt_BR/translation.json
@@ -145,10 +145,10 @@
           "placeholder": "seu-endereço-servidor-onion:porta"
         }
       },
-      "bitcoin_beach": {
-        "title": "Carteira Bitcoin Beach",
+      "blink": {
+        "title": "Carteira Blink",
         "page": {
-          "title": "Conecte-se na <0>Carteira Bitcoin Beach</0>"
+          "title": "Conecte-se na <0>Carteira Blink</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/ro/translation.json b/src/i18n/locales/ro/translation.json
index efe97e7946..b0d8badd58 100644
--- a/src/i18n/locales/ro/translation.json
+++ b/src/i18n/locales/ro/translation.json
@@ -208,10 +208,10 @@
           "placeholder": "adresa-onion-a-nodului-tau:portul"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "Conectare la <0>Bitcoin Beach Wallet</0>"
+          "title": "Conectare la <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json
index 516c435f8e..7e3daf4b37 100644
--- a/src/i18n/locales/ru/translation.json
+++ b/src/i18n/locales/ru/translation.json
@@ -208,7 +208,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""
diff --git a/src/i18n/locales/sv/translation.json b/src/i18n/locales/sv/translation.json
index a651520f05..27a25c217d 100644
--- a/src/i18n/locales/sv/translation.json
+++ b/src/i18n/locales/sv/translation.json
@@ -173,10 +173,10 @@
           "placeholder": "din-onion-nod-adress:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach plånbok",
+      "blink": {
+        "title": "Blink plånbok",
         "page": {
-          "title": "Anslut <0>Bitcoin Beach Wallet</0>"
+          "title": "Anslut <0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/i18n/locales/tl/translation.json b/src/i18n/locales/tl/translation.json
index 3c22e3aa8f..ed04e4904f 100644
--- a/src/i18n/locales/tl/translation.json
+++ b/src/i18n/locales/tl/translation.json
@@ -166,7 +166,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""
diff --git a/src/i18n/locales/uk/translation.json b/src/i18n/locales/uk/translation.json
index fdb210bfb1..5d5a6d562c 100644
--- a/src/i18n/locales/uk/translation.json
+++ b/src/i18n/locales/uk/translation.json
@@ -208,7 +208,7 @@
           "placeholder": ""
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "title": "",
         "page": {
           "title": ""
diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json
index 9b9fc48282..1af8edf39d 100644
--- a/src/i18n/locales/zh_Hans/translation.json
+++ b/src/i18n/locales/zh_Hans/translation.json
@@ -122,11 +122,11 @@
           "placeholder": "config=http://your-btc-pay.org/lnd-config/212121/lnd.config"
         }
       },
-      "bitcoin_beach": {
+      "blink": {
         "page": {
-          "title": "连接<0>比特币海滩钱包</0>"
+          "title": "连接<0>眨眼钱包</0>"
         },
-        "title": "比特币海滩钱包"
+        "title": "眨眼钱包"
       },
       "commando": {
         "config": {
diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json
index fbcdc2c44a..62b21a65ce 100644
--- a/src/i18n/locales/zh_Hant/translation.json
+++ b/src/i18n/locales/zh_Hant/translation.json
@@ -215,10 +215,10 @@
           "placeholder": "your-node-onion-address:port"
         }
       },
-      "bitcoin_beach": {
-        "title": "Bitcoin Beach Wallet",
+      "blink": {
+        "title": "Blink Wallet",
         "page": {
-          "title": "連接<0>Bitcoin Beach Wallet</0>"
+          "title": "連接<0>Blink Wallet</0>"
         }
       },
       "bitcoin_jungle": {
diff --git a/src/types.ts b/src/types.ts
index c085284b05..8e1d5e8da5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -44,6 +44,7 @@ export interface AccountInfo {
   connectorType: ConnectorType;
   currency: ACCOUNT_CURRENCIES;
   avatarUrl?: string;
+  lightningAddress?: string;
 }
 
 export interface MetaData {
diff --git a/static/assets/icons/galoy_bitcoin_beach.png b/static/assets/icons/galoy_bitcoin_beach.png
deleted file mode 100644
index 409c2f1429..0000000000
Binary files a/static/assets/icons/galoy_bitcoin_beach.png and /dev/null differ
diff --git a/static/assets/icons/galoy_blink.png b/static/assets/icons/galoy_blink.png
new file mode 100644
index 0000000000..855bf3acc1
Binary files /dev/null and b/static/assets/icons/galoy_blink.png differ
diff --git a/tailwind.config.js b/tailwind.config.js
index 0b46456aee..4489242621 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -25,7 +25,7 @@ const surfaceColor = "#121212";
 module.exports = {
   darkMode: "class",
   content: ["./static/views/**/*.html", "./src/app/**/*.{js,ts,jsx,tsx}"],
-  plugins: [require("@tailwindcss/forms")],
+  plugins: [require("tailwindcss-3d"), require("@tailwindcss/forms")],
   theme: {
     extend: {
       animation: {
diff --git a/tests/e2e/002-walletFeatures.spec.ts b/tests/e2e/002-walletFeatures.spec.ts
index 419858f11e..5aeb8549d3 100644
--- a/tests/e2e/002-walletFeatures.spec.ts
+++ b/tests/e2e/002-walletFeatures.spec.ts
@@ -34,7 +34,7 @@ test.describe("Wallet features", () => {
     await confirmPasswordInput.type("g3tal6y");
 
     await (await findByText($document, "Change")).click();
-    await page.waitForSelector(".Toastify");
+    await findByText($document, "Passcode changed successfully");
 
     await browser.close();
   });
@@ -56,9 +56,13 @@ test.describe("Wallet features", () => {
 
     await (await findByText($document, "Wallet")).click();
     page.waitForSelector("button");
-    // create invoice
+
+    // goto: receive
     await (await findByText($document, "Receive")).click();
 
+    // goto: receive via lightning invoice
+    await (await findByText($document, "Lightning invoice")).click();
+
     const amountField = await getByLabelText($document, "Amount");
     await amountField.type("888");
 
diff --git a/webpack.config.js b/webpack.config.js
index b7e4ad3f21..f1e002c544 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -113,8 +113,8 @@ if (!process.env.ALBY_OAUTH_AUTHORIZE_URL) {
 }
 
 // default value is set in the code where it is used
-if (!process.env.BITCOIN_BEACH_GALOY_URL) {
-  process.env.BITCOIN_BEACH_GALOY_URL = ""; // env variables are passed as string. empty strings are still falsy
+if (!process.env.BLINK_GALOY_URL) {
+  process.env.BLINK_GALOY_URL = ""; // env variables are passed as string. empty strings are still falsy
 }
 
 // default value is set in the code where it is used
@@ -238,7 +238,7 @@ var options = {
     // new webpack.SourceMapDevToolPlugin({ filename: false }),
     // environmental variables
     new webpack.EnvironmentPlugin([
-      "BITCOIN_BEACH_GALOY_URL",
+      "BLINK_GALOY_URL",
       "BITCOIN_JUNGLE_GALOY_URL",
       "NODE_ENV",
       "TARGET_BROWSER",
diff --git a/yarn.lock b/yarn.lock
index c8bec2549a..53717fea3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1227,6 +1227,13 @@
     "@swc/core-win32-ia32-msvc" "1.3.68"
     "@swc/core-win32-x64-msvc" "1.3.68"
 
+"@swc/helpers@0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.1.tgz#e9031491aa3f26bfcc974a67f48bd456c8a5357a"
+  integrity sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@swc/jest@^0.2.27":
   version "0.2.27"
   resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.27.tgz#f6cbd0b6f95cf689c3344c63fc379fa680cdbf52"
@@ -7083,7 +7090,7 @@ lodash.upperfirst@^4.3.1:
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
-lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9803,6 +9810,14 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+tailwindcss-3d@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tailwindcss-3d/-/tailwindcss-3d-1.0.0.tgz#81dc95a5989c1f00e4063cb04b6fff99c53bcc1c"
+  integrity sha512-weP0xNLA1cd1h9yIzuwn3XQmvDSRJ8sveYavyv4E4ytRXoUsMZhdMVMm7yK0fkc1tRgjFiJp/ytUKgEWRlOPWA==
+  dependencies:
+    "@swc/helpers" "0.5.1"
+    lodash "4.17.21"
+
 tailwindcss@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.3.tgz#90da807393a2859189e48e9e7000e6880a736daf"
@@ -10111,6 +10126,11 @@ tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
+tslib@^2.4.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tween-functions@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tween-functions/-/tween-functions-1.2.0.tgz#1ae3a50e7c60bb3def774eac707acbca73bbc3ff"