diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
index dc12172a82..0ca68b4ea3 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
@@ -19,5 +19,6 @@ fun Blockchain.getIconRes(): Int {
         Blockchain.Tezos -> R.drawable.ic_tezos
         Blockchain.XRP -> R.drawable.ic_xrp
         Blockchain.Stellar -> R.drawable.ic_stellar
+        else -> R.drawable.shape_circle
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
index 17cac3c3e6..3fb9fb0d67 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/Blockchain.kt
@@ -35,6 +35,7 @@ fun Blockchain.getSupportedCurves(): List<EllipticCurve>? {
         Blockchain.Tezos -> listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519)
         Blockchain.Cardano, Blockchain.CardanoShelley, Blockchain.Stellar ->
             listOf(EllipticCurve.Ed25519)
+        else -> listOf(EllipticCurve.Secp256k1)
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
index 6c0328c7ce..62e9849d04 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
@@ -18,9 +18,6 @@ import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.item_currency_wallet.view.*
-import kotlinx.android.synthetic.main.item_currency_wallet.view.iv_currency
-import kotlinx.android.synthetic.main.item_currency_wallet.view.tv_currency_symbol
-import kotlinx.android.synthetic.main.item_currency_wallet.view.tv_token_letter
 import java.math.BigDecimal
 
 class WalletAdapter
@@ -57,7 +54,7 @@ class WalletAdapter
 
         val sorted = listModified.sortedWith(
                 compareByDescending<WalletData> { it.currencyData.fiatAmount ?: BigDecimal.ZERO }
-                        .thenBy { it.currencyData.currencySymbol }
+                    .thenBy { it.currencyData.currency }
         )
         val sortedList = listOfNotNull(primaryBlockchainWallet, primaryTokenWallet) + sorted
         super.submitList(sortedList)