diff --git a/app/src/main/res/drawable/symbol_key_slash_24.xml b/app/src/main/res/drawable/symbol_key_slash_24.xml
new file mode 100644
index 0000000000..092faa4c43
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_key_slash_24.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.83 9.19c-1.85 0.7-3.33 2.17-4.02 4.03-0.28 0.75-0.43 1.56-0.43 2.4 0 0.76 0.12 1.48 0.34 2.16 0.9 2.74 3.49 4.72 6.53 4.72 2.95 0 5.46-1.85 6.44-4.45l-1.41-1.41c-0.47 2.34-2.54 4.11-5.03 4.11-2.27 0-4.2-1.47-4.87-3.52-0.16-0.5-0.25-1.04-0.25-1.6 0-0.64 0.11-1.24 0.32-1.8 0.61-1.64 2.04-2.88 3.8-3.23L5.82 9.19Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.44 11.08l0.04-0.05c0.26-0.26 0.61-0.4 0.98-0.4h1.17V8.5c0-0.76 0.61-1.37 1.37-1.37h2.12V3.88h-2.26l-5.3 5.31-1.25-1.23 5.42-5.43c0.26-0.26 0.61-0.4 0.98-0.4h2.79c0.76 0 1.37 0.61 1.37 1.37v4c0 0.76-0.61 1.38-1.37 1.38h-2.12V11c0 0.76-0.62 1.38-1.38 1.38h-1.27l-1.3-1.3Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7 15.37c0.83 0 1.5 0.68 1.5 1.5 0 0.83-0.67 1.5-1.5 1.5s-1.5-0.67-1.5-1.5c0-0.82 0.67-1.5 1.5-1.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.12 2.88c-0.34-0.34-0.9-0.34-1.24 0-0.34 0.34-0.34 0.9 0 1.24l16.97 16.97c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24L4.12 2.88Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_minus_circle_24.xml b/app/src/main/res/drawable/symbol_minus_circle_24.xml
index 81543cfc5d..29c0e0eff8 100644
--- a/app/src/main/res/drawable/symbol_minus_circle_24.xml
+++ b/app/src/main/res/drawable/symbol_minus_circle_24.xml
@@ -3,11 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16.5,12.875a0.875,0.875 0,0 0,0 -1.75h-9a0.875,0.875 0,0 0,0 1.75h9Z"
-      android:fillColor="#000"/>
-  <path
-      android:pathData="M12,1.125C5.994,1.125 1.125,5.994 1.125,12S5.994,22.875 12,22.875 22.875,18.006 22.875,12 18.006,1.125 12,1.125ZM2.875,12a9.125,9.125 0,1 1,18.25 0,9.125 9.125,0 0,1 -18.25,0Z"
-      android:fillColor="#000"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5 12.88c0.48 0 0.88-0.4 0.88-0.88s-0.4-0.88-0.88-0.88h-9c-0.48 0-0.88 0.4-0.88 0.88s0.4 0.88 0.88 0.88h9Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 1.13C6 1.13 1.12 5.99 1.12 12 1.13 18 6 22.88 12 22.88c6 0 10.88-4.87 10.88-10.88C22.88 6 18 1.12 12 1.12ZM2.87 12c0-5.04 4.09-9.13 9.13-9.13 5.04 0 9.13 4.09 9.13 9.13 0 5.04-4.09 9.13-9.13 9.13-5.04 0-9.13-4.09-9.13-9.13Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/symbol_plus_circle_24.xml b/app/src/main/res/drawable/symbol_plus_circle_24.xml
new file mode 100644
index 0000000000..9abfac2f5e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_plus_circle_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 6.13c0.48 0 0.88 0.39 0.88 0.87v4.13H17c0.48 0 0.88 0.39 0.88 0.87s-0.4 0.88-0.88 0.88h-4.13V17c0 0.48-0.39 0.88-0.87 0.88s-0.88-0.4-0.88-0.88v-4.13H7c-0.48 0-0.88-0.39-0.88-0.87s0.4-0.88 0.88-0.88h4.13V7c0-0.48 0.39-0.88 0.87-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M1.13 12C1.13 6 5.99 1.12 12 1.12 18 1.13 22.88 6 22.88 12c0 6-4.87 10.88-10.88 10.88C6 22.88 1.12 18 1.12 12ZM12 2.87c-5.04 0-9.13 4.09-9.13 9.13 0 5.04 4.09 9.13 9.13 9.13 5.04 0 9.13-4.09 9.13-9.13 0-5.04-4.09-9.13-9.13-9.13Z"/>
+</vector>
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 4d81412555..698b214ada 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -136,57 +136,6 @@
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/rbs_block_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawablePadding="16dp"
-                android:gravity="center_vertical"
-                android:minHeight="56dp"
-                android:paddingStart="@dimen/dsl_settings_gutter"
-                android:paddingEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/RecipientBottomSheet_block"
-                android:textAppearance="@style/Signal.Text.BodyLarge"
-                android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_block_tinted_24"
-                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/rbs_unblock_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawablePadding="16dp"
-                android:gravity="center_vertical"
-                android:minHeight="56dp"
-                android:paddingStart="@dimen/dsl_settings_gutter"
-                android:paddingEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/RecipientBottomSheet_unblock"
-                android:textAppearance="@style/Signal.Text.BodyLarge"
-                android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_block_tinted_24"
-                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/rbs_remove_from_group_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:drawablePadding="16dp"
-                android:gravity="center_vertical"
-                android:minHeight="56dp"
-                android:paddingStart="@dimen/dsl_settings_gutter"
-                android:paddingEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/RecipientBottomSheet_remove_from_group"
-                android:textAppearance="@style/Signal.Text.BodyLarge"
-                android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_leave_tinted_24"
-                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
-                tools:visibility="visible" />
-
             <TextView
                 android:id="@+id/rbs_make_group_admin_button"
                 android:layout_width="match_parent"
