diff --git a/src/app/components/TipCard/index.test.tsx b/src/app/components/TipCard/index.test.tsx
index 7c477d383d..1cdfac5aa8 100644
--- a/src/app/components/TipCard/index.test.tsx
+++ b/src/app/components/TipCard/index.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
-import BuyBitcoinTipCardIcon from "~/app/icons/BuyBitcoinTipCardIcon";
 
+import MnemonicTipCardIcon from "~/app/icons/MnemonicTipCardIcon";
 import type { Props } from "./index";
 import TipCard from "./index";
 
@@ -9,9 +9,9 @@ const props: Props = {
   title: "Card Title",
   description: "Card description",
   handleClose: () => ({}),
-  arrowClassName: "text-orange-500",
-  backgroundIcon: <BuyBitcoinTipCardIcon />,
-  className: "border-orange-500",
+  arrowClassName: "text-purple-500",
+  backgroundIcon: <MnemonicTipCardIcon />,
+  className: "border-purple-500",
 };
 
 describe("CloseableCard", () => {
diff --git a/src/app/icons/BuyBitcoinTipCardIcon.tsx b/src/app/icons/BuyBitcoinTipCardIcon.tsx
deleted file mode 100644
index 3e483ed20d..0000000000
--- a/src/app/icons/BuyBitcoinTipCardIcon.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-export default function BuyBitcoinTipCardIcon() {
-  return (
-    <svg
-      width="102"
-      height="91"
-      viewBox="0 0 102 91"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <g opacity="0.1" clipPath="url(#clip0_719_4947)">
-        <path
-          d="M100.469 63.3372C93.6574 90.6589 65.9851 107.286 38.6603 100.473C11.3466 93.6615 -5.28098 65.9876 1.53389 38.6675C8.34239 11.3427 36.0147 -5.2865 63.3315 1.52519C90.6548 8.33688 107.281 36.0139 100.469 63.3372Z"
-          fill="#F7931A"
-        />
-        <path
-          d="M73.4868 43.7343C74.502 36.9481 69.3351 33.3 62.27 30.8664L64.5618 21.6736L58.9662 20.2791L56.7349 29.2296C55.2639 28.863 53.753 28.5172 52.2517 28.1745L54.4989 19.165L48.9064 17.7705L46.613 26.9601C45.3954 26.6828 44.2001 26.4086 43.0398 26.1202L43.0462 26.0915L35.3292 24.1646L33.8407 30.1412C33.8407 30.1412 37.9924 31.0927 37.9047 31.1516C40.1711 31.7174 40.5806 33.2171 40.5121 34.4061L37.9016 44.8786C38.0577 44.9184 38.2601 44.9758 38.4833 45.0651C38.2968 45.0189 38.0976 44.9679 37.892 44.9184L34.2327 59.5889C33.9554 60.2774 33.2526 61.3102 31.6684 60.9181C31.7242 60.9994 27.6011 59.9029 27.6011 59.9029L24.8232 66.3082L32.1051 68.1235C33.4598 68.4629 34.7874 68.8183 36.0942 69.153L33.7785 78.451L39.3678 79.8455L41.6612 70.6464C43.188 71.0607 44.6702 71.4432 46.1205 71.8034L43.8351 80.9595L49.4307 82.354L51.7465 73.0736C61.2882 74.8794 68.4633 74.151 71.4835 65.5209C73.9171 58.5721 71.3623 54.5638 66.342 51.9501C69.9981 51.107 72.7521 48.702 73.4868 43.7343ZM60.7017 61.6624C58.9725 68.6111 47.2728 64.8547 43.4797 63.9128L46.5524 51.5947C50.3456 52.5414 62.5091 54.4156 60.7017 61.6624ZM62.4326 43.6339C60.8547 49.9547 51.1169 46.7433 47.9581 45.956L50.744 34.7838C53.9028 35.5711 64.0757 37.0405 62.4326 43.6339Z"
-          fill="white"
-        />
-      </g>
-      <defs>
-        <clipPath id="clip0_719_4947">
-          <rect width="102" height="102" fill="white" />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-}
diff --git a/src/app/router/Welcome/Welcome.tsx b/src/app/router/Welcome/Welcome.tsx
index 9d379b9d13..7fa064fffe 100644
--- a/src/app/router/Welcome/Welcome.tsx
+++ b/src/app/router/Welcome/Welcome.tsx
@@ -64,7 +64,7 @@ function Layout() {
   return (
     <div className="flex justify-center items-center min-h-screen">
       <div className="w-full">
-        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 mb-4">
           <div className="text-center font-serif font-medium text-2xl mt-8 dark:text-white">
             <p>
               {t("welcome.title")}
diff --git a/src/app/screens/Discover/index.tsx b/src/app/screens/Discover/index.tsx
index 825cdf628a..1619904855 100644
--- a/src/app/screens/Discover/index.tsx
+++ b/src/app/screens/Discover/index.tsx
@@ -19,7 +19,7 @@ function Discover() {
           <p className="mb-6 text-gray-500 dark:text-neutral-500">
             {t("discover.tips.description")}
           </p>
-          <div className="mb-6 flex gap-4">
+          <div className="mb-6 flex sm:flex-row flex-col gap-4">
             <Tips />
           </div>
         </>
diff --git a/src/app/screens/connectors/ConnectAlby/index.tsx b/src/app/screens/connectors/ConnectAlby/index.tsx
index b0767443dd..5f6c4d29a2 100644
--- a/src/app/screens/connectors/ConnectAlby/index.tsx
+++ b/src/app/screens/connectors/ConnectAlby/index.tsx
@@ -80,7 +80,6 @@ export default function ConnectAlby() {
       disabled={loading}
       primary
       flex
-      className="w-64"
       onClick={connectAlby}
     />
   );
diff --git a/src/extension/background-script/connectors/galoy.ts b/src/extension/background-script/connectors/galoy.ts
index 26014d0e59..53e4c2170a 100644
--- a/src/extension/background-script/connectors/galoy.ts
+++ b/src/extension/background-script/connectors/galoy.ts
@@ -273,6 +273,21 @@ class Galoy implements Connector {
             errors {
               message
             }
+            transaction {
+              settlementVia {
+                ... on SettlementViaLn {
+                  ${
+                    this.config.apiCompatibilityMode
+                      ? "paymentSecret"
+                      : "preImage"
+                  }
+                }
+                ... on SettlementViaIntraLedger {
+                  counterPartyUsername
+                  counterPartyWalletId
+                }
+              }
+            }
           }
         }
       `,
@@ -295,6 +310,25 @@ class Galoy implements Connector {
         throw new Error(errs[0].message || JSON.stringify(errs));
       }
 
+      const transaction = data.lnInvoicePaymentSend.transaction;
+      let preimageMessage = "No preimage received";
+
+      if (transaction && transaction.settlementVia) {
+        if (
+          "preImage" in transaction.settlementVia ||
+          "paymentSecret" in transaction.settlementVia
+        ) {
+          preimageMessage =
+            transaction.settlementVia.preImage ||
+            transaction.settlementVia.paymentSecret;
+        } else if (
+          "counterPartyUsername" in transaction.settlementVia ||
+          "counterPartyWalletId" in transaction.settlementVia
+        ) {
+          preimageMessage = "No preimage, the payment was settled intraledger";
+        }
+      }
+
       switch (data.lnInvoicePaymentSend.status) {
         case "ALREADY_PAID":
           throw new Error("Invoice was already paid.");
@@ -311,7 +345,7 @@ class Galoy implements Connector {
         default:
           return {
             data: {
-              preimage: "No preimage received",
+              preimage: preimageMessage,
               paymentHash,
               route: { total_amt: amountInSats, total_fees: 0 },
             },