diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
index baafb9f01b..5f7134e31a 100644
--- a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
@@ -176,7 +176,7 @@ public class BtcCashEngine extends CoinEngine {
         return Uri.parse("bitcoincash:" + mCard.getWallet());
     }
 
-    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits) {
+    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits, Boolean incfee) {
         Long fee;
         Long amount;
         try {
@@ -193,10 +193,10 @@ public class BtcCashEngine extends CoinEngine {
         if (fee == 0 || amount == 0)
             return false;
 
-        if (fee > amount)
+        if (incfee && amount > card.getBalance())
             return false;
 
-        if (fee < minFeeInInternalUnits)
+        if (!incfee && amount + fee > card.getBalance())
             return false;
 
         return true;
diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
index ff7101b5b1..ded862f5ea 100644
--- a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
@@ -333,7 +333,7 @@ public class BtcEngine extends CoinEngine {
     }
 
 
-    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits) {
+    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits, Boolean incfee) {
         Long fee;
         Long amount;
         try {
@@ -350,10 +350,10 @@ public class BtcEngine extends CoinEngine {
         if (fee == 0 || amount == 0)
             return false;
 
-        if (fee > amount)
+        if (incfee && amount > card.getBalance())
             return false;
 
-        if (fee < minFeeInInternalUnits)
+        if (!incfee && amount + fee > card.getBalance())
             return false;
 
         return true;
diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
index 398a54472f..4579ed1017 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
@@ -49,7 +49,7 @@ public abstract class CoinEngine {
 
     public abstract String evaluateFeeEquivalent(TangemCard card, String fee);
 
-    public abstract boolean checkAmountValue(TangemCard card, String amount, String fee, Long minFeeInInternalUnits);
+    public abstract boolean checkAmountValue(TangemCard card, String amount, String fee, Long minFeeInInternalUnits, Boolean incfee);
 
     public abstract boolean inOutPutVisible();
 
diff --git a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
index 6e519b0b1d..7e1f246cd4 100644
--- a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
@@ -246,7 +246,7 @@ public class EthEngine extends CoinEngine {
     }
 
 
-    public boolean checkAmountValue(TangemCard mCard, String amountValue, String feeValue, Long minFeeInInternalUnits) {
+    public boolean checkAmountValue(TangemCard mCard, String amountValue, String feeValue, Long minFeeInInternalUnits, Boolean incfee) {
 //        Long fee = null;
 //        Long amount = null;
 //        try {
@@ -270,9 +270,18 @@ public class EthEngine extends CoinEngine {
         try {
             BigDecimal tmpFee = new BigDecimal(feeValue);
             BigDecimal tmpAmount = new BigDecimal(amountValue);
+            BigDecimal cardBalance = new BigDecimal(mCard.getDecimalBalance());
             tmpAmount = tmpAmount.multiply(new BigDecimal("1000000000"));
-            if (tmpFee.compareTo(tmpAmount) > 0)
+            cardBalance = cardBalance.divide(new BigDecimal("1000000000"));
+            //if (tmpFee.compareTo(tmpAmount) > 0)
+            //    return false;
+
+            if (incfee && tmpAmount.compareTo(cardBalance) > 0 )
                 return false;
+
+            if (!incfee && tmpAmount.add(tmpFee).compareTo(cardBalance) > 0)
+                return false;
+
         } catch (NumberFormatException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java
index 8e1a35f2e9..1a51ad389c 100644
--- a/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/TokenEngine.java
@@ -292,7 +292,7 @@ public class TokenEngine extends CoinEngine {
         return true;
     }
 
-    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits) {
+    public boolean checkAmountValue(TangemCard card, String amountValue, String feeValue, Long minFeeInInternalUnits, Boolean incfee) {
         Long fee;
         BigDecimal amount;
         try {
@@ -309,17 +309,12 @@ public class TokenEngine extends CoinEngine {
         if (fee == 0 || amount.compareTo(BigDecimal.ZERO) == 0)
             return false;
 
-
-        if (fee < minFeeInInternalUnits)
-            return false;
-
-
-        BigDecimal tmpFee = new BigDecimal(feeValue);
-        BigDecimal tmpAmount = amount;
-        tmpAmount = tmpAmount.multiply(new BigDecimal("1000000000"));
-
-        if (tmpFee.compareTo(tmpAmount) > 0)
-            return false;
+//        BigDecimal tmpFee = new BigDecimal(feeValue);
+//        BigDecimal tmpAmount = amount;
+//        tmpAmount = tmpAmount.multiply(new BigDecimal("1000000000"));
+//
+//        if (tmpFee.compareTo(tmpAmount) > 0)
+//            return false;
 
         return true;
     }
@@ -357,7 +352,7 @@ public class TokenEngine extends CoinEngine {
         //amount = amount.subtract(fee);
 
         BigInteger nonce = nonceValue;
-        BigInteger gasPrice = fee.divide(BigInteger.valueOf(21000));
+        BigInteger gasPrice = fee.divide(BigInteger.valueOf(60000));
         BigInteger gasLimit = BigInteger.valueOf(60000);
         Integer chainId = EthTransaction.ChainEnum.Mainnet.getValue();
         BigInteger amountZero = BigInteger.ZERO;
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
index a30c04a577..f3cb1e046d 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
@@ -203,8 +203,8 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                 return@setOnClickListener
             }
 
-            if (!engineCoin.checkAmountValue(card, txAmount, txFee, minFeeInInternalUnits)) {
-                finishActivityWithError(Activity.RESULT_CANCELED, getString(R.string.not_enough_eth_for_transaction_fee))
+            if (!engineCoin.checkAmountValue(card, txAmount, txFee, minFeeInInternalUnits, incFee)) {
+                finishActivityWithError(Activity.RESULT_CANCELED, getString(R.string.not_enough_funds_or_incorrect_amount))
                 return@setOnClickListener
             }
 
@@ -223,7 +223,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
             gasPrice = gasPrice.substring(2)
             var l = BigInteger(gasPrice, 16)
 
-            val m = if (card!!.blockchain == Blockchain.Token) BigInteger.valueOf(55000) else BigInteger.valueOf(21000)
+            val m = if (card!!.blockchain == Blockchain.Token) BigInteger.valueOf(60000) else BigInteger.valueOf(21000)
             l = l.multiply(m)
             val minFeeInGwei = card!!.getAmountInGwei(l.toString())
             val normalFeeInGwei = card!!.getAmountInGwei(l.multiply(BigInteger.valueOf(12)).divide(BigInteger.valueOf(10)).toString())
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index e78e9dfe37..20e5718675 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -201,7 +201,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
             } else if (!engine.isBalanceNotZero(card))
                 showSingleToast(R.string.wallet_empty)
             else if (!engine.isBalanceAlterNotZero(card))
-                showSingleToast(R.string.not_enough_funds)
+                showSingleToast(R.string.not_enough_funds_or_incorrect_amount)
             else if (engine.awaitingConfirmation(card))
                 showSingleToast(R.string.please_wait_while_previous)
             else if (!engine.checkUnspentTransaction(card))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96f84edc90..98ada212d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,7 +92,6 @@
     <!-- LoadedWalletActivity, LoadedWallet -->
     <string name="wallet_empty">The wallet is empty</string>
     <string name="no_compatible_wallet">No compatible wallet installed</string>
-    <string name="not_enough_funds">Not enough funds for transaction fee (gas)!</string>
     <string name="please_wait_while_previous">Please wait while previous transaction is confirmed in blockchain</string>
     <string name="please_wait_for_confirmation">Could not obtain all inputs. Swipe down to refresh.</string>
     <string name="card_has_no_remaining_signature">Card has no remaining signature!</string>
@@ -180,7 +179,7 @@
     <string name="cannot_check_balance_no_connection_with_blockchain_nodes">Cannot check balance! No connection with blockchain nodes</string>
     <string name="the_wallet_is_empty">The wallet is empty</string>
     <string name="please_wait_for_confirmation_of_incoming_transaction">Please wait for confirmation of incoming transaction</string>
-    <string name="not_enough_eth_for_transaction_fee">Not enough ETH for transaction fee</string>
+    <string name="not_enough_funds_or_incorrect_amount">Not enough funds or incorrect amount</string>
     <string name="pin_2_is_required_to_sign_the_payment">PIN2 is required to sign the payment</string>
 
     <!-- EmptyWalletActivity -->