diff --git a/app/build.gradle b/app/build.gradle
index d1716ff095..04a330ca2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,6 +94,6 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     testImplementation "com.google.truth:truth:1.0.1"
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_payid.png b/app/src/main/res/drawable-hdpi/ic_payid.png
new file mode 100644
index 0000000000..79c7f1ec4f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_payid.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_payid.png b/app/src/main/res/drawable-mdpi/ic_payid.png
new file mode 100644
index 0000000000..1af851efc8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_payid.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_payid.png b/app/src/main/res/drawable-xhdpi/ic_payid.png
new file mode 100644
index 0000000000..914e7f67b9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_payid.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_payid.png b/app/src/main/res/drawable-xxhdpi/ic_payid.png
new file mode 100644
index 0000000000..f7dbee2905
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_payid.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_payid.png b/app/src/main/res/drawable-xxxhdpi/ic_payid.png
new file mode 100644
index 0000000000..bb99030d50
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_payid.png differ
diff --git a/app/src/main/res/drawable/ic_angle_bracket_right.xml b/app/src/main/res/drawable/ic_angle_bracket_right.xml
new file mode 100644
index 0000000000..1cfb0d7374
--- /dev/null
+++ b/app/src/main/res/drawable/ic_angle_bracket_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="6dp"
+    android:height="11dp"
+    android:viewportWidth="6"
+    android:viewportHeight="11">
+    <path
+        android:fillColor="#1C1C1E"
+        android:pathData="M1.1232,10.8334C0.9471,10.8337 0.7765,10.7724 0.641,10.6601C0.5647,10.5968 0.5016,10.5191 0.4554,10.4315C0.4092,10.3438 0.3807,10.2479 0.3716,10.1492C0.3625,10.0505 0.373,9.951 0.4024,9.8564C0.4318,9.7618 0.4796,9.6739 0.543,9.5977L3.9184,5.5593L0.6636,1.5133C0.601,1.4362 0.5543,1.3476 0.5261,1.2524C0.4978,1.1572 0.4887,1.0574 0.4992,0.9586C0.5097,0.8599 0.5397,0.7643 0.5872,0.6771C0.6348,0.59 0.6992,0.5131 0.7766,0.451C0.8545,0.3824 0.9458,0.3306 1.0447,0.299C1.1436,0.2674 1.248,0.2565 1.3513,0.2671C1.4546,0.2777 1.5546,0.3096 1.645,0.3607C1.7354,0.4118 1.8142,0.481 1.8766,0.564L5.5157,5.0846C5.6266,5.2194 5.6871,5.3885 5.6871,5.5631C5.6871,5.7376 5.6266,5.9067 5.5157,6.0415L1.7485,10.5621C1.673,10.6533 1.5769,10.7254 1.4683,10.7725C1.3596,10.8196 1.2414,10.8405 1.1232,10.8334Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_collapse_arrow.xml b/app/src/main/res/drawable/ic_angle_bracket_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_collapse_arrow.xml
rename to app/src/main/res/drawable/ic_angle_bracket_up.xml
diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml
deleted file mode 100644
index e61733ce60..0000000000
--- a/app/src/main/res/drawable/ic_arrow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="6dp"
-    android:height="11dp"
-    android:viewportWidth="6"
-    android:viewportHeight="11">
-  <path
-      android:pathData="M1.1232,10.8334C0.9471,10.8337 0.7765,10.7724 0.641,10.6601C0.5647,10.5968 0.5016,10.5191 0.4554,10.4315C0.4092,10.3438 0.3807,10.2479 0.3716,10.1492C0.3625,10.0505 0.373,9.951 0.4024,9.8564C0.4318,9.7618 0.4796,9.6739 0.543,9.5977L3.9184,5.5593L0.6636,1.5133C0.601,1.4362 0.5543,1.3476 0.5261,1.2524C0.4978,1.1572 0.4887,1.0574 0.4992,0.9586C0.5097,0.8599 0.5397,0.7643 0.5872,0.6771C0.6348,0.59 0.6992,0.5131 0.7766,0.451C0.8545,0.3824 0.9458,0.3306 1.0447,0.299C1.1436,0.2674 1.248,0.2565 1.3513,0.2671C1.4546,0.2777 1.5546,0.3096 1.645,0.3607C1.7354,0.4118 1.8142,0.481 1.8766,0.564L5.5157,5.0846C5.6266,5.2194 5.6871,5.3885 5.6871,5.5631C5.6871,5.7376 5.6266,5.9067 5.5157,6.0415L1.7485,10.5621C1.673,10.6533 1.5769,10.7254 1.4683,10.7725C1.3596,10.8196 1.2414,10.8405 1.1232,10.8334Z"
-      android:fillColor="#1C1C1E"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index e0329e1862..f45f66f818 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -3,7 +3,7 @@
     android:height="11dp"
     android:viewportWidth="14"
     android:viewportHeight="11">
