diff --git a/components/footer/Footer.vue b/components/footer/Footer.vue
new file mode 100644
index 000000000..c2dada138
--- /dev/null
+++ b/components/footer/Footer.vue
@@ -0,0 +1,43 @@
+<template>
+  <footer class="footer">
+    <div>
+      <CommonButtonLabel v-if="!isCorrectNetworkSet && connectorName !== 'WalletConnect'" @click="addNetworkToWallet()">
+        Add {{ eraNetwork.name }} to your wallet
+      </CommonButtonLabel>
+    </div>
+    <div class="links-container">
+      <CommonButtonLabel as="a" href="https://zksync.io/terms" target="_blank" class="footer-link">
+        Terms of Service
+      </CommonButtonLabel>
+      <CommonButtonLabel as="a" href="https://zksync.io/privacy" target="_blank" class="footer-link">
+        Privacy Policy
+      </CommonButtonLabel>
+    </div>
+  </footer>
+</template>
+
+<script lang="ts" setup>
+import { storeToRefs } from "pinia";
+
+import { useOnboardStore } from "@/store/onboard";
+import { useZkSyncProviderStore } from "@/store/zksync/provider";
+import { useZkSyncWalletStore } from "@/store/zksync/wallet";
+
+const eraWalletStore = useZkSyncWalletStore();
+const { isCorrectNetworkSet } = storeToRefs(eraWalletStore);
+const { connectorName } = storeToRefs(useOnboardStore());
+const { eraNetwork } = storeToRefs(useZkSyncProviderStore());
+const addNetworkToWallet = async () => {
+  await eraWalletStore.setCorrectNetwork();
+};
+</script>
+
+<style lang="scss" scoped>
+.footer {
+  @apply flex flex-col items-center justify-between gap-x-8 gap-y-4 px-4 py-8 sm:flex-row;
+
+  .links-container {
+    @apply flex w-max flex-wrap items-center justify-center gap-x-8 gap-y-4 whitespace-nowrap;
+  }
+}
+</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index b2717e242..790127585 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -11,6 +11,7 @@
     <main class="app-layout-main">
       <NuxtPage />
     </main>
+    <Footer />
   </div>
 </template>
 
@@ -27,7 +28,7 @@ const { isConnectingWallet } = storeToRefs(useOnboardStore());
   @apply grid;
   min-height: 100vh;
   min-height: 100dvh;
-  grid-template-rows: auto 1fr;
+  grid-template-rows: auto 1fr max-content;
 
   .app-layout-main {
     @apply flex min-h-0 w-full min-w-0 max-w-[700px] flex-col justify-self-center p-2 md:px-0 md:py-4;
diff --git a/pages/assets.vue b/pages/assets.vue
index 703660915..95712efdf 100644
--- a/pages/assets.vue
+++ b/pages/assets.vue
@@ -182,6 +182,22 @@ const depositMethods = computed(() => {
       },
     });
   }
