diff --git a/apps/namadillo/package.json b/apps/namadillo/package.json
index 3e2be31d5..0537ca646 100644
--- a/apps/namadillo/package.json
+++ b/apps/namadillo/package.json
@@ -27,6 +27,7 @@
     "jotai": "^2.6.3",
     "jotai-tanstack-query": "^0.8.5",
     "lodash.debounce": "^4.0.8",
+    "namada-chain-registry": "https://github.com/anoma/namada-chain-registry",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.1.0",
diff --git a/apps/namadillo/src/App/Ibc/IbcTransfer.tsx b/apps/namadillo/src/App/Ibc/IbcTransfer.tsx
index e743151a4..0ea85b462 100644
--- a/apps/namadillo/src/App/Ibc/IbcTransfer.tsx
+++ b/apps/namadillo/src/App/Ibc/IbcTransfer.tsx
@@ -1,4 +1,4 @@
-import { Asset, Chain } from "@chain-registry/types";
+import { Chain } from "@chain-registry/types";
 import { Window as KeplrWindow } from "@keplr-wallet/types";
 import { mapUndefined } from "@namada/utils";
 import { TransactionTimeline } from "App/Common/TransactionTimeline";
@@ -8,19 +8,20 @@ import {
 } from "App/Transfer/TransferModule";
 import { allDefaultAccountsAtom } from "atoms/accounts";
 import {
+  assetBalanceAtomFamily,
   availableChainsAtom,
   chainRegistryAtom,
   ibcTransferAtom,
 } from "atoms/integrations";
 import clsx from "clsx";
 import { AnimatePresence, motion } from "framer-motion";
-import { useAssetAmount } from "hooks/useAssetAmount";
 import { useWalletManager } from "hooks/useWalletManager";
 import { wallets } from "integrations";
 import { KeplrWalletManager } from "integrations/Keplr";
 import { useAtomValue } from "jotai";
 import { useEffect, useMemo, useState } from "react";
 import namadaChain from "registry/namada.json";
+import { Address } from "types";
 import { IbcTopHeader } from "./IbcTopHeader";
 
 import * as cosmos from "chain-registry/mainnet/cosmoshub";
