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 d3cd156604..b098f5f0ae 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,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
@@ -91,7 +91,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
-        style="@style/TapButtonText"
+        style="@style/TapTextButton"
         android:layout_marginBottom="26dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -99,4 +99,4 @@
         tools:text="Atlernative action" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml b/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
index 4eb63182f8..2d8dd33b4e 100644
--- a/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
+++ b/app/src/main/res/layout-h680dp/layout_onboarding_saltpay_kyc_in_progress.xml
@@ -48,7 +48,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_open_support_chat"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -68,7 +68,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_kyc_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_waiting" />
 
@@ -84,4 +84,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
index 8f2196c2d5..29bf1c052b 100644
--- a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
+++ b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
@@ -81,7 +81,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_yes"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -97,7 +97,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_no"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
diff --git a/app/src/main/res/layout/fragment_details_confirm.xml b/app/src/main/res/layout/fragment_details_confirm.xml
index 8a56bf635b..c4daafda8d 100644
--- a/app/src/main/res/layout/fragment_details_confirm.xml
+++ b/app/src/main/res/layout/fragment_details_confirm.xml
@@ -78,7 +78,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_confirm"
-            style="@style/TapBlackButton"
+            style="@style/TapPrimaryIconButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="7dp"
@@ -93,4 +93,4 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml
index 5840a19ed9..e243e2e94a 100644
--- a/app/src/main/res/layout/fragment_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_disclaimer.xml
@@ -91,7 +91,7 @@
 
         <Button
             android:id="@+id/btn_repeat"
-            style="@style/OnboardingButton.Alternative"
+            style="@style/TapSecondaryButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -104,7 +104,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_accept"
-            style="@style/TapButton"
+            style="@style/TapPrimaryButton"
             android:layout_width="0dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
@@ -134,4 +134,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 1026392257..fe0eebf2a3 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/TapButtonWithIcon"
+                        style="@style/TapPrimaryIconButton"
                         android:layout_width="match_parent"
                         android:fontFamily="@font/saira_semi_condensed_regular"
                         android:text="@string/send_title"
@@ -135,4 +135,4 @@
 
     </ScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 7ebeaa7735..a2d0d43cec 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -339,7 +339,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_main_action"
-                    style="@style/TapBlackButton"
+                    style="@style/TapPrimaryButton"
                     android:layout_width="match_parent"
                     android:layout_height="48sp"
                     android:layout_marginStart="14dp"
@@ -373,4 +373,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index b3d1b54730..9e8f55e880 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -217,21 +217,16 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_add_token"
-                    style="@style/BaseTapButton"
+                    style="@style/TapPrimaryButton"
                     android:layout_width="match_parent"
-                    android:layout_height="42dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:elevation="4dp"
                     android:text="@string/main_manage_tokens"
-                    android:textSize="16sp"
                     android:visibility="gone"
-                    app:cornerRadius="8dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/barrier_wallets"
-                    app:layout_constraintVertical_bias="0.0"
-                    tools:layout_editor_absoluteX="16dp" />
+                    app:layout_constraintVertical_bias="0.0" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/item_popular_token.xml b/app/src/main/res/layout/item_popular_token.xml
index 4bda6a1b28..86b44d34bf 100644
--- a/app/src/main/res/layout/item_popular_token.xml
+++ b/app/src/main/res/layout/item_popular_token.xml
@@ -85,7 +85,7 @@
         android:elevation="0dp"
         android:text="@string/common_add"
         android:textAllCaps="false"
-        android:textColor="@color/btn_tap_text_color"
+        android:textColor="@color/selector_btn_text_primary"
         app:cornerRadius="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -98,4 +98,4 @@
         app:barrierDirection="start"
         app:constraint_referenced_ids="btn_add_token" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_backup_access_code_info.xml b/app/src/main/res/layout/layout_backup_access_code_info.xml
index 3ef7ba57fb..fe37f7cd96 100644
--- a/app/src/main/res/layout/layout_backup_access_code_info.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_info.xml
@@ -116,7 +116,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_create"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
@@ -129,4 +129,4 @@
         app:layout_constraintStart_toStartOf="parent" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml
index 7505dbcc4d..23e95aae7e 100644
--- a/app/src/main/res/layout/layout_backup_access_code_submit.xml
+++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml
@@ -47,7 +47,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_access_code_submit"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
@@ -59,4 +59,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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 2d9ddedad7..ceff4ed673 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,7 +7,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_add_card"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -18,7 +18,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_continue"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_height="wrap_content"
         android:layout_marginBottom="32dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -26,4 +26,4 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Main Action" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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 f51dffd3cb..9bc5621b26 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_common.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_main_action"
-        style="@style/OnboardingButton"
+        style="@style/TapPrimaryButton"
         android:layout_width="204dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
