diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
index c87d5ca8aa..7ac3806126 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
@@ -96,69 +96,69 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
     }
 
     private fun setupNoneState() = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.isVisible = false
-        btnAlternativeAction?.isVisible = false
+        btnMainAction.isVisible = false
+        btnAlternativeAction.isVisible = false
         btnRefreshBalanceWidget.show(false)
         tvHeader.isVisible = false
-        tvBody?.isVisible = false
+        tvBody.isVisible = false
 
-        btnMainAction?.text = ""
-        btnMainAction?.icon = null
-        btnAlternativeAction?.text = ""
-        btnAlternativeAction?.icon = null
+        btnMainAction.text = ""
+        btnMainAction.icon = null
+        btnAlternativeAction.text = ""
+        btnAlternativeAction.icon = null
         tvHeader.text = ""
-        tvBody?.text = ""
+        tvBody.text = ""
     }
 
     private fun setupCreateWalletState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.setText(R.string.onboarding_create_wallet_button_create_wallet)
-        btnMainAction?.setIconResource(R.drawable.ic_tangem_24)
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
+        btnMainAction.setOnClickListener {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(OnboardingNoteAction.CreateWallet)
         }
-        btnAlternativeAction?.setText(R.string.onboarding_button_what_does_it_mean)
-        btnAlternativeAction?.setOnClickListener { }
+        btnAlternativeAction.setText(R.string.onboarding_button_what_does_it_mean)
+        btnAlternativeAction.setOnClickListener { }
 
         btnRefreshBalanceWidget.mainView.setOnClickListener(null)
 
         tvHeader.setText(R.string.onboarding_create_wallet_header)
-        tvBody?.setText(R.string.onboarding_create_wallet_body)
+        tvBody.setText(R.string.onboarding_create_wallet_body)
 
         mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_circle),
         )
         updateConstraints(state.currentStep, R.layout.lp_onboarding_create_wallet)
 
-        btnAlternativeAction?.isVisible = false // temporary
+        btnAlternativeAction.isVisible = false // temporary
     }
 
     private fun setupTopUpWalletState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
         if (state.isBuyAllowed) {
-            btnMainAction?.setText(R.string.onboarding_top_up_button_but_crypto)
-            btnMainAction?.icon = null
-            btnMainAction?.setOnClickListener {
+            btnMainAction.setText(R.string.onboarding_top_up_button_but_crypto)
+            btnMainAction.icon = null
+            btnMainAction.setOnClickListener {
                 store.dispatch(OnboardingNoteAction.TopUp)
             }
 
-            btnAlternativeAction?.isVisible = true
-            btnAlternativeAction?.setText(R.string.onboarding_top_up_button_show_wallet_address)
-            btnAlternativeAction?.setOnClickListener {
+            btnAlternativeAction.isVisible = true
+            btnAlternativeAction.setText(R.string.onboarding_top_up_button_show_wallet_address)
+            btnAlternativeAction.setOnClickListener {
                 store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
             }
         } else {
-            btnMainAction?.setText(R.string.onboarding_button_receive_crypto)
-            btnMainAction?.icon = null
-            btnMainAction?.setOnClickListener {
+            btnMainAction.setText(R.string.onboarding_button_receive_crypto)
+            btnMainAction.icon = null
+            btnMainAction.setOnClickListener {
                 store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
             }
 
-            btnAlternativeAction?.isVisible = false
+            btnAlternativeAction.isVisible = false
         }
 
         tvHeader.setText(R.string.onboarding_topup_title)
         if (state.balanceNonCriticalError == null) {
-            tvBody?.setText(R.string.onboarding_top_up_body)
+            tvBody.setText(R.string.onboarding_top_up_body)
         } else {
             state.walletBalance.amountToCreateAccount?.let { amount ->
                 val tvBodyMessage = getString(
@@ -166,7 +166,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
                     amount,
                     state.walletBalance.currency.currencySymbol,
                 )
-                tvBody?.text = tvBodyMessage
+                tvBody.text = tvBodyMessage
             }
         }
 
@@ -183,20 +183,20 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
     }
 
     private fun setupDoneState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.setText(R.string.common_continue)
-        btnMainAction?.icon = null
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
+        btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingNoteAction.Done)
         }
 
-        btnAlternativeAction?.isVisible = false
-        btnAlternativeAction?.text = ""
-        btnAlternativeAction?.setOnClickListener { }
+        btnAlternativeAction.isVisible = false
+        btnAlternativeAction.text = ""
+        btnAlternativeAction.setOnClickListener { }
         btnRefreshBalanceWidget.mainView.setOnClickListener(null)
 
         tvHeader.setText(R.string.onboarding_done_header)
-        tvBody?.setText(R.string.onboarding_done_body)
+        tvBody.setText(R.string.onboarding_done_body)
 
         mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
index 136145d88c..2e6ac715e0 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
@@ -71,19 +71,19 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
     }
 
     private fun setupCreateWalletState() = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.setText(R.string.onboarding_create_wallet_button_create_wallet)