+
+  const isMainnet = eraNetwork.value.l1Network?.id === 1;
+  const isTestnet = eraNetwork.value.l1Network && eraNetwork.value.l1Network.id !== 1;
+  if (isTestnet && eraNetwork.value.displaySettings?.showPartnerLinks) {
+    methods.push({
+      props: {
+        iconUrl: "/img/faucet.svg",
+        label: "Faucet",
+        description: "Receive testnet funds",
+        as: "a",
+        href: "https://docs.zksync.io/build/tooling/network-faucets.html",
+        target: "_blank",
+        icon: ArrowTopRightOnSquareIcon,
+      },
+    });
+  }
   methods.push({
     props: {
       label: "View your address",
@@ -193,7 +209,7 @@ const depositMethods = computed(() => {
     },
     icon: QrCodeIcon,
   });
-  if (eraNetwork.value.displaySettings?.showPartnerLinks) {
+  if (isMainnet && eraNetwork.value.displaySettings?.showPartnerLinks) {
     methods.push({
       props: {
         label: "Top-up with cash",
diff --git a/pages/receive-methods.vue b/pages/receive-methods.vue
index 5dea5f519..bc77e1ea6 100644
--- a/pages/receive-methods.vue
+++ b/pages/receive-methods.vue
@@ -25,7 +25,18 @@
           :to="{ name: 'index', query: $route.query }"
         />
       </CommonCardWithLineButtons>
-      <CommonCardWithLineButtons v-if="eraNetwork.displaySettings?.showPartnerLinks">
+      <CommonCardWithLineButtons v-if="isTestnet">
+        <DestinationItem
+          label="Faucet"
+          description="Receive testnet funds"
+          icon-url="/img/faucet.svg"
+          as="a"
+          href="https://docs.zksync.io/build/tooling/network-faucets.html"
+          target="_blank"
+          :icon="ArrowTopRightOnSquareIcon"
+        />
+      </CommonCardWithLineButtons>
+      <CommonCardWithLineButtons v-if="isMainnet && eraNetwork.displaySettings?.showPartnerLinks">
         <DestinationItem
           label="Top-up with cash"
           description="Buy tokens using a card or another method for fiat"
@@ -41,7 +52,7 @@
           </template>
         </DestinationItem>
       </CommonCardWithLineButtons>
-      <CommonCardWithLineButtons v-if="eraNetwork.displaySettings?.showPartnerLinks">
+      <CommonCardWithLineButtons v-if="isMainnet && eraNetwork.displaySettings?.showPartnerLinks">
         <DestinationItem
           label="Bridge from other networks"
           description="Explore ecosystem of third party bridges"
@@ -62,6 +73,8 @@
 </template>
 
 <script lang="ts" setup>
+import { computed } from "vue";
+
 import { ArrowsUpDownIcon, ArrowTopRightOnSquareIcon, BanknotesIcon, QrCodeIcon } from "@heroicons/vue/24/outline";
 import { storeToRefs } from "pinia";
 
@@ -70,6 +83,8 @@ import { useZkSyncProviderStore } from "@/store/zksync/provider";
 
 const { destinations } = storeToRefs(useDestinationsStore());
 const { eraNetwork } = storeToRefs(useZkSyncProviderStore());
+const isMainnet = computed(() => eraNetwork.value.l1Network?.id === 1);
+const isTestnet = computed(() => eraNetwork.value.l1Network && eraNetwork.value.l1Network.id !== 1);
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/public/img/faucet.svg b/public/img/faucet.svg
new file mode 100644
index 000000000..fc614cd09
--- /dev/null
+++ b/public/img/faucet.svg
@@ -0,0 +1,8 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="white"/>
+<path d="M15.5 17.5H27.5C29.7091 17.5 31.5 19.2909 31.5 21.5V22.5C31.5 23.0523 31.0523 23.5 30.5 23.5H29.5C28.9477 23.5 28.5 23.0523 28.5 22.5V21.5C28.5 20.9477 28.0523 20.5 27.5 20.5H15.5" stroke="#11141A"/>
+<path d="M19.5 17.5V14.5C19.5 13.9477 19.9477 13.5 20.5 13.5H28.5" stroke="#11141A"/>
+<path d="M22.5 17.5V13.5" stroke="#11141A"/>
+<circle cx="30" cy="28.5" r="2.5" stroke="black"/>
+<path d="M28.5 30.4998C27.8928 30.9559 27.5 31.6821 27.5 32.5C27.5 33.8807 28.6193 35 30 35C31.3807 35 32.5 33.8807 32.5 32.5C32.5 31.6821 32.1072 30.9559 31.5 30.4998" stroke="black"/>
+</svg>
diff --git a/store/onboard.ts b/store/onboard.ts
index a016400a1..1e0090aeb 100644
--- a/store/onboard.ts
+++ b/store/onboard.ts
@@ -170,7 +170,7 @@ export const useOnboardStore = defineStore("onboard", () => {
   });
   const switchNetworkById = async (chainId: number, networkName?: string) => {
     try {
-      await switchWalletNetwork({ chainId });
+      return await switchWalletNetwork({ chainId });
     } catch (err) {
       if (err instanceof Error && err.message.includes("does not support programmatic chain switching")) {
         throw new Error(`Please switch network manually to "${networkName}" in your ${walletName.value} wallet`);
@@ -185,12 +185,12 @@ export const useOnboardStore = defineStore("onboard", () => {
   } = usePromise(
     async () => {
       if (!l1Network.value) throw new Error(`L1 network is not available on ${selectedNetwork.value.name}`);
-      await switchNetworkById(l1Network.value.id);
+      return await switchNetworkById(l1Network.value.id);
     },
     { cache: false }
   );
   const setCorrectNetwork = async () => {
-    await switchNetwork().catch(() => undefined);
+    return await switchNetwork().catch(() => undefined);
   };
 
   const { subscribe: subscribeOnAccountChange, notify: notifyOnAccountChange } = useObservable<string | undefined>();
diff --git a/store/zksync/wallet.ts b/store/zksync/wallet.ts
index 54311ef16..37c226fe7 100644
--- a/store/zksync/wallet.ts
+++ b/store/zksync/wallet.ts
@@ -156,12 +156,12 @@ export const useZkSyncWalletStore = defineStore("zkSyncWallet", () => {
     execute: switchNetwork,
   } = usePromise(
     async () => {
-      await onboardStore.switchNetworkById(eraNetwork.value.id, eraNetwork.value.name);
+      return await onboardStore.switchNetworkById(eraNetwork.value.id, eraNetwork.value.name);
     },
     { cache: false }
   );
   const setCorrectNetwork = async () => {
-    await switchNetwork().catch(() => undefined);
+    return await switchNetwork().catch(() => undefined);
   };
 
   const { execute: walletAddressValidate, reload: reloadWalletAddressValidation } = usePromise(async () => {
diff --git a/views/transactions/Deposit.vue b/views/transactions/Deposit.vue
index 375be1031..5374b0074 100644
--- a/views/transactions/Deposit.vue
+++ b/views/transactions/Deposit.vue
@@ -129,6 +129,7 @@
               Insufficient <span class="font-medium">{{ feeToken?.symbol }}</span> balance on
               <span class="font-medium">{{ destinations.ethereum.label }}</span> to cover the fee
             </p>
+            <NuxtLink :to="{ name: 'receive-methods' }" class="alert-link">Receive funds</NuxtLink>
           </CommonAlert>
         </transition>
         <transition v-bind="TransitionAlertScaleInOutTransition">
@@ -151,6 +152,7 @@
               >
               on {{ eraNetwork.l1Network?.name ?? "L1" }} for deposit.
             </p>
+            <NuxtLink :to="{ name: 'receive-methods' }" class="alert-link">Receive funds</NuxtLink>
           </CommonAlert>
         </transition>
         <CommonErrorBlock v-if="allowanceRequestError" class="mt-2" @try-again="requestAllowance">
diff --git a/views/transactions/Transfer.vue b/views/transactions/Transfer.vue
index 532479fa1..2ac3902ce 100644
--- a/views/transactions/Transfer.vue
+++ b/views/transactions/Transfer.vue
@@ -156,6 +156,7 @@
               Insufficient <span class="font-medium">{{ feeToken?.symbol }}</span> balance on
               {{ destinations.era.label }} to cover the fee
             </p>
+            <NuxtLink :to="{ name: 'receive-methods' }" class="alert-link">Receive funds</NuxtLink>
           </CommonAlert>
         </transition>
 
diff --git a/views/transactions/TransferSubmitted.vue b/views/transactions/TransferSubmitted.vue
index 96a11d787..62882008f 100644
--- a/views/transactions/TransferSubmitted.vue
+++ b/views/transactions/TransferSubmitted.vue
@@ -35,6 +35,7 @@
       :transaction-hash="transaction.transactionHash"
       :token="transaction.token"
       :completed="transaction.info.completed"
+      :expected-complete-timestamp="transaction.info.expectedCompleteTimestamp"
     />
 
     <CommonButton as="RouterLink" :to="{ name: 'assets' }" class="mt-block-gap" variant="primary">