@@ -18,7 +18,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_wallet_alternative_action"
-        style="@style/OnboardingButton.Borderless"
+        style="@style/TapTextButton"
         android:layout_width="204dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
@@ -27,4 +27,4 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Alternative action" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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 f737c473c0..abd59b36c3 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,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
@@ -91,12 +91,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_alternative_action"
-        style="@style/TapButtonText"
+        style="@style/TapTextButton"
         android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="Atlernative action" />
+        tools:text="Alternative action" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml b/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
index cd3f8dbb04..5e3ff40fb1 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_connect_card.xml
@@ -56,7 +56,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_connect"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_register_wallet"
             app:icon="@drawable/ic_tangem_24"
@@ -75,4 +75,4 @@
     </FrameLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
index 580995fc6f..6c6f8a9ab2 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_in_progress.xml
@@ -48,7 +48,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_open_support_chat"
-        style="@style/OnboardingButton.Alternative"
+        style="@style/TapSecondaryButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="92dp"
@@ -68,7 +68,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_kyc_action"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_waiting" />
 
@@ -84,4 +84,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
index f1d03e8347..4a9ef0a9e2 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_kyc_start.xml
@@ -56,7 +56,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_verify"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_kyc_start" />
 
@@ -73,4 +73,4 @@
     </FrameLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml b/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
index 08e2bfe29b..96562a0c1f 100644
--- a/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
+++ b/app/src/main/res/layout/layout_onboarding_saltpay_pin_code.xml
@@ -53,7 +53,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_set_pin"
-            style="@style/OnboardingButton"
+            style="@style/TapPrimaryButton"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_button_pin" />
 
@@ -69,4 +69,4 @@
 
     </FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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 5fc11bef41..60ac6691fb 100644
--- a/app/src/main/res/layout/layout_wallet_long_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_long_buttons.xml
@@ -15,7 +15,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_confirm_long"
-        style="@style/TapButtonWithIcon"
+        style="@style/TapPrimaryIconButton"
         android:layout_width="0dp"
             android:text="@string/wallet_button_send"
             app:icon="@drawable/ic_send"
diff --git a/app/src/main/res/layout/layout_wallet_short_buttons.xml b/app/src/main/res/layout/layout_wallet_short_buttons.xml
index e235511583..e8c85a41d5 100644
--- a/app/src/main/res/layout/layout_wallet_short_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml
@@ -7,8 +7,8 @@
 
     <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_trade"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="0dp"
+        style="@style/TapPrimaryIconButton"
+        android:layout_width="0dp"
             android:text="@string/wallet_button_trade"
             app:icon="@drawable/ic_arrows_up_down"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -21,9 +21,9 @@
             app:layout_constraintVertical_bias="1" />
 
     <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_confirm"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="0dp"
+        android:id="@+id/btn_confirm"
+        style="@style/TapPrimaryIconButton"
+        android:layout_width="0dp"
             android:layout_marginStart="8dp"
             android:text="@string/wallet_button_send"
             app:icon="@drawable/ic_send"
diff --git a/app/src/main/res/layout/test_shopify_fragment.xml b/app/src/main/res/layout/test_shopify_fragment.xml
index eff6a14884..b844d1b1d3 100644
--- a/app/src/main/res/layout/test_shopify_fragment.xml
+++ b/app/src/main/res/layout/test_shopify_fragment.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/btn_2_cards"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="2 cards"
         app:layout_constraintEnd_toStartOf="@+id/btn_3_cards"
         app:layout_constraintHorizontal_bias="0.5"
@@ -19,7 +19,7 @@
 
     <Button
         android:id="@+id/btn_3_cards"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="3 cards"
         android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +62,7 @@
 
     <Button
         android:id="@+id/pay_gpay"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="GPay"
         app:layout_constraintEnd_toStartOf="@+id/pay_web"
         app:layout_constraintHorizontal_bias="0.5"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/pay_web"
-        style="@style/TapButton"
+        style="@style/TapPrimaryButton"
         android:text="Pay online"
         android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -84,4 +84,4 @@
 
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
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 0a6a51bfdd..9644db6849 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,9 +16,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_trade"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TapPrimaryIconButton"
             android:text="@string/wallet_button_trade"
             android:visibility="gone"
             app:icon="@drawable/ic_arrows_up_down"
@@ -26,18 +24,14 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_buy"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TapPrimaryIconButton"
             android:text="@string/wallet_button_buy"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_up" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_sell"
-            style="@style/TapButtonWithIcon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TapPrimaryIconButton"
             android:text="@string/wallet_button_sell"
             android:visibility="gone"
             app:icon="@drawable/ic_arrow_down" />
@@ -47,7 +41,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_send"
-        style="@style/TapButtonWithIcon"
+        style="@style/TapPrimaryIconButton"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:text="@string/wallet_button_send"