diff --git a/src/components/elements/input/token/selector.svelte b/src/components/elements/input/token/selector.svelte
index 51dc359a..36ac1b5f 100644
--- a/src/components/elements/input/token/selector.svelte
+++ b/src/components/elements/input/token/selector.svelte
@@ -2,7 +2,7 @@
     import {writable} from 'svelte/store'
 
     import {activeBlockchain} from '~/store'
-    import type {Token, TokenOption} from '~/stores/tokens'
+    import type {Token} from '~/stores/tokens'
     import {tokens} from '~/stores/tokens'
     import {balances} from '~/stores/balances'
 
@@ -15,7 +15,7 @@
 
     export let defaultToken: Token | undefined = undefined
     export let selectedToken: Token | undefined = undefined
-    export let tokenOptions: TokenOption[] | undefined = undefined
+    export let tokenOptions: Token[] | undefined = undefined
     export let onTokenSelect: (token: Token) => void
     export let showTokensWithoutBalance: boolean = false
 
@@ -44,21 +44,7 @@
 
     $: {
         if (tokenOptions) {
-            filteredTokens = tokenOptions.map(tokenOption => {
-                const token = $tokens?.find(token =>
-                    String(tokenOption.tokenKey) === String(token.key) &&
-                    String(tokenOption.tokenContract) === String(token.contract)
-                )
-
-                if (!token) {
-                    throw new Error(`Token ${tokenOption.tokenName} not found.`)
-                }
-
-                return {
-                    ...token,
-                    name: tokenOption.label || token.name,
-                }
-            })
+            filteredTokens = tokenOptions
         } else {
             filteredTokens =
                 $tokens?.filter((token) => {
diff --git a/src/pages/transfer/form.svelte b/src/pages/transfer/form.svelte
index 1764d26a..eef9da39 100644
--- a/src/pages/transfer/form.svelte
+++ b/src/pages/transfer/form.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import {Asset as CoreAsset} from '@greymass/eosio'
     import {activeEvmSession, activeSession, activeBlockchain, currentAccountBalance} from '~/store'
-    import type {Token, TokenOption} from '~/stores/tokens'
+    import {tokens, type Token} from '~/stores/tokens'
 
     import Label from '~/components/elements/input/label.svelte'
     import Form from '~/components/elements/form.svelte'
@@ -24,12 +24,12 @@
 
     let validAmount = false
 
-    function handleFromChange(token: TokenOption) {
+    function handleFromChange(token: Token) {
         resetForm() // reset form when changing from token
         from = token
     }
 
-    function handleToChange(token: TokenOption) {
+    function handleToChange(token: Token) {
         to = token
     }
 
@@ -56,8 +56,8 @@
         }
     }
 
-    let fromOptions: TokenOption[] = []
-    let toOptions: TokenOption[] = []
+    let fromOptions: Token[] = []
+    let toOptions: Token[] = []
     let availableToReceive: CoreAsset | undefined
 
     let generatingOptions = false
@@ -86,11 +86,14 @@
                     accountBalance = await transferManager.balance()
                 }
 
-                fromOptions.push({
-                    tokenKey: transferManagerData.tokenKey,
-                    tokenContract: String(transferManagerData.tokenContract),
-                    label: transferManagerData.fromLabel,
-                })
+                const token = $tokens.find(token => token.key === transferManagerData.tokenKey)
+
+                if (!token) {
+                    console.error(`Token ${transferManagerData.tokenKey} not found`)
+                    return
+                }
+
+                fromOptions.push(token)
             })
         )
 
@@ -99,7 +102,7 @@
 
     $: {
         if (from) {
-            toOptions = fromOptions.filter((token) => token.tokenKey !== from?.name)
+            toOptions = fromOptions.filter((token) => token.name !== from?.name)
         } else {
             toOptions = fromOptions
         }
diff --git a/src/stores/balances-provider.ts b/src/stores/balances-provider.ts
index d38f8815..1aa91c8e 100644
--- a/src/stores/balances-provider.ts
+++ b/src/stores/balances-provider.ts
@@ -53,7 +53,7 @@ export async function updateBalances(session: LinkSession) {
                     const evmBalances = await evmSession.getBalances()
 
                     evmBalances.forEach((balance) => {
-                        const tokenKey = `evm-${balance.symbol.code}`
+                        const tokenKey = `EVM-${balance.symbol.code}`
                         balances.push({
                             key: tokenKey,
                             chainId: session.chainId,
diff --git a/src/stores/tokens.ts b/src/stores/tokens.ts
index 17bcd099..85a58358 100644
--- a/src/stores/tokens.ts
+++ b/src/stores/tokens.ts
@@ -20,12 +20,6 @@ export interface Token {
     balance?: Asset | string
 }
 
-export interface TokenOption {
-    tokenContract: NameType
-    tokenKey: string
-    label?: string
-}
-
 export interface TokenKeyParams {
     chainId: ChainId
     contract: NameType