diff --git a/src/components/AssetBadge.tsx b/src/components/AssetBadge.tsx
index 17d42fc3e..57b584405 100644
--- a/src/components/AssetBadge.tsx
+++ b/src/components/AssetBadge.tsx
@@ -50,7 +50,9 @@ const AssetBadge = ({ assetId, amount, simple, className }: AssetBadgeProps) =>
         assetName={assetInfo?.name}
         isNft={!!nftInfo}
       />
-      {amount !== undefined ? (
+      {nftInfo?.name ? (
+        <AssetSymbol>{nftInfo?.name}</AssetSymbol>
+      ) : amount !== undefined ? (
         <Amount value={amount} suffix={assetInfo?.symbol} />
       ) : (
         !simple && assetInfo?.symbol && <AssetSymbol>{assetInfo.symbol}</AssetSymbol>
diff --git a/src/components/Inputs/SelectOptionAddress.tsx b/src/components/Inputs/SelectOptionAddress.tsx
index 2213f1892..bfbe4df40 100644
--- a/src/components/Inputs/SelectOptionAddress.tsx
+++ b/src/components/Inputs/SelectOptionAddress.tsx
@@ -22,6 +22,7 @@ import styled from 'styled-components'
 
 import AddressBadge from '@/components/AddressBadge'
 import AssetBadge from '@/components/AssetBadge'
+import Badge from '@/components/Badge'
 import SelectOptionItemContent from '@/components/Inputs/SelectOptionItemContent'
 import { useAppSelector } from '@/hooks/redux'
 import { makeSelectAddressesTokens } from '@/storage/addresses/addressesSelectors'
@@ -38,6 +39,9 @@ const SelectOptionAddress = ({ address, isSelected, className }: SelectOptionAdd
   const selectAddressesTokens = useMemo(makeSelectAddressesTokens, [])
   const assets = useAppSelector((s) => selectAddressesTokens(s, address.hash))
 
+  const knownAssetsWithBalance = assets.filter((a) => a.balance > 0 && a.name)
+  const unknownAssetsNb = assets.filter((a) => a.balance > 0 && !a.name).length
+
   return (
     <SelectOptionItemContent
       className={className}
@@ -53,9 +57,10 @@ const SelectOptionAddress = ({ address, isSelected, className }: SelectOptionAdd
       }
       SecondaryContent={
         <AssetList>
-          {assets.map((a) => (
+          {knownAssetsWithBalance.map((a) => (
             <AssetBadge key={a.id} assetId={a.id} amount={a.balance} withBackground />
           ))}
+          {unknownAssetsNb > 0 && <Badge compact>+ {unknownAssetsNb}</Badge>}
         </AssetList>
       }
     />
@@ -85,4 +90,5 @@ const AssetList = styled.div`
   display: flex;
   gap: var(--spacing-2);
   flex-wrap: wrap;
+  align-items: center;
 `
diff --git a/src/modals/SendModals/AddressInputs.tsx b/src/modals/SendModals/AddressInputs.tsx
index 1eb347e3b..f3d293e72 100644
--- a/src/modals/SendModals/AddressInputs.tsx
+++ b/src/modals/SendModals/AddressInputs.tsx
@@ -54,8 +54,6 @@ interface AddressInputsProps {
   className?: string
 }
 
-type InputFieldMode = 'view' | 'edit'
-
 const AddressInputs = ({
   defaultFromAddress,
   fromAddresses,