diff --git a/res/drawable/ic_circle.xml b/res/drawable/ic_circle.xml
index c73285b7d2..b5b8615d22 100644
--- a/res/drawable/ic_circle.xml
+++ b/res/drawable/ic_circle.xml
@@ -1,6 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="15"
-    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-  <path android:fillColor="#00000000"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15"
+    android:tint="?colorControlNormal">
+  <path
       android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
-      android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="1"/>
 </vector>
diff --git a/res/drawable/ic_circle_check.xml b/res/drawable/ic_circle_check.xml
index a258b5c30c..e88b286a9d 100644
--- a/res/drawable/ic_circle_check.xml
+++ b/res/drawable/ic_circle_check.xml
@@ -1,7 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="15"
-    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15"
+    android:tint="?colorControlNormal">
+    <path
         android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
-        android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M4.77,7.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0l4.13,-4.12c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L6.38,9.22L4.77,7.61z"/>
+        android:strokeColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4.77,7.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0l4.13,-4.12c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L6.38,9.22L4.77,7.61z"/>
 </vector>
diff --git a/res/drawable/ic_edit_white_24dp.xml b/res/drawable/ic_edit_white_24dp.xml
deleted file mode 100644
index 46462b5726..0000000000
--- a/res/drawable/ic_edit_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/res/drawable/ic_more_horiz_white.xml b/res/drawable/ic_more_horiz_white.xml
index 8bb3fc306f..efb34a24a3 100644
--- a/res/drawable/ic_more_horiz_white.xml
+++ b/res/drawable/ic_more_horiz_white.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/res/layout-sw400dp/view_seed_reminder.xml b/res/layout-sw400dp/view_seed_reminder.xml
index c1b16634fe..e9bb3bbe81 100644
--- a/res/layout-sw400dp/view_seed_reminder.xml
+++ b/res/layout-sw400dp/view_seed_reminder.xml
@@ -71,6 +71,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/separator" />
+        android:background="?android:dividerHorizontal" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index f8446309d1..4c773cc6ad 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -24,7 +24,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/separator" />
+            android:background="?android:dividerHorizontal" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 7fd0b7613c..e665a74e12 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -89,7 +89,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/separator" />
+            android:background="?android:dividerHorizontal" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -126,7 +126,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/separator" />
+            android:background="?android:dividerHorizontal" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 782d6553de..56f5998c97 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -109,7 +109,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="1px"
                 android:layout_marginTop="@dimen/large_spacing"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/themeSwitchButton"
@@ -125,7 +125,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/privacyButton"
@@ -141,7 +141,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/notificationsButton"
@@ -157,7 +157,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/chatsButton"
@@ -174,7 +174,7 @@
                 android:id="@+id/linkedDevicesButtonTopSeparator"
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/linkedDevicesButton"
@@ -191,7 +191,7 @@
                 android:id="@+id/seedButtonTopSeparator"
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/seedButton"
@@ -207,7 +207,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/clearAllDataButton"
@@ -224,7 +224,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="1px"
                 android:layout_marginBottom="@dimen/medium_spacing"
-                android:background="@color/separator" />
+                android:background="?android:dividerHorizontal" />
 
             <TextView
                 android:id="@+id/versionTextView"
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 05fe9db713..8151fbefba 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -159,14 +159,14 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1px"
-                        android:background="@color/separator" />
+                        android:background="?android:dividerHorizontal" />
 
                     <include layout="@layout/view_mention_candidate_selection" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1px"
-                        android:background="@color/separator" />
+                        android:background="?android:dividerHorizontal" />
 
                 </LinearLayout>
 
diff --git a/res/layout/session_restore_banner.xml b/res/layout/session_restore_banner.xml
index 30a6d99c96..4d402326e2 100644
--- a/res/layout/session_restore_banner.xml
+++ b/res/layout/session_restore_banner.xml
@@ -11,7 +11,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/separator" />
+        android:background="?android:dividerHorizontal" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -68,6 +68,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/separator" />
+        android:background="?android:dividerHorizontal" />
 
 </LinearLayout>
diff --git a/res/layout/view_seed_reminder.xml b/res/layout/view_seed_reminder.xml
index 362e25b32c..02258d49b1 100644
--- a/res/layout/view_seed_reminder.xml
+++ b/res/layout/view_seed_reminder.xml
@@ -71,6 +71,6 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/separator" />
+        android:background="?android:dividerHorizontal" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index 6d9aa37e09..f213e59972 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/conversation_view_background"
@@ -29,22 +29,23 @@
             android:ellipsize="end"
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
-            android:textColor="@color/text"
-            android:text="Spiderman"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            android:textColor="?android:textColorPrimary"
+            tools:text="Spiderman" />
 
         <ImageView
             android:id="@+id/actionIndicatorImageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="@dimen/medium_spacing"
-            android:src="@drawable/ic_circle" />
+            android:src="@drawable/ic_circle"
+            android:tint="?android:textColorPrimary"/>
 
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/separator" />
+        android:background="?android:dividerHorizontal" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 3305294a34..43cd12cf4c 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -66,7 +66,7 @@ class UserView : LinearLayout {
             profilePictureView.additionalPublicKey = null
             profilePictureView.isRSSFeed = false
         }
-        actionIndicatorImageView.setImageResource(R.drawable.ic_edit_white_24dp)
+        actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24)
         profilePictureView.glide = glide
         profilePictureView.update()
         nameTextView.text = user.name ?: "Unknown Contact"