diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
index ddc8869f0..db9870412 100644
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@@ -140,6 +140,7 @@ jobs:
           echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const payfuraApiKey = '${{ secrets.PAYFURA_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
+          echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
           echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
diff --git a/cw_evm/lib/evm_chain_client.dart b/cw_evm/lib/evm_chain_client.dart
index cf73b13db..eebbe4f4f 100644
--- a/cw_evm/lib/evm_chain_client.dart
+++ b/cw_evm/lib/evm_chain_client.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:developer';
 
 import 'package:cw_core/node.dart';
@@ -9,6 +10,7 @@ import 'package:cw_evm/evm_erc20_balance.dart';
 import 'package:cw_evm/evm_chain_transaction_model.dart';
 import 'package:cw_evm/pending_evm_chain_transaction.dart';
 import 'package:cw_evm/evm_chain_transaction_priority.dart';
+import 'package:cw_evm/.secrets.g.dart' as secrets;
 import 'package:flutter/services.dart';
 
 import 'package:http/http.dart';
@@ -211,26 +213,61 @@ abstract class EVMChainClient {
     return EVMChainERC20Balance(balance, exponent: exponent);
   }
 
-  Future<Erc20Token?> getErc20Token(String contractAddress) async {
+  Future<Erc20Token?> getErc20Token(String contractAddress, String chainName) async {
     try {
-      final erc20 = ERC20(address: EthereumAddress.fromHex(contractAddress), client: _client!);
-      final name = await erc20.name();
-      final symbol = await erc20.symbol();
-      final decimal = await erc20.decimals();
+      final uri = Uri.https(
+        'deep-index.moralis.io',
+        '/api/v2.2/erc20/metadata',
+        {
+          "chain": chainName,
+          "addresses": contractAddress,
+        },
+      );
+
+      final response = await httpClient.get(
+        uri,
+        headers: {
+          "Accept": "application/json",
+          "X-API-Key": secrets.moralisApiKey,
+        },
+      );
+
+      final decodedResponse = jsonDecode(response.body)[0] as Map<String, dynamic>;
+
+      final name = decodedResponse['name'] ?? '';
+      final symbol = decodedResponse['symbol'] ?? '';
+      final decimal = decodedResponse['decimals'] ?? '0';
+      final iconPath = decodedResponse['logo'] ?? '';
 
       return Erc20Token(
         name: name,
         symbol: symbol,
         contractAddress: contractAddress,
-        decimal: decimal.toInt(),
+        decimal: int.tryParse(decimal) ?? 0,
+        iconPath: iconPath,
       );
     } catch (e) {
+      try {
+        final erc20 = ERC20(address: EthereumAddress.fromHex(contractAddress), client: _client!);
+        final name = await erc20.name();
+        final symbol = await erc20.symbol();
+        final decimal = await erc20.decimals();
+
+        return Erc20Token(
+          name: name,
+          symbol: symbol,
+          contractAddress: contractAddress,
+          decimal: decimal.toInt(),
+        );
+      } catch (_) {}
+
       return null;
     }
   }
 
   Uint8List hexToBytes(String hexString) {
-    return Uint8List.fromList(hex.HEX.decode(hexString.startsWith('0x') ? hexString.substring(2) : hexString));
+    return Uint8List.fromList(
+        hex.HEX.decode(hexString.startsWith('0x') ? hexString.substring(2) : hexString));
   }
 
   void stop() {
diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart
index c90a3e809..4193e590a 100644
--- a/cw_evm/lib/evm_chain_wallet.dart
+++ b/cw_evm/lib/evm_chain_wallet.dart
@@ -439,11 +439,16 @@ abstract class EVMChainWalletBase
 
   Future<void> addErc20Token(Erc20Token token) async {
     String? iconPath;
-    try {
-      iconPath = CryptoCurrency.all
-          .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
-          .iconPath;
-    } catch (_) {}
+
+    if (token.iconPath == null || token.iconPath!.isEmpty) {
+      try {
+        iconPath = CryptoCurrency.all
+            .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
+            .iconPath;
+      } catch (_) {}
+    } else {
+      iconPath = token.iconPath;
+    }
 
     final newToken = createNewErc20TokenObject(token, iconPath);
 
@@ -466,8 +471,8 @@ abstract class EVMChainWalletBase
     _updateBalance();
   }
 
-  Future<Erc20Token?> getErc20Token(String contractAddress) async =>
-      await _client.getErc20Token(contractAddress);
+  Future<Erc20Token?> getErc20Token(String contractAddress, String chainName) async =>
+      await _client.getErc20Token(contractAddress, chainName);
 
   void _onNewTransaction() {
     _updateBalance();
diff --git a/cw_solana/lib/solana_client.dart b/cw_solana/lib/solana_client.dart
index 781fff5f7..6ed8cab29 100644
--- a/cw_solana/lib/solana_client.dart
+++ b/cw_solana/lib/solana_client.dart
@@ -533,4 +533,21 @@ class SolanaWalletClient {
       throw Exception(e);
     }
   }
+
+  Future<String?> getIconImageFromTokenUri(String uri) async {
+    try {
+      final response = await httpClient.get(Uri.parse(uri));
+
+      final jsonResponse = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode >= 200 && response.statusCode < 300) {
+        return jsonResponse['image'];
+      } else {
+        return null;
+      }
+    } catch (e) {
+      print('Error occurred while fetching token image: \n${e.toString()}');
+      return null;
+    }
+  }
 }