-  <path
-      android:pathData="M13.7974,4.9765L9.4899,0.2623C9.2126,-0.0594 8.6644,-0.088 8.3428,0.192C8.0212,0.472 7.9888,1.0063 8.2869,1.3099L11.3997,4.7146L0.8077,4.7146C0.3616,4.7146 0,5.0664 0,5.5003C0,5.9342 0.3616,6.2859 0.8077,6.2859L11.3997,6.2859L8.2869,9.6906C7.9888,9.9942 8.0291,10.5275 8.3507,10.8076C8.6723,11.0876 9.2126,11.0599 9.4899,10.7382L13.7974,6.0241C14.0786,5.6429 14.0562,5.3008 13.7974,4.9765L13.7974,4.9765Z"
-      android:fillColor="#F9F9FA"/>
+    <path
+        android:fillColor="#F9F9FA"
+        android:pathData="M13.7974,4.9765L9.4899,0.2623C9.2126,-0.0594 8.6644,-0.088 8.3428,0.192C8.0212,0.472 7.9888,1.0063 8.2869,1.3099L11.3997,4.7146L0.8077,4.7146C0.3616,4.7146 0,5.0664 0,5.5003C0,5.9342 0.3616,6.2859 0.8077,6.2859L11.3997,6.2859L8.2869,9.6906C7.9888,9.9942 8.0291,10.5275 8.3507,10.8076C8.6723,11.0876 9.2126,11.0599 9.4899,10.7382L13.7974,6.0241C14.0786,5.6429 14.0562,5.3008 13.7974,4.9765L13.7974,4.9765Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_up_down.xml
rename to app/src/main/res/drawable/ic_arrows_up_down.xml
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
new file mode 100644
index 0000000000..b33d1ca408
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_qrcode.xml b/app/src/main/res/drawable/ic_qr_code_create.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_qrcode.xml
rename to app/src/main/res/drawable/ic_qr_code_create.xml
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_qr_code.xml
rename to app/src/main/res/drawable/ic_qr_code_scan.xml
diff --git a/app/src/main/res/drawable/round_button.xml b/app/src/main/res/drawable/round_button.xml
deleted file mode 100644
index 0f10393497..0000000000
--- a/app/src/main/res/drawable/round_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="49dp"
-    android:height="49dp"
-    android:viewportWidth="49"
-    android:viewportHeight="49">
-    <path
-        android:pathData="M24.5,2L24.5,2A21.5,21.5 0,0 1,46 23.5L46,23.5A21.5,21.5 0,0 1,24.5 45L24.5,45A21.5,21.5 0,0 1,3 23.5L3,23.5A21.5,21.5 0,0 1,24.5 2z"
-        android:fillColor="#F4F5F6"/>
-
-</vector>
diff --git a/app/src/main/res/layout/btn_arrow_up_down.xml b/app/src/main/res/layout/btn_arrow_up_down.xml
index 6a2ef33ebf..1aedcead47 100644
--- a/app/src/main/res/layout/btn_arrow_up_down.xml
+++ b/app/src/main/res/layout/btn_arrow_up_down.xml
@@ -17,6 +17,6 @@
         android:layout_gravity="center"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="4dp"
-        app:srcCompat="@drawable/ic_arrow_up_down" />
+        app:srcCompat="@drawable/ic_arrows_up_down" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/btn_expand_collapse.xml b/app/src/main/res/layout/btn_expand_collapse.xml
index 828bf856fc..17ab5b0e2c 100644
--- a/app/src/main/res/layout/btn_expand_collapse.xml
+++ b/app/src/main/res/layout/btn_expand_collapse.xml
@@ -19,6 +19,6 @@
         android:layout_gravity="center"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="5dp"
