From ed23ec21bdeda9492822e7cbd9a6d69082e5a36f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 1 Sep 2023 13:30:17 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../disclaimer/ui/DisclaimerFragment.kt       |  2 +-
 .../products/twins/ui/TwinsCardsFragment.kt   |  2 +-
 .../stateSubscribers/SendStateSubscriber.kt   |  2 +-
 .../res/color/selector_chip_background.xml    | 10 ++---
 .../main/res/color/selector_chip_stroke.xml   | 10 ++---
 app/src/main/res/color/selector_chip_text.xml |  9 ++++
 .../color/selector_edit_text_secondary.xml    |  5 +++
 .../main/res/drawable/ic_arrows_up_down.xml   |  2 +-
 app/src/main/res/drawable/ic_paste.xml        |  2 +-
 .../main/res/drawable/ic_paste_disabled.xml   |  2 +-
 app/src/main/res/drawable/ic_qr_code_scan.xml |  2 +-
 app/src/main/res/drawable/shape_ellipse.xml   |  2 +-
 .../layout_onboarding_container_bottom.xml    |  2 +-
 .../main/res/layout/btn_expand_collapse.xml   |  3 +-
 .../dialog_russians_cardholders_warning.xml   |  4 +-
 .../main/res/layout/dialog_wallet_trade.xml   |  8 ++--
 .../main/res/layout/fragment_disclaimer.xml   |  4 +-
 .../res/layout/fragment_onboarding_main.xml   |  2 +-
 .../res/layout/fragment_onboarding_wallet.xml |  4 +-
 app/src/main/res/layout/fragment_send.xml     | 10 +++--
 app/src/main/res/layout/fragment_shop.xml     |  4 +-
 .../layout_onboarding_container_bottom.xml    |  2 +-
 .../main/res/layout/layout_pseudo_toolbar.xml |  2 +-
 .../main/res/layout/layout_receipt_total.xml  |  6 +--
 .../main/res/layout/layout_send_address.xml   | 34 +++++++++------
 .../main/res/layout/layout_send_amount.xml    |  9 ++--
 app/src/main/res/layout/layout_send_fee.xml   |  1 +
 .../main/res/layout/layout_send_receipt.xml   |  4 +-
 .../res/layout/test_leapfrog_fragment.xml     |  2 +-
 .../main/res/layout/view_currency_icon.xml    |  2 +-
 app/src/main/res/values-night/colors.xml      | 42 +++++++++---------
 app/src/main/res/values/colors.xml            | 11 +++--
 app/src/main/res/values/styles.xml            | 43 ++++++++++++++-----
 33 files changed, 147 insertions(+), 102 deletions(-)
 create mode 100644 app/src/main/res/color/selector_chip_text.xml
 create mode 100644 app/src/main/res/color/selector_edit_text_secondary.xml

diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
index 930f33afe6..21d6804bb5 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
@@ -56,7 +56,7 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
 
     override fun onStart() {
         super.onStart()
-        setStatusBarColor(R.color.backgroundLightGray)
+        setStatusBarColor(R.color.background_secondary)
 
         webViewClient.onProgressStateChanged = { store.dispatch(DisclaimerAction.OnProgressStateChanged(it)) }
         store.subscribe(subscriber = this) { state ->
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 a4b12b434c..ddcdc4119b 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
@@ -105,7 +105,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     override fun onStart() {
         super.onStart()
-        setStatusBarColor(R.color.backgroundWhite)
+        setStatusBarColor(R.color.background_primary)
     }
 
     private fun reconfigureLayoutForTwins(containerBinding: LayoutOnboardingContainerTopBinding) =
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index 6de86eba68..568f1529d0 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -256,7 +256,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
 
         val imageRes = if (state.inputIsEnabled) R.drawable.ic_arrows_up_down else 0
         tvAmountCurrency.setCompoundDrawablesWithIntrinsicBounds(0, 0, imageRes, 0)
-        val textColor = if (state.inputIsEnabled) R.color.blue else R.color.textGray
+        val textColor = if (state.inputIsEnabled) R.color.accent else R.color.text_secondary
         tvAmountCurrency.setTextColor(fg.getColor(textColor))
     }
 
diff --git a/app/src/main/res/color/selector_chip_background.xml b/app/src/main/res/color/selector_chip_background.xml
index e0b0431767..16be87b913 100644
--- a/app/src/main/res/color/selector_chip_background.xml
+++ b/app/src/main/res/color/selector_chip_background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 24% opacity -->
-<item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
-<item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
+    <!-- 24% opacity -->
+    <item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
+    <item android:alpha="0.1" android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
 
-<item android:color="@color/backgroundLightGray" android:state_enabled="true" />
-<item android:color="@color/backgroundLightGray" />
+    <item android:color="@color/background_secondary" android:state_enabled="true" />
+    <item android:color="@color/background_secondary" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_chip_stroke.xml b/app/src/main/res/color/selector_chip_stroke.xml
index e4a5d64acc..c2827e783e 100644
--- a/app/src/main/res/color/selector_chip_stroke.xml
+++ b/app/src/main/res/color/selector_chip_stroke.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" android:state_enabled="true" android:state_selected="true" />
-    <item android:color="?attr/colorSecondary" android:state_checked="true" android:state_enabled="true" />
-    <!-- 12% of 87% opacity -->
-    <item android:alpha="0.10" android:color="?attr/colorOnSurface" android:state_enabled="true" />
-    <item android:alpha="0.12" android:color="?attr/colorOnSurface" />
+    <item android:color="@color/accent" android:state_enabled="true" android:state_selected="true" />
+    <item android:color="@color/accent" android:state_checked="true" android:state_enabled="true" />
+
+    <item android:color="@color/text_secondary" android:state_enabled="true" />
+    <item android:color="@color/text_secondary" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_chip_text.xml b/app/src/main/res/color/selector_chip_text.xml
new file mode 100644
index 0000000000..e205f4e82d
--- /dev/null
+++ b/app/src/main/res/color/selector_chip_text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent" android:state_enabled="true" android:state_selected="true" />
+    <item android:color="@color/accent" android:state_checked="true" android:state_enabled="true" />
+
+    <item android:color="@color/text_primary_1" android:state_enabled="true" />
+    <item android:color="@color/text_primary_1" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_edit_text_secondary.xml b/app/src/main/res/color/selector_edit_text_secondary.xml
new file mode 100644
index 0000000000..df06469793
--- /dev/null
+++ b/app/src/main/res/color/selector_edit_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/accent" android:state_focused="true" />
+    <item android:color="@color/text_secondary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml
index 6e7d34d5e6..96faa98e71 100644
--- a/app/src/main/res/drawable/ic_arrows_up_down.xml
+++ b/app/src/main/res/drawable/ic_arrows_up_down.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="14"
     android:viewportHeight="19">
     <path
-        android:fillColor="@color/blue"
+        android:fillColor="@color/accent"
         android:pathData="M11,14.51V7.5H9V14.51H6L10,18.5L14,14.51H11ZM4,0.5L0,4.49H3V11.5H5V4.49H8L4,0.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_paste.xml b/app/src/main/res/drawable/ic_paste.xml
index c49d12dc4b..b971249451 100644
--- a/app/src/main/res/drawable/ic_paste.xml
+++ b/app/src/main/res/drawable/ic_paste.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="19">
     <path
-        android:fillColor="#1C1C1E"
+        android:fillColor="@color/text_primary_1"
         android:pathData="M13.8333,1.6667H10.35C10,0.7 9.0833,0 8,0C6.9167,0 6,0.7 5.65,1.6667H2.1667C1.25,1.6667 0.5,2.4167 0.5,3.3333V16.6667C0.5,17.5833 1.25,18.3333 2.1667,18.3333H13.8333C14.75,18.3333 15.5,17.5833 15.5,16.6667V3.3333C15.5,2.4167 14.75,1.6667 13.8333,1.6667ZM8,1.6667C8.4583,1.6667 8.8333,2.0417 8.8333,2.5C8.8333,2.9583 8.4583,3.3333 8,3.3333C7.5417,3.3333 7.1667,2.9583 7.1667,2.5C7.1667,2.0417 7.5417,1.6667 8,1.6667ZM13.8333,16.6667H2.1667V3.3333H3.8333V5.8333H12.1667V3.3333H13.8333V16.6667Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_paste_disabled.xml b/app/src/main/res/drawable/ic_paste_disabled.xml
index 7666c5a52d..156ddafc4b 100644
--- a/app/src/main/res/drawable/ic_paste_disabled.xml
+++ b/app/src/main/res/drawable/ic_paste_disabled.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="19">
 
     <path
-        android:fillColor="#99838383"
+        android:fillColor="@color/text_disabled"
         android:pathData="M13.8333 1.66667H10.35C10 0.7 9.08333 0 8 0C6.91667 0 6 0.7 5.65 1.66667H2.16667C1.25 1.66667 0.5 2.41667 0.5 3.33333V16.6667C0.5 17.5833 1.25 18.3333 2.16667 18.3333H13.8333C14.75 18.3333 15.5 17.5833 15.5 16.6667V3.33333C15.5 2.41667 14.75 1.66667 13.8333 1.66667ZM8 1.66667C8.45833 1.66667 8.83333 2.04167 8.83333 2.5C8.83333 2.95833 8.45833 3.33333 8 3.33333C7.54167 3.33333 7.16667 2.95833 7.16667 2.5C7.16667 2.04167 7.54167 1.66667 8 1.66667ZM13.8333 16.6667H2.16667V3.33333H3.83333V5.83333H12.1667V3.33333H13.8333V16.6667Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_qr_code_scan.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml
index 34a2bf62a8..5ec455e546 100644
--- a/app/src/main/res/drawable/ic_qr_code_scan.xml
+++ b/app/src/main/res/drawable/ic_qr_code_scan.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="18">
   <path
       android:pathData="M1.0712,6.8139C1.5571,6.8139 1.8138,6.5481 1.8138,6.0622V3.8986C1.8138,2.9451 2.318,2.4593 3.2348,2.4593H5.4534C5.9392,2.4593 6.2051,2.1934 6.2051,1.7167C6.2051,1.2491 5.9392,0.9833 5.4534,0.9833H3.2164C1.3004,0.9833 0.3378,1.9275 0.3378,3.8161V6.0622C0.3378,6.5481 0.6036,6.8139 1.0712,6.8139ZM16.4271,6.8139C16.913,6.8139 17.1697,6.5481 17.1697,6.0622V3.8161C17.1697,1.9275 16.2071,0.9833 14.2911,0.9833H12.045C11.5682,0.9833 11.3024,1.2491 11.3024,1.7167C11.3024,2.1934 11.5682,2.4593 12.045,2.4593H14.2636C15.1712,2.4593 15.6937,2.9451 15.6937,3.8986V6.0622C15.6937,6.5481 15.9596,6.8139 16.4271,6.8139ZM8.3595,8.6016V5.4021C8.3595,5.1821 8.1854,4.9987 7.9562,4.9987H4.7566C4.5366,4.9987 4.3624,5.1821 4.3624,5.4021V8.6016C4.3624,8.8217 4.5366,8.9958 4.7566,8.9958H7.9562C8.1854,8.9958 8.3595,8.8217 8.3595,8.6016ZM9.9455,5.7963H12.3475V8.1983H9.9455V5.7963ZM11.6507,7.5015V6.5022H10.6423V7.5015H11.6507ZM6.856,7.5015V6.5022H5.8567V7.5015H6.856ZM5.1508,10.591H7.5619V12.993H5.1508V10.591ZM13.0259,10.9027V9.9035H12.0266V10.9027H13.0259ZM10.2664,10.9027V9.9035H9.2671V10.9027H10.2664ZM6.856,12.2871V11.2878H5.8567V12.2871H6.856ZM11.6416,12.2871V11.2878H10.6423V12.2871H11.6416ZM12.045,17.806H14.2911C16.2071,17.806 17.1697,16.8526 17.1697,14.964V12.7271C17.1697,12.2412 16.9039,11.9754 16.4271,11.9754C15.9504,11.9754 15.6937,12.2412 15.6937,12.7271V14.8907C15.6937,15.8441 15.1712,16.33 14.2636,16.33H12.045C11.5682,16.33 11.3024,16.5959 11.3024,17.0726C11.3024,17.5402 11.5682,17.806 12.045,17.806ZM3.2164,17.806H5.4534C5.9392,17.806 6.2051,17.5402 6.2051,17.0726C6.2051,16.5959 5.9392,16.33 5.4534,16.33H3.2348C2.318,16.33 1.8138,15.8441 1.8138,14.8907V12.7271C1.8138,12.2412 1.5479,11.9754 1.0712,11.9754C0.5945,11.9754 0.3378,12.2412 0.3378,12.7271V14.964C0.3378,16.8618 1.3004,17.806 3.2164,17.806ZM10.2664,13.6714V12.6721H9.2671V13.6714H10.2664ZM13.0259,13.6714V12.6721H12.0266V13.6714H13.0259ZM13.1451,8.6016V5.4021C13.1451,5.1821 12.9709,4.9987 12.7417,4.9987H9.5513C9.3222,4.9987 9.148,5.1821 9.148,5.4021V8.6016C9.148,8.8217 9.3222,8.9958 9.5513,8.9958H12.7417C12.9709,8.9958 13.1451,8.8217 13.1451,8.6016ZM5.1508,5.7963H7.5619V8.1983H5.1508V5.7963ZM8.3595,13.3872V10.1877C8.3595,9.9676 8.1854,9.7935 7.9562,9.7935H4.7566C4.5366,9.7935 4.3624,9.9676 4.3624,10.1877V13.3872C4.3624,13.6072 4.5366,13.7906 4.7566,13.7906H7.9562C8.1854,13.7906 8.3595,13.6072 8.3595,13.3872Z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/text_primary_1" />
 </vector>
diff --git a/app/src/main/res/drawable/shape_ellipse.xml b/app/src/main/res/drawable/shape_ellipse.xml
index b5f3fc7939..ca6cad24b5 100644
--- a/app/src/main/res/drawable/shape_ellipse.xml
+++ b/app/src/main/res/drawable/shape_ellipse.xml
@@ -10,7 +10,7 @@
         <clip-path android:pathData="M40 20C40 31.0457 31.0457 40 20 40C8.95431 40 0 31.0457 0 20C0 8.95431 8.95431 0 20 0C31.0457 0 40 8.95431 40 20Z" />
 
         <path
-            android:fillColor="#F4F5F6"
+            android:fillColor="@color/button_secondary"
             android:pathData="M0 0V40H40V0" />
 
     </group>
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 32d2544981..ee7f2b2cb0 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
@@ -85,7 +85,7 @@
             android:layout_gravity="center"
             android:elevation="18dp"
             android:indeterminate="true"
-            android:indeterminateTint="@color/backgroundLightGray"
+            android:indeterminateTint="@color/background_secondary"
             android:visibility="invisible" />
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/btn_expand_collapse.xml b/app/src/main/res/layout/btn_expand_collapse.xml
index 76f0338c98..8d9c220409 100644
--- a/app/src/main/res/layout/btn_expand_collapse.xml
+++ b/app/src/main/res/layout/btn_expand_collapse.xml
@@ -18,6 +18,7 @@
         android:layout_gravity="center"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="5dp"
-        app:srcCompat="@drawable/ic_angle_bracket_up" />
+        app:srcCompat="@drawable/ic_angle_bracket_up"
+        app:tint="@color/icon_primary_1" />
 
 </FrameLayout>
\ No newline at end of file
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 29bf1c052b..ae04b02d83 100644
--- a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
+++ b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:minHeight="420dp"
     tools:layout_gravity="bottom">
 
@@ -25,7 +25,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:background="@drawable/shape_circle"
-        android:backgroundTint="@color/backgroundWhite"
+        android:backgroundTint="@color/background_primary"
         app:layout_constraintBottom_toBottomOf="@id/iv_cross"
         app:layout_constraintEnd_toEndOf="@id/iv_cross"
         app:layout_constraintStart_toStartOf="@id/iv_cross"
diff --git a/app/src/main/res/layout/dialog_wallet_trade.xml b/app/src/main/res/layout/dialog_wallet_trade.xml
index dea867e05a..96dd6d34c1 100644
--- a/app/src/main/res/layout/dialog_wallet_trade.xml
+++ b/app/src/main/res/layout/dialog_wallet_trade.xml
@@ -11,7 +11,7 @@
         android:layout_height="56dp"
         android:padding="16dp"
         android:text="@string/wallet_choose_trade_action"
-        android:textColor="@color/darkGray2"
+        android:textColor="@color/text_secondary"
         android:textSize="14sp" />
 
     <TextView
@@ -24,7 +24,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/common_buy"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_arrow_up_24" />
@@ -39,7 +39,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/common_sell"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_arrow_down_24" />
@@ -54,7 +54,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="@string/swapping_swap_action"
-        android:textColor="@color/darkGray3"
+        android:textColor="@color/text_primary_1"
         android:textSize="14sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_exchange_vertical_24" />
diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml
index 328a435e5c..136a258b23 100644
--- a/app/src/main/res/layout/fragment_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_disclaimer.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -12,7 +12,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
diff --git a/app/src/main/res/layout/fragment_onboarding_main.xml b/app/src/main/res/layout/fragment_onboarding_main.xml
index c88f910dcb..bc1cafb403 100644
--- a/app/src/main/res/layout/fragment_onboarding_main.xml
+++ b/app/src/main/res/layout/fragment_onboarding_main.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_onboarding"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:fitsSystemWindows="true"
diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml
index 821f0d3ef8..0080b81937 100644
--- a/app/src/main/res/layout/fragment_onboarding_wallet.xml
+++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical">
@@ -183,7 +183,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
                 android:layout_marginBottom="16dp"
-                android:background="@color/backgroundLightGray"
+                android:background="@color/background_secondary"
                 android:visibility="gone"
                 app:layout_constraintBottom_toTopOf="@id/layout_buttons_common"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 20949f4932..a7f8c54c42 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_wallet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -13,7 +13,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
@@ -22,7 +22,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/common_send" />
+            app:navigationIconTint="@color/text_primary_1"
+            app:title="@string/common_send"
+            app:titleTextColor="@color/text_primary_1" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -125,7 +127,7 @@
                         android:layout_gravity="center"
                         android:elevation="18dp"
                         android:indeterminate="true"
-                        android:indeterminateTint="@color/backgroundLightGray" />
+                        android:indeterminateTint="@color/background_primary" />
 
                 </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 3d6e2f4020..48384d34c6 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_details_confirm"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:focusableInTouchMode="true"
@@ -16,7 +16,7 @@
         style="@style/ThemeOverlay.MyTheme.Toolbar.AccentColorMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
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 187018cab1..8f92cb1daa 100644
--- a/app/src/main/res/layout/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
@@ -85,7 +85,7 @@
             android:layout_gravity="center"
             android:elevation="18dp"
             android:indeterminate="true"
-            android:indeterminateTint="@color/backgroundLightGray"
+            android:indeterminateTint="@color/background_secondary"
             android:visibility="invisible" />
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/layout_pseudo_toolbar.xml b/app/src/main/res/layout/layout_pseudo_toolbar.xml
index c1bc683d3a..bb2a5ce723 100644
--- a/app/src/main/res/layout/layout_pseudo_toolbar.xml
+++ b/app/src/main/res/layout/layout_pseudo_toolbar.xml
@@ -4,7 +4,7 @@
     android:id="@+id/pseudo_toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/layout_receipt_total.xml b/app/src/main/res/layout/layout_receipt_total.xml
index 7cca4f9165..5ff5d3377c 100644
--- a/app/src/main/res/layout/layout_receipt_total.xml
+++ b/app/src/main/res/layout/layout_receipt_total.xml
@@ -47,7 +47,7 @@
             android:layout_gravity="end"
             android:layout_marginTop="4dp"
             android:gravity="end"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             tools:text="123.29837729 ADA 39487593.109342039402938049 will be sent" />
 
     </LinearLayout>
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="start"
             android:text="@string/send_total_label"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             android:textSize="14sp"
             android:textStyle="bold" />
 
@@ -74,7 +74,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:textAllCaps="true"
-            android:textColor="@color/darkGray1"
+            android:textColor="@color/text_tertiary"
             android:textSize="14sp"
             android:textStyle="bold"
             tools:text="usd" />
diff --git a/app/src/main/res/layout/layout_send_address.xml b/app/src/main/res/layout/layout_send_address.xml
index c6dd2873c8..8367bf3524 100644
--- a/app/src/main/res/layout/layout_send_address.xml
+++ b/app/src/main/res/layout/layout_send_address.xml
@@ -21,23 +21,24 @@
             android:id="@+id/tilAddress"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:boxBackgroundColor="@color/backgroundLightGray"
             app:errorIconDrawable="@null"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            style="@style/SecondaryTextInputLayout"
             app:layout_constraintTop_toTopOf="parent">
 
             <com.tangem.tap.features.send.ui.EditTextCustomPaste
                 android:id="@+id/etAddress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/backgroundLightGray"
                 android:ellipsize="middle"
                 android:inputType="textNoSuggestions"
                 android:paddingStart="0dp"
                 android:paddingEnd="98dp"
                 android:singleLine="true"
                 android:textSize="16sp"
+                android:background="@color/background_secondary"
+                android:textColor="@color/text_primary_1"
                 tools:text="139mrsJgyWnJ **** y9BV" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -67,10 +68,10 @@
             android:id="@+id/flQrCode"
             android:layout_width="@dimen/btn_rounded_size"
             android:layout_height="@dimen/btn_rounded_size"
-            android:layout_marginTop="10dp"
             android:background="@drawable/shape_ellipse"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tilAddress">
+            android:layout_marginTop="4dp"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/imvQrCode"
@@ -108,14 +109,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etXlmMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="middle"
                     android:inputType="text|textNoSuggestions"
                     android:paddingStart="0dp"
@@ -140,14 +142,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etBinanceMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:inputType="number"
                     android:paddingStart="0dp"
@@ -172,14 +175,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_destination_tag"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etDestinationTag"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:inputType="number"
                     android:paddingStart="0dp"
@@ -204,14 +208,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etTonMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:paddingStart="0dp"
                     android:paddingEnd="0dp"
@@ -235,14 +240,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/send_extras_hint_memo"
-                app:boxBackgroundColor="@color/backgroundLightGray"
+                style="@style/SecondaryTextInputLayout"
                 app:errorIconDrawable="@null">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etCosmosMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/backgroundLightGray"
+                    android:background="@color/background_secondary"
+                    android:textColor="@color/text_primary_1"
                     android:ellipsize="end"
                     android:paddingStart="0dp"
                     android:paddingEnd="0dp"
diff --git a/app/src/main/res/layout/layout_send_amount.xml b/app/src/main/res/layout/layout_send_amount.xml
index d53d8eed53..fb744b5755 100644
--- a/app/src/main/res/layout/layout_send_amount.xml
+++ b/app/src/main/res/layout/layout_send_amount.xml
@@ -44,20 +44,21 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            app:boxBackgroundColor="@color/backgroundLightGray"
+            style="@style/SecondaryTextInputLayout"
             app:errorIconDrawable="@null">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/etAmountToSend"
+                android:background="@color/background_secondary"
                 android:layout_width="match_parent"
                 android:layout_height="82dp"
-                android:background="@color/backgroundLightGray"
                 android:fontFamily="sans-serif-light"
                 android:imeOptions="actionDone"
                 android:inputType="numberDecimal"
                 android:paddingStart="0dp"
                 android:paddingEnd="96dp"
                 android:textSize="@dimen/text_size_amount_to_send"
+                android:textColor="@color/text_primary_1"
                 tools:text="139" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -74,7 +75,7 @@
         android:drawablePadding="10dp"
         android:fontFamily="sans-serif-light"
         android:textAllCaps="true"
-        android:textColor="@color/blue"
+        android:textColor="@color/accent"
         android:textSize="32sp"
         app:drawableEndCompat="@drawable/ic_arrows_up_down"
         app:layout_constraintEnd_toEndOf="parent"
@@ -88,7 +89,7 @@
         android:layout_gravity="end"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/flAmountToSend" />
diff --git a/app/src/main/res/layout/layout_send_fee.xml b/app/src/main/res/layout/layout_send_fee.xml
index f54f8f8bfe..bba30587f9 100644
--- a/app/src/main/res/layout/layout_send_fee.xml
+++ b/app/src/main/res/layout/layout_send_fee.xml
@@ -85,6 +85,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
             android:text="@string/send_fee_include_description"
+            android:textColor="@color/text_primary_1"
             android:textSize="13sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/layout_send_receipt.xml b/app/src/main/res/layout/layout_send_receipt.xml
index 2cf18b1ed5..4a8fab6816 100644
--- a/app/src/main/res/layout/layout_send_receipt.xml
+++ b/app/src/main/res/layout/layout_send_receipt.xml
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/send_fee_label"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvReceiptAmount" />
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:textAllCaps="true"
-        android:textColor="@color/darkGray1"
+        android:textColor="@color/text_tertiary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvReceiptFee"
diff --git a/app/src/main/res/layout/test_leapfrog_fragment.xml b/app/src/main/res/layout/test_leapfrog_fragment.xml
index 52b720ad27..9e0865e85a 100644
--- a/app/src/main/res/layout/test_leapfrog_fragment.xml
+++ b/app/src/main/res/layout/test_leapfrog_fragment.xml
@@ -4,7 +4,7 @@
     android:id="@+id/coordinator_onboarding"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundWhite"
+    android:background="@color/background_primary"
     android:clipChildren="false"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/view_currency_icon.xml b/app/src/main/res/layout/view_currency_icon.xml
index aa1330c398..7e76b227e7 100644
--- a/app/src/main/res/layout/view_currency_icon.xml
+++ b/app/src/main/res/layout/view_currency_icon.xml
@@ -45,7 +45,7 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:background="@drawable/shape_circle"
-        android:backgroundTint="@color/backgroundWhite"
+        android:backgroundTint="@color/background_primary"
         android:contentDescription="@null"
         android:padding="2dp"
         android:visibility="gone"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 9be291c700..75ebc64343 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,32 +2,32 @@
 <resources>
 
 
-    <!--<color name="background_action">#C9C9C9</color>-->
+    <color name="background_action">#C9C9C9</color>
     <!--<color name="background_plain">#000000</color>-->
-    <!--<color name="background_primary">#1E1E1E</color>-->
-    <!--<color name="background_secondary">#000000</color>-->
+    <color name="background_primary">#1E1E1E</color>
+    <color name="background_secondary">#000000</color>
 
-    <!--<color name="button_disabled">#1E1E1E</color>-->
+    <color name="button_disabled">#1E1E1E</color>
     <!--<color name="button_positive">#1ACE80</color>-->
     <!--<color name="button_positive_disabled">#06311F</color>-->
-    <!--<color name="button_primary">#F5F5F5</color>-->
-    <!--<color name="button_secondary">#303030</color>-->
+    <color name="button_primary">#F5F5F5</color>
+    <color name="button_secondary">#303030</color>
 
-    <!--<color name="control_checked">#1ACE80</color>-->
+    <color name="control_checked">#1ACE80</color>
     <!--<color name="control_key">#F5F5F5</color>-->
     <!--<color name="control_unchecked">#3B3B3B</color>-->
 
     <!--<color name="field_focused">#3B3B3B</color>-->
     <!--<color name="field_primary">#303030</color>-->
 
-    <!--<color name="icon_accent">#1ACE80</color>-->
-    <!--<color name="icon_attention">#FFB71B</color>-->
-    <!--<color name="icon_inactive">#3B3B3B</color>-->
-    <!--<color name="icon_informative">#656565</color>-->
-    <!--<color name="icon_primary_1">#FFFFFF</color>-->
-    <!--<color name="icon_primary_2">#1E1E1E</color>-->
-    <!--<color name="icon_secondary">#919191</color>-->
-    <!--<color name="icon_warning">#DE1010</color>-->
+    <color name="icon_accent">#1ACE80</color>
+    <color name="icon_attention">#FFB71B</color>
+    <color name="icon_inactive">#3B3B3B</color>
+    <color name="icon_informative">#656565</color>
+    <color name="icon_primary_1">#FFFFFF</color>
+    <color name="icon_primary_2">#1E1E1E</color>
+    <color name="icon_secondary">#919191</color>
+    <color name="icon_warning">#FF5B5B</color>
 
 
     <!--<color name="stroke_primary">#303030</color>-->
@@ -36,13 +36,13 @@
 
 
     <!--<color name="text_accent">#1ACE80</color>-->
-    <!--<color name="text_attention">#FFB71B</color>-->
+    <color name="text_attention">#FFB71B</color>
     <!--<color name="text_constant_white">#FFFFFF</color>-->
-    <!--<color name="text_disabled">#494949</color>-->
-    <!--<color name="text_primary_1">#FFFFFF</color>-->
-    <!--<color name="text_primary_2">#1E1E1E</color>-->
-    <!--<color name="text_secondary">#B0B0B0</color>-->
-    <!--<color name="text_tertiary">#919191</color>-->
+    <color name="text_disabled">#494949</color>
+    <color name="text_primary_1">#FFFFFF</color>
+    <color name="text_primary_2">#1E1E1E</color>
+    <color name="text_secondary">#B0B0B0</color>
+    <color name="text_tertiary">#919191</color>
     <!--<color name="text_warning">#DE1010</color>-->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3509ec1ee5..733c9d3d07 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
 
     <color name="colorPrimary">#0029FF</color>
     <color name="colorSecondary">#0022D4</color>
-    <color name="accent">#19C878</color>
+    <color name="accent">#0099FF</color>
 
     <color name="menu_accent_color">@color/accent</color>
 
@@ -11,7 +11,7 @@
 
     <color name="warning">#FFB71B</color>
 
-    <color name="toolbarColor">@color/backgroundLightGray</color>
+    <color name="toolbarColor">@color/background_secondary</color>
 
     <color name="white">#FFFFFF</color>
     <color name="lightGray0">#F3F3F3</color>
@@ -19,12 +19,10 @@
     <color name="lightGray5">#D1D1D6</color>
     <color name="darkGray1">#8E8E90</color>
     <color name="darkGray2">#666668</color>
-    <color name="darkGray3">#48484A</color>
+
     <color name="darkGray4">#3A3A3C</color>
     <color name="darkGray6">#1C1C1E</color>
 
-    <color name="backgroundWhite">#FFFFFF</color>
-    <color name="backgroundLightGray">#F9F9F9</color>
     <color name="buttonGray">#F4F5F6</color>
     <color name="textGray">#DE000000</color>
 
@@ -61,9 +59,10 @@
     <color name="icon_attention">#FFB71B</color>
     <color name="icon_inactive">#C9C9C9</color>
     <color name="icon_informative">#B0B0B0</color>
+    <color name="icon_primary_1">#1E1E1E</color>
     <color name="icon_primary_2">#FFFFFF</color>
     <color name="icon_secondary">#656565</color>
-    <color name="icon_warning">#DE1010</color>
+    <color name="icon_warning">#FF3333</color>
 
 
     <color name="text_attention">#FFB71B</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 70af1872c5..f97ed69d87 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,11 +3,15 @@
     <style name="BaseAppTheme" parent="Theme.MaterialComponents.Light.NoActionBar" />
 
     <style name="AppTheme" parent="BaseAppTheme">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="android:textColor">@color/darkGray6</item>
+        <item name="colorPrimary">@color/menu_accent_color</item>
+        <item name="colorSecondary">@color/menu_accent_color</item>
+        <item name="android:textColor">@color/text_primary_1</item>
         <item name="actionMenuTextColor">@color/menu_accent_color</item>
 
+        <item name="colorControlNormal">@color/text_secondary</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlHighlight">@color/accent</item>
+
         <item name="materialCardViewStyle">@style/Widget.AppTheme.CardView</item>
     </style>
 
@@ -22,15 +26,21 @@
     <!-- Toolbar - overrides the menu text color to use a selector that responds to whether it's enabled or not -->
     <style name="ThemeOverlay.MyTheme.Toolbar" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
         <!-- Color used in the icons of menu actions (i.e. non-overflow menu items). This is just convention, this will affect anything that uses ?attr/colorControlNormal) -->
