diff --git a/apps/namadillo/src/App/Transfer/ShieldedPropertiesTooltip.tsx b/apps/namadillo/src/App/Transfer/ShieldedPropertiesTooltip.tsx
index 490bbc4073..495998fb52 100644
--- a/apps/namadillo/src/App/Transfer/ShieldedPropertiesTooltip.tsx
+++ b/apps/namadillo/src/App/Transfer/ShieldedPropertiesTooltip.tsx
@@ -1,8 +1,14 @@
 import { Tooltip } from "@namada/components";
+import clsx from "clsx";
 import { useMemo } from "react";
 import { BsEye, BsEyeSlash } from "react-icons/bs";
+import semiTransparentEye from "./assets/semi-transparent-eye.svg";
+import shieldedEye from "./assets/shielded-eye.svg";
+import transparentEye from "./assets/transparent-eye.svg";
 import { isShieldedAddress } from "./common";
 
+type TransactionType = "transparent" | "semi-transparent" | "shielded";
+
 export const ShieldedPropertiesTooltip = ({
   sourceAddress,
   destinationAddress,
@@ -10,6 +16,20 @@ export const ShieldedPropertiesTooltip = ({
   sourceAddress: string | undefined;
   destinationAddress: string | undefined;
 }): JSX.Element => {
+  const isSourceShielded = isShieldedAddress(sourceAddress ?? "");
+  const isDestShielded = isShieldedAddress(destinationAddress ?? "");
+
+  // Determine transaction type
+  const transactionType: TransactionType = useMemo(() => {
+    if (isSourceShielded && isDestShielded) {
+      return "shielded";
+    } else if (!isSourceShielded && !isDestShielded) {
+      return "transparent";
+    } else {
+      return "semi-transparent";
+    }
+  }, [isSourceShielded, isDestShielded]);
+
   const visible = useMemo((): JSX.Element => {
     return (
       <span className="flex items-center gap-2">
@@ -28,32 +48,67 @@ export const ShieldedPropertiesTooltip = ({
     );
   }, []);
 
-  const shieldedTransfer =
-    isShieldedAddress(sourceAddress ?? "") &&
-    isShieldedAddress(destinationAddress ?? "");
-  const shieldingTransfer =
-    isShieldedAddress(destinationAddress ?? "") &&
-    !isShieldedAddress(sourceAddress ?? "");
+  // Determine visibility for each property based on transaction type
+  const senderVisible = transactionType !== "shielded" && !isSourceShielded;
+  const recipientVisible = transactionType === "transparent" || !isDestShielded;
+  const assetVisible = transactionType !== "shielded";
+  const amountVisible = transactionType !== "shielded";
+
+  // Transaction type header
+  const transactionTypeHeader = useMemo(() => {
+    return (
+      <div className="flex items-center justify-center gap-2 bg-neutral-800 rounded-sm py-2 px-4">
+        <span
+          className={clsx(
+            "text-sm font-medium",
+            transactionType === "shielded" && "text-yellow-400"
+          )}
+        >
+          {transactionType === "shielded" ?
+            "Shielded"
+          : transactionType === "semi-transparent" ?
+            "Semi-transparent"
+          : "Transparent"}
+        </span>
+        <img
+          src={
+            transactionType === "shielded" ? shieldedEye
+            : transactionType === "semi-transparent" ?
+              semiTransparentEye
+            : transparentEye
+          }
+          alt={
+            transactionType === "shielded" ? "Shielded"
+            : transactionType === "semi-transparent" ?
+              "Semi-transparent"
+            : "Transparent"
+          }
+          className="w-4 h-4"
+        />
+      </div>
+    );
+  }, [transactionType]);
 
   return (
     <Tooltip position="top" className="z-50 rounded-lg -mt-2">
-      <div className="min-w-[15rem] py-2 space-y-3">
-        <p className="text-white text-sm font-medium">Transaction Privacy:</p>
+      <div className="min-w-[18rem] py-3 space-y-3">
+        {transactionTypeHeader}
+
         <div className="flex w-full items-center justify-between">
           <span className="text-neutral-400 text-sm">Sender address</span>
-          {shieldedTransfer ? hidden : visible}
-        </div>
-        <div className="flex w-full items-center justify-between">
-          <span className="text-neutral-400 text-sm">Recipient address</span>
-          {shieldingTransfer || shieldedTransfer ? hidden : visible}
+          {senderVisible ? visible : hidden}
         </div>
         <div className="flex w-full items-center justify-between">
           <span className="text-neutral-400 text-sm">Asset</span>
-          {shieldedTransfer ? hidden : visible}
+          {assetVisible ? visible : hidden}
         </div>
         <div className="flex w-full items-center justify-between">
           <span className="text-neutral-400 text-sm">Amount</span>
-          {shieldedTransfer ? hidden : visible}
+          {amountVisible ? visible : hidden}
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <span className="text-neutral-400 text-sm">Destination address</span>
+          {recipientVisible ? visible : hidden}
         </div>
       </div>
     </Tooltip>
diff --git a/apps/namadillo/src/App/Transfer/TransferDestination.tsx b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
index 10ed9badae..a176c234ec 100644
--- a/apps/namadillo/src/App/Transfer/TransferDestination.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
@@ -25,7 +25,9 @@ import { useLocation } from "react-router-dom";
 import { Address } from "types";
 import namadaShieldedIcon from "./assets/namada-shielded.svg";
 import namadaTransparentIcon from "./assets/namada-transparent.svg";
+import semiTransparentEye from "./assets/semi-transparent-eye.svg";
 import shieldedEye from "./assets/shielded-eye.svg";
+import transparentEye from "./assets/transparent-eye.svg";
 import { ConnectProviderButton } from "./ConnectProviderButton";
 import { CustomAddressForm } from "./CustomAddressForm";
 import { DestinationAddressModal } from "./DestinationAddressModal";
@@ -124,13 +126,6 @@ export const TransferDestination = ({
       undefined
     : destinationAddress;
 
-  const isShieldedTransfer =
-    isShieldedNamAddress(sourceAddress ?? "") &&
-    isShieldedNamAddress(destinationAddress ?? "");
-  const isShieldingTransfer =
-    !isShieldedNamAddress(sourceAddress ?? "") &&
-    isShieldedNamAddress(destinationAddress ?? "");
-
   const sourceWallet =
     isNamadaAddress(destinationAddress || "") ? wallets.namada : wallets.keplr;
   const addressType =
@@ -138,6 +133,19 @@ export const TransferDestination = ({
     : isTransparentAddress(destinationAddress ?? "") ? "transparent"
     : "ibc";
 
+  // Determine transaction type for eye icon
+  const isSourceShielded = isShieldedNamAddress(sourceAddress ?? "");
+  const isDestShielded = isShieldedNamAddress(destinationAddress ?? "");
+  const transactionType =
+    isSourceShielded && isDestShielded ? "shielded"
+    : !isSourceShielded && !isDestShielded ? "transparent"
+    : "semi-transparent";
+
+  const eyeIcon =
+    transactionType === "shielded" ? shieldedEye
+    : transactionType === "semi-transparent" ? semiTransparentEye
+    : transparentEye;
+
   return (
     <>
       <div
@@ -152,11 +160,11 @@ export const TransferDestination = ({
           <div>
             <div className="flex justify-between items-center mb-5">
               <h4 className="text-neutral-500">Destination</h4>
-              {(isShieldedTransfer || isShieldingTransfer) && (
+              {sourceAddress && destinationAddress && (
                 <div className="relative w-fit group/tooltip ml-auto">
                   <img
-                    src={shieldedEye}
-                    alt="Shielded Logo"
+                    src={eyeIcon}
+                    alt="Privacy Info"
                     className="w-5 mb-2 select-none cursor-pointer"
                   />
                   <ShieldedPropertiesTooltip
diff --git a/apps/namadillo/src/App/Transfer/TransferSource.tsx b/apps/namadillo/src/App/Transfer/TransferSource.tsx
index e52ef11abc..2a6d8553e8 100644
--- a/apps/namadillo/src/App/Transfer/TransferSource.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferSource.tsx
@@ -125,7 +125,6 @@ export const TransferSource = ({
               "text-center [&_input]:text-center [&_input]:text-3xl [&_input]:bg-transparent",
               "[&_input]:!border-0 [&_input]:px-0"
             )}
-            disabled={!asset}
             value={amount}
             onChange={(e) => onChangeAmount?.(e.target.value)}
             placeholder="Amount"
diff --git a/apps/namadillo/src/App/Transfer/assets/semi-transparent-eye.svg b/apps/namadillo/src/App/Transfer/assets/semi-transparent-eye.svg
new file mode 100644
index 0000000000..a14999b37f
--- /dev/null
+++ b/apps/namadillo/src/App/Transfer/assets/semi-transparent-eye.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="19" height="19" rx="9.5" stroke="#FFFF00"/>
+<path d="M10 11.5C10.3978 11.5 10.7794 11.342 11.0607 11.0607C11.342 10.7794 11.5 10.3978 11.5 10C11.5 9.60218 11.342 9.22064 11.0607 8.93934C10.7794 8.65804 10.3978 8.5 10 8.5C9.60218 8.5 9.22064 8.65804 8.93934 8.93934C8.65804 9.22064 8.5 9.60218 8.5 10C8.5 10.3978 8.65804 10.7794 8.93934 11.0607C9.22064 11.342 9.60218 11.5 10 11.5Z" fill="#FFFF00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.37935 10.28C3.31626 10.0966 3.31626 9.89739 3.37935 9.714C3.85572 8.33737 4.74953 7.14356 5.93631 6.29881C7.12309 5.45407 8.54376 5.00044 10.0005 5.0011C11.4572 5.00176 12.8775 5.45667 14.0635 6.3025C15.2495 7.14832 16.1422 8.34294 16.6173 9.72C16.6804 9.90339 16.6804 10.1026 16.6173 10.286C16.1412 11.663 15.2474 12.8572 14.0605 13.7022C12.8736 14.5472 11.4527 15.001 9.99571 15.0003C8.53872 14.9997 7.11822 14.5446 5.93209 13.6985C4.74596 12.8524 3.85326 11.6574 3.37835 10.28H3.37935ZM12.9993 10C12.9993 10.7956 12.6833 11.5587 12.1207 12.1213C11.5581 12.6839 10.795 13 9.99935 13C9.2037 13 8.44064 12.6839 7.87803 12.1213C7.31542 11.5587 6.99935 10.7956 6.99935 10C6.99935 9.20435 7.31542 8.44129 7.87803 7.87868C8.44064 7.31607 9.2037 7 9.99935 7C10.795 7 11.5581 7.31607 12.1207 7.87868C12.6833 8.44129 12.9993 9.20435 12.9993 10Z" fill="#FFFF00"/>
+</svg>
diff --git a/apps/namadillo/src/App/Transfer/assets/shielded-eye.svg b/apps/namadillo/src/App/Transfer/assets/shielded-eye.svg
index fc1d0fa0c7..7620d71c0d 100644
--- a/apps/namadillo/src/App/Transfer/assets/shielded-eye.svg
+++ b/apps/namadillo/src/App/Transfer/assets/shielded-eye.svg
@@ -1,4 +1,5 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="20" height="20" rx="10" fill="#FFFF00"/>
-<path d="M4.98578 7.63937C4.40107 8.32949 3.96567 9.13325 3.70703 10C4.51453 12.7112 7.02578 14.6875 9.99828 14.6875C10.6189 14.6875 11.2189 14.6012 11.7877 14.4406M6.39078 6.3925C7.46119 5.68616 8.71583 5.31055 9.99828 5.3125C12.9708 5.3125 15.4814 7.28875 16.2889 9.99875C15.8464 11.4796 14.8964 12.7572 13.6058 13.6075M6.39078 6.3925L4.37328 4.375M6.39078 6.3925L8.67203 8.67375M13.6058 13.6075L15.6233 15.625M13.6058 13.6075L11.3245 11.3262C11.4987 11.1521 11.6368 10.9454 11.731 10.7179C11.8253 10.4904 11.8738 10.2466 11.8738 10.0003C11.8738 9.75406 11.8253 9.51022 11.731 9.28272C11.6368 9.05522 11.4987 8.8485 11.3245 8.67437C11.1504 8.50025 10.9437 8.36213 10.7162 8.26789C10.4887 8.17366 10.2448 8.12515 9.99859 8.12515C9.75234 8.12515 9.50851 8.17366 9.281 8.26789C9.0535 8.36213 8.84678 8.50025 8.67266 8.67437M11.3239 11.3256L8.67328 8.675" stroke="black" stroke-width="0.9375" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.28082 4.21997C5.13865 4.08749 4.9506 4.01537 4.7563 4.01879C4.562 4.02222 4.37661 4.10093 4.2392 4.23835C4.10179 4.37576 4.02308 4.56114 4.01965 4.75545C4.01622 4.94975 4.08834 5.13779 4.22082 5.27997L14.7208 15.78C14.7895 15.8537 14.8723 15.9128 14.9643 15.9537C15.0563 15.9947 15.1556 16.0168 15.2563 16.0186C15.357 16.0203 15.457 16.0018 15.5504 15.9641C15.6438 15.9264 15.7286 15.8702 15.7999 15.799C15.8711 15.7278 15.9272 15.643 15.9649 15.5496C16.0027 15.4562 16.0212 15.3561 16.0194 15.2554C16.0176 15.1547 15.9956 15.0554 15.9546 14.9634C15.9136 14.8714 15.8545 14.7886 15.7808 14.72L14.4588 13.397C15.4504 12.578 16.1976 11.5021 16.6188 10.287C16.6821 10.1033 16.6821 9.90367 16.6188 9.71997C16.2926 8.77291 15.7669 7.90687 15.0774 7.18029C14.3879 6.45371 13.5505 5.88351 12.6218 5.50816C11.6931 5.13282 10.6947 4.96107 9.694 5.00451C8.69327 5.04795 7.7135 5.30556 6.82082 5.75997L5.28082 4.21997ZM8.47682 7.41497L9.61182 8.55097C9.8663 8.48298 10.1342 8.48311 10.3886 8.55134C10.643 8.61957 10.875 8.75351 11.0613 8.93971C11.2476 9.12591 11.3817 9.35783 11.45 9.6122C11.5184 9.86658 11.5187 10.1345 11.4508 10.389L12.5868 11.524C12.9255 10.9509 13.0639 10.2816 12.9804 9.62121C12.8968 8.96086 12.5961 8.34704 12.1254 7.87638C11.6548 7.40572 11.0409 7.10495 10.3806 7.02142C9.72023 6.93789 9.05086 7.07633 8.47782 7.41497H8.47682Z" fill="black"/>
+<path d="M9.81135 12.994L11.6273 14.81C9.93548 15.2142 8.15375 14.9742 6.6291 14.1368C5.10445 13.2995 3.94601 11.9246 3.37935 10.28C3.31626 10.0967 3.31626 9.89744 3.37935 9.71405C3.63394 8.97702 4.01014 8.28783 4.49235 7.67505L7.00535 10.188C7.05116 10.9172 7.36149 11.6046 7.87812 12.1213C8.39475 12.6379 9.08216 12.9482 9.81135 12.994Z" fill="black"/>
 </svg>
diff --git a/apps/namadillo/src/App/Transfer/assets/transparent-eye.svg b/apps/namadillo/src/App/Transfer/assets/transparent-eye.svg
new file mode 100644
index 0000000000..d2b94b4dc4
--- /dev/null
+++ b/apps/namadillo/src/App/Transfer/assets/transparent-eye.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="20" height="20" rx="10" fill="white"/>
+<path d="M10 11.5C10.3978 11.5 10.7794 11.342 11.0607 11.0607C11.342 10.7794 11.5 10.3978 11.5 10C11.5 9.60218 11.342 9.22064 11.0607 8.93934C10.7794 8.65804 10.3978 8.5 10 8.5C9.60218 8.5 9.22064 8.65804 8.93934 8.93934C8.65804 9.22064 8.5 9.60218 8.5 10C8.5 10.3978 8.65804 10.7794 8.93934 11.0607C9.22064 11.342 9.60218 11.5 10 11.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.37935 10.28C3.31626 10.0966 3.31626 9.89739 3.37935 9.714C3.85572 8.33737 4.74953 7.14356 5.93631 6.29881C7.12309 5.45407 8.54376 5.00044 10.0005 5.0011C11.4572 5.00176 12.8775 5.45667 14.0635 6.3025C15.2495 7.14832 16.1422 8.34294 16.6173 9.72C16.6804 9.90339 16.6804 10.1026 16.6173 10.286C16.1412 11.663 15.2474 12.8572 14.0605 13.7022C12.8736 14.5472 11.4527 15.001 9.99571 15.0003C8.53872 14.9997 7.11822 14.5446 5.93209 13.6985C4.74596 12.8524 3.85326 11.6574 3.37835 10.28H3.37935ZM12.9993 10C12.9993 10.7956 12.6833 11.5587 12.1207 12.1213C11.5581 12.6839 10.795 13 9.99935 13C9.2037 13 8.44064 12.6839 7.87803 12.1213C7.31542 11.5587 6.99935 10.7956 6.99935 10C6.99935 9.20435 7.31542 8.44129 7.87803 7.87868C8.44064 7.31607 9.2037 7 9.99935 7C10.795 7 11.5581 7.31607 12.1207 7.87868C12.6833 8.44129 12.9993 9.20435 12.9993 10Z" fill="black"/>
+</svg>