-        btnMainAction?.setIconResource(R.drawable.ic_tangem_24)
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
+        btnMainAction.setOnClickListener {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(OnboardingOtherCardsAction.CreateWallet)
         }
-        btnAlternativeAction?.setText(R.string.onboarding_button_what_does_it_mean)
-        btnAlternativeAction?.setOnClickListener { }
+        btnAlternativeAction.setText(R.string.onboarding_button_what_does_it_mean)
+        btnAlternativeAction.setOnClickListener { }
 
         tvHeader.setText(R.string.onboarding_create_wallet_header)
-        tvBody?.setText(R.string.onboarding_create_wallet_body)
+        tvBody.setText(R.string.onboarding_create_wallet_body)
 
-        btnAlternativeAction?.isVisible = false // temporary
+        btnAlternativeAction.isVisible = false // temporary
 
         mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_circle),
@@ -92,19 +92,19 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
     }
 
     private fun setupDoneState() = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.setText(R.string.common_continue)
-        btnMainAction?.icon = null
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
+        btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingOtherCardsAction.Done)
         }
 
-        btnAlternativeAction?.isVisible = false
-        btnAlternativeAction?.text = ""
-        btnAlternativeAction?.setOnClickListener { }
+        btnAlternativeAction.isVisible = false
+        btnAlternativeAction.text = ""
+        btnAlternativeAction.setOnClickListener { }
 
         tvHeader.setText(R.string.onboarding_done_header)
-        tvBody?.setText(R.string.onboarding_done_body)
+        tvBody.setText(R.string.onboarding_done_body)
 
         mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
index 0b0f394f02..e07b4ab7f3 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@@ -187,14 +187,14 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             pbBinding.pbState.hide()
 
             tvHeader.setText(R.string.twins_onboarding_subtitle)
-            tvBody?.text = getString(
+            tvBody.text = getString(
                 R.string.twins_onboarding_description_format,
                 state.cardNumber?.pairIndexNumber(),
             )
 
-            btnMainAction?.setText(R.string.common_continue)
-            btnMainAction?.icon = null
-            btnMainAction?.setOnClickListener { onMainButtonClick() }
+            btnMainAction.setText(R.string.common_continue)
+            btnMainAction.icon = null
+            btnMainAction.setOnClickListener { onMainButtonClick() }
         }
 
     private fun setupWarningState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
@@ -202,18 +202,18 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         mainBinding.onboardingTopContainer.onboardingTwinsWelcomeBg.root.hide()
         pbBinding.pbState.hide()
-        chbUnderstand?.show()
+        chbUnderstand.show()
 
         tvHeader.setText(R.string.common_warning)
-        tvBody?.setText(R.string.twins_recreate_warning)
+        tvBody.setText(R.string.twins_recreate_warning)
 
-        chbUnderstand?.setOnCheckedChangeListener { buttonView, isChecked ->
+        chbUnderstand.setOnCheckedChangeListener { _, isChecked ->
             store.dispatch(TwinCardsAction.SetUserUnderstand(isChecked))
         }
-        btnMainAction?.isEnabled = state.userWasUnderstandIfWalletRecreate
-        btnMainAction?.setText(R.string.common_continue)
-        btnMainAction?.icon = null
-        btnMainAction?.setOnClickListener {
+        btnMainAction.isEnabled = state.userWasUnderstandIfWalletRecreate
+        btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
+        btnMainAction.setOnClickListener {
             store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet))
         }
     }
@@ -223,7 +223,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         mainBinding.onboardingTopContainer.onboardingTwinsWelcomeBg.bgCircleLarge.hide()
         mainBinding.onboardingTopContainer.onboardingTwinsWelcomeBg.bgCircleMedium.hide()
         mainBinding.onboardingTopContainer.onboardingTwinsWelcomeBg.bgCircleMin.hide()
-        chbUnderstand?.hide()
+        chbUnderstand.hide()
         pbBinding.pbState.show()
 
         mainBinding.onboardingTopContainer.onboardingWalletContainer.beginDelayedTransition()
@@ -251,11 +251,11 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         val twinIndexNumber = state.cardNumber?.indexNumber()
         tvHeader.text = getString(R.string.twins_recreate_title_format, twinIndexNumber)
-        tvBody?.setText(R.string.onboarding_twins_interrupt_warning)
+        tvBody.setText(R.string.onboarding_twins_interrupt_warning)
 
-        btnMainAction?.text = getString(R.string.twins_recreate_button_format, twinIndexNumber)
-        btnMainAction?.setIconResource(R.drawable.ic_tangem_24)
-        btnMainAction?.setOnClickListener {
+        btnMainAction.text = getString(R.string.twins_recreate_button_format, twinIndexNumber)
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
+        btnMainAction.setOnClickListener {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchFirstStep(
@@ -265,8 +265,8 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             )
         }
 
-        btnAlternativeAction?.isVisible = false
-        btnAlternativeAction?.isClickable = false
+        btnAlternativeAction.isVisible = false
+        btnAlternativeAction.isClickable = false
     }
 
     private fun setupCreateSecondWalletState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