-        app:srcCompat="@drawable/ic_collapse_arrow" />
+        app:srcCompat="@drawable/ic_angle_bracket_up" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/btn_qr_code.xml b/app/src/main/res/layout/btn_qr_code.xml
index 267a46d2a6..ec3f704035 100644
--- a/app/src/main/res/layout/btn_qr_code.xml
+++ b/app/src/main/res/layout/btn_qr_code.xml
@@ -16,6 +16,6 @@
         android:layout_gravity="center"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="4dp"
-        app:srcCompat="@drawable/ic_qr_code" />
+        app:srcCompat="@drawable/ic_qr_code_scan" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_extract.xml b/app/src/main/res/layout/fragment_extract.xml
index c1ee86b6e2..cce01b7664 100644
--- a/app/src/main/res/layout/fragment_extract.xml
+++ b/app/src/main/res/layout/fragment_extract.xml
@@ -38,18 +38,14 @@
         android:layout_marginBottom="24dp" />
 
     <com.google.android.material.button.MaterialButton
+        style="@style/TapButtonWithIcon"
         android:layout_width="200dp"
         android:layout_height="48dp"
         android:layout_gravity="end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="33dp"
-        android:backgroundTint="#1ACE80"
-        android:fontFamily="@font/saira_condensed_bold"
-        android:gravity="start|center_vertical"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
+        android:fontFamily="@font/saira_semi_condensed_regular"
         android:text="@string/extract_send"
-        app:icon="@drawable/ic_arrow_right"
-        app:iconGravity="end" />
+        app:icon="@drawable/ic_arrow_right" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 1c6c9986e0..982303e7e0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -70,7 +70,6 @@
         android:layout_marginStart="30dp"
         android:layout_marginBottom="33dp"
         android:text="@string/home_button_yes"
-        app:cornerRadius="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -82,9 +81,8 @@
         android:layout_marginStart="7dp"
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="33dp"
-        android:drawableEnd="@drawable/ic_shop"
         android:text="@string/home_button_shop"
-        app:cornerRadius="4dp"
+        app:icon="@drawable/ic_shop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/btn_yes" />
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index a134b0b981..111e2e1016 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -27,20 +27,20 @@
         android:src="@drawable/card_default"
         app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
-    <include layout="@layout/card_balance"
+    <include
         android:id="@+id/l_card_balance"
-        android:layout_height="wrap_content"
+        layout="@layout/card_balance"
         android:layout_width="match_parent"
-        app:layout_constraintTop_toBottomOf="@id/iv_card"
-        />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/iv_card" />
 
 
-    <include layout="@layout/layout_address"
+    <include
         android:id="@+id/l_address"
-        android:layout_height="wrap_content"
+        layout="@layout/layout_address"
         android:layout_width="match_parent"
-        app:layout_constraintTop_toBottomOf="@id/l_card_balance"
-        />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/l_card_balance" />
 
 
     <com.google.android.material.button.MaterialButton
@@ -50,9 +50,8 @@
         android:layout_height="48dp"
         android:layout_marginStart="30dp"
         android:layout_marginBottom="33dp"
-        android:drawableEnd="@drawable/ic_scan"
         android:text="@string/wallet_button_scan"
-        app:cornerRadius="4dp"
+        app:icon="@drawable/ic_scan"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -64,9 +63,8 @@
         android:layout_marginStart="7dp"
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="33dp"
-        android:drawableEnd="@drawable/ic_send"
         android:text="@string/wallet_button_send"
-        app:cornerRadius="4dp"
+        app:icon="@drawable/ic_send"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/btn_scan" />
diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml
index 387887b460..2c2ccf9e00 100644
--- a/app/src/main/res/layout/layout_address.xml
+++ b/app/src/main/res/layout/layout_address.xml
@@ -54,7 +54,7 @@
                 android:textColor="@color/darkGray6"
                 android:textSize="12sp"
                 android:textStyle="bold"
-                app:drawableEndCompat="@drawable/ic_arrow"
+                app:drawableEndCompat="@drawable/ic_angle_bracket_right"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_address" />
 
@@ -81,7 +81,7 @@
                 android:background="@drawable/ic_btn_round_background"
                 android:elevation="3dp"
                 android:padding="10dp"
-                android:src="@drawable/ic_qrcode"
+                android:src="@drawable/ic_qr_code_create"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -114,7 +114,7 @@
                 android:textColor="@color/darkGray6"
                 android:textSize="12sp"
                 android:textStyle="bold"