diff --git a/cw_solana/lib/solana_wallet.dart b/cw_solana/lib/solana_wallet.dart
index f69a597ae..ad58c4293 100644
--- a/cw_solana/lib/solana_wallet.dart
+++ b/cw_solana/lib/solana_wallet.dart
@@ -464,11 +464,17 @@ abstract class SolanaWalletBase
         return null;
       }
 
+      String? iconPath;
+      try {
+        iconPath = await _client.getIconImageFromTokenUri(token.uri);
+      } catch (_) {}
+
       return SPLToken.fromMetadata(
         name: token.name,
         mint: token.mint,
         symbol: token.symbol,
         mintAddress: mintAddress,
+        iconPath: iconPath,
       );
     } catch (e) {
       return null;
diff --git a/cw_solana/lib/spl_token.dart b/cw_solana/lib/spl_token.dart
index 0413990b1..0b3b8b372 100644
--- a/cw_solana/lib/spl_token.dart
+++ b/cw_solana/lib/spl_token.dart
@@ -55,6 +55,7 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
     required String mint,
     required String symbol,
     required String mintAddress,
+    String? iconPath
   }) {
     return SPLToken(
       name: name,
@@ -62,7 +63,7 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
       mintAddress: mintAddress,
       decimal: 0,
       mint: mint,
-      iconPath: '',
+      iconPath: iconPath,
     );
   }
 
diff --git a/lib/ethereum/cw_ethereum.dart b/lib/ethereum/cw_ethereum.dart
index 52839d68a..13fe3aafd 100644
--- a/lib/ethereum/cw_ethereum.dart
+++ b/lib/ethereum/cw_ethereum.dart
@@ -131,7 +131,7 @@ class CWEthereum extends Ethereum {
   @override
   Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) async {
     final ethereumWallet = wallet as EthereumWallet;
-    return await ethereumWallet.getErc20Token(contractAddress);
+    return await ethereumWallet.getErc20Token(contractAddress, 'eth');
   }
 
   @override
diff --git a/lib/polygon/cw_polygon.dart b/lib/polygon/cw_polygon.dart
index 0ee7457eb..9f0f9a1bf 100644
--- a/lib/polygon/cw_polygon.dart
+++ b/lib/polygon/cw_polygon.dart
@@ -129,7 +129,7 @@ class CWPolygon extends Polygon {
   @override
   Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) async {
     final polygonWallet = wallet as PolygonWallet;
-    return await polygonWallet.getErc20Token(contractAddress);
+    return await polygonWallet.getErc20Token(contractAddress, 'polygon');
   }
 
   @override
diff --git a/lib/solana/cw_solana.dart b/lib/solana/cw_solana.dart
index d6df78318..6f4b17309 100644
--- a/lib/solana/cw_solana.dart
+++ b/lib/solana/cw_solana.dart
@@ -86,6 +86,7 @@ class CWSolana extends Solana {
       decimal: token.decimals,
       mint: token.name.toUpperCase(),
       enabled: token.enabled,
+      iconPath: token.iconPath,
     );
 
     await (wallet as SolanaWallet).addSPLToken(splToken);
diff --git a/lib/src/screens/dashboard/edit_token_page.dart b/lib/src/screens/dashboard/edit_token_page.dart
index 1a1db8658..59f7de9e5 100644
--- a/lib/src/screens/dashboard/edit_token_page.dart
+++ b/lib/src/screens/dashboard/edit_token_page.dart
@@ -59,6 +59,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
   final TextEditingController _tokenNameController = TextEditingController();
   final TextEditingController _tokenSymbolController = TextEditingController();
   final TextEditingController _tokenDecimalController = TextEditingController();
+  final TextEditingController _tokenIconPathController = TextEditingController();
 
   final FocusNode _contractAddressFocusNode = FocusNode();
   final FocusNode _tokenNameFocusNode = FocusNode();
@@ -83,6 +84,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
       _tokenNameController.text = widget.token!.name;
       _tokenSymbolController.text = widget.token!.title;
       _tokenDecimalController.text = widget.token!.decimals.toString();
+      _tokenIconPathController.text = widget.token?.iconPath ?? '';
     }
 
     if (widget.initialContractAddress != null) {
@@ -200,6 +202,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                             name: _tokenNameController.text,
                             title: _tokenSymbolController.text.toUpperCase(),
                             decimals: int.parse(_tokenDecimalController.text),
+                            iconPath: _tokenIconPathController.text,
                           ),
                           contractAddress: _contractAddressController.text,
                         );