@@ -274,12 +274,12 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         val twinPairIndexNumber = state.cardNumber?.pairIndexNumber()
         tvHeader.text = getString(R.string.twins_recreate_title_format, twinPairIndexNumber)
-        tvBody?.setText(R.string.onboarding_twins_interrupt_warning)
+        tvBody.setText(R.string.onboarding_twins_interrupt_warning)
 
-        btnMainAction?.text =
+        btnMainAction.text =
             getString(R.string.twins_recreate_button_format, twinPairIndexNumber)
-        btnMainAction?.setIconResource(R.drawable.ic_tangem_24)
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
+        btnMainAction.setOnClickListener {
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchSecondStep(
                     Message(
@@ -300,11 +300,11 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         val twinIndexNumber = state.cardNumber?.indexNumber()
         tvHeader.text = getString(R.string.twins_recreate_title_format, twinIndexNumber)
-        tvBody?.setText(R.string.onboarding_twins_interrupt_warning)
+        tvBody.setText(R.string.onboarding_twins_interrupt_warning)
 
-        btnMainAction?.text = getString(R.string.twins_recreate_button_format, twinIndexNumber)
-        btnMainAction?.setIconResource(R.drawable.ic_tangem_24)
-        btnMainAction?.setOnClickListener {
+        btnMainAction.text = getString(R.string.twins_recreate_button_format, twinIndexNumber)
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
+        btnMainAction.setOnClickListener {
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchThirdStep(
                     Message(getString(R.string.twins_recreate_title_format, twinIndexNumber)),
@@ -337,27 +337,27 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
 
         if (state.isBuyAllowed) {
-            btnMainAction?.setText(R.string.onboarding_top_up_button_but_crypto)
-            btnMainAction?.setOnClickListener {
+            btnMainAction.setText(R.string.onboarding_top_up_button_but_crypto)
+            btnMainAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.TopUp)
             }
-            btnAlternativeAction?.isVisible = true
-            btnAlternativeAction?.setText(R.string.onboarding_top_up_button_show_wallet_address)
-            btnAlternativeAction?.setOnClickListener {
+            btnAlternativeAction.isVisible = true
+            btnAlternativeAction.setText(R.string.onboarding_top_up_button_show_wallet_address)
+            btnAlternativeAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
             }
         } else {
-            btnMainAction?.setText(R.string.onboarding_button_receive_crypto)
-            btnMainAction?.setOnClickListener {
+            btnMainAction.setText(R.string.onboarding_button_receive_crypto)
+            btnMainAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
             }
 
-            btnAlternativeAction?.isVisible = false
+            btnAlternativeAction.isVisible = false
         }
 
         tvHeader.setText(R.string.onboarding_topup_title)
-        tvBody?.setText(R.string.onboarding_top_up_body)
-        btnMainAction?.icon = null
+        tvBody.setText(R.string.onboarding_top_up_body)
+        btnMainAction.icon = null
 
         btnRefreshBalanceWidget.changeState(state.walletBalance.state)
         if (btnRefreshBalanceWidget.isShowing != true) {
@@ -375,18 +375,18 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
     }
 
     private fun setupDoneState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction?.setText(R.string.common_continue)
-        btnMainAction?.icon = null
-        btnMainAction?.setOnClickListener {
+        btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
+        btnMainAction.setOnClickListener {
             store.dispatch(TwinCardsAction.Confetti.Hide)
             store.dispatch(TwinCardsAction.Done)
         }
 
-        btnAlternativeAction?.isVisible = false
-        btnAlternativeAction?.isClickable = false
+        btnAlternativeAction.isVisible = false
+        btnAlternativeAction.isClickable = false
 
         tvHeader.setText(R.string.onboarding_done_header)
-        tvBody?.setText(R.string.onboarding_done_body)
+        tvBody.setText(R.string.onboarding_done_body)
 
         val layout = when (state.mode) {
             CreateTwinWalletMode.CreateWallet -> R.layout.lp_onboarding_done_activation_twins
diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
index b836da6b07..131299d4d5 100644
--- a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
@@ -31,6 +31,7 @@
             tools:text="One wallet. Two cards." />
 
         <TextView
+            android:id="@+id/tv_body"
             style="@style/TextViewOnboarding.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,6 +48,7 @@
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <androidx.appcompat.widget.AppCompatCheckBox
+        android:id="@+id/chb_understand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_understand"
@@ -71,6 +73,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_main_action"
             style="@style/TapPrimaryIconButton"
             tools:icon="@drawable/ic_tangem_24"
             tools:text="@string/welcome_unlock_card" />
@@ -88,6 +91,7 @@
     </FrameLayout>
 
     <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_alternative_action"
         style="@style/TapTextButton"
         android:layout_width="match_parent"
         android:layout_marginStart="@dimen/dimen16"