-                app:drawableEndCompat="@drawable/ic_arrow"
+                app:drawableEndCompat="@drawable/ic_angle_bracket_right"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/v_payid_divider" />
 
diff --git a/app/src/main/res/layout/layout_balance_error.xml b/app/src/main/res/layout/layout_balance_error.xml
index 6e0c0b3f71..6f2ed067ac 100644
--- a/app/src/main/res/layout/layout_balance_error.xml
+++ b/app/src/main/res/layout/layout_balance_error.xml
@@ -25,7 +25,6 @@
         android:paddingStart="18dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
-        android:textColor="@color/darkGray6"
         android:textSize="20sp"
         android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/layout_extract_currency.xml b/app/src/main/res/layout/layout_extract_currency.xml
index eb705c2391..b1afc7a942 100644
--- a/app/src/main/res/layout/layout_extract_currency.xml
+++ b/app/src/main/res/layout/layout_extract_currency.xml
@@ -71,21 +71,21 @@
             android:layout_height="wrap_content"
             android:paddingEnd="5dp"
             android:text="@string/extract_balance"
-            android:textColor="@color/text_color_gray_dark" />
+            android:textColor="@color/darkGray1" />
 
         <TextView
             android:id="@+id/tvBalanceCurrency"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingEnd="5dp"
-            android:textColor="@color/text_color_gray_dark"
+            android:textColor="@color/darkGray1"
             tools:text="USD" />
 
         <TextView
             android:id="@+id/tvBalanceAmount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/text_color_gray_dark"
+            android:textColor="@color/darkGray1"
             tools:text="23.45" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_extract_total.xml b/app/src/main/res/layout/layout_extract_total.xml
index fc33390c3e..d983048902 100644
--- a/app/src/main/res/layout/layout_extract_total.xml
+++ b/app/src/main/res/layout/layout_extract_total.xml
@@ -42,7 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/extract_total_fee"
-        android:textColor="@color/text_color_gray_dark"
+        android:textColor="@color/darkGray1"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvAmount" />
@@ -52,7 +52,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
-        android:textColor="@color/text_color_gray_dark"
+        android:textColor="@color/darkGray1"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/tvFeeCurrency"
         app:layout_constraintTop_toTopOf="@+id/tvFeeCurrency"
@@ -63,7 +63,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAllCaps="true"
-        android:textColor="@color/text_color_gray_dark"
+        android:textColor="@color/darkGray1"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvFee"
@@ -74,7 +74,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="10dp"
-        android:background="@color/delimiter_color"
+        android:background="@color/separatorGrey2"
         app:layout_constraintTop_toBottomOf="@+id/tvFee"
         tools:layout_editor_absoluteX="0dp" />
 
@@ -116,7 +116,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
-        android:textColor="@color/text_color_gray_light"
+        android:textColor="@color/lightGray4"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/tvSentCurrency"
         app:layout_constraintTop_toTopOf="@+id/tvWillBeSent"
@@ -127,7 +127,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
-        android:textColor="@color/text_color_gray_light"
+        android:textColor="@color/lightGray4"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/tvWillBeSent"
         app:layout_constraintTop_toTopOf="@+id/tvWillBeSent"
