diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinData.java b/app/src/main/java/com/tangem/domain/wallet/CoinData.java
index 9447ee6935..9ec1663bdb 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinData.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinData.java
@@ -143,7 +143,7 @@ public abstract class CoinData {
 
     public void clearInfo() {
         setIsBalanceEqual(false);
-        setBalanceReceived(false); // TODO check
+        setBalanceReceived(false);
         setValidationNodeDescription("");
         minFee=null;
         maxFee=null;
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 5bfb7b9b4e..e4cfb67533 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
@@ -192,7 +192,6 @@ public abstract class CoinEngine {
 
     public abstract boolean checkNewTransactionAmount(Amount amount);
 
-    // TODO - move minFeeInInternalUnits to CoinData
     public abstract boolean checkNewTransactionAmountAndFee(Amount amount, Amount fee, Boolean isFeeIncluded);
 
     public abstract boolean validateBalance(BalanceValidator balanceValidator);
diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
index 0f0086f8d1..7ddebba10a 100644
--- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
@@ -321,8 +321,8 @@ public class EthEngine extends CoinEngine {
 
         if (!coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount())) {
             balanceValidator.setScore(0);
-            balanceValidator.setFirstLine("Unguaranteed balance");
-            balanceValidator.setSecondLine("Transaction is in progress. Wait for confirmation in blockchain.");
+            balanceValidator.setFirstLine("Transaction in progress");
+            balanceValidator.setSecondLine("Wait for confirmation in blockchain");
             return false;
         }
 
diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
index 96d178234f..ee10a59073 100644
--- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
@@ -394,8 +394,8 @@ public class TokenEngine extends CoinEngine {
 
         if (!coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount())) {
             balanceValidator.setScore(0);
-            balanceValidator.setFirstLine("Unguaranteed balance");
-            balanceValidator.setSecondLine("Transaction is in progress. Wait for confirmation in blockchain.");
+            balanceValidator.setFirstLine("Transaction in progress");
+            balanceValidator.setSecondLine("Wait for confirmation in blockchain");
             return false;
         }
 
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
index 2e62f6dd2f..adede77949 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
@@ -87,12 +87,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
 
         btnSend.visibility = View.INVISIBLE
 
-        val allowFeeLevelSelection = engine.allowSelectFeeLevel()
-        for (lol in rgFee.touchables) {//TODO: leave invisible only?
-            lol.isEnabled = allowFeeLevelSelection
-        }
-
-        if (!allowFeeLevelSelection) {
+        if (!engine.allowSelectFeeLevel()) {
             rgFee.visibility = View.INVISIBLE
         }
 
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 6e3b09fbb1..9a25817c4d 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -729,7 +729,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
                 Blockchain.Litecoin -> "litecoin"
                 Blockchain.Rootstock -> "bitcoin"
                 Blockchain.RootstockToken -> "bitcoin"
-                Blockchain.Cardano -> "cardano" //TODO:check
+                Blockchain.Cardano -> "cardano"
                 else -> {
                     throw Exception("Can''t get rate for blockchain " + ctx.blockchainName)
                 }
diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml
index acb261225c..decf945d60 100644
--- a/app/src/main/res/layout/activity_confirm_transaction.xml
+++ b/app/src/main/res/layout/activity_confirm_transaction.xml
@@ -263,7 +263,7 @@
 
             <EditText
                 android:id="@+id/etFee"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
                 android:enabled="false"
@@ -278,7 +278,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_min="150dp" />
+                app:layout_constraintWidth_min="130dp" />
 
             <TextView
                 android:id="@+id/tvCurrency2"