diff --git a/app/src/main/res/drawable/symbol_brush_pen_24.xml b/app/src/main/res/drawable/symbol_brush_pen_24.xml
new file mode 100644
index 0000000000..96532d25f8
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_brush_pen_24.xml
@@ -0,0 +1,9 @@
+<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="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 2.73 1.2 5.18 3.1 6.85l1.2-3.4c0.07-0.22 0.17-0.52 0.38-0.76 0.17-0.2 0.4-0.36 0.64-0.45 0.1-0.05 0.22-0.07 0.32-0.09l1.51-4.41c0.23-0.66 0.4-1.18 0.57-1.56 0.16-0.36 0.36-0.73 0.7-0.91 0.44-0.24 0.98-0.24 1.42 0 0.34 0.18 0.54 0.55 0.7 0.9 0.17 0.39 0.34 0.91 0.57 1.57l1.5 4.41c0.11 0.02 0.22 0.04 0.33 0.09 0.25 0.1 0.47 0.25 0.64 0.45 0.2 0.24 0.31 0.54 0.39 0.76l1.19 3.4c1.9-1.67 3.1-4.12 3.1-6.85 0-5.04-4.09-9.13-9.13-9.13Zm0 18.25c1.65 0 3.2-0.44 4.54-1.2l-1.41-4.05H8.87l-1.41 4.05c1.33 0.76 2.89 1.2 4.54 1.2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_emoji_24.xml b/app/src/main/res/drawable/symbol_emoji_24.xml
new file mode 100644
index 0000000000..11611ab3b0
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_emoji_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="M8.43 14.94c-0.3-0.37-0.86-0.42-1.23-0.11-0.37 0.3-0.43 0.85-0.12 1.23 1.17 1.41 2.94 2.32 4.92 2.32s3.75-0.9 4.92-2.32c0.3-0.38 0.25-0.93-0.12-1.23-0.37-0.31-0.92-0.26-1.23 0.11-0.85 1.03-2.13 1.69-3.57 1.69s-2.72-0.66-3.57-1.69Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.25 7.75c-0.5 0-0.88 0.3-1.12 0.66-0.25 0.37-0.38 0.84-0.38 1.34 0 0.5 0.13 0.97 0.38 1.34 0.24 0.36 0.62 0.66 1.12 0.66 0.5 0 0.88-0.3 1.12-0.66 0.25-0.37 0.38-0.84 0.38-1.34 0-0.5-0.13-0.97-0.38-1.34-0.24-0.36-0.62-0.66-1.12-0.66Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.63 8.41c0.24-0.36 0.62-0.66 1.12-0.66 0.5 0 0.88 0.3 1.12 0.66 0.25 0.37 0.38 0.84 0.38 1.34 0 0.5-0.13 0.97-0.38 1.34-0.24 0.36-0.62 0.66-1.12 0.66-0.5 0-0.88-0.3-1.12-0.66-0.25-0.37-0.38-0.84-0.38-1.34 0-0.5 0.13-0.97 0.38-1.34Z"/>
+    <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_view_once_24.xml b/app/src/main/res/drawable/symbol_view_once_24.xml
new file mode 100644
index 0000000000..7183279290
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_view_once_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="M21.86 11.5h0.7c0.58 0 0.94 0.63 0.65 1.13l-1.56 2.64c-0.3 0.49-1 0.49-1.3 0l-1.56-2.64c-0.3-0.5 0.07-1.13 0.65-1.13h0.67c-0.26-4.25-3.8-7.63-8.11-7.63-4.49 0-8.13 3.64-8.13 8.13s3.64 8.13 8.13 8.13c2.33 0 4.42-0.98 5.9-2.55 0.34-0.35 0.9-0.37 1.24-0.03 0.35 0.33 0.37 0.88 0.04 1.23-1.8 1.9-4.35 3.1-7.18 3.1-5.45 0-9.88-4.43-9.88-9.88 0-5.45 4.43-9.88 9.88-9.88 5.29 0 9.6 4.16 9.86 9.38Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.37 7.25c-0.23 0-0.43 0.1-0.57 0.26-0.22 0.24-0.42 0.4-0.64 0.5-0.22 0.1-0.5 0.17-0.86 0.22-0.37 0.04-0.68 0.36-0.68 0.76 0 0.42 0.35 0.76 0.77 0.76h0.98v6.13c0 0.48 0.4 0.87 0.88 0.87s0.88-0.4 0.88-0.88V8.02c0-0.42-0.34-0.76-0.76-0.76Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_view_once_infinite_24.xml b/app/src/main/res/drawable/symbol_view_once_infinite_24.xml
new file mode 100644
index 0000000000..b614a6de57
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_view_once_infinite_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="M21.86 11.5h0.7c0.58 0 0.94 0.63 0.65 1.13l-1.56 2.64c-0.3 0.49-1 0.49-1.3 0l-1.56-2.64c-0.3-0.5 0.07-1.13 0.65-1.13h0.67c-0.26-4.25-3.8-7.63-8.11-7.63-4.49 0-8.13 3.64-8.13 8.13s3.64 8.13 8.13 8.13c2.33 0 4.42-0.98 5.9-2.55 0.34-0.35 0.9-0.37 1.24-0.03 0.35 0.33 0.37 0.88 0.04 1.23-1.8 1.9-4.35 3.1-7.18 3.1-5.45 0-9.88-4.43-9.88-9.88 0-5.45 4.43-9.88 9.88-9.88 5.29 0 9.6 4.16 9.86 9.38Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 10.48c-0.18-0.23-0.37-0.46-0.58-0.66-0.54-0.52-1.25-0.95-2.17-0.95-1.73 0-3.13 1.4-3.13 3.13s1.4 3.13 3.13 3.13c0.92 0 1.63-0.43 2.17-0.95 0.2-0.2 0.4-0.43 0.58-0.66 0.18 0.23 0.37 0.46 0.58 0.66 0.54 0.52 1.25 0.95 2.17 0.95 1.73 0 3.13-1.4 3.13-3.13s-1.4-3.13-3.13-3.13c-0.92 0-1.63 0.43-2.17 0.95-0.2 0.2-0.4 0.43-0.58 0.66Zm-2.75 0.14c0.33 0 0.62 0.14 0.96 0.46 0.25 0.25 0.48 0.55 0.73 0.92-0.25 0.37-0.48 0.67-0.73 0.92-0.34 0.32-0.63 0.46-0.96 0.46-0.76 0-1.38-0.62-1.38-1.38 0-0.76 0.62-1.38 1.38-1.38Zm3.8 1.38c0.26-0.37 0.5-0.67 0.74-0.92 0.34-0.32 0.63-0.46 0.96-0.46 0.76 0 1.38 0.62 1.38 1.38 0 0.76-0.62 1.38-1.38 1.38-0.33 0-0.62-0.14-0.96-0.46-0.25-0.25-0.48-0.55-0.73-0.92Z"/>
+</vector>
diff --git a/app/src/main/res/layout/v2_media_review_fragment.xml b/app/src/main/res/layout/v2_media_review_fragment.xml
index 8a6d3b1742..b0fb269fd9 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -138,7 +138,7 @@
                 android:layout_height="40dp"
                 android:layout_gravity="center"
                 android:scaleType="centerInside"
-                app:srcCompat="@drawable/ic_view_infinite_24"
+                app:srcCompat="@drawable/symbol_view_once_infinite_24"
                 app:tint="@color/signal_colorOnSurface" />
 
             <com.google.android.material.imageview.ShapeableImageView
@@ -146,7 +146,7 @@
                 android:layout_height="40dp"
                 android:layout_gravity="center"
                 android:scaleType="centerInside"
-                app:srcCompat="@drawable/ic_view_once_24"
+                app:srcCompat="@drawable/symbol_view_once_24"
                 app:tint="@color/signal_colorOnSurface" />
 
         </ViewSwitcher>
@@ -158,7 +158,7 @@
             android:layout_gravity="center"
             android:background="@color/transparent"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_emoji"
+            android:src="@drawable/symbol_emoji_24"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/add_a_message"
             app:layout_constraintStart_toStartOf="@id/add_a_message"
@@ -220,7 +220,7 @@
             app:layout_constraintBottom_toTopOf="@id/add_a_message"
             app:layout_constraintStart_toStartOf="parent"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
-            app:srcCompat="@drawable/ic_draw_24"
+            app:srcCompat="@drawable/symbol_brush_pen_24"
             app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:visibility="visible" />