@@ -33,7 +34,7 @@ export const IbcTransfer: React.FC = () => {
   const chainRegistry = useAtomValue(chainRegistryAtom);
   const availableChains = useAtomValue(availableChainsAtom);
   const [shielded, setShielded] = useState<boolean>(true);
-  const [selectedAsset, setSelectedAsset] = useState<Asset>();
+  const [selectedAssetAddress, setSelectedAssetAddress] = useState<Address>();
   const [currentStep, setCurrentStep] = useState(0);
   const [generalErrorMessage, setGeneralErrorMessage] = useState("");
   const performIbcTransfer = useAtomValue(ibcTransferAtom);
@@ -45,15 +46,17 @@ export const IbcTransfer: React.FC = () => {
     chainId,
   } = useWalletManager(keplr);
 
-  const {
-    balance: availableAmount,
-    availableAssets,
-    isLoading: isLoadingBalances,
-  } = useAssetAmount({
-    registry,
-    asset: selectedAsset,
-    walletAddress: sourceAddress,
-  });
+  const { data: availableAssets, isLoading: isLoadingBalances } = useAtomValue(
+    assetBalanceAtomFamily({
+      chain: registry?.chain,
+      walletAddress: sourceAddress,
+    })
+  );
+
+  const availableAmount = mapUndefined(
+    (address) => availableAssets?.[address]?.amount,
+    selectedAssetAddress
+  );
 
   const transactionFee = useMemo(() => {
     if (typeof registry !== "undefined") {
@@ -63,7 +66,7 @@ export const IbcTransfer: React.FC = () => {
   }, [registry]);
 
   useEffect(() => {
-    setSelectedAsset(undefined);
+    setSelectedAssetAddress(undefined);
   }, [registry]);
 
   const namadaAddress = useMemo(() => {
@@ -90,6 +93,11 @@ export const IbcTransfer: React.FC = () => {
         throw new Error("Chain ID is undefined");
       }
 
+      const selectedAsset = mapUndefined(
+        (address) => availableAssets?.[address],
+        selectedAssetAddress
+      );
+
       if (!selectedAsset) {
         throw new Error("No asset is selected");
       }
@@ -182,7 +190,7 @@ export const IbcTransfer: React.FC = () => {
               source={{
                 isLoadingAssets: isLoadingBalances,
                 availableAssets,
-                selectedAsset,
+                selectedAssetAddress,
                 availableAmount,
                 availableChains,
                 onChangeChain,
@@ -191,7 +199,7 @@ export const IbcTransfer: React.FC = () => {
                 wallet: wallets.keplr,
                 walletAddress: sourceAddress,
                 onChangeWallet,
-                onChangeSelectedAsset: setSelectedAsset,
+                onChangeSelectedAsset: setSelectedAssetAddress,
               }}
               destination={{
                 chain: namadaChain as Chain,
diff --git a/apps/namadillo/src/App/Ibc/IbcWithdraw.tsx b/apps/namadillo/src/App/Ibc/IbcWithdraw.tsx
index 85c85c925..4be84ed4e 100644
--- a/apps/namadillo/src/App/Ibc/IbcWithdraw.tsx
+++ b/apps/namadillo/src/App/Ibc/IbcWithdraw.tsx
@@ -1,4 +1,4 @@
-import { Asset, Chain } from "@chain-registry/types";
+import { Chain } from "@chain-registry/types";
 import { WindowWithNamada } from "@namada/types";
 import { mapUndefined } from "@namada/utils";
 import {
@@ -16,6 +16,7 @@ import { useAtomValue } from "jotai";
 import { useState } from "react";
 import namadaChainRegistry from "registry/namada.json";
 import { namadaAsset } from "registry/namadaAsset";
+import { Address, AddressWithAssetAndAmountMap } from "types";
 import { getSdkInstance } from "utils/sdk";
 import { IbcTopHeader } from "./IbcTopHeader";
 
@@ -30,16 +31,26 @@ export const IbcWithdraw: React.FC = () => {
   const namadaChainParams = useAtomValue(chainParametersAtom);
   const namadaChain = useAtomValue(chainAtom);
 
-  const [selectedAsset, setSelectedAsset] = useState<Asset>();
+  const [selectedAssetAddress, setSelectedAssetAddress] = useState<Address>();
 
   // TODO: remove hardcoding and display assets other than NAM
   const availableAmount = useAtomValue(accountBalanceAtom).data;
-  const availableAssets = [namadaAsset];
+  const availableAssets: AddressWithAssetAndAmountMap =
+    availableAmount ?
+      {
+        [namadaAsset.address]: {
+          asset: namadaAsset,
+          originalAddress: namadaAsset.address,
+          amount: availableAmount,
+        },
+      }
+    : {};
 
   const GAS_PRICE = BigNumber(0.000001); // 0.000001 NAM
   const GAS_LIMIT = BigNumber(1_000_000);
   const transactionFee = {
-    token: namadaAsset,
+    originalAddress: namadaAsset.address,
+    asset: namadaAsset,
     amount: GAS_PRICE.multipliedBy(GAS_LIMIT),
   };
 
@@ -115,8 +126,8 @@ export const IbcWithdraw: React.FC = () => {
           isShielded: false,
           availableAssets,
           availableAmount,
-          selectedAsset,
-          onChangeSelectedAsset: setSelectedAsset,
+          selectedAssetAddress,
+          onChangeSelectedAsset: setSelectedAssetAddress,
         }}
         destination={{
           wallet: wallets.keplr,
diff --git a/apps/namadillo/src/App/Ibc/ShieldAllAssetList.tsx b/apps/namadillo/src/App/Ibc/ShieldAllAssetList.tsx
index 19944804e..cf7fa4b67 100644
--- a/apps/namadillo/src/App/Ibc/ShieldAllAssetList.tsx
+++ b/apps/namadillo/src/App/Ibc/ShieldAllAssetList.tsx
@@ -4,15 +4,14 @@ import { TokenCurrency } from "App/Common/TokenCurrency";
 import BigNumber from "bignumber.js";
 import clsx from "clsx";
 import { getAssetImageUrl } from "integrations/utils";
-import { AddressWithAssetAndBalance } from "types";
+import { AddressWithAssetAndAmount } from "types";
 
-export type SelectableAddressWithAssetAndBalance =
-  AddressWithAssetAndBalance & {
-    checked: boolean;
-  };
+export type SelectableAddressWithAssetAndAmount = AddressWithAssetAndAmount & {
+  checked: boolean;
+};
 
 type ShieldAllAssetListProps = {
-  assets: SelectableAddressWithAssetAndBalance[];
+  assets: SelectableAddressWithAssetAndAmount[];
   onToggleAsset: (asset: Asset) => void;
 };
 
@@ -24,7 +23,7 @@ export const ShieldAllAssetList = ({
     <ul className="max-h-[200px] dark-scrollbar -mr-2">
       {assets.map(
         (
-          assetWithBalance: SelectableAddressWithAssetAndBalance,
+          assetWithBalance: SelectableAddressWithAssetAndAmount,
           idx: number
         ) => {
           const image = getAssetImageUrl(assetWithBalance.asset);
@@ -55,7 +54,7 @@ export const ShieldAllAssetList = ({
                 <TokenCurrency
                   currencySymbolClassName="hidden"
                   asset={assetWithBalance.asset}
-                  amount={assetWithBalance.balance || new BigNumber(0)}
+                  amount={assetWithBalance.amount || new BigNumber(0)}
                 />
               </span>
             </li>
diff --git a/apps/namadillo/src/App/Ibc/ShieldAllPanel.tsx b/apps/namadillo/src/App/Ibc/ShieldAllPanel.tsx
index 81f98a017..5a1d9e897 100644
--- a/apps/namadillo/src/App/Ibc/ShieldAllPanel.tsx
+++ b/apps/namadillo/src/App/Ibc/ShieldAllPanel.tsx
@@ -11,12 +11,12 @@ import { TransferTransactionFee } from "App/Transfer/TransferTransactionFee";
 import { getTransactionFee } from "integrations/utils";
 import { useEffect, useMemo, useState } from "react";
 import {
-  AddressWithAssetAndBalance,
+  AddressWithAssetAndAmount,
   ChainRegistryEntry,
   WalletProvider,
 } from "types";
 import {
-  SelectableAddressWithAssetAndBalance,
+  SelectableAddressWithAssetAndAmount,
   ShieldAllAssetList,
 } from "./ShieldAllAssetList";
 import { ShieldAllContainer } from "./ShieldAllContainer";
@@ -26,7 +26,7 @@ type ShieldAllPanelProps = {
   wallet: WalletProvider;
   walletAddress: string;
   isLoading: boolean;
-  assetList: AddressWithAssetAndBalance[];
+  assetList: AddressWithAssetAndAmount[];
   onShieldAll: (assets: Asset[]) => void;
 };
 
@@ -39,7 +39,7 @@ export const ShieldAllPanel = ({
   onShieldAll,
 }: ShieldAllPanelProps): JSX.Element => {
   const [selectableAssets, setSelectableAssets] = useState<
-    SelectableAddressWithAssetAndBalance[]
+    SelectableAddressWithAssetAndAmount[]
   >([]);
 
   useEffect(() => {
diff --git a/apps/namadillo/src/App/Transfer/SelectAssetModal.tsx b/apps/namadillo/src/App/Transfer/SelectAssetModal.tsx
index 7d7070db7..e8dfe5aab 100644
--- a/apps/namadillo/src/App/Transfer/SelectAssetModal.tsx
+++ b/apps/namadillo/src/App/Transfer/SelectAssetModal.tsx
@@ -1,18 +1,17 @@
-import { Asset } from "@chain-registry/types";
 import { Stack } from "@namada/components";
 import { Search } from "App/Common/Search";
 import { SelectModal } from "App/Common/SelectModal";
 import clsx from "clsx";
 import { useMemo, useState } from "react";
 import { twMerge } from "tailwind-merge";
-import { WalletProvider } from "types";
+import { Address, AddressWithAsset, WalletProvider } from "types";
 import { AssetCard } from "./AssetCard";
 import { ConnectedWalletInfo } from "./ConnectedWalletInfo";
 
 type SelectWalletModalProps = {
   onClose: () => void;
-  onSelect: (asset: Asset) => void;
-  assets: Asset[];
+  onSelect: (address: Address) => void;
+  assets: AddressWithAsset[];
   wallet: WalletProvider;
   walletAddress: string;
 };
@@ -28,7 +27,7 @@ export const SelectAssetModal = ({
 
   const filteredAssets = useMemo(() => {
     return assets.filter(
-      (asset) =>
+      ({ asset }) =>
         asset.name.toLowerCase().indexOf(filter.toLowerCase()) >= 0 ||
         asset.symbol.toLowerCase().indexOf(filter.toLowerCase()) >= 0
     );
@@ -45,11 +44,11 @@ export const SelectAssetModal = ({
         gap={0}
         className="max-h-[400px] overflow-auto dark-scrollbar pb-4 mr-[-0.5rem]"
       >
-        {filteredAssets.map((asset: Asset, index: number) => (
-          <li key={index} className="text-sm">
+        {filteredAssets.map(({ asset, originalAddress }) => (
+          <li key={originalAddress} className="text-sm">
             <button
               onClick={() => {
-                onSelect(asset);
+                onSelect(originalAddress);
                 onClose();
               }}
               className={twMerge(
diff --git a/apps/namadillo/src/App/Transfer/TransferModule.tsx b/apps/namadillo/src/App/Transfer/TransferModule.tsx
index 6a8f739d7..426ac85b4 100644
--- a/apps/namadillo/src/App/Transfer/TransferModule.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferModule.tsx
@@ -1,9 +1,15 @@
-import { Asset, Chain, Chains } from "@chain-registry/types";
+import { Chain, Chains } from "@chain-registry/types";
 import { ActionButton, Stack } from "@namada/components";
+import { mapUndefined } from "@namada/utils";
 import { InlineError } from "App/Common/InlineError";
 import BigNumber from "bignumber.js";
 import { useMemo, useState } from "react";
-import { WalletProvider } from "types";
+import {
+  Address,
+  AddressWithAssetAndAmount,
+  AddressWithAssetAndAmountMap,
+  WalletProvider,
+} from "types";
 import { parseChainInfo } from "./common";
 import { IbcChannels } from "./IbcChannels";
 import { SelectAssetModal } from "./SelectAssetModal";
@@ -13,10 +19,7 @@ import { TransferArrow } from "./TransferArrow";
 import { TransferDestination } from "./TransferDestination";
 import { TransferSource } from "./TransferSource";
 
-export type TransactionFee = {
-  token: Asset;
-  amount: BigNumber;
-};
+export type TransactionFee = AddressWithAssetAndAmount;
 
 type TransferModuleConfig = {
   wallet?: WalletProvider;
@@ -31,11 +34,11 @@ type TransferModuleConfig = {
 };
 
 export type TransferSourceProps = TransferModuleConfig & {
-  availableAssets?: Asset[];
+  availableAssets?: AddressWithAssetAndAmountMap;
   isLoadingAssets?: boolean;
-  selectedAsset?: Asset;
+  selectedAssetAddress?: Address;
   availableAmount?: BigNumber;
-  onChangeSelectedAsset?: (asset: Asset | undefined) => void;
+  onChangeSelectedAsset?: (address: Address | undefined) => void;
 };
 
 export type IbcOptions = {
@@ -50,7 +53,7 @@ export type TransferDestinationProps = TransferModuleConfig & {
 
 export type OnSubmitTransferParams = {
   amount: BigNumber;
-  destinationAddress: string;
+  destinationAddress: Address;
   memo?: string;
   ibcOptions?: IbcOptions;
 };
@@ -97,23 +100,31 @@ export const TransferModule = ({
   const [sourceIbcChannel, setSourceIbcChannel] = useState("");
   const [destinationIbcChannel, setDestinationIbcChannel] = useState("");
 
+  const selectedAsset = mapUndefined(
+    (address) => source.availableAssets?.[address],
+    source.selectedAssetAddress
+  );
+
   const availableAmountMinusFees = useMemo(() => {
-    const { selectedAsset, availableAmount } = source;
+    const { selectedAssetAddress, availableAmount } = source;
 
     if (
-      typeof selectedAsset === "undefined" ||
+      typeof selectedAssetAddress === "undefined" ||
       typeof availableAmount === "undefined"
     ) {
       return undefined;
     }
 
     const minusFees =
-      transactionFee && selectedAsset.base === transactionFee.token.base ?
+      (
+        transactionFee &&
+        selectedAssetAddress === transactionFee.originalAddress
+      ) ?
         availableAmount.minus(transactionFee.amount)
       : availableAmount;
 
     return BigNumber.max(minusFees, 0);
-  }, [source.selectedAsset, source.availableAmount, transactionFee]);
+  }, [source.selectedAssetAddress, source.availableAmount, transactionFee]);
 
   const validationResult = useMemo((): ValidationResult => {
     if (!source.wallet) {
@@ -122,7 +133,7 @@ export const TransferModule = ({
       return "NoSourceChain";
     } else if (!destination.chain) {
       return "NoDestinationChain";
-    } else if (!source.selectedAsset) {
+    } else if (!source.selectedAssetAddress) {
       return "NoSelectedAsset";
     } else if (!amount || amount.eq(0)) {
       return "NoAmount";
@@ -151,7 +162,7 @@ export const TransferModule = ({
       throw new Error("Address is not provided");
     }
 
-    if (!source.selectedAsset) {
+    if (!source.selectedAssetAddress) {
       throw new Error("Asset is not selected");
     }
 
@@ -255,7 +266,7 @@ export const TransferModule = ({
             isConnected={Boolean(source.connected)}
             wallet={source.wallet}
             walletAddress={source.walletAddress}
-            asset={source.selectedAsset}
+            asset={selectedAsset?.asset}
             isLoadingAssets={source.isLoadingAssets}
             chain={parseChainInfo(source.chain, source.isShielded)}
             availableAmount={availableAmountMinusFees}
@@ -338,7 +349,7 @@ export const TransferModule = ({
         source.walletAddress && (
           <SelectAssetModal
             onClose={() => setAssetSelectorModalOpen(false)}
-            assets={source.availableAssets || []}
+            assets={Object.values(source.availableAssets || {})}
             onSelect={source.onChangeSelectedAsset}
             wallet={source.wallet}
             walletAddress={source.walletAddress}
diff --git a/apps/namadillo/src/App/Transfer/TransferTransactionFee.tsx b/apps/namadillo/src/App/Transfer/TransferTransactionFee.tsx
index b9f51223c..520ddbba7 100644
--- a/apps/namadillo/src/App/Transfer/TransferTransactionFee.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferTransactionFee.tsx
@@ -34,7 +34,7 @@ export const TransferTransactionFee = ({
       )}
       <TokenCurrency
         amount={transactionFee.amount}
-        asset={transactionFee.token}
+        asset={transactionFee.asset}
       />
     </footer>
   );
diff --git a/apps/namadillo/src/App/Transfer/__mocks__/assets.tsx b/apps/namadillo/src/App/Transfer/__mocks__/assets.tsx
index bbd2c859d..417578c30 100644
--- a/apps/namadillo/src/App/Transfer/__mocks__/assets.tsx
+++ b/apps/namadillo/src/App/Transfer/__mocks__/assets.tsx
@@ -1,19 +1,83 @@
 import { Asset } from "@chain-registry/types";
+import { AddressWithAsset } from "types";
 
-export const assetMock: Partial<Asset> = {
+export const assetMock: Asset = {
+  description:
+    "Ethereum is a decentralized blockchain platform for running smart contracts and dApps, with Ether (ETH) as its native cryptocurrency, enabling a versatile ecosystem beyond just digital currency.",
+  extended_description:
+    "Ethereum, symbolized as ETH, is a groundbreaking cryptocurrency and blockchain platform introduced in 2015 by a team led by Vitalik Buterin. Unlike Bitcoin, which primarily serves as a digital currency, Ethereum is designed to be a decentralized platform for running smart contracts and decentralized applications (dApps). These smart contracts are self-executing contracts with the terms directly written into code, enabling trustless and automated transactions without intermediaries. Ethereum's blockchain can host a wide variety of applications, from financial services to gaming, making it a versatile and powerful tool in the world of blockchain technology.\n\nOne of the most notable features of Ethereum is its native cryptocurrency, Ether (ETH), which is used to pay for transaction fees and computational services on the network. Ethereum has also been the backbone for the explosive growth of decentralized finance (DeFi), which seeks to recreate traditional financial systems with blockchain-based alternatives. Additionally, Ethereum is undergoing a significant upgrade known as Ethereum 2.0, which aims to improve scalability, security, and energy efficiency through a shift from proof-of-work (PoW) to proof-of-stake (PoS) consensus mechanisms. This transition is expected to enhance the network's performance and reduce its environmental impact, further solidifying Ethereum's position as a leading platform in the blockchain ecosystem.",
+  denom_units: [
+    {
+      denom: "wei",
+      exponent: 0,
+    },
+    {
+      denom: "gwei",
+      exponent: 9,
+    },
+    {
+      denom: "eth",
+      exponent: 18,
+      aliases: ["ether"],
+    },
+  ],
+  type_asset: "evm-base",
+  base: "wei",
   name: "Ethereum",
+  display: "eth",
   symbol: "ETH",
   logo_URIs: {
     svg: "https://example.com/eth-icon.png",
   },
+  coingecko_id: "ethereum",
+  images: [
+    {
+      png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/ethereum/images/eth-white.png",
+      svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/ethereum/images/eth-white.svg",
+      theme: {
+        primary_color_hex: "#303030",
+      },
+    },
+  ],
 };
 
-export const assetMock2: Partial<Asset> = {
+export const assetMock2: Asset = {
+  description:
+    'Bitcoin, the first and most well-known cryptocurrency, allows decentralized peer-to-peer transactions on a secure blockchain network, serving as "digital gold."',
+  extended_description:
+    'Bitcoin, often referred to as BTC, is the first and most well-known cryptocurrency, introduced in 2009 by an anonymous entity known as Satoshi Nakamoto. It was designed as a decentralized digital currency, allowing peer-to-peer transactions without the need for a central authority or intermediary. Bitcoin operates on a technology called blockchain, a distributed ledger that records all transactions across a network of computers. The security and integrity of the blockchain are maintained through a process called mining, where participants solve complex mathematical problems to validate and add new transactions to the blockchain. Bitcoin\'s decentralized nature and limited supply, capped at 21 million coins, have contributed to its status as "digital gold" and a store of value.\n\nBitcoin has significantly influenced the financial world, inspiring the development of thousands of other cryptocurrencies and blockchain technologies. Its adoption has grown over the years, with numerous merchants and service providers accepting it as a payment method. Additionally, Bitcoin has become a popular investment asset, attracting both individual and institutional investors. Despite its volatility and regulatory challenges, Bitcoin remains a dominant force in the crypto space, symbolizing the potential for a more open and inclusive financial system. Its impact extends beyond finance, as it continues to drive innovation in areas such as decentralized finance (DeFi), supply chain management, and digital identity verification.',
+  denom_units: [
+    {
+      denom: "sat",
+      exponent: 0,
+    },
+    {
+      denom: "btc",
+      exponent: 8,
+    },
+  ],
+  type_asset: "bitcoin-like",
+  base: "sat",
   name: "Bitcoin",
+  display: "btc",
   symbol: "BTC",
   logo_URIs: { svg: "btc.svg" },
+  coingecko_id: "bitcoin",
+  images: [
+    {
+      svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/bitcoin/images/btc.svg",
+      png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/bitcoin/images/btc.png",
+      theme: {
+        primary_color_hex: "#f4941c",
+        background_color_hex: "#f4941c",
+        circle: true,
+      },
+    },
+  ],
 };
 
-export const assetMockList: Array<Partial<Asset>> = [assetMock, assetMock2];
+export const assetMockList: AddressWithAsset[] = [assetMock, assetMock2].map(
+  (asset) => ({ asset, originalAddress: asset.base })
+);
 
-export const assetWithoutLogo: Partial<Asset> = { ...assetMock, logo_URIs: {} };
+export const assetWithoutLogo: Asset = { ...assetMock, logo_URIs: {} };
diff --git a/apps/namadillo/src/App/Transfer/__tests__/AssetCard.test.tsx b/apps/namadillo/src/App/Transfer/__tests__/AssetCard.test.tsx
index 813bfd155..69de3e93c 100644
--- a/apps/namadillo/src/App/Transfer/__tests__/AssetCard.test.tsx
+++ b/apps/namadillo/src/App/Transfer/__tests__/AssetCard.test.tsx
@@ -1,23 +1,22 @@
-import { Asset } from "@chain-registry/types";
 import { render, screen } from "@testing-library/react";
 import { AssetCard } from "App/Transfer/AssetCard";
 import { assetMock, assetWithoutLogo } from "App/Transfer/__mocks__/assets";
 
 describe("Component: AssetCard", () => {
   it("should render asset name", () => {
-    render(<AssetCard asset={assetMock as Asset} />);
+    render(<AssetCard asset={assetMock} />);
     expect(screen.getByText("Ethereum")).toBeInTheDocument();
   });
 
   it("should render asset logo if available", () => {
-    render(<AssetCard asset={assetMock as Asset} />);
+    render(<AssetCard asset={assetMock} />);
     const logo = screen.getByAltText("Ethereum logo");
     expect(logo).toBeInTheDocument();
     expect(logo).toHaveAttribute("src", assetMock.logo_URIs?.svg);
   });
 
   it("should render placeholder if logo is not available", () => {
-    render(<AssetCard asset={assetWithoutLogo as Asset} />);
+    render(<AssetCard asset={assetWithoutLogo} />);
     expect(screen.getByAltText(/logo not available/i)).toBeInTheDocument();
   });
 });
diff --git a/apps/namadillo/src/App/Transfer/__tests__/SelectAssetModal.test.tsx b/apps/namadillo/src/App/Transfer/__tests__/SelectAssetModal.test.tsx
index a0e156bdc..59d87d754 100644
--- a/apps/namadillo/src/App/Transfer/__tests__/SelectAssetModal.test.tsx
+++ b/apps/namadillo/src/App/Transfer/__tests__/SelectAssetModal.test.tsx
@@ -1,4 +1,3 @@
-import { Asset } from "@chain-registry/types";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { SelectAssetModal } from "App/Transfer/SelectAssetModal";
 import { assetMockList } from "../__mocks__/assets";
@@ -14,7 +13,7 @@ describe("SelectAssetModal", () => {
       <SelectAssetModal
         onClose={onCloseMock}
         onSelect={onSelectMock}
-        assets={assetMockList as Asset[]}
+        assets={assetMockList}
         wallet={walletMock}
         walletAddress={mockAddress}
       />
@@ -27,7 +26,7 @@ describe("SelectAssetModal", () => {
       <SelectAssetModal
         onClose={onCloseMock}
         onSelect={onSelectMock}
-        assets={assetMockList as Asset[]}
+        assets={assetMockList}
         wallet={walletMock}
         walletAddress={mockAddress}
       />
@@ -41,7 +40,7 @@ describe("SelectAssetModal", () => {
       <SelectAssetModal
         onClose={onCloseMock}
         onSelect={onSelectMock}
-        assets={assetMockList as Asset[]}
+        assets={assetMockList}
         wallet={walletMock}
         walletAddress={mockAddress}
       />
@@ -62,13 +61,13 @@ describe("SelectAssetModal", () => {
       <SelectAssetModal
         onClose={onCloseMock}
         onSelect={onSelectMock}
-        assets={assetMockList as Asset[]}
+        assets={assetMockList}
         wallet={walletMock}
         walletAddress={mockAddress}
       />
     );
     fireEvent.click(screen.getByText("Bitcoin"));
-    expect(onSelectMock).toHaveBeenCalledWith(assetMockList[1]);
+    expect(onSelectMock).toHaveBeenCalledWith(assetMockList[1].originalAddress);
     expect(onCloseMock).toHaveBeenCalled();
   });
 });
diff --git a/apps/namadillo/src/App/Transfer/__tests__/TransferDestination.test.tsx b/apps/namadillo/src/App/Transfer/__tests__/TransferDestination.test.tsx
index 645fac8f9..a366f1ce5 100644
--- a/apps/namadillo/src/App/Transfer/__tests__/TransferDestination.test.tsx
+++ b/apps/namadillo/src/App/Transfer/__tests__/TransferDestination.test.tsx
@@ -100,7 +100,11 @@ describe("TransferDestination", () => {
     const fee = BigNumber(0.000001);
     render(
       <TransferDestination
-        transactionFee={{ amount: fee, token: namadaAsset }}
+        transactionFee={{
+          amount: fee,
+          asset: namadaAsset,
+          originalAddress: namadaAsset.address,
+        }}
       />
     );
     const transactionFee = screen.getByText("Transaction Fee");
diff --git a/apps/namadillo/src/atoms/balance/atoms.ts b/apps/namadillo/src/atoms/balance/atoms.ts
index db3366b8c..852e5e863 100644
--- a/apps/namadillo/src/atoms/balance/atoms.ts
+++ b/apps/namadillo/src/atoms/balance/atoms.ts
@@ -15,7 +15,7 @@ import { queryDependentFn } from "atoms/utils";
 import BigNumber from "bignumber.js";
 import { atomWithQuery } from "jotai-tanstack-query";
 import { namadaAsset } from "registry/namadaAsset";
-import { AddressWithAssetAndBalance } from "types";
+import { AddressWithAsset } from "types";
 import {
   findAssetByToken,
   mapNamadaAddressesToAssets,
@@ -23,7 +23,8 @@ import {
 } from "./functions";
 import { fetchCoinPrices, fetchShieldedBalance } from "./services";
 
-export type TokenBalance = AddressWithAssetAndBalance & {
+export type TokenBalance = AddressWithAsset & {
+  balance: BigNumber;
   dollar?: BigNumber;
 };
 
diff --git a/apps/namadillo/src/atoms/balance/functions.ts b/apps/namadillo/src/atoms/balance/functions.ts
index 9b4e27626..d15506eb1 100644
--- a/apps/namadillo/src/atoms/balance/functions.ts
+++ b/apps/namadillo/src/atoms/balance/functions.ts
@@ -4,7 +4,7 @@ import { mapCoinsToAssets } from "atoms/integrations";
 import BigNumber from "bignumber.js";
 import { DenomTrace } from "cosmjs-types/ibc/applications/transfer/v1/transfer";
 import { namadaAsset } from "registry/namadaAsset";
-import { AddressWithAssetAndBalanceMap } from "types";
+import { AddressWithAssetAndAmountMap } from "types";
 import { TokenBalance } from "./atoms";
 
 // TODO upgrade this function to be as smart as possible
@@ -88,29 +88,31 @@ const tnamAddressToDenomTrace = (
 export const mapNamadaAddressesToAssets = async (
   balances: { address: string; amount: BigNumber }[],
   tokenAddresses: (NativeToken | IbcToken)[],
-  chainName: string
-): Promise<AddressWithAssetAndBalanceMap> => {
+  chainId: string
+): Promise<AddressWithAssetAndAmountMap> => {
   const coins = balances.map(({ address, amount }) => ({
     denom: address,
     amount: amount.toString(), // TODO: don't convert back to string
   }));
 
-  return await mapCoinsToAssets(coins, chainName, (tnamAddress) =>
+  return await mapCoinsToAssets(coins, chainId, (tnamAddress) =>
     Promise.resolve(tnamAddressToDenomTrace(tnamAddress, tokenAddresses))
   );
 };
 
 export const mapNamadaAssetsToTokenBalances = (
-  assets: AddressWithAssetAndBalanceMap,
+  assets: AddressWithAssetAndAmountMap,
   tokenPrices: Record<string, BigNumber>
 ): TokenBalance[] => {
   return Object.values(assets).map((assetEntry) => {
-    const tokenPrice = tokenPrices[assetEntry.address];
-    const dollar =
-      tokenPrice ? assetEntry.balance.multipliedBy(tokenPrice) : undefined;
+    const { originalAddress, asset, amount } = assetEntry;
+    const tokenPrice = tokenPrices[originalAddress];
+    const dollar = tokenPrice ? amount.multipliedBy(tokenPrice) : undefined;
 
     return {
-      ...assetEntry,
+      originalAddress,
+      asset,
+      balance: amount,
       dollar,
     };
   });
diff --git a/apps/namadillo/src/atoms/integrations/atoms.ts b/apps/namadillo/src/atoms/integrations/atoms.ts
index c9fbad7e3..ff06ace82 100644
--- a/apps/namadillo/src/atoms/integrations/atoms.ts
+++ b/apps/namadillo/src/atoms/integrations/atoms.ts
@@ -66,7 +66,7 @@ export const assetBalanceAtomFamily = atomFamily(
           const assetsBalances = await queryAssetBalances(walletAddress!, rpc);
           return await mapCoinsToAssets(
             assetsBalances,
-            chain!.chain_name,
+            chain!.chain_id,
             ibcAddressToDenomTrace(rpc)
           );
         });
diff --git a/apps/namadillo/src/atoms/integrations/functions.ts b/apps/namadillo/src/atoms/integrations/functions.ts
index 352f443ba..96464a825 100644
--- a/apps/namadillo/src/atoms/integrations/functions.ts
+++ b/apps/namadillo/src/atoms/integrations/functions.ts
@@ -16,50 +16,34 @@ import * as elysTestnet from "chain-registry/testnet/elystestnet";
 import * as osmosisTestnet from "chain-registry/testnet/osmosistestnet";
 import * as stargazeTestnet from "chain-registry/testnet/stargazetestnet";
 import { DenomTrace } from "cosmjs-types/ibc/applications/transfer/v1/transfer";
-import { namadaAsset } from "registry/namadaAsset";
 import {
-  AddressWithAssetAndBalance,
-  AddressWithAssetAndBalanceMap,
+  AddressWithAssetAndAmount,
+  AddressWithAssetAndAmountMap,
   ChainRegistryEntry,
 } from "types";
 import { toDisplayAmount } from "utils";
 
+import housefireAssets from "namada-chain-registry/namadahousefire/assetlist.json";
+import housefireChain from "namada-chain-registry/namadahousefire/chain.json";
+import internalDevnetAssets from "namada-chain-registry/namadainternaldevnet/assetlist.json";
+import internalDevnetChain from "namada-chain-registry/namadainternaldevnet/chain.json";
+
+import housefireCosmosTestnetIbc from "namada-chain-registry/_IBC/namadahousefire-cosmoshubtestnet.json";
+import housefireOsmosisTestnetIbc from "namada-chain-registry/_IBC/namadahousefire-osmosistestnet.json";
+import internalDevnetCosmosTestnetIbc from "namada-chain-registry/_IBC/namadainternaldevnet-cosmoshubtestnet.json";
+
 // TODO: this causes a big increase on bundle size. See #1224.
 import cosmosRegistry from "chain-registry";
 
-// TODO: remove once integrated with namada-chain-registry
-cosmosRegistry.ibc.push({
-  chain_1: {
-    chain_name: "cosmoshubtestnet",
-    client_id: "07-tendermint-3792",
-    connection_id: "connection-3832",
-  },
-  chain_2: {
-    chain_name: "internal-devnet-44a.1bd3e6ca62",
-    client_id: "07-tendermint-0",
-    connection_id: "connection-0",
-  },
-  channels: [
-    {
-      chain_1: {
-        channel_id: "channel-4353",
-        port_id: "transfer",
-      },
-      chain_2: {
-        channel_id: "channel-0",
-        port_id: "transfer",
-      },
-      ordering: "unordered",
-      version: "ics20-1",
-    },
-  ],
-});
+cosmosRegistry.chains.push(internalDevnetChain, housefireChain);
 
-// TODO: remove once integrated with namada-chain-registry
-cosmosRegistry.assets.push({
-  chain_name: "internal-devnet-44a.1bd3e6ca62",
-  assets: [namadaAsset],
-});
+cosmosRegistry.assets.push(internalDevnetAssets, housefireAssets);
+
+cosmosRegistry.ibc.push(
+  internalDevnetCosmosTestnetIbc,
+  housefireCosmosTestnetIbc,
+  housefireOsmosisTestnetIbc
+);
 
 const mainnetChains: ChainRegistryEntry[] = [
   celestia,
@@ -111,11 +95,18 @@ export const ibcAddressToDenomTrace =
 const assetLookup = (chainName: string): Asset[] | undefined =>
   cosmosRegistry.assets.find((chain) => chain.chain_name === chainName)?.assets;
 
-const tryCoinToRegistryAsset = (
-  coin: Coin,
+const tryDenomToRegistryAsset = (
+  denom: string,
   registryAssets: Asset[]
 ): Asset | undefined =>
-  registryAssets.find((asset) => asset.base === coin.denom);
+  registryAssets.find((asset) => {
+    const { base, address } = asset;
+    const aliases =
+      asset.denom_units.find((denomUnit) => denomUnit.denom === base)
+        ?.aliases || [];
+
+    return [base, address, ...aliases].includes(denom);
+  });
 
 // For a given chain name with a given IBC channel, look up the counterpart
 // chain name that the channel corresponds to.
@@ -156,13 +147,11 @@ const findCounterpartChainName = (
   }, undefined);
 };
 
-const tryCoinToIbcAsset = async (
-  coin: Coin,
+const tryDenomToIbcAsset = async (
+  denom: string,
   ibcAddressToDenomTrace: (address: string) => Promise<DenomTrace | undefined>,
   chainName: string
 ): Promise<Asset | undefined> => {
-  const { denom } = coin;
-
   const denomTrace = await ibcAddressToDenomTrace(denom);
   if (typeof denomTrace === "undefined") {
     return undefined;
@@ -199,9 +188,9 @@ const tryCoinToIbcAsset = async (
 
   const originalChainAssets = mapUndefined(assetLookup, originalChainName);
 
-  const originalChainRegistryAsset = originalChainAssets?.find(
-    (asset) => asset.base === baseDenom
-  );
+  const originalChainRegistryAsset =
+    originalChainAssets &&
+    tryDenomToRegistryAsset(baseDenom, originalChainAssets);
 
   return originalChainRegistryAsset || unknownAsset(path + "/" + baseDenom);
 };
@@ -221,21 +210,29 @@ const unknownAsset = (denom: string): Asset => ({
 
 export const mapCoinsToAssets = async (
   coins: Coin[],
-  chainName: string,
+  chainId: string,
   ibcAddressToDenomTrace: (address: string) => Promise<DenomTrace | undefined>
-): Promise<AddressWithAssetAndBalanceMap> => {
-  const assets = assetLookup(chainName);
+): Promise<AddressWithAssetAndAmountMap> => {
+  const chainName = cosmosRegistry.chains.find(
+    (chain) => chain.chain_id === chainId
+  )?.chain_name;
+  const assets = mapUndefined(assetLookup, chainName);
 
   const results = await Promise.allSettled(
-    coins.map(async (coin: Coin): Promise<AddressWithAssetAndBalance> => {
+    coins.map(async (coin: Coin): Promise<AddressWithAssetAndAmount> => {
+      const { amount, denom } = coin;
+
       const asset =
-        typeof assets === "undefined" ?
-          unknownAsset(coin.denom)
-        : tryCoinToRegistryAsset(coin, assets) ||
-          (await tryCoinToIbcAsset(coin, ibcAddressToDenomTrace, chainName)) ||
-          unknownAsset(coin.denom);
+        typeof chainName === "undefined" || typeof assets === "undefined" ?
+          unknownAsset(denom)
+        : tryDenomToRegistryAsset(denom, assets) ||
+          (await tryDenomToIbcAsset(
+            denom,
+            ibcAddressToDenomTrace,
+            chainName
+          )) ||
+          unknownAsset(denom);
 
-      const { amount, denom } = coin;
       const baseBalance = BigNumber(amount);
       if (baseBalance.isNaN()) {
         throw new Error(`Balance is invalid, got ${amount}`);
@@ -244,23 +241,20 @@ export const mapCoinsToAssets = async (
       const displayBalance = toDisplayAmount(asset, baseBalance);
 
       return {
-        address: denom,
-        balance: displayBalance,
+        originalAddress: denom,
+        amount: displayBalance,
         asset,
       };
     })
   );
 
-  const successfulResults = results.reduce<AddressWithAssetAndBalance[]>(
+  const successfulResults = results.reduce<AddressWithAssetAndAmount[]>(
     (acc, curr) => (curr.status === "fulfilled" ? [...acc, curr.value] : acc),
     []
   );
 
-  // TODO: keying by asset base isn't going to work when there are multiple
-  // assets with the same base from different chains. Fix this.
-  // We can actually fix this now by keying by address.
   return Object.fromEntries(
-    successfulResults.map((asset) => [asset.asset.base, asset])
+    successfulResults.map((asset) => [asset.originalAddress, asset])
   );
 };
 
diff --git a/apps/namadillo/src/atoms/integrations/services.ts b/apps/namadillo/src/atoms/integrations/services.ts
index a7c1542c1..ea52f9eb1 100644
--- a/apps/namadillo/src/atoms/integrations/services.ts
+++ b/apps/namadillo/src/atoms/integrations/services.ts
@@ -1,4 +1,4 @@
-import { Asset, Chain } from "@chain-registry/types";
+import { Chain } from "@chain-registry/types";
 import { Coin, OfflineSigner } from "@cosmjs/launchpad";
 import { coin, coins } from "@cosmjs/proto-signing";
 import {
@@ -9,6 +9,7 @@ import {
 import { TransactionFee } from "App/Transfer/TransferModule";
 import BigNumber from "bignumber.js";
 import { getDefaultStore } from "jotai";
+import { AddressWithAsset } from "types";
 import { toBaseAmount } from "utils";
 import { getSdkInstance } from "utils/sdk";
 import { workingRpcsAtom } from "./atoms";
@@ -19,7 +20,7 @@ type CommonParams = {
   sourceAddress: string;
   destinationAddress: string;
   amount: BigNumber;
-  asset: Asset;
+  asset: AddressWithAsset;
   sourceChannelId: string;
   transactionFee: TransactionFee;
 };
@@ -83,18 +84,18 @@ export const submitIbcTransfer =
     });
 
     // cosmjs expects amounts to be represented in the base denom, so convert
-    const baseAmount = toBaseAmount(asset, displayAmount);
-    const baseFee = toBaseAmount(transactionFee.token, transactionFee.amount);
+    const baseAmount = toBaseAmount(asset.asset, displayAmount);
+    const baseFee = toBaseAmount(transactionFee.asset, transactionFee.amount);
 
     const fee = {
-      amount: coins(baseFee.toString(), transactionFee.token.base),
+      amount: coins(baseFee.toString(), transactionFee.originalAddress),
       gas: "222000", // TODO: what should this be?
     };
 
     const timeoutTimestampNanoseconds =
       BigInt(Math.floor(Date.now() / 1000) + 60) * BigInt(1_000_000_000);
 
-    const token = asset.base;
+    const token = asset.originalAddress;
 
     const { receiver, memo }: { receiver: string; memo?: string } =
       isShielded ?
diff --git a/apps/namadillo/src/hooks/useAssetAmount.tsx b/apps/namadillo/src/hooks/useAssetAmount.tsx
index 23da89475..5528deed7 100644
--- a/apps/namadillo/src/hooks/useAssetAmount.tsx
+++ b/apps/namadillo/src/hooks/useAssetAmount.tsx
@@ -3,7 +3,7 @@ import { assetBalanceAtomFamily } from "atoms/integrations";
 import BigNumber from "bignumber.js";
 import { useAtomValue } from "jotai";
 import { useMemo } from "react";
-import { AddressWithAssetAndBalance, ChainRegistryEntry } from "types";
+import { AddressWithAssetAndAmount, ChainRegistryEntry } from "types";
 
 type useAmountTransferProps = {
   registry?: ChainRegistryEntry;
@@ -15,7 +15,7 @@ type UseAmountTransferOutput = {
   isLoading: boolean;
   balance: BigNumber | undefined;
   availableAssets?: Asset[];
-  assetsBalances?: Record<string, AddressWithAssetAndBalance>;
+  assetsBalances?: Record<string, AddressWithAssetAndAmount>;
 };
 
 export const useAssetAmount = ({
@@ -35,7 +35,7 @@ export const useAssetAmount = ({
     if (!asset || !assetsBalances) {
       return undefined;
     }
-    return assetsBalances[asset.base].balance;
+    return assetsBalances[asset.base].amount;
   }, [asset, assetsBalances]);
 
   const availableAssets = useMemo<Asset[] | undefined>(() => {
diff --git a/apps/namadillo/src/integrations/utils.ts b/apps/namadillo/src/integrations/utils.ts
index dd6b46188..cf0a5e623 100644
--- a/apps/namadillo/src/integrations/utils.ts
+++ b/apps/namadillo/src/integrations/utils.ts
@@ -44,7 +44,8 @@ export const getTransactionFee = (
     if (typeof asset !== "undefined") {
       return {
         amount: BigNumber(0.003), // TODO: remove hardcoding
-        token: asset,
+        asset,
+        originalAddress: asset.base,
       };
     }
   }
diff --git a/apps/namadillo/src/registry/namadaAsset.ts b/apps/namadillo/src/registry/namadaAsset.ts
index ef44ee5f3..231bb55a6 100644
--- a/apps/namadillo/src/registry/namadaAsset.ts
+++ b/apps/namadillo/src/registry/namadaAsset.ts
@@ -1,16 +1,16 @@
 import { Asset } from "@chain-registry/types";
 import namadaShieldedSvg from "./assets/namada-shielded.svg";
 
-export const namadaAsset: Asset = {
+export const namadaAsset = {
   name: "Namada",
-  base: "tnam1qy440ynh9fwrx8aewjvvmu38zxqgukgc259fzp6h",
+  base: "unam",
+  address: "tnam1qy440ynh9fwrx8aewjvvmu38zxqgukgc259fzp6h",
   display: "nam",
   symbol: "NAM",
   denom_units: [
     {
-      denom: "tnam1qy440ynh9fwrx8aewjvvmu38zxqgukgc259fzp6h",
+      denom: "unam",
       exponent: 0,
-      aliases: ["unam"],
     },
     {
       denom: "nam",
@@ -18,4 +18,4 @@ export const namadaAsset: Asset = {
     },
   ],
   logo_URIs: { svg: namadaShieldedSvg },
-};
+} satisfies Asset;
diff --git a/apps/namadillo/src/types.d.ts b/apps/namadillo/src/types.d.ts
index e154223f7..f35b343c0 100644
--- a/apps/namadillo/src/types.d.ts
+++ b/apps/namadillo/src/types.d.ts
@@ -189,13 +189,16 @@ export type ChainRegistryEntry = {
   ibc: IBCInfo[];
 };
 
-export type AddressWithAssetAndBalance = {
-  address: string;
+export type AddressWithAsset = {
+  originalAddress: Address;
   asset: Asset;
-  balance: BigNumber;
 };
 
-export type AddressWithAssetAndBalanceMap = Record<
-  string,
-  AddressWithAssetAndBalance
+export type AddressWithAssetAndAmount = AddressWithAsset & {
+  amount: BigNumber;
+};
+
+export type AddressWithAssetAndAmountMap = Record<
+  Address,
+  AddressWithAssetAndAmount
 >;
diff --git a/yarn.lock b/yarn.lock
index c3e5342b9..8d86e7694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3678,6 +3678,7 @@ __metadata:
     jotai-tanstack-query: "npm:^0.8.5"
     local-cors-proxy: "npm:^1.1.0"
     lodash.debounce: "npm:^4.0.8"
+    namada-chain-registry: "https://github.com/anoma/namada-chain-registry"
     postcss: "npm:^8.4.32"
     react: "npm:^18.3.1"
     react-dom: "npm:^18.3.1"
@@ -15815,6 +15816,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"namada-chain-registry@https://github.com/anoma/namada-chain-registry":
+  version: 0.0.1
+  resolution: "namada-chain-registry@https://github.com/anoma/namada-chain-registry.git#commit=ca1d841d75f105fe91a907c678a4fe3077d0f1e8"
+  checksum: f9223374efee6af23f9485a82074d2fa34f4a38f5592bd947ee3be845bdfe648d692980805a03f15ada6b077585f6ef0e05baf0542e2ec6fc33dd4d683064f78
+  languageName: node
+  linkType: hard
+
 "namada@workspace:.":
   version: 0.0.0-use.local
   resolution: "namada@workspace:."