@@ -139,7 +139,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:text="@string/extract_total_will_be_sent"
-        android:textColor="@color/text_color_gray_light"
+        android:textColor="@color/lightGray4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvTotal" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 64b9056fe7..88c6c121e4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,35 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="colorPrimary">#1ACE80</color>
-    <color name="colorPrimaryLight">#46D799</color>
-    <color name="colorPrimaryVeryLight">#D0F5E5</color>
-
-    <color name="success">#5AC461</color>
-    <color name="error">#C4291C</color>
-    <color name="warning">#FFB71B</color>
-
-    <color name="darkGray1">#8E8E93</color>
-    <color name="darkGray2">#636366</color>
-    <color name="darkGray3">#48484A</color>
-    <color name="darkGray4">#3A3A3C</color>
-    <color name="darkGray5">#2C2C2E</color>
-    <color name="darkGray6">#1C1C1E</color>
-
-    <color name="backgroundGray">#F9F9FA</color>
-    <color name="buttonGray">#F4F5F6</color>
-
-
-    <color name="lightGray1">#F8F8FB</color>
-    <color name="lightGray4">#C7C7CC</color>
-    <color name="lightGray5">#D1D1D6</color>
-    <color name="lightGray6">#F2F2F7</color>
-
-    <color name="separatorGrey">#1F000000</color>
-
-    <color name="blue">#0022D4</color>
-    <color name="blue1">#0029FF</color>
-    <color name="blue2">#1F50FF</color>
-    <color name="blue3">#CBE4FF</color>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="colorPrimary">#1ACE80</color>
+    <color name="colorPrimaryLight">#46D799</color>
+    <color name="colorPrimaryVeryLight">#D0F5E5</color>
+
+    <color name="success">#5AC461</color>
+    <color name="error">#C4291C</color>
+    <color name="warning">#FFB71B</color>
+
+    <color name="darkGray1">#8E8E93</color>
+    <color name="darkGray2">#636366</color>
+    <color name="darkGray3">#48484A</color>
+    <color name="darkGray4">#3A3A3C</color>
+    <color name="darkGray5">#2C2C2E</color>
+    <color name="darkGray6">#1C1C1E</color>
+
+    <color name="backgroundGray">#F9F9FA</color>
+    <color name="buttonGray">#F4F5F6</color>
+
+
+    <color name="lightGray1">#F8F8FB</color>
+    <color name="lightGray4">#C7C7CC</color>
+    <color name="lightGray5">#D1D1D6</color>
+    <color name="lightGray6">#F2F2F7</color>
+
+    <color name="separatorGrey1">#1F000000</color>
+    <color name="separatorGrey2">#14212121</color>
+
+    <color name="blue">#0022D4</color>
+    <color name="blue1">#0029FF</color>
+    <color name="blue2">#1F50FF</color>
+    <color name="blue3">#CBE4FF</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1612a3d2a4..3941e9fb33 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,32 +1,34 @@
-<resources>
-
-    <dimen name="height_thin_separator">0.8dp</dimen>
-    <dimen name="margin_separator">4dp</dimen>
-    <dimen name="margin_window">8dp</dimen>
-    <dimen name="activity_vertical_margin">4dp</dimen>
-    <dimen name="activity_horizontal_margin">4dp</dimen>
-    <dimen name="fab_margin">8dp</dimen>
-    <dimen name="appbar_padding_top">8dp</dimen>
-    <dimen name="pin_button_size">80dp</dimen>
-    <dimen name="pin_button_top_margin">8dp</dimen>
-    <dimen name="card_height">168dp</dimen>
-    <dimen name="card_info_height">132dp</dimen>
-
-    <dimen name="verify_card_left_col_width">144dp</dimen>
-
-    <dimen name="empty_wallet_left_col_width">140dp</dimen>
-    <dimen name="empty_wallet_left_col_margin">16dp</dimen>
-
-    <dimen name="text_size_2_small">11dp</dimen>
-    <dimen name="text_size_small">13dp</dimen>
-    <dimen name="text_size_1_small">15dp</dimen>
-    <dimen name="text_size_medium">19dp</dimen>
-    <dimen name="text_size_1_large">23dp</dimen>
-    <dimen name="text_size_large">26dp</dimen>
-    <dimen name="text_size_pin">34dp</dimen>
-
-    <dimen name="size_qr_image">180dp</dimen>
-    <dimen name="size_explore_image">30dp</dimen>
-    <dimen name="size_progress_bar_big">135dp</dimen>
-
-</resources>
+<resources>
+
+    <dimen name="height_thin_separator">0.8dp</dimen>
+    <dimen name="margin_separator">4dp</dimen>
+    <dimen name="margin_window">8dp</dimen>
+    <dimen name="activity_vertical_margin">4dp</dimen>
+    <dimen name="activity_horizontal_margin">4dp</dimen>
+    <dimen name="fab_margin">8dp</dimen>
+    <dimen name="appbar_padding_top">8dp</dimen>
+    <dimen name="pin_button_size">80dp</dimen>
+    <dimen name="pin_button_top_margin">8dp</dimen>
+    <dimen name="card_height">168dp</dimen>
+    <dimen name="card_info_height">132dp</dimen>
+
+    <dimen name="verify_card_left_col_width">144dp</dimen>
+
+    <dimen name="empty_wallet_left_col_width">140dp</dimen>
+    <dimen name="empty_wallet_left_col_margin">16dp</dimen>
+
+    <dimen name="text_size_2_small">11dp</dimen>
+    <dimen name="text_size_small">13dp</dimen>
+    <dimen name="text_size_1_small">15dp</dimen>
+    <dimen name="text_size_medium">19dp</dimen>
+    <dimen name="text_size_1_large">23dp</dimen>
+    <dimen name="text_size_large">26dp</dimen>
+    <dimen name="text_size_pin">34dp</dimen>
+
+    <dimen name="size_qr_image">180dp</dimen>
+    <dimen name="size_explore_image">30dp</dimen>
+    <dimen name="size_progress_bar_big">135dp</dimen>
+
+    <dimen name="btn_corner_radius">4dp</dimen>
+
+</resources>
diff --git a/app/src/main/res/values/res_extract.xml b/app/src/main/res/values/res_extract.xml
deleted file mode 100644
index f08d1d3244..0000000000
--- a/app/src/main/res/values/res_extract.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ChipNetworkFee" parent="@style/Widget.MaterialComponents.Chip.Choice">
-        <item name="chipBackgroundColor">@color/selector_chip_background</item>
-        <item name="chipStrokeColor">@color/selector_chip_stroke</item>
-        <item name="chipStrokeWidth">1dp</item>
-        <item name="android:minWidth">100dp</item>
-        <item name="android:textAlignment">center</item>
-    </style>
-
-    <color name="extract_accent_color">#0022D4</color>
-    <color name="text_color_primary">#1C1C1E</color>
-    <color name="text_color_gray_dark">#8E8E93</color>
-    <color name="text_color_gray_light">#C7C7CC</color>
-
-    <color name="delimiter_color">#14212121</color>
-
-    <string name="extract_network_fee">Network fee</string>
-    <string name="extract_network_chip_fee_low">Low</string>
-    <string name="extract_network_chip_fee_normal">Normal</string>
-    <string name="extract_network_chip_fee_priority">Priority</string>
-    <string name="extract_send">Send</string>
-
-    <string name="extract_total">Total</string>
-    <string name="extract_total_amount">Amount</string>
-    <string name="extract_total_fee">Fee</string>
-    <string name="extract_total_will_be_sent">will be sent</string>
-
-
-    <string name="extract_address_or_payid">Address or PayID</string>
-    <string name="extract_balance">Balance:</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0e4f023fb..434c27428c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,17 @@
     <string name="wallet_account_not_created">Account is not created</string>
     <string name="wallet_tokens">Tokens</string>
 
