diff --git a/app/src/main/java/com/tangem/domain/cardReader/CardProtocol.java b/app/src/main/java/com/tangem/domain/cardReader/CardProtocol.java
index ab71225536..5e38310835 100644
--- a/app/src/main/java/com/tangem/domain/cardReader/CardProtocol.java
+++ b/app/src/main/java/com/tangem/domain/cardReader/CardProtocol.java
@@ -517,8 +517,21 @@ public class CardProtocol {
                 if (tokenSymbol != null)
                     mCard.setTokenSymbol(tokenSymbol.getAsString());
 
-                if (contractAddress != null)
+                // Hardcoded smart contracts for the cards manufactured before registration of smart-contract in ETH
+
+                if( mCard.getBatch().equals("0017") )
+                {
+
+                    mCard.setContractAddress("contract for 0017");
+                }
+                else if( mCard.getBatch().equals("0019") )
+                {
+                    mCard.setContractAddress("0x0c056b0cda0763cc14b8b2d6c02465c91e33ec72");
+                }
+                else if (contractAddress != null)
+                {
                     mCard.setContractAddress(contractAddress.getAsString());
+                }
 
                 if (tokens_decimal != null)
                     mCard.setTokensDecimal(tokens_decimal.getAsInt());
diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml
index 62d64011d6..332054f2b0 100644
--- a/app/src/main/res/layout/activity_confirm_payment.xml
+++ b/app/src/main/res/layout/activity_confirm_payment.xml
@@ -293,7 +293,6 @@
                 android:id="@+id/tvFeeEquivalent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
                 android:fontFamily="@font/maax"
                 android:paddingEnd="10dp"
                 android:paddingStart="10dp"