@@ -228,6 +231,8 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
       if (token != null) {
         if (_tokenNameController.text.isEmpty) _tokenNameController.text = token.name;
         if (_tokenSymbolController.text.isEmpty) _tokenSymbolController.text = token.title;
+        if (_tokenIconPathController.text.isEmpty)
+          _tokenIconPathController.text = token.iconPath ?? '';
         if (_tokenDecimalController.text.isEmpty)
           _tokenDecimalController.text = token.decimals.toString();
       }
@@ -305,10 +310,15 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
               if (text?.isEmpty ?? true) {
                 return S.of(context).field_required;
               }
+
               if (int.tryParse(text!) == null) {
                 return S.of(context).invalid_input;
               }
 
+              if (int.tryParse(text) == 0) {
+                return S.current.decimals_cannot_be_zero;
+              }
+
               return null;
             },
           ),
diff --git a/lib/src/screens/dashboard/home_settings_page.dart b/lib/src/screens/dashboard/home_settings_page.dart
index e841423c1..aa6bb12c0 100644
--- a/lib/src/screens/dashboard/home_settings_page.dart
+++ b/lib/src/screens/dashboard/home_settings_page.dart
@@ -129,25 +129,29 @@ class HomeSettingsPage extends BasePage {
                               'token': token,
                             });
                           },
