diff --git a/packages/bridge-ui/src/components/ERC20Faucet.svelte b/packages/bridge-ui/src/components/ERC20Faucet.svelte
deleted file mode 100644
index 77ea0ec016f..00000000000
--- a/packages/bridge-ui/src/components/ERC20Faucet.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-<script lang="ts">
-  import { ethers } from "ethers";
-  import { HORSE } from "../domain/token";
-  import { pendingTransactions } from "../store/transactions";
-  import { signer } from "../store/signer";
-  import { errorToast, successToast } from "../utils/toast";
-  import { _ } from "svelte-i18n";
-  import { Funnel } from "svelte-heros-v2";
-  import MintableERC20 from "../constants/abi/MintableERC20";
-  import { fromChain } from "../store/chain";
-  import { fetchSigner, switchNetwork } from "@wagmi/core";
-  import { CHAIN_MAINNET } from "../domain/chain";
-  import Tooltip from "./Tooltip.svelte";
-  import TooltipModal from "./modals/TooltipModal.svelte";
-  import { token } from "../store/token";
-
-  export let onMint: () => Promise<void>;
-
-  let tooltipOpen: boolean = false;
-
-  async function mint() {
-    try {
-      if ($fromChain.id !== HORSE.addresses[0].chainId) {
-        await switchNetwork({
-          chainId: CHAIN_MAINNET.id,
-        });
-        const wagmiSigner = await fetchSigner();
-
-        signer.set(wagmiSigner);
-      }
-      const contract = new ethers.Contract(
-        HORSE.addresses[0].address,
-        MintableERC20,
-        $signer
-      );
-
-      const tx = await contract.mint(ethers.utils.parseEther("1000"));
-      pendingTransactions.update((store) => {
-        store.push(tx);
-        return store;
-      });
-
-      successToast($_("toast.transactionSent"));
-      await $signer.provider.waitForTransaction(tx.hash, 1);
-
-      await onMint();
-    } catch (e) {
-      console.log(e);
-      errorToast($_("toast.errorSendingTransaction"));
-    }
-  }
-</script>
-
-<div class="flex items-start">
-  <button class="btn" on:click={mint}>
-    <Funnel class="mr-2" /> Faucet
-  </button>
-  <button class="inline-block ml-2" on:click={() => (tooltipOpen = true)}>
-    <Tooltip />
-  </button>
-</div>
-
-<TooltipModal title="{$token.symbol} Faucet" bind:isOpen={tooltipOpen}>
-  <span slot="body">
-    <p class="text-left">
-      You can request 1000 {$token.symbol}. {$token.symbol} is only available to
-      be minted on Ethereum A1. If you are on Taiko A1, your network will be changed
-      first. You must have a small amount of ETH in your Ethereum A1 wallet to
-      send the transaction.
-    </p>
-  </span>
-</TooltipModal>
diff --git a/packages/bridge-ui/src/components/Transaction.svelte b/packages/bridge-ui/src/components/Transaction.svelte
index 2ed40a0f354..e40029a24db 100644
--- a/packages/bridge-ui/src/components/Transaction.svelte
+++ b/packages/bridge-ui/src/components/Transaction.svelte
@@ -133,7 +133,7 @@
 
   <td>
     {#if !processable}
-      Pending...
+      Pending {fromChain.id === CHAIN_TKO.id ? '(2-3hrs)': ''}...
     {:else if !transaction.receipt && transaction.status === MessageStatus.New}
       <div class="inline-block">
         <LottiePlayer
@@ -150,14 +150,14 @@
       </div>
     {:else if transaction.receipt && transaction.status === MessageStatus.New}
       <span
-        class="cursor-pointer"
+        class="cursor-pointer border rounded p-1"
         on:click={async () => await claim(transaction)}
       >
         Claim
       </span>
     {:else if transaction.status === MessageStatus.Retriable}
       <span
-        class="cursor-pointer"
+        class="cursor-pointer border rounded p-1"
         on:click={async () => await claim(transaction)}
       >
         Retry