From c16c284ddddd643acc190b879efc295802df384a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 29 Aug 2023 08:17:41 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../products/note/OnboardingNoteFragment.kt   |  6 +++++
 .../OnboardingOtherCardsFragment.kt           |  2 ++
 .../products/twins/ui/TwinsCardsFragment.kt   | 20 +++++++++++---
 .../wallet/ui/OnboardingWalletFragment.kt     |  8 ++++++
 ...y.xml => selector_btn_content_primary.xml} |  0
 ...xml => selector_btn_content_secondary.xml} |  0
 .../layout_onboarding_container_bottom.xml    |  3 ++-
 app/src/main/res/layout/fragment_send.xml     |  2 +-
 .../layout_onboarding_buttons_add_cards.xml   |  5 ++--
 .../layout_onboarding_buttons_common.xml      |  3 ++-
 .../layout_onboarding_container_bottom.xml    |  3 ++-
 .../view_wallet_details_buttons_row.xml       | 10 +++----
 app/src/main/res/values/styles.xml            | 26 +++++++++++++------
 .../wallet2/ui/CheckSeedPhraseScreen.kt       |  4 +--
 .../wallet2/ui/ImportSeedPhraseScreen.kt      |  5 ++--
 .../presentation/wallet2/ui/IntroScreen.kt    |  4 +--
 16 files changed, 72 insertions(+), 29 deletions(-)
 rename app/src/main/res/color/{selector_btn_text_primary.xml => selector_btn_content_primary.xml} (100%)
 rename app/src/main/res/color/{selector_btn_text_secondary.xml => selector_btn_content_secondary.xml} (100%)

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 6cdb83e4d7..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
@@ -103,13 +103,16 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
         tvBody.isVisible = false
 
         btnMainAction.text = ""
+        btnMainAction.icon = null
         btnAlternativeAction.text = ""
+        btnAlternativeAction.icon = null
         tvHeader.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 {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(OnboardingNoteAction.CreateWallet)
@@ -133,6 +136,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
     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 {
                 store.dispatch(OnboardingNoteAction.TopUp)
             }
@@ -144,6 +148,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
             }
         } else {
             btnMainAction.setText(R.string.onboarding_button_receive_crypto)
+            btnMainAction.icon = null
             btnMainAction.setOnClickListener {
                 store.dispatch(OnboardingNoteAction.ShowAddressInfoDialog)
             }
@@ -179,6 +184,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
 
     private fun setupDoneState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
         btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
         btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingNoteAction.Done)
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 83674d9227..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
@@ -72,6 +72,7 @@ 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 {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(OnboardingOtherCardsAction.CreateWallet)
@@ -92,6 +93,7 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
 
     private fun setupDoneState() = with(mainBinding.onboardingActionContainer) {
         btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
         btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingOtherCardsAction.Done)
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 5163bf4284..de763ef778 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
@@ -5,6 +5,7 @@ import android.util.TypedValue
 import android.view.View
 import android.view.animation.OvershootInterpolator
 import androidx.annotation.LayoutRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
 import androidx.transition.TransitionInflater
@@ -175,10 +176,12 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
     }
 
     private fun setupWelcomeState(state: TwinCardsState) {
-        setupWelcomeState(state) { store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet)) }
+        setupWelcomeState(state) {
+            store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet))
+        }
     }
 
-    private fun setupWelcomeState(state: TwinCardsState, mainAction: VoidCallback) =
+    private fun setupWelcomeState(state: TwinCardsState, onMainButtonClick: VoidCallback) =
         with(mainBinding.onboardingActionContainer) {
             twinsWidget.toWelcome(false)
 
@@ -192,7 +195,12 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             )
 
             btnMainAction.setText(R.string.common_continue)
-            btnMainAction.setOnClickListener { mainAction() }
+            btnMainAction.icon = when (state.currentStep) {
+                is TwinCardsStep.WelcomeOnly -> null
+                is TwinCardsStep.Welcome -> AppCompatResources.getDrawable(requireContext(), R.drawable.ic_tangem_24)
+                else -> null
+            }
+            btnMainAction.setOnClickListener { onMainButtonClick() }
         }
 
     private fun setupWarningState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
@@ -210,6 +218,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
         btnMainAction.isEnabled = state.userWasUnderstandIfWalletRecreate
         btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
         btnMainAction.setOnClickListener {
             store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet))
         }
