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 46fbfa8537..9907ef7851 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt
@@ -14,6 +14,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import com.tangem.Constant
+import com.tangem.data.Blockchain
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
@@ -71,10 +72,17 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
         else
             tvIncFee.visibility = View.INVISIBLE
 
-        etAmount.setText(amount.toValueString())
+        if (ctx.card.blockchainID == Blockchain.Token.id) {
+            // for Blockchain.Token limit decimals
+            etAmount.setText(amount.toValueString(ctx.card.tokensDecimal))
+        } else {
+            // for others
+            etAmount.setText(amount.toValueString())
+        }
+
         tvCurrency.text = engine.balanceCurrency
         tvCurrency2.text = engine.feeCurrency
-        tvCardID.text = ctx.card!!.cidDescription
+        tvCardID.text = ctx.card.cidDescription
         etWallet.setText(intent.getStringExtra(Constant.EXTRA_TARGET_ADDRESS))
 
         btnSend.visibility = View.INVISIBLE
diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml
index 50a52dd393..8f7dcc5929 100644
--- a/app/src/main/res/layout/activity_confirm_transaction.xml
+++ b/app/src/main/res/layout/activity_confirm_transaction.xml
@@ -156,7 +156,7 @@
                 android:layout_height="wrap_content"
                 android:enabled="false"
                 android:fontFamily="@font/maax"
-                android:hint="@string/transaction_amount"
+                android:hint="@string/payment_amount"
                 android:inputType="numberDecimal"
                 android:padding="12dp"
                 android:textColor="@color/black"
@@ -268,6 +268,7 @@
                 android:layout_marginBottom="4dp"
                 android:enabled="false"
                 android:fontFamily="@font/maax"
+                android:hint="@string/fee_amount"
                 android:inputType="numberDecimal"
                 android:textColor="@color/black"
                 android:textColorLink="@android:color/holo_blue_dark"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5864598db5..b424f87e0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,7 +168,8 @@
 
     <!-- ConfirmTransactionActivity -->
     <string name="target_wallet_address">target wallet address</string>
-    <string name="transaction_amount">payment amount</string>
+    <string name="payment_amount">payment amount</string>
+    <string name="fee_amount">fee amount</string>
     <string name="fee">Fee</string>
     <string name="send_1">Send</string>
     <string name="minimal">Minimal</string>