diff --git a/cw_evm/lib/clients/evm_chain_client.dart b/cw_evm/lib/clients/evm_chain_client.dart
index 14301cb83..7795e3981 100644
--- a/cw_evm/lib/clients/evm_chain_client.dart
+++ b/cw_evm/lib/clients/evm_chain_client.dart
@@ -90,7 +90,6 @@ class EVMChainClient {
               if (totalNet < BigInt.zero) {
                 mergedMap[key]!['from'] = address;
               } else {
-
                 mergedMap[key]!['to'] = address;
                 mergedMap[key]!['from'] = '';
               }
@@ -118,7 +117,6 @@ class EVMChainClient {
     }
   }
 
-
   BigInt getNetFlow(Map<String, dynamic> txData, String address) {
     final val = BigInt.parse(txData['value'] ?? '0');
     final isIncoming = txData['to']?.toLowerCase() == address.toLowerCase();
@@ -129,7 +127,6 @@ class EVMChainClient {
     return BigInt.zero;
   }
 
-
   Future<List<EVMChainTransactionModel>> fetchInternalTransactions(String address) async {
     try {
       if (secrets.etherScanApiKey.isEmpty) {
@@ -544,16 +541,16 @@ class EVMChainClient {
 
   Future<Erc20Token?> getErc20Token(String contractAddress, String chainName) async {
     try {
-      final token = await getErcTokenInfoFromNode(contractAddress, chainName);
+      final token = await getErc20TokenFromMoralis(contractAddress, chainName);
 
       if (token == null || token.name.isEmpty || token.symbol.isEmpty) {
-        return await getErc20TokenFromMoralis(contractAddress, chainName);
+        return await getErcTokenInfoFromNode(contractAddress, chainName);
       }
 
       return token;
     } catch (e) {
       try {
-        return await getErc20TokenFromMoralis(contractAddress, chainName);
+        return await getErcTokenInfoFromNode(contractAddress, chainName);
       } catch (e) {
         return null;
       }
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index e784169e7..9b9e534a7 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -3,6 +3,7 @@
 import 'dart:math';
 
 import 'package:cake_wallet/entities/seed_type.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/search_bar_widget.dart';
 import 'package:cake_wallet/themes/core/theme_extension.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -497,8 +498,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
   Widget? _getItemIcon(Item item) {
     if (item is Currency) {
       if (item.iconPath != null) {
-        return Image.asset(
-          item.iconPath!,
+        return CakeImageWidget(
+          imageUrl: item.iconPath!,
           height: 20.0,
           width: 20.0,
         );