diff --git a/app/build.gradle b/app/build.gradle
index 439820d87c..549774d931 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,7 @@ android {
             initWith debug
             versionNameSuffix "-beta"
             applicationIdSuffix ".debug"
+            buildConfigField 'String', 'CONFIG_ENVIRONMENT', '\"prod\"'
         }
     }
     kotlinOptions {
diff --git a/app/src/main/assets/features_dev.json b/app/src/main/assets/features_dev.json
index 4866065376..71561c4c69 100644
--- a/app/src/main/assets/features_dev.json
+++ b/app/src/main/assets/features_dev.json
@@ -1,6 +1,6 @@
 {
   "isWalletPayIdEnabled": true,
-  "isTopUpEnabled": true,
   "isSendingToPayIdEnabled": true,
+  "isTopUpEnabled": true,
   "isCreatingTwinCardsAllowed": false
 }
\ No newline at end of file
diff --git a/app/src/main/assets/features_prod.json b/app/src/main/assets/features_prod.json
index 7c4ebbbb72..d3b1375fae 100644
--- a/app/src/main/assets/features_prod.json
+++ b/app/src/main/assets/features_prod.json
@@ -1,6 +1,6 @@
 {
-  "isWalletPayIdEnabled": true,
-  "isTopUpEnabled": true,
+  "isWalletPayIdEnabled": false,
   "isSendingToPayIdEnabled": true,
+  "isTopUpEnabled": true,
   "isCreatingTwinCardsAllowed": true
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
index 66c4238850..207062e770 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
@@ -128,6 +128,11 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
     }
 
     companion object {
-        private val excludedBatches = listOf("0027", "0030", "0031")
+        private val excludedBatches = listOf(
+                "0027",
+                "0030",
+                "0031", //tags
+                "0079", //TOTHEMOON
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt
index 38cfac39bc..669ab9be91 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt
@@ -18,7 +18,7 @@ class CreateTwinWalletMiddleware {
     fun handle(action: DetailsAction.CreateTwinWalletAction) {
         when (action) {
             is DetailsAction.CreateTwinWalletAction.ShowWarning -> {
-                val wallet = store.state.detailsState.wallet
+                val wallet = store.state.globalState.scanNoteResponse?.walletManager?.wallet
                 if (wallet == null) {
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.CreateTwinWalletWarning))
                     return
diff --git a/app/src/main/res/layout/layout_wallet_long_buttons.xml b/app/src/main/res/layout/layout_wallet_long_buttons.xml
index 3872698afc..d32b3ac917 100644
--- a/app/src/main/res/layout/layout_wallet_long_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_long_buttons.xml
@@ -10,6 +10,7 @@
         android:layout_width="0dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="30dp"
+        android:layout_marginBottom="33dp"
         android:text="@string/wallet_button_scan"
         app:icon="@drawable/ic_scan"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -34,6 +35,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="30dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="33dp"
         android:text="@string/wallet_button_send"
         app:icon="@drawable/ic_send"
         app:layout_constraintBottom_toBottomOf="parent"