diff --git a/app/src/main/res/color/btn_tap_text_color.xml b/app/src/main/res/color/btn_tap_text_color.xml
deleted file mode 100644
index 01e0752f01..0000000000
--- a/app/src/main/res/color/btn_tap_text_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:color="#66FFFFFF"
-        android:textColor="#66FFFFFF"/>
-    <item android:color="#FFFFFF"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_btn_primary.xml b/app/src/main/res/color/selector_btn_primary.xml
new file mode 100644
index 0000000000..6e8aab4c79
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/button_disabled" android:state_enabled="false" />
+    <item android:color="@color/button_primary" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_secondary.xml b/app/src/main/res/color/selector_btn_secondary.xml
new file mode 100644
index 0000000000..47a88e3645
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/button_disabled" android:state_enabled="false" />
+    <item android:color="@color/button_secondary" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_text_primary.xml b/app/src/main/res/color/selector_btn_text_primary.xml
new file mode 100644
index 0000000000..70f6aded83
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_text_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/text_disabled" android:state_enabled="false" android:textColor="@color/text_disabled" />
+    <item android:color="@color/text_primary_2" android:textColor="@color/text_primary_2" />
+</selector>
diff --git a/app/src/main/res/color/selector_btn_text_secondary.xml b/app/src/main/res/color/selector_btn_text_secondary.xml
new file mode 100644
index 0000000000..41aa7c843c
--- /dev/null
+++ b/app/src/main/res/color/selector_btn_text_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/text_disabled" android:state_enabled="false" android:textColor="@color/text_disabled" />
+    <item android:color="@color/text_primary_1" android:textColor="@color/text_primary_1" />
+</selector>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 63924e74c0..fdeae808a2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,6 +31,7 @@
 
     <dimen name="btn_corner_radius">4dp</dimen>
     <dimen name="btn_corner_radius_medium">8dp</dimen>
+    <dimen name="btn_corner_radius_large">12dp</dimen>
     <dimen name="btn_rounded_size">44dp</dimen>
 
     <dimen name="text_size_amount_to_send">32sp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2bd13d5482..a5774803a5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,69 +41,43 @@
         <item name="colorPrimary">@color/accent</item>
     </style>
 
-    <style name="BaseTapButton">
+    <style name="BaseTapButton" parent="Widget.Material3.Button">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minWidth">204dp</item>
+        <item name="android:minHeight">48dp</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
-        <item name="android:textColor">@color/btn_tap_text_color</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:letterSpacing">0</item>
-        <item name="android:backgroundTint">@color/selector_btn_green</item>
+        <item name="lineHeight">24sp</item>
+        <item name="cornerRadius">@dimen/btn_corner_radius_large</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>
+    </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>
+    </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>
     </style>
 
-    <style name="TapButton" parent="BaseTapButton">
-        <item name="android:layout_width">93dp</item>
-        <item name="android:minHeight">52dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">@font/saira_semi_condensed_regular</item>
-        <item name="elevation">3dp</item>
-    </style>
-
-    <style name="OnboardingButton" parent="BaseTapButton">
-        <item name="android:minWidth">204dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="elevation">2dp</item>
-    </style>
-
-    <style name="OnboardingButton.Alternative">
-        <item name="android:backgroundTint">@color/gray_button</item>
-        <item name="android:textColor">@color/selector_btn_gray_text_color</item>
-        <item name="elevation">0dp</item>
-    </style>
-
-    <style name="OnboardingButton.Borderless" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="textAllCaps">false</item>
-        <item name="android:backgroundTint">@color/gray_button</item>
-        <item name="android:textColor">@color/tapButtonColorBlack</item>
-        <item name="elevation">0dp</item>
-    </style>
-
-
-    <style name="TapButtonText" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:minWidth">204dp</item>
-        <item name="android:layout_height">58dp</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">#060606</item>
-        <item name="cornerRadius">@dimen/btn_corner_radius</item>
-    </style>
-
-    <style name="TapButtonWithIcon" parent="TapButton">
+    <style name="TapPrimaryIconButton" parent="TapPrimaryButton">
         <item name="android:gravity">start|center_vertical</item>
-        <item name="iconTint">@color/btn_tap_text_color</item>
+        <item name="iconTint">@color/selector_btn_text_primary</item>
         <item name="iconGravity">end</item>
-        <item name="android:layout_width">200dp</item>
-    </style>
-
-    <style name="TapBlackButton" parent="TapButtonWithIcon">
-        <item name="android:backgroundTint">@color/selector_btn_black</item>
     </style>
 
     <style name="TapChip" parent="@style/Widget.MaterialComponents.Chip.Choice">