+
+    <string name="extract_address_or_payid">Address or PayID</string>
+    <string name="extract_network_fee">Network fee</string>
+    <string name="extract_network_chip_fee_low">Low</string>
+    <string name="extract_network_chip_fee_normal">Normal</string>
+    <string name="extract_network_chip_fee_priority">Priority</string>
+    <string name="extract_send">Send</string>
+    <string name="extract_total">Total</string>
+    <string name="extract_total_amount">Amount</string>
+    <string name="extract_total_fee">Fee</string>
+    <string name="extract_total_will_be_sent">will be sent</string>
+    <string name="extract_balance">Balance:</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 53b10c11b5..219f695136 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColor">@color/text_color_primary</item>
+        <item name="android:textColor">@color/darkGray6</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
     </style>
@@ -26,21 +26,28 @@
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:elevation">3dp</item>
+        <item name="cornerRadius">@dimen/btn_corner_radius</item>
         <item name="android:fontFamily">@font/saira_semi_condensed_regular</item>
     </style>
 
-    <style name="TapButtonWithIcon"  parent="TapButton">
+    <style name="TapButtonWithIcon" parent="TapButton">
         <item name="android:gravity">start|center_vertical</item>
-        <item name="android:paddingEnd">18dp</item>
+        <item name="iconGravity">end</item>
     </style>
 
-    <style name="TapBlackButton"  parent="TapButtonWithIcon">
+    <style name="TapBlackButton" parent="TapButtonWithIcon">
         <item name="android:backgroundTint">@color/darkGray6</item>
     </style>
 
+    <style name="ChipNetworkFee" parent="@style/Widget.MaterialComponents.Chip.Choice">
+        <item name="chipBackgroundColor">@color/selector_chip_background</item>
+        <item name="chipStrokeColor">@color/selector_chip_stroke</item>
+        <item name="chipStrokeWidth">1dp</item>
+        <item name="android:minWidth">100dp</item>
+        <item name="android:textAlignment">center</item>
+    </style>
 
 </resources>
\ No newline at end of file