-                          leading: CakeImageWidget(
-                            imageUrl: token.iconPath,
-                            height: 40,
-                            width: 40,
-                            displayOnError: Container(
-                                  height: 30.0,
-                                  width: 30.0,
-                                  child: Center(
-                                    child: Text(
-                                      token.title.substring(0, min(token.title.length, 2)),
-                                      style: TextStyle(fontSize: 11),
-                                    ),
-                                  ),
-                                  decoration: BoxDecoration(
-                                    shape: BoxShape.circle,
-                                    color: Colors.grey.shade400,
+                          leading: Container(
+                            clipBehavior: Clip.hardEdge,
+                            decoration: BoxDecoration(shape: BoxShape.circle),
+                            child: CakeImageWidget(
+                              imageUrl: token.iconPath,
+                              height: 40,
+                              width: 40,
+                              displayOnError: Container(
+                                height: 30.0,
+                                width: 30.0,
+                                child: Center(
+                                  child: Text(
+                                    token.title.substring(0, min(token.title.length, 2)),
+                                    style: TextStyle(fontSize: 11),
                                   ),
+                                ),
+                                decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  color: Colors.grey.shade400,
+                                ),
+                              ),
                             ),
-                          ),        
+                          ),
                           decoration: BoxDecoration(
                             color: Theme.of(context).cardColor,
                             borderRadius: BorderRadius.circular(30),
diff --git a/lib/src/screens/dashboard/pages/balance_page.dart b/lib/src/screens/dashboard/pages/balance_page.dart
index bb3ec70dc..0b7596469 100644
--- a/lib/src/screens/dashboard/pages/balance_page.dart
+++ b/lib/src/screens/dashboard/pages/balance_page.dart
@@ -323,7 +323,7 @@ class BalanceRowWidget extends StatelessWidget {
                           style: TextStyle(
                               fontSize: 16,
                               fontFamily: 'Lato',
-                              fontWeight: FontWeight.w500,
+                             fontWeight: FontWeight.w500,
                               color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
                               height: 1)),
                     ],
@@ -334,24 +334,28 @@ class BalanceRowWidget extends StatelessWidget {
                   child: Center(
                     child: Column(
                       children: [
-                        CakeImageWidget(
-                          imageUrl: currency.iconPath,
-                          height: 40,
-                          width: 40,
-                          displayOnError: Container(
-                                height: 30.0,
-                                width: 30.0,
-                                child: Center(
-                                  child: Text(
-                                    currency.title.substring(0, min(currency.title.length, 2)),
-                                    style: TextStyle(fontSize: 11),
-                                  ),
-                                ),
-                                decoration: BoxDecoration(
-                                  shape: BoxShape.circle,
-                                  color: Colors.grey.shade400,
+                        Container(
+                          clipBehavior: Clip.antiAlias,
+                          decoration: BoxDecoration(shape: BoxShape.circle),
+                          child: CakeImageWidget(
+                            imageUrl: currency.iconPath,
+                            height: 40,
+                            width: 40,
+                            displayOnError: Container(
+                              height: 30.0,
+                              width: 30.0,
+                              child: Center(
+                                child: Text(
+                                  currency.title.substring(0, min(currency.title.length, 2)),
+                                  style: TextStyle(fontSize: 11),
                                 ),
                               ),
+                              decoration: BoxDecoration(
+                                shape: BoxShape.circle,
+                                color: Colors.grey.shade400,
+                              ),
+                            ),
+                          ),
                         ),
                         const SizedBox(height: 10),
                         Text(
@@ -410,9 +414,7 @@ class BalanceRowWidget extends StatelessWidget {
                         fontSize: 20,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w400,
-                        color: Theme.of(context)
-                            .extension<BalancePageTheme>()!
-                            .balanceAmountColor,
+                        color: Theme.of(context).extension<BalancePageTheme>()!.balanceAmountColor,
                         height: 1,
                       ),
                       maxLines: 1,
diff --git a/lib/src/widgets/cake_image_widget.dart b/lib/src/widgets/cake_image_widget.dart
index 14c62ad34..ad02c48dd 100644
--- a/lib/src/widgets/cake_image_widget.dart
+++ b/lib/src/widgets/cake_image_widget.dart
@@ -18,7 +18,7 @@ class CakeImageWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     try {
-      if (imageUrl == null) return _displayOnError!;
+      if (imageUrl == null || imageUrl!.isEmpty) return _displayOnError!;
 
       if (imageUrl!.contains('assets/images')) {
         return Image.asset(
diff --git a/lib/view_model/dashboard/home_settings_view_model.dart b/lib/view_model/dashboard/home_settings_view_model.dart
index 4b9811c37..e60a37ccf 100644
--- a/lib/view_model/dashboard/home_settings_view_model.dart
+++ b/lib/view_model/dashboard/home_settings_view_model.dart
@@ -54,6 +54,7 @@ abstract class HomeSettingsViewModelBase with Store {
         symbol: token.title,
         decimal: token.decimals,
         contractAddress: contractAddress,
+        iconPath: token.iconPath,
       );
 
       await ethereum!.addErc20Token(_balanceViewModel.wallet, erc20token);
@@ -65,6 +66,7 @@ abstract class HomeSettingsViewModelBase with Store {
         symbol: token.title,
         decimal: token.decimals,
         contractAddress: contractAddress,
+        iconPath: token.iconPath,
       );
       await polygon!.addErc20Token(_balanceViewModel.wallet, polygonToken);
     }
diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index 08815bf1d..d0f1a2043 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -175,6 +175,7 @@
   "debit_card": "بطاقة ائتمان",
   "debit_card_terms": "يخضع تخزين واستخدام رقم بطاقة الدفع الخاصة بك (وبيانات الاعتماد المقابلة لرقم بطاقة الدفع الخاصة بك) في هذه المحفظة الرقمية لشروط وأحكام اتفاقية حامل البطاقة المعمول بها مع جهة إصدار بطاقة الدفع ، كما هو معمول به من وقت لآخر.",
   "decimal_places_error": "عدد كبير جدًا من المنازل العشرية",
+  "decimals_cannot_be_zero": "الرمز العشري لا يمكن أن يكون الصفر.",
   "default_buy_provider": "مزود شراء الافتراضي",
   "default_sell_provider": "ﻲﺿﺍﺮﺘﻓﻻﺍ ﻊﻴﺒﻟﺍ ﺩﻭﺰﻣ",
   "delete": "حذف",
diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb
index 49e494394..249952d75 100644
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@@ -175,6 +175,7 @@
   "debit_card": "Дебитна карта",
   "debit_card_terms": "Съхранението и използването на данните от вашата платежна карта в този дигитален портфейл подлежат на условията на съответното съгласие за картодържец от издателя на картата.",
   "decimal_places_error": "Твърде много знаци след десетичната запетая",
+  "decimals_cannot_be_zero": "Десетичната точка не може да бъде нула.",
   "default_buy_provider": "Доставчик по подразбиране купува",
   "default_sell_provider": "Доставчик за продажба по подразбиране",
   "delete": "Изтрий",
diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb
index 348b6fa38..9b3b06ffd 100644
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debetní karta",
   "debit_card_terms": "Uložení a použití vašeho čísla platební karty (a přihlašovací údaje k vašemu číslu karty) v této digitální peněžence se řídí Obchodními podmínkami smlouvy příslušného držitele karty s vydavatelem karty (v jejich nejaktuálnější verzi).",
   "decimal_places_error": "Příliš mnoho desetinných míst",
+  "decimals_cannot_be_zero": "Desetinná desetinná škola nemůže být nulová.",
   "default_buy_provider": "Výchozí poskytovatel nákupu",
   "default_sell_provider": "Výchozí poskytovatel prodeje",
   "delete": "Smazat",
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 25ab3a54d..8a914628f 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debitkarte",
   "debit_card_terms": "Die Speicherung und Nutzung Ihrer Zahlungskartennummer (und Ihrer Zahlungskartennummer entsprechenden Anmeldeinformationen) in dieser digitalen Geldbörse unterliegt den Allgemeinen Geschäftsbedingungen des geltenden Karteninhabervertrags mit dem Zahlungskartenaussteller, gültig ab von Zeit zu Zeit.",
   "decimal_places_error": "Zu viele Nachkommastellen",
+  "decimals_cannot_be_zero": "Token -Dezimalzahl kann nicht Null sein.",
   "default_buy_provider": "Standard-Kaufanbieter",
   "default_sell_provider": "Standard-Verkaufsanbieter",
   "delete": "Löschen",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 45e8ef21b..3fe9474c5 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debit Card",
   "debit_card_terms": "The storage and usage of your payment card number (and credentials corresponding to your payment card number) in this digital wallet are subject to the Terms and Conditions of the applicable cardholder agreement with the payment card issuer, as in effect from time to time.",
   "decimal_places_error": "Too many decimal places",
+  "decimals_cannot_be_zero": "Token decimal cannot be zero.",
   "default_buy_provider": "Default Buy Provider",
   "default_sell_provider": "Default Sell Provider",
   "delete": "Delete",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index e04bc4cfe..47b11bc48 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -175,6 +175,7 @@
   "debit_card": "Tarjeta de Débito",
   "debit_card_terms": "El almacenamiento y el uso de su número de tarjeta de pago (y las credenciales correspondientes a su número de tarjeta de pago) en esta billetera digital están sujetos a los Términos y condiciones del acuerdo del titular de la tarjeta aplicable con el emisor de la tarjeta de pago, en vigor desde tiempo al tiempo.",
   "decimal_places_error": "Demasiados lugares decimales",
+  "decimals_cannot_be_zero": "Token Decimal no puede ser cero.",
   "default_buy_provider": "Proveedor de compra predeterminado",
   "default_sell_provider": "Proveedor de venta predeterminado",
   "delete": "Borrar",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 069f569ba..edae901a3 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -175,6 +175,7 @@
   "debit_card": "Carte de débit",
   "debit_card_terms": "Le stockage et l'utilisation de votre numéro de carte de paiement (et des informations d'identification correspondant à votre numéro de carte de paiement) dans ce portefeuille (wallet) numérique peuvent être soumis aux conditions générales de l'accord du titulaire de carte parfois en vigueur avec l'émetteur de la carte de paiement.",
   "decimal_places_error": "Trop de décimales",
+  "decimals_cannot_be_zero": "La décimale du jeton ne peut pas être nulle.",
   "default_buy_provider": "Fournisseur d'achat par défaut",
   "default_sell_provider": "Fournisseur de vente par défaut",
   "delete": "Effacer",
diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb
index 7dd1cd52e..c7174d23f 100644
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@@ -175,6 +175,7 @@
   "debit_card": "Katin Zare kudi",
   "debit_card_terms": "Adana da amfani da lambar katin kuɗin ku (da takaddun shaida masu dacewa da lambar katin kuɗin ku) a cikin wannan walat ɗin dijital suna ƙarƙashin Sharuɗɗa da Sharuɗɗa na yarjejeniya mai amfani da katin tare da mai fitar da katin biyan kuɗi, kamar yadda yake aiki daga lokaci zuwa lokaci.",
   "decimal_places_error": "Wadannan suna da tsawon harsuna",
+  "decimals_cannot_be_zero": "Alamar alama ba zata iya zama sifili ba.",
   "default_buy_provider": "Tsohuwar Siyarwa",
   "default_sell_provider": "Tsohuwar Mai Bayar Siyarwa",
   "delete": "Share",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 5dbe22f0e..4ee9bd4f8 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -175,6 +175,7 @@
   "debit_card": "डेबिट कार्ड",
   "debit_card_terms": "इस डिजिटल वॉलेट में आपके भुगतान कार्ड नंबर (और आपके भुगतान कार्ड नंबर से संबंधित क्रेडेंशियल) का भंडारण और उपयोग भुगतान कार्ड जारीकर्ता के साथ लागू कार्डधारक समझौते के नियमों और शर्तों के अधीन है, जैसा कि प्रभावी है समय - समय पर।",
   "decimal_places_error": "बहुत अधिक दशमलव स्थान",
+  "decimals_cannot_be_zero": "टोकन दशमलव शून्य नहीं हो सकता।",
   "default_buy_provider": "डिफ़ॉल्ट खरीद प्रदाता",
   "default_sell_provider": "डिफ़ॉल्ट विक्रय प्रदाता",
   "delete": "हटाएं",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 4aac8216e..a4de56dcf 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debitna kartica",
   "debit_card_terms": "Pohranjivanje i korištenje broja vaše platne kartice (i vjerodajnica koje odgovaraju broju vaše platne kartice) u ovom digitalnom novčaniku podliježu Uvjetima i odredbama važećeg ugovora vlasnika kartice s izdavateljem platne kartice, koji su na snazi ​​od S vremena na vrijeme.",
   "decimal_places_error": "Previše decimalnih mjesta",
+  "decimals_cannot_be_zero": "Token Decimal ne može biti nula.",
   "default_buy_provider": "Zadani davatelj kupnje",
   "default_sell_provider": "Zadani dobavljač prodaje",
   "delete": "Izbriši",
diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb
index 09d28e453..411daf9e0 100644
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@@ -175,6 +175,7 @@
   "debit_card": "Kartu Debit",
   "debit_card_terms": "Penyimpanan dan penggunaan nomor kartu pembayaran Anda (dan kredensial yang sesuai dengan nomor kartu pembayaran Anda) dalam dompet digital ini tertakluk pada Syarat dan Ketentuan persetujuan pemegang kartu yang berlaku dengan penerbit kartu pembayaran, seperti yang berlaku dari waktu ke waktu.",
   "decimal_places_error": "Terlalu banyak tempat desimal",
+  "decimals_cannot_be_zero": "Token desimal tidak bisa nol.",
   "default_buy_provider": "Penyedia beli default",
   "default_sell_provider": "Penyedia Penjualan Default",
   "delete": "Hapus",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index c9ac60bb5..7cf298cae 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -176,6 +176,7 @@
   "debit_card": "Carta di debito",
   "debit_card_terms": "L'archiviazione e l'utilizzo del numero della carta di pagamento (e delle credenziali corrispondenti al numero della carta di pagamento) in questo portafoglio digitale sono soggetti ai Termini e condizioni del contratto applicabile con il titolare della carta con l'emittente della carta di pagamento, come in vigore da tempo al tempo.",
   "decimal_places_error": "Troppe cifre decimali",
+  "decimals_cannot_be_zero": "Il decimale token non può essere zero.",
   "default_buy_provider": "Provider di acquisto predefinito",
   "default_sell_provider": "Fornitore di vendita predefinito",
   "delete": "Elimina",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 98d87a90c..42377fa85 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -175,6 +175,7 @@
   "debit_card": "デビットカード",
   "debit_card_terms": "このデジタルウォレットでの支払いカード番号（および支払いカード番号に対応する資格情報）の保存と使用には、支払いカード発行者との該当するカード所有者契約の利用規約が適用されます。時々。",
   "decimal_places_error": "小数点以下の桁数が多すぎる",
+  "decimals_cannot_be_zero": "トークン小数はゼロにすることはできません。",
   "default_buy_provider": "デフォルトの購入プロバイダー",
   "default_sell_provider": "デフォルトの販売プロバイダー",
   "delete": "削除する",
@@ -809,4 +810,4 @@
   "you_will_get": "に変換",
   "you_will_send": "から変換",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 7cc49e315..c67d531ce 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -175,6 +175,7 @@
   "debit_card": "직불 카드",
   "debit_card_terms": "이 디지털 지갑에 있는 귀하의 지불 카드 번호(및 귀하의 지불 카드 번호에 해당하는 자격 증명)의 저장 및 사용은 부터 발효되는 지불 카드 발행자와의 해당 카드 소지자 계약의 이용 약관을 따릅니다. 수시로.",
   "decimal_places_error": "소수점 이하 자릿수가 너무 많습니다.",
+  "decimals_cannot_be_zero": "토큰 소수점은 0이 될 수 없습니다.",
   "default_buy_provider": "기본 구매 제공자",
   "default_sell_provider": "기본 판매 공급자",
   "delete": "지우다",
@@ -810,4 +811,4 @@
   "you_will_send": "다음에서 변환",
   "YY": "YY",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index 9c88dc817..e373eefc0 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -175,6 +175,7 @@
   "debit_card": "ဒက်ဘစ်ကတ်",
   "debit_card_terms": "ဤဒစ်ဂျစ်တယ်ပိုက်ဆံအိတ်ရှိ သင့်ငွေပေးချေမှုကတ်နံပါတ် (နှင့် သင့်ငွေပေးချေကတ်နံပါတ်နှင့် သက်ဆိုင်သောအထောက်အထားများ) ၏ သိုလှောင်မှုနှင့် အသုံးပြုမှုသည် အချိန်အခါနှင့်အမျှ သက်ရောက်မှုရှိသကဲ့သို့ ကတ်ကိုင်ဆောင်ထားသူ၏ သဘောတူညီချက်၏ စည်းကမ်းသတ်မှတ်ချက်များနှင့် ကိုက်ညီပါသည်။",
   "decimal_places_error": "ဒဿမနေရာများ များလွန်းသည်။",
+  "decimals_cannot_be_zero": "တိုကင်ဒ decimal မသုညမဖြစ်နိုင်ပါ။",
   "default_buy_provider": "Default Provider ကိုဝယ်ပါ",
   "default_sell_provider": "ပုံသေရောင်းချပေးသူ",
   "delete": "ဖျက်ပါ။",
@@ -808,4 +809,4 @@
   "you_will_get": "သို့ပြောင်းပါ။",
   "you_will_send": "မှပြောင်းပါ။",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 74b111dcb..1fc85a28b 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debetkaart",
   "debit_card_terms": "De opslag en het gebruik van uw betaalkaartnummer (en inloggegevens die overeenkomen met uw betaalkaartnummer) in deze digitale portemonnee zijn onderworpen aan de Algemene voorwaarden van de toepasselijke kaarthouderovereenkomst met de uitgever van de betaalkaart, zoals van kracht vanaf tijd tot tijd.",
   "decimal_places_error": "Te veel decimalen",
+  "decimals_cannot_be_zero": "Token decimaal kan niet nul zijn.",
   "default_buy_provider": "Standaard Koopprovider",
   "default_sell_provider": "Standaard verkoopaanbieder",
   "delete": "Delete",
@@ -809,4 +810,4 @@
   "you_will_get": "Converteren naar",
   "you_will_send": "Converteren van",
   "yy": "JJ"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 2ac1b9fb5..f279dbaa7 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -175,6 +175,7 @@
   "debit_card": "Karta debetowa",
   "debit_card_terms": "Przechowywanie i używanie numeru karty płatniczej (oraz danych uwierzytelniających odpowiadających numerowi karty płatniczej) w tym portfelu cyfrowym podlega Warunkom odpowiedniej umowy posiadacza karty z wydawcą karty płatniczej, zgodnie z obowiązującym od od czasu do czasu.",
   "decimal_places_error": "Za dużo miejsc dziesiętnych",
+  "decimals_cannot_be_zero": "Token dziesiętny nie może być zerowy.",
   "default_buy_provider": "Domyślny dostawca zakupu",
   "default_sell_provider": "Domyślny dostawca sprzedaży",
   "delete": "Skasuj",
@@ -808,4 +809,4 @@
   "you_will_get": "Konwertuj na",
   "you_will_send": "Konwertuj z",
   "yy": "RR"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index bf0b0082d..ba3acae88 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -175,6 +175,7 @@
   "debit_card": "Cartão de débito",
   "debit_card_terms": "O armazenamento e uso do número do cartão de pagamento (e credenciais correspondentes ao número do cartão de pagamento) nesta carteira digital estão sujeitos aos Termos e Condições do contrato do titular do cartão aplicável com o emissor do cartão de pagamento, em vigor a partir de tempo ao tempo.",
   "decimal_places_error": "Muitas casas decimais",
+  "decimals_cannot_be_zero": "Decimal de token não pode ser zero.",
   "default_buy_provider": "Provedor de compra padrão",
   "default_sell_provider": "Provedor de venda padrão",
   "delete": "Excluir",
@@ -811,4 +812,4 @@
   "you_will_get": "Converter para",
   "you_will_send": "Converter de",
   "yy": "aa"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 999728faf..b24f940dd 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -175,6 +175,7 @@
   "debit_card": "Дебетовая карта",
   "debit_card_terms": "Хранение и использование номера вашей платежной карты (и учетных данных, соответствующих номеру вашей платежной карты) в этом цифровом кошельке регулируются положениями и условиями применимого соглашения держателя карты с эмитентом платежной карты, действующим с время от времени.",
   "decimal_places_error": "Слишком много десятичных знаков",
+  "decimals_cannot_be_zero": "Десятичный токен не может быть нулевым.",
   "default_buy_provider": "По умолчанию поставщик покупки",
   "default_sell_provider": "Поставщик продаж по умолчанию",
   "delete": "Удалить",
@@ -809,4 +810,4 @@
   "you_will_get": "Конвертировать в",
   "you_will_send": "Конвертировать из",
   "yy": "ГГ"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index a71bc6b36..0795faf2e 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -175,6 +175,7 @@
   "debit_card": "บัตรเดบิต",
   "debit_card_terms": "การเก็บรักษาและใช้หมายเลขบัตรจ่ายเงิน (และข้อมูลประจำตัวที่เกี่ยวข้องกับหมายเลขบัตรจ่ายเงิน) ในกระเป๋าดิจิทัลนี้ จะต้องยึดถือข้อกำหนดและเงื่อนไขของข้อตกลงผู้ใช้บัตรของผู้ถือบัตรที่เกี่ยวข้องกับบัตรผู้ถือบัตร ซึ่งจะมีผลตั้งแต่เวลานั้น",
   "decimal_places_error": "ทศนิยมมากเกินไป",
+  "decimals_cannot_be_zero": "ทศนิยมโทเค็นไม่สามารถเป็นศูนย์ได้",
   "default_buy_provider": "ผู้ให้บริการซื้อเริ่มต้น",
   "default_sell_provider": "ผู้ให้บริการการขายเริ่มต้น",
   "delete": "ลบ",
@@ -808,4 +809,4 @@
   "you_will_get": "แปลงเป็น",
   "you_will_send": "แปลงจาก",
   "yy": "ปี"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb
index 73cd8a1f7..91ca5a548 100644
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@@ -175,6 +175,7 @@
   "debit_card": "Debit card",
   "debit_card_terms": "Ang pag -iimbak at paggamit ng numero ng iyong card ng pagbabayad (at mga kredensyal na naaayon sa iyong numero ng card ng pagbabayad) sa digital na pitaka na ito ay napapailalim sa mga termino at kundisyon ng naaangkop na kasunduan sa cardholder kasama ang nagbigay ng card ng pagbabayad, tulad ng sa oras -oras.",
   "decimal_places_error": "Masyadong maraming mga lugar na desimal",
+  "decimals_cannot_be_zero": "Ang Token Decimal ay hindi maaaring maging zero.",
   "default_buy_provider": "Default na Provider ng Pagbili",
   "default_sell_provider": "Default na Sell Provider",
   "delete": "Tanggalin",
@@ -808,4 +809,4 @@
   "you_will_get": "Mag -convert sa",
   "you_will_send": "I -convert mula sa",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index de197c1b1..784ebfb7e 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -175,6 +175,7 @@
   "debit_card": "Ön ödemeli Kart",
   "debit_card_terms": "Ödeme kartı numaranızın (ve kart numaranıza karşılık gelen kimlik bilgilerinin) bu dijital cüzdanda saklanması ve kullanılması, zaman zaman yürürlükte olan ödeme kartı veren kuruluşla yapılan ilgili kart sahibi sözleşmesinin Hüküm ve Koşullarına tabidir.",
   "decimal_places_error": "Çok fazla ondalık basamak",
+  "decimals_cannot_be_zero": "Token oncial sıfır olamaz.",
   "default_buy_provider": "Varsayılan Satın Alma Sağlayıcısı",
   "default_sell_provider": "Varsayılan Satış Sağlayıcısı",
   "delete": "Sil",
@@ -808,4 +809,4 @@
   "you_will_get": "Biçimine dönüştür:",
   "you_will_send": "Biçiminden dönüştür:",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 86e60214b..65a1f5c96 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -175,6 +175,7 @@
   "debit_card": "Дебетова картка",
   "debit_card_terms": "Зберігання та використання номера вашої платіжної картки (та облікових даних, які відповідають номеру вашої платіжної картки) у цьому цифровому гаманці регулюються Умовами відповідної угоди власника картки з емітентом платіжної картки, що діє з час від часу.",
   "decimal_places_error": "Забагато знаків після коми",
+  "decimals_cannot_be_zero": "Десятковий знак не може бути нульовим.",
   "default_buy_provider": "Постачальник покупки за замовчуванням",
   "default_sell_provider": "Постачальник продажу за замовчуванням",
   "delete": "Видалити",
@@ -809,4 +810,4 @@
   "you_will_get": "Конвертувати в",
   "you_will_send": "Конвертувати з",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb
index 725a1d895..6c768daa8 100644
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@@ -175,6 +175,7 @@
   "debit_card": "ڈیبٹ کارڈ",
   "debit_card_terms": "اس ڈیجیٹل والیٹ میں آپ کے ادائیگی کارڈ نمبر (اور آپ کے ادائیگی کارڈ نمبر سے متعلقہ اسناد) کا ذخیرہ اور استعمال ادائیگی کارڈ جاری کنندہ کے ساتھ قابل اطلاق کارڈ ہولڈر کے معاہدے کی شرائط و ضوابط کے ساتھ مشروط ہے، جیسا کہ وقتاً فوقتاً نافذ ہوتا ہے۔",
   "decimal_places_error": "بہت زیادہ اعشاریہ جگہیں۔",
+  "decimals_cannot_be_zero": "ٹوکن اعشاریہ صفر نہیں ہوسکتا۔",
   "default_buy_provider": "پہلے سے طے شدہ خریدنے والا",
   "default_sell_provider": "                                                        ﮦﺪﻨﻨﮐ ﻢﮨﺍﺮﻓ ﻞﯿﺳ ﭧﻟﺎﻔﯾﮈ",
   "delete": "حذف کریں۔",
@@ -810,4 +811,4 @@
   "you_will_get": "میں تبدیل کریں۔",
   "you_will_send": "سے تبدیل کریں۔",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb
index 517757716..b5f2d69a3 100644
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@@ -175,6 +175,7 @@
   "debit_card": "Káàdì ìrajà",
   "debit_card_terms": "Òfin ti olùṣe àjọrò káàdì ìrajà bójú irú ọ̀nà t'á pamọ́ àti a lo òǹkà ti káàdì ìrajà yín (àti ọ̀rọ̀ ìdánimọ̀ tí káàdì náà) nínú àpamọ́wọ́ yìí.",
   "decimal_places_error": "Oọ̀rọ̀ ayipada ti o wa ni o dara julọ",
+  "decimals_cannot_be_zero": "Token eleemel ko le jẹ odo.",
   "default_buy_provider": "Aiyipada Ra Olupese",
   "default_sell_provider": "Aiyipada Olupese Tita",
   "delete": "Pa á",
@@ -809,4 +810,4 @@
   "you_will_get": "Ṣe pàṣípààrọ̀ sí",
   "you_will_send": "Ṣe pàṣípààrọ̀ láti",
   "yy": "Ọd"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 104848996..e9a6b63f2 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -175,6 +175,7 @@
   "debit_card": "借记卡",
   "debit_card_terms": "您的支付卡号（以及与您的支付卡号对应的凭证）在此数字钱包中的存储和使用受适用的持卡人与支付卡发卡机构签订的协议的条款和条件的约束，自时不时。",
   "decimal_places_error": "小数位太多",
+  "decimals_cannot_be_zero": "代币十进制不能为零。",
   "default_buy_provider": "默认购买提供商",
   "default_sell_provider": "默认销售提供商",
   "delete": "删除",
@@ -808,4 +809,4 @@
   "you_will_get": "转换到",
   "you_will_send": "转换自",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart
index 430de03b6..8fedbb12a 100644
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@@ -42,6 +42,7 @@ class SecretKey {
   static final evmChainsSecrets = [
     SecretKey('etherScanApiKey', () => ''),
     SecretKey('polygonScanApiKey', () => ''),
+    SecretKey('moralisApiKey', () => ''),
   ];
 
   static final solanaSecrets = [