@@ -200,7 +149,7 @@
                 android:text="@string/RecipientBottomSheet_make_admin"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_group_24"
+                app:drawableStartCompat="@drawable/symbol_key_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />
 
@@ -217,7 +166,7 @@
                 android:text="@string/RecipientBottomSheet_remove_as_admin"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_group_24"
+                app:drawableStartCompat="@drawable/symbol_key_slash_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />
 
@@ -233,13 +182,13 @@
                 android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_group_24"
+                app:drawableStartCompat="@drawable/symbol_plus_circle_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:text="@string/RecipientBottomSheet_add_to_a_group"
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/rbs_add_contact_button"
+                android:id="@+id/rbs_view_safety_number_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?selectableItemBackground"
@@ -248,10 +197,10 @@
                 android:minHeight="56dp"
                 android:paddingStart="@dimen/dsl_settings_gutter"
                 android:paddingEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/RecipientBottomSheet_add_to_contacts"
+                android:text="@string/RecipientBottomSheet_view_safety_number"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_plus_24"
+                app:drawableStartCompat="@drawable/symbol_safety_number_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />
 
@@ -268,12 +217,12 @@
                 android:text="@string/ConversationSettingsFragment__contact_details"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_profile_circle_24"
+                app:drawableStartCompat="@drawable/symbol_person_circle_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/rbs_view_safety_number_button"
+                android:id="@+id/rbs_add_contact_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?selectableItemBackground"
@@ -282,10 +231,61 @@
                 android:minHeight="56dp"
                 android:paddingStart="@dimen/dsl_settings_gutter"
                 android:paddingEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/RecipientBottomSheet_view_safety_number"
+                android:text="@string/RecipientBottomSheet_add_to_contacts"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_safety_number_24"
+                app:drawableStartCompat="@drawable/symbol_plus_24"
+                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/rbs_block_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
+                android:minHeight="56dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
+                android:text="@string/RecipientBottomSheet_block"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/symbol_block_24"
+                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/rbs_unblock_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
+                android:minHeight="56dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
+                android:text="@string/RecipientBottomSheet_unblock"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/symbol_block_24"
+                app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/rbs_remove_from_group_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
+                android:minHeight="56dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
+                android:text="@string/RecipientBottomSheet_remove_from_group"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/symbol_minus_circle_24"
                 app:drawableTint="@color/icon_tint_color_primary_enabled_selector"
                 tools:visibility="visible" />