diff --git a/app/src/main/res/drawable/labeled_edit_text_background_inactive.xml b/app/src/main/res/drawable/labeled_edit_text_background_inactive.xml
index 6360ef28e8..929ce07134 100644
--- a/app/src/main/res/drawable/labeled_edit_text_background_inactive.xml
+++ b/app/src/main/res/drawable/labeled_edit_text_background_inactive.xml
@@ -7,7 +7,7 @@
     <corners android:radius="4dp" />
 
     <stroke
-        android:color="@color/core_grey_25"
+        android:color="@color/signal_divider_major"
         android:width="1dp" />
 
 </shape>
diff --git a/app/src/main/res/layout/account_locked_fragment.xml b/app/src/main/res/layout/account_locked_fragment.xml
index 726fd6e01a..8c5fb76f73 100644
--- a/app/src/main/res/layout/account_locked_fragment.xml
+++ b/app/src/main/res/layout/account_locked_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -26,10 +27,11 @@
         android:gravity="center_horizontal"
         android:minHeight="66dp"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-        android:textColor="@color/core_grey_60"
+        android:textColor="@color/signal_text_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/account_locked_title" />
+        app:layout_constraintTop_toBottomOf="@id/account_locked_title"
+        tools:text="@string/AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy" />
 
     <Button
         android:id="@+id/account_locked_next"
diff --git a/app/src/main/res/layout/country_list_item.xml b/app/src/main/res/layout/country_list_item.xml
index c209a6886b..202086eb74 100644
--- a/app/src/main/res/layout/country_list_item.xml
+++ b/app/src/main/res/layout/country_list_item.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1.0"
         android:textAlignment="viewStart"
-        android:textColor="@color/core_black"
+        android:textColor="@color/signal_text_primary"
         android:textSize="18sp"
         tools:text="Canada" />
 
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="5dp"
-        android:textColor="@color/core_black"
+        android:textColor="@color/signal_text_primary"
         android:textSize="18sp"
         tools:text="+1" />
 
diff --git a/app/src/main/res/layout/fragment_registration_country_picker.xml b/app/src/main/res/layout/fragment_registration_country_picker.xml
index e17bae87fa..2e0583aa54 100644
--- a/app/src/main/res/layout/fragment_registration_country_picker.xml
+++ b/app/src/main/res/layout/fragment_registration_country_picker.xml
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:background="#ffffff">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/signal_background_primary"
+    android:orientation="vertical">
 
-    <EditText android:id="@+id/country_search"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:drawableStart="@drawable/ic_menu_search_holo_light"
-              android:hint="@string/country_selection_fragment__search" />
+    <EditText
+        android:id="@+id/country_search"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_menu_search_holo_light"
+        android:hint="@string/country_selection_fragment__search"
+        app:drawableTint="@color/signal_icon_tint_primary" />
 
-    <ListView android:id="@android:id/list"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:divider="#ffdddddd"
-              android:dividerHeight="1.0px"
-              android:choiceMode="singleChoice" />
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:choiceMode="singleChoice"
+        android:divider="@color/signal_divider_minor"
+        android:dividerHeight="1dp" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:text="@string/country_selection_fragment__loading_countries"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <TextView android:id="@android:id/empty"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:gravity="center"
-              android:textAppearance="?android:attr/textAppearanceLarge"
-              android:text="@string/country_selection_fragment__loading_countries" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml
index d1617f02e0..1a75380025 100644
--- a/app/src/main/res/layout/fragment_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_registration_lock.xml
@@ -32,7 +32,7 @@
             android:minHeight="66dp"
             android:text="@string/RegistrationLockFragment__enter_the_pin_you_created"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-            android:textColor="@color/core_grey_60"
+            android:textColor="@color/signal_text_secondary"
             app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_title" />
 
         <EditText
diff --git a/app/src/main/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml
index f6d316b046..a69499ad65 100644
--- a/app/src/main/res/layout/verification_code_view.xml
+++ b/app/src/main/res/layout/verification_code_view.xml
@@ -22,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="0" />
 
@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="1" />
 
@@ -66,7 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="2" />
 
@@ -79,7 +79,7 @@
         android:layout_gravity="center"
         android:layout_marginStart="4dp"
         android:text="-"
-        android:textColor="@color/core_black"
+        android:textColor="@color/signal_inverse_primary"
         android:textSize="28sp"
         app:layout_constraintStart_toEndOf="@+id/container_two"
         app:layout_constraintTop_toTopOf="parent"
@@ -101,7 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="3" />
 
@@ -123,7 +123,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="4" />
 
@@ -145,7 +145,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_black"
+            android:textColor="@color/signal_inverse_primary"
             android:textSize="28sp"
             tools:text="5" />
 
diff --git a/app/src/main/res/values/registration_styles.xml b/app/src/main/res/values/registration_styles.xml
index 5e5461b062..12b2ee723a 100644
--- a/app/src/main/res/values/registration_styles.xml
+++ b/app/src/main/res/values/registration_styles.xml
@@ -21,7 +21,7 @@
     </style>
 
     <style name="Button.Borderless.Registration">
-        <item name="android:textColor">@color/core_grey_60</item>
+        <item name="android:textColor">@color/signal_text_secondary</item>
     </style>
 
 </resources>