-        <item name="colorControlNormal">@color/menu_item_color</item>
+        <item name="colorControlNormal">@color/text_secondary</item>
         <!-- Color used in the text of menu actions (i.e. non-overflow menu items) -->
-        <item name="actionMenuTextColor">@color/menu_item_color</item>
+        <item name="actionMenuTextColor">@color/text_secondary</item>
     </style>
 
     <style name="ThemeOverlay.MyTheme.Toolbar.AccentColorMenu" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
         <item name="actionMenuTextColor">@color/accent</item>
     </style>
 
+
+    <style name="Widget.MaterialComponents.Toolbar.PrimarySurface" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <item name="titleTextColor">@color/text_primary_1</item>
+        <item name="subtitleTextColor">@color/text_secondary</item>
+    </style>
+
     <!-- EditText -->
 
     <style name="EditTextThemeOverlay" parent="ThemeOverlay.AppCompat">
@@ -38,6 +48,16 @@
         <item name="colorPrimary">@color/accent</item>
     </style>
 
+    <style name="SecondaryTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="android:textColorHint">@color/text_secondary</item>
+        <item name="boxStrokeColor">@color/selector_edit_text_secondary</item>
+        <item name="helperTextTextColor">@color/text_secondary</item>
+        <item name="boxBackgroundColor">@color/background_secondary</item>
+        <item name="colorError">@color/icon_warning</item>
+        <item name="errorTextColor">@color/icon_warning</item>
+        <item name="boxStrokeErrorColor">@color/icon_warning</item>
+    </style>
+
     <style name="BaseTapButton" parent="Widget.Material3.Button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -88,11 +108,12 @@
     </style>
 
     <style name="TapChip" parent="@style/Widget.MaterialComponents.Chip.Choice">
-        <item name="chipBackgroundColor">@color/selector_chip_background</item>
+        <item name="chipBackgroundColor">@color/icon_primary_2</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>
+        <item name="android:textColor">@color/selector_chip_text</item>
     </style>
 
     <style name="TextViewOnboarding">
@@ -100,32 +121,32 @@
     </style>
 
     <style name="TextViewOnboarding.Header">
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
         <item name="android:textSize">24sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="TextViewOnboarding.Body">
-        <item name="android:textColor">#686868</item>
+        <item name="android:textColor">@color/text_secondary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
     </style>
 
     <style name="heading">
         <item name="android:textSize">24sp</item>
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
     </style>
 
     <style name="title">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#060606</item>
+        <item name="android:textColor">@color/text_primary_1</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="description">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#686868</item>
+        <item name="android:textColor">@color/text_secondary</item>
     </style>