@@ -251,6 +260,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         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 {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(
@@ -274,6 +284,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         btnMainAction.text =
             getString(R.string.twins_recreate_button_format, twinPairIndexNumber)
+        btnMainAction.setIconResource(R.drawable.ic_tangem_24)
         btnMainAction.setOnClickListener {
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchSecondStep(
@@ -298,6 +309,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         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 {
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchThirdStep(
@@ -343,6 +355,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
             }
         } else {
             btnMainAction.setText(R.string.onboarding_button_receive_crypto)
+            btnMainAction.icon = null
             btnMainAction.setOnClickListener {
                 store.dispatch(TwinCardsAction.ShowAddressInfoDialog)
             }
@@ -367,6 +380,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     private fun setupDoneState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
         btnMainAction.setText(R.string.common_continue)
+        btnMainAction.icon = null
         btnMainAction.setOnClickListener {
             store.dispatch(TwinCardsAction.Confetti.Hide)
             store.dispatch(TwinCardsAction.Done)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 4c2628276f..c92e735da5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -208,6 +208,8 @@ class OnboardingWalletFragment :
 
     private fun setupCreateWalletState() = with(binding) {
         layoutButtonsCommon.btnWalletMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
+        layoutButtonsCommon.btnWalletMainAction.setIconResource(R.drawable.ic_tangem_24)
+
         layoutButtonsCommon.btnWalletMainAction.setOnClickListener {
             Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(OnboardingWalletAction.CreateWallet)
@@ -247,6 +249,7 @@ class OnboardingWalletFragment :
 
         with(layoutButtonsCommon) {
             btnWalletMainAction.text = getText(R.string.onboarding_button_backup_now)
+            btnWalletMainAction.icon = null
             btnWalletMainAction.setOnClickListener { store.dispatch(BackupAction.StartBackup) }
 
             btnWalletAlternativeAction.text = getText(R.string.onboarding_button_skip_backup)
@@ -265,6 +268,7 @@ class OnboardingWalletFragment :
 
         with(layoutButtonsCommon) {
             btnWalletMainAction.text = getString(R.string.onboarding_button_scan_origin_card)
+            btnWalletMainAction.setIconResource(R.drawable.ic_tangem_24)
             btnWalletAlternativeAction.hide()
             btnWalletMainAction.setOnClickListener { store.dispatch(BackupAction.ScanPrimaryCard) }
         }
@@ -281,6 +285,7 @@ class OnboardingWalletFragment :
         layoutButtonsAddCards.root.show()
         layoutButtonsCommon.root.hide()
         layoutButtonsAddCards.btnAddCard.text = getText(R.string.onboarding_button_add_backup_card)
+        layoutButtonsAddCards.btnAddCard.setIconResource(R.drawable.ic_tangem_24)
         if (state.backupCardsNumber < state.maxBackupCards) {
             layoutButtonsAddCards.btnAddCard.setOnClickListener { store.dispatch(BackupAction.AddBackupCard) }
         } else {
@@ -362,6 +367,7 @@ class OnboardingWalletFragment :
             state.primaryCardId?.let { cardIdFormatter.getFormattedCardId(it) },
         )
         layoutButtonsCommon.btnWalletMainAction.text = getText(R.string.onboarding_button_backup_origin)
+        layoutButtonsCommon.btnWalletMainAction.setIconResource(R.drawable.ic_tangem_24)
         layoutButtonsCommon.btnWalletMainAction.setOnClickListener { store.dispatch(BackupAction.WritePrimaryCard) }
 
         animator.showWritePrimaryCard(state)
@@ -394,6 +400,7 @@ class OnboardingWalletFragment :
             R.string.onboarding_button_backup_card_format,
             cardNumber,
         )
+        layoutButtonsCommon.btnWalletMainAction.setIconResource(R.drawable.ic_tangem_24)
         layoutButtonsCommon.btnWalletMainAction.setOnClickListener {
             store.dispatch(BackupAction.WriteBackupCard(cardNumber))
         }
@@ -412,6 +419,7 @@ class OnboardingWalletFragment :
 
         tvBody.text = getText(R.string.onboarding_subtitle_success_tangem_wallet_onboarding)
         layoutButtonsCommon.btnWalletMainAction.text = getText(R.string.onboarding_button_continue_wallet)
+        layoutButtonsCommon.btnWalletMainAction.icon = null
         layoutButtonsCommon.btnWalletAlternativeAction.hide()
         layoutButtonsCommon.btnWalletMainAction.setOnClickListener {
             showConfetti(false)
diff --git a/app/src/main/res/color/selector_btn_text_primary.xml b/app/src/main/res/color/selector_btn_content_primary.xml
similarity index 100%
rename from app/src/main/res/color/selector_btn_text_primary.xml
rename to app/src/main/res/color/selector_btn_content_primary.xml
diff --git a/app/src/main/res/color/selector_btn_text_secondary.xml b/app/src/main/res/color/selector_btn_content_secondary.xml
similarity index 100%
rename from app/src/main/res/color/selector_btn_text_secondary.xml
rename to app/src/main/res/color/selector_btn_content_secondary.xml
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 b098f5f0ae..32d2544981 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
@@ -74,7 +74,8 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/TapPrimaryButton"
+            style="@style/TapPrimaryIconButton"
+            tools:icon="@drawable/ic_tangem_24"
             tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 4035f923e2..20949f4932 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -112,7 +112,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnSend"
-                        style="@style/TapPrimaryIconButton"
+                        style="@style/TapPrimaryIconButtonLegacy"
                         android:layout_width="match_parent"
                         android:fontFamily="@font/saira_semi_condensed_regular"
                         android:text="@string/common_send"
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
index ceff4ed673..23821c5ce9 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
@@ -7,14 +7,15 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_add_card"
-        style="@style/TapSecondaryButton"
+        style="@style/TapSecondaryIconButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/btn_continue"
         app:layout_constraintStart_toStartOf="@id/btn_continue"
-        tools:text="+ Add backup card" />
+        tools:icon="@drawable/ic_tangem_24"
+        tools:text="Add backup card" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_continue"
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_common.xml b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
index 9bc5621b26..919923f821 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_common.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
@@ -7,13 +7,14 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_main_action"
-        style="@style/TapPrimaryButton"
+        style="@style/TapPrimaryIconButton"
         android:layout_width="204dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        tools:icon="@drawable/ic_tangem_24"
         tools:text="Main Action" />
 
     <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/layout_onboarding_container_bottom.xml b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
index abd59b36c3..187018cab1 100644
--- a/app/src/main/res/layout/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
@@ -74,7 +74,8 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/TapPrimaryButton"
+            style="@style/TapPrimaryIconButton"
+            tools:icon="@drawable/ic_tangem_24"
             tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
diff --git a/app/src/main/res/layout/view_wallet_details_buttons_row.xml b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
index 6397189d73..ca2145b197 100644
--- a/app/src/main/res/layout/view_wallet_details_buttons_row.xml
+++ b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
@@ -16,7 +16,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_trade"
-            style="@style/TapPrimaryIconButton"
+            style="@style/TapPrimaryIconButtonLegacy"
             android:text="@string/wallet_button_actions"
             android:visibility="gone"
             app:icon="@drawable/ic_arrows_up_down"
@@ -24,21 +24,21 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_buy"
-            style="@style/TapPrimaryIconButton"
+            style="@style/TapPrimaryIconButtonLegacy"
             android:text="@string/common_buy"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_up" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sell"
-            style="@style/TapPrimaryIconButton"
+            style="@style/TapPrimaryIconButtonLegacy"
             android:text="@string/common_sell"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_down" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_swap"
-            style="@style/TapPrimaryIconButton"
+            style="@style/TapPrimaryIconButtonLegacy"
             android:text="@string/swapping_swap_action"
             android:visibility="gone"
             app:icon="@drawable/ic_arrows_up_down"
@@ -48,7 +48,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_send"
-        style="@style/TapPrimaryIconButton"
+        style="@style/TapPrimaryIconButtonLegacy"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:text="@string/common_send"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c451317c2..a6d3f7e6d4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,38 +46,48 @@
         <item name="android:minHeight">48dp</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
+        <item name="cornerRadius">14dp</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:fontFamily">@font/roboto_medium</item>
+        <item name="android:fontFamily">@font/roboto_regular</item>
         <item name="android:letterSpacing">0</item>
-        <item name="lineHeight">24sp</item>
-        <item name="cornerRadius">@dimen/btn_corner_radius_large</item>
+        <item name="fontWeight">500</item>
+        <item name="lineHeight">16sp</item>
     </style>
 
     <style name="TapPrimaryButton" parent="BaseTapButton">
         <item name="android:backgroundTint">@color/selector_btn_primary</item>
-        <item name="android:textColor">@color/selector_btn_text_primary</item>
+        <item name="android:textColor">@color/selector_btn_content_primary</item>
     </style>
 
     <style name="TapSecondaryButton" parent="BaseTapButton">
         <item name="android:backgroundTint">@color/selector_btn_secondary</item>
-        <item name="android:textColor">@color/selector_btn_text_secondary</item>
+        <item name="android:textColor">@color/selector_btn_content_secondary</item>
     </style>
 
     <style name="TapTextButton" parent="BaseTapButton">
         <item name="android:minHeight">40dp</item>
         <item name="cornerRadius">@dimen/btn_corner_radius</item>
         <item name="android:backgroundTint">@android:color/transparent</item>
-        <item name="android:textColor">@color/selector_btn_text_secondary</item>
+        <item name="android:textColor">@color/selector_btn_content_secondary</item>
     </style>
 
     <style name="TapPrimaryIconButton" parent="TapPrimaryButton">
+        <item name="iconTint">@color/selector_btn_content_primary</item>
+        <item name="iconGravity">textEnd</item>
+    </style>
+
+    <style name="TapPrimaryIconButtonLegacy" parent="TapPrimaryButton">
         <item name="android:gravity">start|center_vertical</item>
-        <item name="iconTint">@color/selector_btn_text_primary</item>
+        <item name="iconTint">@color/selector_btn_content_primary</item>
         <item name="iconGravity">end</item>
     </style>
 
+    <style name="TapSecondaryIconButton" parent="TapSecondaryButton">
+        <item name="iconTint">@color/selector_btn_content_secondary</item>
+        <item name="iconGravity">textEnd</item>
+    </style>
+
     <style name="TapChip" parent="@style/Widget.MaterialComponents.Chip.Choice">
         <item name="chipBackgroundColor">@color/selector_chip_background</item>
         <item name="chipStrokeColor">@color/selector_chip_stroke</item>
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/CheckSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/CheckSeedPhraseScreen.kt
index 2edb3e416c..c98eb683e9 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/CheckSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/CheckSeedPhraseScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.OutlineTextField
-import com.tangem.core.ui.components.PrimaryButtonIconStart
+import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.onboarding.presentation.wallet2.model.CheckSeedPhraseState
 import com.tangem.feature.onboarding.presentation.wallet2.ui.components.Description
@@ -56,7 +56,7 @@ fun CheckSeedPhraseScreen(state: CheckSeedPhraseState, modifier: Modifier = Modi
         }
         OnboardingActionBlock(
             firstActionContent = {
-                PrimaryButtonIconStart(
+                PrimaryButtonIconEnd(
                     modifier = Modifier
                         .fillMaxWidth(),
                     text = stringResource(id = R.string.onboarding_create_wallet_button_create_wallet),
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
index be8a31f5df..5f9b14ae11 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt
@@ -18,9 +18,8 @@ import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameter
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import com.tangem.core.ui.components.Notifier
-import com.tangem.core.ui.components.PrimaryButtonIconStart
+import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.components.TangemTextFieldsDefault
-import com.tangem.core.ui.components.buttons.common.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.onboarding.R
 import com.tangem.feature.onboarding.presentation.wallet2.model.ImportSeedPhraseState
@@ -65,7 +64,7 @@ fun ImportSeedPhraseScreen(state: ImportSeedPhraseState, modifier: Modifier = Mo
         Box {
             OnboardingActionBlock(
                 firstActionContent = {
-                    PrimaryButtonIconStart(
+                    PrimaryButtonIconEnd(
                         modifier = Modifier
                             .fillMaxWidth(),
                         text = stringResource(id = R.string.onboarding_create_wallet_button_create_wallet),
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
index cba03f9df9..62a4ffde12 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/IntroScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
-import com.tangem.core.ui.components.PrimaryButtonIconStart
+import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.onboarding.R
@@ -46,7 +46,7 @@ fun IntroScreen(state: IntroState, modifier: Modifier = Modifier) {
         Box {
             OnboardingActionBlock(
                 firstActionContent = {
-                    PrimaryButtonIconStart(
+                    PrimaryButtonIconEnd(
                         modifier = Modifier
                             .fillMaxWidth(),
                         text = stringResource(id = R.string.onboarding_create_wallet_button_create_wallet),