diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferProgressView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferProgressView.kt
index 182779489d..0998e45efb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferProgressView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferProgressView.kt
@@ -51,8 +51,8 @@ class TransferProgressView @JvmOverloads constructor(
 
   private val progressRect = RectF()
   private val stopIconRect = RectF()
-  private val downloadDrawable = ContextCompat.getDrawable(context, R.drawable.ic_arrow_down_24)
-  private val uploadDrawable = ContextCompat.getDrawable(context, R.drawable.ic_arrow_up_16)
+  private val downloadDrawable = ContextCompat.getDrawable(context, R.drawable.symbol_arrow_down_24)
+  private val uploadDrawable = ContextCompat.getDrawable(context, R.drawable.symbol_arrow_up_24)
 
   private var progressPercent = 0f
   private var currentState = State.UNINITIALIZED
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaAnimations.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaAnimations.kt
index 0cbed31ba8..65542a0ee7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaAnimations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaAnimations.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.mediasend.v2
 
 import android.view.animation.Interpolator
-import android.view.animation.LinearInterpolator
 import org.thoughtcrime.securesms.util.createDefaultCubicBezierInterpolator
 
 object MediaAnimations {
@@ -10,6 +9,4 @@ object MediaAnimations {
    */
   @JvmStatic
   val interpolator: Interpolator = createDefaultCubicBezierInterpolator()
-
-  val toolIconInterpolator = LinearInterpolator()
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index 5060a3d693..e8bf2a0bde 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -367,7 +367,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
       getString(R.string.MediaReviewFragment__photo_set_to_view_once)
     }
 
-    MediaReviewToastPopupWindow.show(controls, R.drawable.ic_view_once_24, description)
+    MediaReviewToastPopupWindow.show(controls, R.drawable.symbol_view_once_24, description)
   }
 
   private fun presentQualityToggleToast(state: MediaSelectionState) {
@@ -494,8 +494,8 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
     }
 
     val sendButtonForegroundDrawable = when {
-      recipient != null -> ContextCompat.getDrawable(requireContext(), R.drawable.ic_send_24)
-      else -> ContextCompat.getDrawable(requireContext(), R.drawable.ic_arrow_end_24)
+      recipient != null -> ContextCompat.getDrawable(requireContext(), R.drawable.symbol_send_24)
+      else -> ContextCompat.getDrawable(requireContext(), R.drawable.symbol_arrow_end_24)
     }
 
     val sendButtonForegroundTint = when {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
index b7dd4fece1..edbd5438f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
@@ -122,16 +122,16 @@ public class ViewOnceMessageView extends LinearLayout {
       if (messageRecord.isViewed()) {
         iconColor = openedIconColor;
         text.setText(R.string.RevealableMessageView_viewed);
-        icon.setImageResource(R.drawable.ic_viewed_once_24);
+        icon.setImageResource(R.drawable.symbol_view_once_dash_24);
       } else {
         iconColor = unopenedIconColor;
         text.setText(R.string.RevealableMessageView_media);
-        icon.setImageResource(R.drawable.ic_view_once_24);
+        icon.setImageResource(R.drawable.symbol_view_once_24);
       }
     } else if (ViewOnceUtil.isViewable(messageRecord)) {
       iconColor = unopenedIconColor;
       text.setText(getDescriptionId(messageRecord));
-      icon.setImageResource(R.drawable.ic_view_once_24);
+      icon.setImageResource(R.drawable.symbol_view_once_24);
     } else if (networkInProgress(messageRecord)) {
       iconColor = unopenedIconColor;
       text.setText("");
@@ -140,11 +140,11 @@ public class ViewOnceMessageView extends LinearLayout {
     } else if (requiresTapToDownload(messageRecord)) {
       iconColor = unopenedIconColor;
       text.setText(formatFileSize(messageRecord));
-      icon.setImageResource(R.drawable.ic_arrow_down_circle_outline_24);
+      icon.setImageResource(R.drawable.symbol_arrow_circle_down_24);
     } else {
       iconColor = openedIconColor;
       text.setText(R.string.RevealableMessageView_viewed);
-      icon.setImageResource(R.drawable.ic_viewed_once_24);
+      icon.setImageResource(R.drawable.symbol_view_once_dash_24);
     }
 
     text.setTextColor(textColor);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
index 0ca9d1c74a..2b44d72fca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
@@ -146,9 +146,9 @@ class ImageEditorHudV2 @JvmOverloads constructor(
     cropAspectLockButton.setOnClickListener {
       listener?.onCropAspectLock()
       if (listener?.isCropAspectLocked == true) {
-        cropAspectLockButton.setImageResource(R.drawable.ic_crop_lock_24)
+        cropAspectLockButton.setImageResource(R.drawable.symbol_crop_lock_24)
       } else {
-        cropAspectLockButton.setImageResource(R.drawable.ic_crop_unlock_24)
+        cropAspectLockButton.setImageResource(R.drawable.symbol_crop_unlock_24)
       }
     }
 
@@ -355,7 +355,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
 
   private fun presentModeDraw() {
     drawButton.isSelected = true
-    brushToggle.setImageResource(R.drawable.ic_draw_white_24)
+    brushToggle.setImageResource(R.drawable.symbol_brush_pen_24)
     widthSeekBar.progress = SignalStore.imageEditorValues().getMarkerPercentage()
     listener?.onColorChange(getActiveColor())
     updateColorIndicator()
@@ -368,7 +368,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
 
   private fun presentModeHighlight() {
     drawButton.isSelected = true
-    brushToggle.setImageResource(R.drawable.ic_marker_24)
+    brushToggle.setImageResource(R.drawable.symbol_brush_highlighter_24)
     widthSeekBar.progress = SignalStore.imageEditorValues().getHighlighterPercentage()
     listener?.onColorChange(getActiveColor())
     updateColorIndicator()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
index aff3a7a457..5fae5f2143 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
@@ -287,7 +287,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
         shareButtonImage.setVisibility(View.VISIBLE);
         shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
       } else {
-        actionButtonImage.setImageResource(R.drawable.ic_arrow_down);
+        actionButtonImage.setImageResource(R.drawable.symbol_arrow_down_24);
         actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
 
         shareButton.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
deleted file mode 100644
index 2afc613651..0000000000
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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.8,2v17.8c0.4,-0.6 0.7,-1 0.7,-1l5.6,-5.6l1.1,1.1l-7.5,7.5c-0.3,0.3 -0.8,0.3 -1.1,0l-7.5,-7.5L5,13.2l5.6,5.6c0,0 0.3,0.4 0.7,1V2H12.8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down_24.xml b/app/src/main/res/drawable/ic_arrow_down_24.xml
deleted file mode 100644
index 7a44a04047..0000000000
--- a/app/src/main/res/drawable/ic_arrow_down_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M11.13 4.25V15.5l0.12 1.76-5.13-5.13c-0.34-0.34-0.9-0.34-1.24 0-0.34 0.34-0.34 0.9 0 1.24l6.5 6.5c0.17 0.16 0.39 0.25 0.62 0.25 0.23 0 0.45-0.09 0.62-0.25l6.5-6.5c0.34-0.34 0.34-0.9 0-1.24-0.34-0.34-0.9-0.34-1.24 0l-5.13 5.13 0.13-1.76V4.25c0-0.48-0.4-0.88-0.88-0.88s-0.88 0.4-0.88 0.88Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down_circle_filled.xml b/app/src/main/res/drawable/ic_arrow_down_circle_filled.xml
deleted file mode 100644
index be0bc5b4ac..0000000000
--- a/app/src/main/res/drawable/ic_arrow_down_circle_filled.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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,1C5.9,1 1,5.9 1,12s4.9,11 11,11s11,-4.9 11,-11S18.1,1 12,1zM12.5,18.8c-0.3,0.3 -0.8,0.3 -1.1,0l-5.5,-5.5L7,12.2l3.6,3.6c0,0 0.3,0.4 0.7,1V5h1.5v11.8c0.4,-0.6 0.7,-1 0.7,-1l3.6,-3.6l1.1,1.1L12.5,18.8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml b/app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml
deleted file mode 100644
index 4e18168963..0000000000
--- a/app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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,1C5.9,1 1,5.9 1,12s4.9,11 11,11s11,-4.9 11,-11S18.1,1 12,1zM12,21.5c-5.2,0 -9.5,-4.3 -9.5,-9.5S6.8,2.5 12,2.5s9.5,4.3 9.5,9.5C21.5,17.2 17.2,21.5 12,21.5zM17,12.2l1.1,1.1l-5.5,5.5c-0.3,0.3 -0.8,0.3 -1.1,0l-5.5,-5.5L7,12.2l3.6,3.6c0,0 0.3,0.4 0.7,1V5h1.5v11.8c0.4,-0.6 0.7,-1 0.7,-1L17,12.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right_16.xml b/app/src/main/res/drawable/ic_arrow_right_16.xml
deleted file mode 100644
index 294bff12a8..0000000000
--- a/app/src/main/res/drawable/ic_arrow_right_16.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:autoMirrored="true"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M8.515,13.5131L7.454,12.4521L10.325,9.5821L11.45,8.7791L3,8.7791L3,7.2791L11.45,7.2791L10.409,6.5351L7.451,3.5411L8.518,2.4871L13.997,8.0321L8.515,13.5131Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up_16.xml b/app/src/main/res/drawable/ic_arrow_up_16.xml
deleted file mode 100644
index da393d508d..0000000000
--- a/app/src/main/res/drawable/ic_arrow_up_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M8 2.38c-0.2 0-0.39 0.07-0.53 0.21L3.22 6.84c-0.3 0.3-0.3 0.77 0 1.07 0.3 0.29 0.77 0.29 1.06 0l3.05-3.05-0.08 1.26v7c0 0.42 0.34 0.76 0.75 0.76s0.75-0.34 0.75-0.76v-7L8.67 4.87l3.05 3.05c0.3 0.29 0.77 0.29 1.06 0 0.3-0.3 0.3-0.77 0-1.07L8.53 2.6C8.39 2.45 8.2 2.38 8 2.38Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cancel_36.xml b/app/src/main/res/drawable/ic_cancel_36.xml
deleted file mode 100644
index c926fe9027..0000000000
--- a/app/src/main/res/drawable/ic_cancel_36.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M24.4,12.9l-1.3,-1.3l-5.1,5.2l-5.1,-5.2l-1.3,1.3l5.2,5.1l-5.2,5.1l1.3,1.3l5.1,-5.2l5.1,5.2l1.3,-1.3l-5.2,-5.1l5.2,-5.1z"/>
-  <path
-      android:pathData="M18,18m-17.1,0a17.1,17.1 0,1 1,34.2 0a17.1,17.1 0,1 1,-34.2 0"
-      android:strokeWidth="1.75"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_confirm_36.xml b/app/src/main/res/drawable/ic_confirm_36.xml
deleted file mode 100644
index 6685f97005..0000000000
--- a/app/src/main/res/drawable/ic_confirm_36.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M15,24.7l-5.6,-5.6l1.2,-1.2l4.4,4.4l9.9,-9.9l1.2,1.2l-11.1,11.1z"/>
-  <path
-      android:pathData="M18,18m-17.1,0a17.1,17.1 0,1 1,34.2 0a17.1,17.1 0,1 1,-34.2 0"
-      android:strokeWidth="1.75"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_crop_lock_24.xml b/app/src/main/res/drawable/ic_crop_lock_24.xml
deleted file mode 100644
index 41a5bd510c..0000000000
--- a/app/src/main/res/drawable/ic_crop_lock_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M14.9,7.3C15.1,7.5 15.2,7.7 15.2,7.9V9.2H17V7.9C17,7.5 16.9,7.2 16.8,6.9C16.7,6.6 16.5,6.3 16.2,6C16,5.8 15.7,5.6 15.3,5.4C15,5.3 14.6,5.2 14.3,5.2H7V2.8C7,2.6 6.9,2.4 6.7,2.2C6.5,2.1 6.3,2 6.1,2C5.9,2 5.7,2.1 5.5,2.2C5.3,2.4 5.2,2.6 5.2,2.8V5.2H2.8C2.6,5.2 2.4,5.3 2.2,5.5C2,5.7 2,5.9 2,6.1C2,6.3 2.1,6.5 2.2,6.7C2.4,6.9 2.6,7 2.8,7H14.3C14.5,7 14.8,7.1 14.9,7.3Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M11.1,15.2H7.9C7.7,15.2 7.4999,15.1 7.3,14.9C7.0999,14.8 6.9999,14.5 6.9999,14.3V9.2C6.9999,9 6.9,8.8 6.7,8.6C6.4999,8.5 6.3,8.4 6.0999,8.4C5.9,8.4 5.7,8.5 5.4999,8.6C5.3,8.8 5.2,9 5.2,9.2V14.3C5.2,15 5.4999,15.7 5.9999,16.2C6.4999,16.7 7.2,17 7.9,17H11.1V15.2V15.2Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M20.9999,15.5H20.5999H20.4999V12.9C20.4999,11.6 19.3999,10.5 18.0999,10.5C16.7999,10.5 15.6999,11.6 15.6999,12.9V15.5H15.5999H15.1999C14.6999,15.5 14.3999,15.8 14.3999,16.3V20.4C14.3999,20.9 14.6999,21.2 15.1999,21.2H20.9999C21.4999,21.2 21.7999,20.9 21.7999,20.4V16.3C21.8999,15.8 21.4999,15.5 20.9999,15.5ZM18.1999,11.7C18.7999,11.7 19.3999,12.2 19.3999,12.9V15.5H16.9999V12.9C16.9999,12.3 17.4999,11.7 18.1999,11.7Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_crop_rotate_24.xml b/app/src/main/res/drawable/ic_crop_rotate_24.xml
deleted file mode 100644
index ddda2984eb..0000000000
--- a/app/src/main/res/drawable/ic_crop_rotate_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3.341,9.884H14.02C14.213,9.884 14.405,9.884 14.694,10.081L14.694,10.081C14.79,10.278 14.886,10.475 14.886,10.672V15.593C14.886,15.889 14.982,16.085 15.175,16.184L15.175,16.184C15.367,16.282 15.56,16.381 15.752,16.381C15.944,16.381 16.137,16.282 16.329,16.184L16.329,16.184C16.522,15.987 16.618,15.79 16.618,15.593V10.672C16.618,10.377 16.522,9.983 16.426,9.688C16.233,9.392 16.041,9.097 15.848,8.9C15.656,8.605 15.367,8.408 15.079,8.31C14.79,8.211 14.405,8.113 14.116,8.113H7.286V5.849C7.286,5.554 7.189,5.357 6.997,5.258C6.804,5.16 6.612,5.061 6.42,5.061C6.227,5.061 6.035,5.16 5.842,5.258C5.65,5.455 5.554,5.652 5.554,5.849V8.113H3.341C3.052,8.113 2.86,8.211 2.764,8.408C2.667,8.605 2.571,8.802 2.571,8.999C2.571,9.195 2.571,9.392 2.764,9.589C2.956,9.786 3.148,9.884 3.341,9.884Z"
-      android:fillColor="#E2E1E5"/>
-  <path
-      android:pathData="M19.504,18.743C19.601,18.645 19.601,18.546 19.601,18.448C19.601,18.349 19.601,18.251 19.504,18.152C19.504,18.054 19.408,17.956 19.312,17.857C19.216,17.759 19.119,17.66 19.023,17.66C18.927,17.562 18.831,17.562 18.735,17.562H8.151H8.151C7.959,17.562 7.767,17.562 7.574,17.365C7.478,17.168 7.382,16.971 7.382,16.774V11.951C7.382,11.656 7.286,11.459 7.093,11.361L7.093,11.361C6.901,11.262 6.708,11.164 6.516,11.164C6.323,11.164 6.131,11.262 5.939,11.361C5.746,11.558 5.65,11.755 5.65,11.951V16.774C5.65,17.463 5.939,18.054 6.42,18.546C6.901,19.038 7.478,19.334 8.151,19.334H14.982V21.597C14.982,21.794 15.079,21.991 15.271,22.09C15.367,22.188 15.56,22.286 15.752,22.286C15.944,22.286 16.041,22.188 16.233,22.09C16.329,21.991 16.426,21.794 16.522,21.597V19.334H18.735C18.831,19.334 18.927,19.235 19.023,19.235C19.119,19.137 19.216,19.137 19.312,19.038C19.408,18.94 19.504,18.841 19.504,18.743Z"
-      android:fillColor="#E2E1E5"/>
-  <path
-      android:pathData="M21.428,9.786V9.392C21.428,7.621 20.755,5.947 19.504,4.766C18.35,3.585 16.714,2.798 14.982,2.798V2.502C14.982,2.404 14.982,2.207 14.886,2.109C14.79,1.912 14.694,1.813 14.501,1.813C14.405,1.715 14.309,1.715 14.116,1.715C14.02,1.715 13.828,1.715 13.732,1.813L11.807,2.896C11.711,2.896 11.615,3.093 11.519,3.29C11.423,3.388 11.423,3.487 11.423,3.683C11.423,3.782 11.423,3.979 11.519,4.077L11.807,4.372L13.732,5.455C13.828,5.554 13.924,5.554 14.116,5.554C14.309,5.554 14.501,5.455 14.694,5.258C14.886,5.16 14.982,4.865 14.982,4.668V4.471C16.233,4.471 17.484,5.061 18.35,5.947C19.216,6.833 19.697,8.113 19.697,9.392C19.601,9.589 19.697,9.688 19.697,9.786C19.793,9.884 19.793,9.983 19.889,10.081C19.985,10.18 20.081,10.18 20.178,10.278C20.37,10.377 20.37,10.377 20.563,10.377C20.755,10.377 20.851,10.377 20.947,10.278C21.044,10.278 21.14,10.18 21.236,10.081C21.332,9.983 21.428,9.884 21.428,9.786Z"
-      android:fillColor="#E2E1E5"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_crop_unlock_24.xml b/app/src/main/res/drawable/ic_crop_unlock_24.xml
deleted file mode 100644
index e874cca2b8..0000000000
--- a/app/src/main/res/drawable/ic_crop_unlock_24.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M2,2h19.9v19.4h-19.9z"/>
-    <path
-        android:pathData="M14.9,7.3C15.1,7.5 15.2,7.7 15.2,7.9V9.2H17V7.9C17,7.5 16.9,7.2 16.8,6.9C16.7,6.6 16.5,6.3 16.2,6C16,5.8 15.7,5.6 15.3,5.4C15,5.3 14.6,5.2 14.3,5.2H7V2.8C7,2.6 6.9,2.4 6.7,2.2C6.5,2.1 6.3,2 6.1,2C5.9,2 5.7,2.1 5.5,2.2C5.3,2.4 5.2,2.6 5.2,2.8V5.2H2.8C2.6,5.2 2.4,5.3 2.2,5.5C2,5.7 2,5.9 2,6.1C2,6.3 2.1,6.5 2.2,6.7C2.4,6.9 2.6,7 2.8,7H14.3C14.5,7 14.8,7.1 14.9,7.3Z"
-        android:fillColor="#010101"/>
-    <path
-        android:pathData="M11.1,15.2H7.9C7.7,15.2 7.4999,15.1 7.3,14.9C7.0999,14.8 6.9999,14.5 6.9999,14.3V9.2C6.9999,9 6.9,8.8 6.7,8.6C6.4999,8.5 6.3,8.4 6.0999,8.4C5.9,8.4 5.7,8.5 5.4999,8.6C5.3,8.8 5.2,9 5.2,9.2V14.3C5.2,15 5.4999,15.7 5.9999,16.2C6.4999,16.7 7.2,17 7.9,17H11.1V15.2V15.2Z"
-        android:fillColor="#010101"/>
-    <path
-        android:pathData="M21.1,15.6H17V13.1C17,11.7 15.9,10.6 14.5,10.6C13.1,10.6 12,11.7 12,13.1V14.8H13.2V13.1C13.2,12.4 13.8,11.9 14.4,11.9C15,11.9 15.6,12.5 15.6,13.1V15.6H15.2C14.7,15.6 14.4,15.9 14.4,16.4V20.5C14.4,21 14.7,21.3 15.2,21.3H21C21.5,21.3 21.8,21 21.8,20.5V16.4C21.9,15.9 21.6,15.6 21.1,15.6Z"
-        android:fillColor="#010101"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_text_tool_24.xml b/app/src/main/res/drawable/ic_text_tool_24.xml
deleted file mode 100644
index 994d26ae12..0000000000
--- a/app/src/main/res/drawable/ic_text_tool_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17.202,9.988l-1.6,0.2L15.202,7.988L13.002,7.988v8h1.9v1.7L9.202,17.688L9.202,15.988L11.002,15.988L11.002,7.988L8.802,7.988l-0.4,2.2L6.802,9.988l0.3,-3.7h9.8Z"
-      android:fillColor="#000600"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16.015,1.5A6.5,6.5 0,0 1,22.502 7.995v8.011a6.5,6.5 0,0 1,-6.487 6.494L7.986,22.5A6.5,6.5 0,0 1,1.502 16.006L1.502,7.995A6.5,6.5 0,0 1,7.986 1.5h8.029m0,-1.5L7.986,-0A7.991,7.991 0,0 0,0.002 7.995v8.011a7.989,7.989 0,0 0,7.986 7.994h8.029A7.989,7.989 0,0 0,24.002 16.006L24.002,7.995A7.991,7.991 0,0 0,16.015 0Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_view_infinite_24.xml b/app/src/main/res/drawable/ic_view_infinite_24.xml
deleted file mode 100644
index f59e264d0c..0000000000
--- a/app/src/main/res/drawable/ic_view_infinite_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M22.239,16a11.009,11.009 0,1 0,-2.448 3.755L19.5,21.5L19.5,23L21,23L21,17.5L15.5,17.5L15.5,19L17,19l1.7,-0.284A9.56,9.56 0,1 1,20.605 16ZM11.455,10.231a7.3,7.3 0,0 1,0.55 0.6,4.531 4.531,0 0,1 0.535,-0.6 3.76,3.76 0,0 1,2.635 -1.156,2.925 2.925,0 1,1 0,5.85 3.82,3.82 0,0 1,-2.63 -1.126,5.967 5.967,0 0,1 -0.54,-0.617c-0.168,0.2 -0.336,0.4 -0.556,0.617a3.784,3.784 0,0 1,-2.614 1.126,2.925 2.925,0 1,1 0,-5.85A3.738,3.738 0,0 1,11.455 10.231ZM8.835,13.519a2.365,2.365 0,0 0,1.631 -0.754,4.967 4.967,0 0,0 0.652,-0.77 6.146,6.146 0,0 0,-0.652 -0.749,2.355 2.355,0 0,0 -1.631,-0.765 1.519,1.519 0,1 0,0 3.038ZM15.175,10.481a2.377,2.377 0,0 0,-1.646 0.765,7.391 7.391,0 0,0 -0.652,0.749 5.493,5.493 0,0 0,0.652 0.77,2.382 2.382,0 0,0 1.646,0.754 1.519,1.519 0,1 0,0 -3.038Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_view_once_24.xml b/app/src/main/res/drawable/ic_view_once_24.xml
deleted file mode 100644
index cad17d0643..0000000000
--- a/app/src/main/res/drawable/ic_view_once_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M13.25,7.75v7.87a0.88,0.88 0,1 1,-1.75 0V9.5H10.25A0.74,0.74 0,0 1,10.13 8V8A2.34,2.34 0,0 0,12 7.22,0.73 0.73,0 0,1 12.5,7 0.76,0.76 0,0 1,13.25 7.75ZM12,1a11,11 0,1 0,7.31 19.21l-0.19,1.09V22a0.88,0.88 0,0 0,1.76 0V18a0.89,0.89 0,0 0,-0.88 -0.88H16a0.88,0.88 0,0 0,0 1.76h1.34l1,-0.18A9.24,9.24 0,1 1,21.25 12a9.37,9.37 0,0 1,-0.41 2.74,0.87 0.87,0 1,0 1.67,0.52A11.19,11.19 0,0 0,23 12,11 11,0 0,0 12,1Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_viewed_once_24.xml b/app/src/main/res/drawable/ic_viewed_once_24.xml
deleted file mode 100644
index a1849f8f57..0000000000
--- a/app/src/main/res/drawable/ic_viewed_once_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M13.25,7.75v7.87a0.88,0.88 0,1 1,-1.75 0L11.5,9.5L10.25,9.5A0.74,0.74 0,0 1,10.13 8L10.13,8A2.34,2.34 0,0 0,12 7.22,0.73 0.73,0 0,1 12.5,7 0.76,0.76 0,0 1,13.25 7.75ZM8.89,3.29a9.18,9.18 0,0 1,2.65 -0.53L12,2.76A0.88,0.88 0,1 0,12 1h-0.54a11.3,11.3 0,0 0,-3.16 0.63,0.88 0.88,0 0,0 0.29,1.7A1,1 0,0 0,8.89 3.29ZM3.64,8a9.2,9.2 0,0 1,1.5 -2.25A0.87,0.87 0,1 0,3.85 4.61,11.11 11.11,0 0,0 2.06,7.29a0.88,0.88 0,0 0,0.41 1.17,0.84 0.84,0 0,0 0.38,0.08A0.87,0.87 0,0 0,3.64 8ZM2.76,16.19a0.87,0.87 0,0 0,0.53 -1.11,9.31 9.31,0 0,1 -0.53,-2.66c0,-0.15 0,-0.31 0,-0.46A0.88,0.88 0,1 0,1 12c0,0.18 0,0.36 0,0.54a11.3,11.3 0,0 0,0.63 3.16,0.87 0.87,0 0,0 0.82,0.58A0.79,0.79 0,0 0,2.76 16.23ZM8.46,21.49A0.88,0.88 0,0 0,8 20.36a9.2,9.2 0,0 1,-2.25 -1.5,0.87 0.87,0 1,0 -1.17,1.29 10.86,10.86 0,0 0,2.67 1.79,0.85 0.85,0 0,0 0.38,0.09A0.89,0.89 0,0 0,8.46 21.53ZM12.54,23a11.3,11.3 0,0 0,3.16 -0.63,0.86 0.86,0 0,0 0.53,-1.12 0.87,0.87 0,0 0,-1.11 -0.53,9.31 9.31,0 0,1 -2.66,0.53L12,21.25A0.88,0.88 0,1 0,12 23ZM20.15,19.39a10.86,10.86 0,0 0,1.79 -2.67A0.87,0.87 0,1 0,20.36 16a9.2,9.2 0,0 1,-1.5 2.25,0.86 0.86,0 0,0 0.06,1.23 0.81,0.81 0,0 0,0.58 0.23A0.84,0.84 0,0 0,20.15 19.38ZM23,12c0,-0.18 0,-0.36 0,-0.54a11.3,11.3 0,0 0,-0.63 -3.16,0.87 0.87,0 0,0 -1.65,0.58 9.31,9.31 0,0 1,0.53 2.66c0,0.15 0,0.31 0,0.46A0.88,0.88 0,1 0,23 12ZM19.45,5.08a0.87,0.87 0,0 0,-0.07 -1.23,10.86 10.86,0 0,0 -2.67,-1.79A0.87,0.87 0,1 0,16 3.64a9.2,9.2 0,0 1,2.25 1.5,0.85 0.85,0 0,0 0.59,0.23A0.89,0.89 0,0 0,19.45 5.08Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/image_editor_hud_blur.xml b/app/src/main/res/drawable/image_editor_hud_blur.xml
index 112c5000e7..f5c2421395 100644
--- a/app/src/main/res/drawable/image_editor_hud_blur.xml
+++ b/app/src/main/res/drawable/image_editor_hud_blur.xml
@@ -5,11 +5,11 @@
             <item>
                 <shape android:shape="oval">
                     <size android:width="36dp" android:height="36dp" />
-                    <solid android:color="@color/core_white" />
+                    <solid android:color="@color/signal_dark_colorOnPrimaryContainer" />
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_blur_24" />
+            <item android:drawable="@drawable/symbol_blur_24" />
         </layer-list>
     </item>
     <item>
@@ -20,7 +20,7 @@
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_blur_white_24" />
+            <item android:drawable="@drawable/symbol_blur_24_dark_onsurface" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/image_editor_hud_clear_all_background.xml b/app/src/main/res/drawable/image_editor_hud_clear_all_background.xml
index 3940ebe12e..440d20dcf8 100644
--- a/app/src/main/res/drawable/image_editor_hud_clear_all_background.xml
+++ b/app/src/main/res/drawable/image_editor_hud_clear_all_background.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/signal_dark_colorSurfaceVariant_92" />
+            <solid android:color="@color/signal_dark_colorSecondaryContainer" />
             <corners android:radius="50dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/image_editor_hud_draw.xml b/app/src/main/res/drawable/image_editor_hud_draw.xml
index 471eb589a8..8eb33fe41e 100644
--- a/app/src/main/res/drawable/image_editor_hud_draw.xml
+++ b/app/src/main/res/drawable/image_editor_hud_draw.xml
@@ -5,11 +5,11 @@
             <item>
                 <shape android:shape="oval">
                     <size android:width="36dp" android:height="36dp" />
-                    <solid android:color="@color/core_white" />
+                    <solid android:color="@color/signal_dark_colorOnPrimaryContainer" />
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_draw_24" />
+            <item android:drawable="@drawable/symbol_draw_24" />
         </layer-list>
     </item>
     <item>
@@ -20,7 +20,7 @@
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_draw_white_24" />
+            <item android:drawable="@drawable/symbol_draw_24_dark_onsurface" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/image_editor_hud_sticker.xml b/app/src/main/res/drawable/image_editor_hud_sticker.xml
index 06af3779b1..5f49cabfb6 100644
--- a/app/src/main/res/drawable/image_editor_hud_sticker.xml
+++ b/app/src/main/res/drawable/image_editor_hud_sticker.xml
@@ -5,11 +5,11 @@
             <item>
                 <shape android:shape="oval">
                     <size android:width="36dp" android:height="36dp" />
-                    <solid android:color="@color/core_white" />
+                    <solid android:color="@color/signal_dark_colorOnPrimaryContainer" />
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_sticker_outline_24" />
+            <item android:drawable="@drawable/symbol_sticker_smiley_24" />
         </layer-list>
     </item>
     <item>
@@ -20,7 +20,7 @@
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_sticker_outline_white_24" />
+            <item android:drawable="@drawable/symbol_sticker_smiley_24_dark_onsurface" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/image_editor_hud_text.xml b/app/src/main/res/drawable/image_editor_hud_text.xml
index 696764d4ce..c8c2132175 100644
--- a/app/src/main/res/drawable/image_editor_hud_text.xml
+++ b/app/src/main/res/drawable/image_editor_hud_text.xml
@@ -5,11 +5,11 @@
             <item>
                 <shape android:shape="oval">
                     <size android:width="36dp" android:height="36dp" />
-                    <solid android:color="@color/core_white" />
+                    <solid android:color="@color/signal_dark_colorOnPrimaryContainer" />
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_text_24" />
+            <item android:drawable="@drawable/symbol_text_24" />
         </layer-list>
     </item>
     <item>
@@ -20,7 +20,7 @@
                     <padding android:bottom="6dp" android:left="6dp" android:right="6dp" android:top="6dp" />
                 </shape>
             </item>
-            <item android:drawable="@drawable/ic_text_white_24" />
+            <item android:drawable="@drawable/symbol_text_24_dark_onsurface" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/image_editor_hud_undo.xml b/app/src/main/res/drawable/image_editor_hud_undo.xml
index 39fc9f7a28..b20594e639 100644
--- a/app/src/main/res/drawable/image_editor_hud_undo.xml
+++ b/app/src/main/res/drawable/image_editor_hud_undo.xml
@@ -2,10 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/transparent_black_40" />
+            <solid android:color="@color/signal_dark_colorSecondaryContainer" />
             <size android:width="36dp" android:height="36dp" />
             <padding android:left="6dp" android:top="6dp" android:right="6dp" android:bottom="6dp" />
         </shape>
     </item>
-    <item android:drawable="@drawable/ic_undo_24" />
+    <item android:drawable="@drawable/symbol_undo_24" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/symbol_arrow_circle_dash_down_24.xml b/app/src/main/res/drawable/symbol_arrow_circle_dash_down_24.xml
new file mode 100644
index 0000000000..dc7ce3362b
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_circle_dash_down_24.xml
@@ -0,0 +1,45 @@
+<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="M10.63 2.06c-0.03-0.49 0.34-0.9 0.83-0.92 0.36-0.02 0.72-0.02 1.08 0 0.49 0.02 0.86 0.43 0.83 0.92-0.02 0.48-0.43 0.85-0.91 0.83-0.3-0.02-0.61-0.02-0.92 0-0.48 0.02-0.89-0.35-0.91-0.83Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.63 21.94c0.02-0.48 0.43-0.85 0.91-0.83 0.3 0.02 0.61 0.02 0.92 0 0.48-0.02 0.89 0.35 0.91 0.83 0.03 0.49-0.34 0.9-0.83 0.92-0.36 0.02-0.72 0.02-1.08 0-0.49-0.02-0.86-0.43-0.83-0.92Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.13 7.12v5.75l0.12 1.77L8.62 12c-0.34-0.35-0.9-0.35-1.24 0-0.34 0.34-0.34 0.9 0 1.23l4 4c0.17 0.17 0.39 0.26 0.62 0.26 0.23 0 0.45-0.1 0.62-0.26l4-4c0.34-0.34 0.34-0.9 0-1.23-0.34-0.35-0.9-0.35-1.24 0l-2.63 2.63 0.13-1.77V7.13c0-0.48-0.4-0.87-0.88-0.87s-0.88 0.4-0.88 0.87Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.1 2.87c-0.4 0.26-0.52 0.8-0.26 1.2 0.26 0.41 0.8 0.53 1.2 0.27 0.26-0.17 0.53-0.32 0.8-0.46 0.43-0.22 0.6-0.75 0.38-1.18C8 2.27 7.47 2.1 7.04 2.32 6.72 2.5 6.4 2.67 6.1 2.87Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.16 20.12c-0.43 0.22-0.6 0.75-0.38 1.18 0.22 0.43 0.75 0.6 1.18 0.38 0.32-0.17 0.64-0.35 0.94-0.55 0.4-0.26 0.52-0.8 0.26-1.2-0.26-0.41-0.8-0.53-1.2-0.27-0.26 0.17-0.53 0.32-0.8 0.46Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.7 8.22C2.27 8 2.1 7.47 2.32 7.04 2.5 6.72 2.67 6.4 2.87 6.1c0.26-0.4 0.8-0.52 1.2-0.26 0.41 0.26 0.53 0.8 0.27 1.2-0.17 0.26-0.32 0.53-0.46 0.8-0.22 0.43-0.75 0.6-1.18 0.38Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.92 18.16c-0.4-0.26-0.52-0.8-0.26-1.2 0.17-0.26 0.32-0.53 0.46-0.8 0.22-0.43 0.75-0.6 1.18-0.38 0.43 0.22 0.6 0.75 0.38 1.18-0.17 0.32-0.35 0.64-0.55 0.94-0.26 0.4-0.8 0.52-1.2 0.26Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.86 11.46c-0.02-0.49-0.43-0.86-0.92-0.83-0.48 0.02-0.85 0.43-0.83 0.91 0.02 0.3 0.02 0.61 0 0.92-0.02 0.48 0.35 0.89 0.83 0.91 0.49 0.03 0.9-0.34 0.92-0.83 0.02-0.36 0.02-0.72 0-1.08Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.89 11.54c0.02-0.48-0.35-0.89-0.83-0.91-0.49-0.03-0.9 0.34-0.92 0.83-0.02 0.36-0.02 0.72 0 1.08 0.02 0.49 0.43 0.86 0.92 0.83 0.48-0.02 0.85-0.43 0.83-0.91-0.02-0.3-0.02-0.61 0-0.92Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.92 5.84c0.41-0.26 0.95-0.15 1.21 0.26 0.2 0.3 0.38 0.62 0.55 0.94C21.9 7.47 21.73 8 21.3 8.22c-0.43 0.22-0.96 0.05-1.18-0.38-0.14-0.27-0.3-0.54-0.46-0.8-0.26-0.4-0.14-0.94 0.26-1.2Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.7 15.78c0.43-0.22 0.96-0.05 1.18 0.38 0.14 0.27 0.29 0.54 0.46 0.8 0.26 0.4 0.14 0.94-0.26 1.2-0.41 0.26-0.95 0.15-1.21-0.26-0.2-0.3-0.38-0.62-0.55-0.94C2.1 16.53 2.27 16 2.7 15.78Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.96 2.32C16.53 2.1 16 2.27 15.78 2.7c-0.22 0.43-0.05 0.96 0.38 1.18 0.27 0.14 0.54 0.29 0.8 0.46 0.4 0.26 0.94 0.14 1.2-0.26 0.26-0.41 0.15-0.95-0.26-1.21-0.3-0.2-0.62-0.38-0.94-0.55Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.05 19.66c-0.4-0.26-0.95-0.14-1.21 0.26-0.26 0.41-0.15 0.95 0.26 1.21 0.3 0.2 0.62 0.38 0.94 0.55C7.47 21.9 8 21.73 8.22 21.3c0.22-0.43 0.05-0.96-0.38-1.18-0.27-0.14-0.54-0.29-0.8-0.46Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_arrow_circle_down_24.xml b/app/src/main/res/drawable/symbol_arrow_circle_down_24.xml
new file mode 100644
index 0000000000..3814e871a6
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_circle_down_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="M11.13 12.88V7.12c0-0.48 0.39-0.87 0.87-0.87s0.88 0.4 0.88 0.88v5.75l-0.13 1.76L15.38 12c0.34-0.35 0.9-0.35 1.24 0 0.34 0.34 0.34 0.9 0 1.23l-4 4c-0.17 0.17-0.39 0.26-0.62 0.26-0.23 0-0.45-0.1-0.62-0.26l-4-4c-0.34-0.34-0.34-0.9 0-1.23 0.34-0.35 0.9-0.35 1.24 0l2.63 2.63-0.13-1.77Z"/>
+    <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_arrow_end_24.xml b/app/src/main/res/drawable/symbol_arrow_end_24.xml
new file mode 100644
index 0000000000..ddd0cf63a9
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_end_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.13 12c0 0.23-0.1 0.45-0.26 0.62l-6.5 6.5c-0.34 0.34-0.9 0.34-1.24 0-0.34-0.34-0.34-0.9 0-1.24l5.13-5.13-1.76 0.13H4.25c-0.48 0-0.88-0.4-0.88-0.88s0.4-0.88 0.88-0.88H15.5l1.76 0.13-5.13-5.13c-0.34-0.34-0.34-0.9 0-1.24 0.34-0.34 0.9-0.34 1.24 0l6.5 6.5c0.16 0.17 0.25 0.39 0.25 0.62Z" />
+</vector>
diff --git a/app/src/main/res/drawable/symbol_arrow_right_24.xml b/app/src/main/res/drawable/symbol_arrow_right_24.xml
index fd74d60b42..f6e2d9c784 100644
--- a/app/src/main/res/drawable/symbol_arrow_right_24.xml
+++ b/app/src/main/res/drawable/symbol_arrow_right_24.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:autoMirrored="true">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M20.13 12c0 0.23-0.1 0.45-0.26 0.62l-6.5 6.5c-0.34 0.34-0.9 0.34-1.24 0-0.34-0.34-0.34-0.9 0-1.24l5.13-5.13-1.76 0.13H4.25c-0.48 0-0.88-0.4-0.88-0.88s0.4-0.88 0.88-0.88H15.5l1.76 0.13-5.13-5.13c-0.34-0.34-0.34-0.9 0-1.24 0.34-0.34 0.9-0.34 1.24 0l6.5 6.5c0.16 0.17 0.25 0.39 0.25 0.62Z"/>
diff --git a/app/src/main/res/drawable/symbol_arrow_up_24.xml b/app/src/main/res/drawable/symbol_arrow_up_24.xml
new file mode 100644
index 0000000000..dfa4af7c1d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_up_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="M12.62 4.13C12.45 3.97 12.23 3.88 12 3.88c-0.23 0-0.45 0.09-0.62 0.25l-6.5 6.5c-0.34 0.34-0.34 0.9 0 1.24 0.34 0.34 0.9 0.34 1.24 0l5.13-5.13-0.13 1.76v11.25c0 0.48 0.4 0.88 0.88 0.88s0.88-0.4 0.88-0.88V8.5l-0.13-1.76 5.13 5.13c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24l-6.5-6.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_blur_24.xml b/app/src/main/res/drawable/symbol_blur_24.xml
new file mode 100644
index 0000000000..7217c3e1c5
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_blur_24.xml
@@ -0,0 +1,78 @@
+<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="M9.75 1.13C9.27 1.13 8.87 1.52 8.87 2s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2 8.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88S2.48 8.87 2 8.87Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M1.13 14.25c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.88 22c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.75 12.5C8.78 12.5 8 13.28 8 14.25S8.78 16 9.75 16s1.75-0.78 1.75-1.75-0.78-1.75-1.75-1.75Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.5 14.25c0-0.97 0.78-1.75 1.75-1.75S16 13.28 16 14.25 15.22 16 14.25 16s-1.75-0.78-1.75-1.75Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.25 8c-0.97 0-1.75 0.78-1.75 1.75s0.78 1.75 1.75 1.75S16 10.72 16 9.75 15.22 8 14.25 8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8 9.75C8 8.78 8.78 8 9.75 8s1.75 0.78 1.75 1.75-0.78 1.75-1.75 1.75S8 10.72 8 9.75Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.5 8.5c-0.69 0-1.25 0.56-1.25 1.25S4.81 11 5.5 11s1.25-0.56 1.25-1.25S6.19 8.5 5.5 8.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.25 9.75c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25S19.19 11 18.5 11s-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.5 4.25c-0.69 0-1.25 0.56-1.25 1.25s0.56 1.25 1.25 1.25 1.25-0.56 1.25-1.25-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.25 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.25 4.25C13.56 4.25 13 4.81 13 5.5s0.56 1.25 1.25 1.25S15.5 6.19 15.5 5.5s-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25S13 19.19 13 18.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.75 4.25C9.06 4.25 8.5 4.81 8.5 5.5s0.56 1.25 1.25 1.25S11 6.19 11 5.5s-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.5 18.5c0-0.69 0.56-1.25 1.25-1.25S11 17.81 11 18.5s-0.56 1.25-1.25 1.25S8.5 19.19 8.5 18.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.5 4.25c-0.69 0-1.25 0.56-1.25 1.25S4.81 6.75 5.5 6.75 6.75 6.19 6.75 5.5 6.19 4.25 5.5 4.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.25 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.5 13c-0.69 0-1.25 0.56-1.25 1.25S4.81 15.5 5.5 15.5s1.25-0.56 1.25-1.25S6.19 13 5.5 13Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.25 14.25c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.25 1.13c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.38 22c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22 8.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.13 14.25c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_blur_24_dark_onsurface.xml b/app/src/main/res/drawable/symbol_blur_24_dark_onsurface.xml
new file mode 100644
index 0000000000..c3c44b9cca
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_blur_24_dark_onsurface.xml
@@ -0,0 +1,78 @@
+<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="@color/signal_dark_colorOnSurface"
+        android:pathData="M9.75 1.13C9.27 1.13 8.87 1.52 8.87 2s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M2 8.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88S2.48 8.87 2 8.87Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M1.13 14.25c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M8.88 22c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M9.75 12.5C8.78 12.5 8 13.28 8 14.25S8.78 16 9.75 16s1.75-0.78 1.75-1.75-0.78-1.75-1.75-1.75Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M12.5 14.25c0-0.97 0.78-1.75 1.75-1.75S16 13.28 16 14.25 15.22 16 14.25 16s-1.75-0.78-1.75-1.75Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M14.25 8c-0.97 0-1.75 0.78-1.75 1.75s0.78 1.75 1.75 1.75S16 10.72 16 9.75 15.22 8 14.25 8Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M8 9.75C8 8.78 8.78 8 9.75 8s1.75 0.78 1.75 1.75-0.78 1.75-1.75 1.75S8 10.72 8 9.75Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M5.5 8.5c-0.69 0-1.25 0.56-1.25 1.25S4.81 11 5.5 11s1.25-0.56 1.25-1.25S6.19 8.5 5.5 8.5Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M17.25 9.75c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25S19.19 11 18.5 11s-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M18.5 4.25c-0.69 0-1.25 0.56-1.25 1.25s0.56 1.25 1.25 1.25 1.25-0.56 1.25-1.25-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M17.25 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M14.25 4.25C13.56 4.25 13 4.81 13 5.5s0.56 1.25 1.25 1.25S15.5 6.19 15.5 5.5s-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M13 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25S13 19.19 13 18.5Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M9.75 4.25C9.06 4.25 8.5 4.81 8.5 5.5s0.56 1.25 1.25 1.25S11 6.19 11 5.5s-0.56-1.25-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M8.5 18.5c0-0.69 0.56-1.25 1.25-1.25S11 17.81 11 18.5s-0.56 1.25-1.25 1.25S8.5 19.19 8.5 18.5Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M5.5 4.25c-0.69 0-1.25 0.56-1.25 1.25S4.81 6.75 5.5 6.75 6.75 6.19 6.75 5.5 6.19 4.25 5.5 4.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M4.25 18.5c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M5.5 13c-0.69 0-1.25 0.56-1.25 1.25S4.81 15.5 5.5 15.5s1.25-0.56 1.25-1.25S6.19 13 5.5 13Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M17.25 14.25c0-0.69 0.56-1.25 1.25-1.25s1.25 0.56 1.25 1.25-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M14.25 1.13c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M13.38 22c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M22 8.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88 0.88-0.4 0.88-0.88-0.4-0.88-0.88-0.88Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M21.13 14.25c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88-0.4 0.88-0.88 0.88-0.88-0.4-0.88-0.88Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_brush_highlighter_24.xml b/app/src/main/res/drawable/symbol_brush_highlighter_24.xml
new file mode 100644
index 0000000000..ed6cc6b298
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_brush_highlighter_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.82 1.29 5.34 3.3 7.02l1.24-3.57C7.5 15.23 7.6 14.93 7.8 14.7c0.17-0.2 0.4-0.36 0.64-0.45 0.14-0.06 0.28-0.08 0.4-0.1L8.08 9.5c-0.08-0.46 0.21-0.9 0.67-1l6.13-1.36C15.47 7 16 7.5 15.92 8.1l-0.8 6.04c0.14 0.01 0.3 0.04 0.44 0.1 0.25 0.1 0.47 0.25 0.64 0.45 0.2 0.24 0.31 0.54 0.39 0.76l1.24 3.57c2.01-1.68 3.3-4.2 3.3-7.02 0-5.04-4.09-9.13-9.13-9.13Zm0 18.25c1.57 0 3.04-0.4 4.33-1.09l-1.45-4.15H9.12l-1.45 4.15c1.29 0.7 2.76 1.1 4.33 1.1Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_check_24.xml b/app/src/main/res/drawable/symbol_check_24.xml
index 1ebb78249b..9ea75d86c7 100644
--- a/app/src/main/res/drawable/symbol_check_24.xml
+++ b/app/src/main/res/drawable/symbol_check_24.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M18.972,5.263c0.407,0.26 0.525,0.802 0.265,1.209l-8.32,13a0.875,0.875 0,0 1,-1.426 0.067l-4.68,-5.98a0.875,0.875 0,0 1,1.378 -1.078l3.92,5.008 7.654,-11.96a0.875,0.875 0,0 1,1.209 -0.266Z"
-      android:fillColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.97 5.26c0.4 0.26 0.53 0.8 0.27 1.21l-8.32 13c-0.16 0.24-0.42 0.4-0.7 0.4-0.28 0.02-0.55-0.1-0.73-0.33l-4.68-5.98c-0.3-0.38-0.23-0.93 0.15-1.23 0.38-0.3 0.93-0.23 1.23 0.15l3.92 5 7.65-11.95c0.26-0.4 0.8-0.53 1.21-0.27Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/symbol_crop_lock_24.xml b/app/src/main/res/drawable/symbol_crop_lock_24.xml
new file mode 100644
index 0000000000..02620324ce
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_crop_lock_24.xml
@@ -0,0 +1,15 @@
+<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="M6.88 2.5c0-0.48-0.4-0.88-0.88-0.88S5.12 2.02 5.12 2.5v2.63H2.5C2.02 5.13 1.62 5.52 1.62 6s0.4 0.88 0.88 0.88h12.75c1.04 0 1.88 0.83 1.88 1.87 0 0.48 0.39 0.88 0.87 0.88s0.88-0.4 0.88-0.88c0-2-1.63-3.62-3.63-3.62H6.87V2.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6 8.38c0.48 0 0.88 0.39 0.88 0.87v3.95c0 0.85 0 1.44 0.03 1.9 0.04 0.45 0.1 0.69 0.2 0.86 0.2 0.4 0.53 0.73 0.93 0.93 0.17 0.1 0.41 0.16 0.86 0.2 0.46 0.03 1.05 0.04 1.9 0.04h0.7c0.48 0 0.88 0.39 0.88 0.87s-0.4 0.88-0.88 0.88h-0.74c-0.8 0-1.47 0-2-0.05C8.2 18.8 7.7 18.7 7.24 18.45c-0.73-0.37-1.32-0.96-1.7-1.7-0.23-0.46-0.33-0.95-0.37-1.5-0.05-0.54-0.05-1.2-0.04-2.01V9.25c0-0.48 0.39-0.88 0.87-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.13 14c0-1.59 1.28-2.88 2.87-2.88s2.88 1.3 2.88 2.88v2.2l0.03 0.02c0.37 0.19 0.68 0.5 0.87 0.87 0.13 0.24 0.17 0.5 0.2 0.78 0.02 0.27 0.02 0.6 0.02 1v0.75c0 0.4 0 0.74-0.02 1-0.03 0.29-0.07 0.55-0.2 0.79-0.19 0.37-0.5 0.68-0.87 0.87-0.24 0.13-0.5 0.17-0.78 0.2-0.27 0.02-0.6 0.02-1 0.02h-2.25c-0.4 0-0.74 0-1-0.02-0.29-0.03-0.55-0.07-0.79-0.2-0.37-0.19-0.68-0.5-0.87-0.87-0.13-0.24-0.17-0.5-0.2-0.78-0.02-0.27-0.02-0.6-0.02-1v-0.75c0-0.4 0-0.74 0.02-1 0.03-0.29 0.07-0.55 0.2-0.79 0.19-0.37 0.5-0.68 0.87-0.87l0.04-0.02V14Zm1.74 2h2.25v-2c0-0.62-0.5-1.13-1.12-1.13-0.62 0-1.13 0.5-1.13 1.13v2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_crop_rotate_24.xml b/app/src/main/res/drawable/symbol_crop_rotate_24.xml
new file mode 100644
index 0000000000..0b068c3593
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_crop_rotate_24.xml
@@ -0,0 +1,15 @@
+<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="M13.37 0.79c0.5-0.3 1.13 0.07 1.13 0.65v0.44c4.23 0.13 7.63 3.6 7.63 7.87 0 0.48-0.4 0.88-0.88 0.88s-0.88-0.4-0.88-0.88c0-3.3-2.6-5.99-5.87-6.12v0.43c0 0.58-0.63 0.94-1.13 0.65L11.12 3.4c-0.5-0.3-0.5-1 0-1.3l2.25-1.31Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5 4.63c0.48 0 0.88 0.39 0.88 0.87v2.13h5.66c0.67 0 1.22 0 1.67 0.03 0.47 0.04 0.91 0.12 1.32 0.33 0.64 0.33 1.15 0.84 1.48 1.48 0.2 0.4 0.29 0.85 0.33 1.32 0.04 0.45 0.04 1 0.04 1.67v3.29c0 0.48-0.4 0.88-0.88 0.88s-0.88-0.4-0.88-0.88V12.5c0-0.71 0-1.2-0.03-1.57-0.03-0.36-0.08-0.54-0.14-0.67-0.16-0.3-0.4-0.55-0.71-0.7-0.13-0.07-0.3-0.12-0.67-0.15-0.37-0.03-0.86-0.04-1.57-0.04H2c-0.48 0-0.88-0.39-0.88-0.87S1.52 7.62 2 7.62h2.13V5.5c0-0.48 0.39-0.88 0.87-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.88 11.75c0-0.48-0.4-0.88-0.88-0.88s-0.88 0.4-0.88 0.88v3.29c0 0.67 0 1.22 0.04 1.67 0.04 0.47 0.12 0.91 0.33 1.32 0.33 0.64 0.84 1.15 1.48 1.48 0.4 0.2 0.85 0.29 1.32 0.33 0.45 0.04 1 0.04 1.67 0.04h5.66V22c0 0.48 0.4 0.88 0.88 0.88s0.88-0.4 0.88-0.88v-2.13h2.12c0.48 0 0.88-0.39 0.88-0.87s-0.4-0.88-0.88-0.88H9c-0.71 0-1.2 0-1.57-0.03-0.36-0.03-0.54-0.08-0.67-0.14-0.3-0.16-0.55-0.4-0.7-0.71-0.07-0.13-0.12-0.3-0.15-0.67C5.88 16.2 5.87 15.71 5.87 15v-3.25Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_crop_unlock_24.xml b/app/src/main/res/drawable/symbol_crop_unlock_24.xml
new file mode 100644
index 0000000000..373318dffc
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_crop_unlock_24.xml
@@ -0,0 +1,15 @@
+<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="M6.88 2.5c0-0.48-0.4-0.88-0.88-0.88S5.12 2.02 5.12 2.5v2.63H2.5C2.02 5.13 1.62 5.51 1.62 6s0.4 0.88 0.88 0.88H15c1.17 0 2.13 0.95 2.13 2.12 0 0.48 0.39 0.88 0.87 0.88s0.88-0.4 0.88-0.88c0-2.14-1.74-3.88-3.88-3.88H6.87V2.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6 8.38c0.48 0 0.88 0.39 0.88 0.87v4.25c0 0.71 0 1.2 0.02 1.58 0.03 0.38 0.07 0.58 0.14 0.73 0.21 0.52 0.63 0.94 1.15 1.15 0.15 0.07 0.35 0.11 0.73 0.14 0.38 0.02 0.87 0.02 1.58 0.02 0.48 0 0.88 0.4 0.88 0.88s-0.4 0.88-0.88 0.88h-0.03c-0.67 0-1.22 0-1.67-0.04-0.46-0.03-0.88-0.1-1.28-0.26-0.95-0.4-1.7-1.15-2.1-2.1-0.17-0.4-0.23-0.82-0.26-1.28-0.04-0.45-0.04-1-0.04-1.67V9.25c0-0.48 0.4-0.88 0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23.38 14c0-1.59-1.3-2.88-2.88-2.88-1.59 0-2.88 1.3-2.88 2.88v2h-1.74c-0.4 0-0.74 0-1 0.02-0.29 0.03-0.55 0.07-0.79 0.2-0.37 0.19-0.68 0.5-0.87 0.87-0.13 0.24-0.17 0.5-0.2 0.78-0.02 0.27-0.02 0.6-0.02 1v0.75c0 0.4 0 0.74 0.02 1 0.03 0.29 0.07 0.55 0.2 0.79 0.19 0.37 0.5 0.68 0.87 0.87 0.24 0.13 0.5 0.17 0.78 0.2 0.27 0.02 0.6 0.02 1 0.02h1.75c0.4 0 0.74 0 1-0.02 0.29-0.03 0.55-0.07 0.79-0.2 0.37-0.19 0.68-0.5 0.87-0.87 0.13-0.24 0.17-0.5 0.2-0.78 0.02-0.27 0.02-0.6 0.02-1v-0.75c0-0.4 0-0.74-0.02-1-0.03-0.29-0.07-0.55-0.2-0.79-0.19-0.37-0.5-0.68-0.87-0.87l-0.04-0.02V14c0-0.62 0.5-1.13 1.13-1.13 0.62 0 1.13 0.5 1.13 1.13v1c0 0.48 0.39 0.88 0.87 0.88s0.88-0.4 0.88-0.88v-1Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_draw_24.xml b/app/src/main/res/drawable/symbol_draw_24.xml
new file mode 100644
index 0000000000..92e5cd812f
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_draw_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="M10.45 6.7c-2.74 1.99-5.8 4.73-7.81 6.9-0.33 0.35-0.88 0.37-1.24 0.04-0.35-0.33-0.37-0.88-0.04-1.24 2.1-2.24 5.23-5.06 8.05-7.12 1.41-1.03 2.79-1.9 3.94-2.4 0.57-0.26 1.14-0.44 1.67-0.5 0.52-0.04 1.14 0.04 1.6 0.5 0.58 0.58 0.6 1.32 0.43 1.96-0.16 0.6-0.54 1.22-0.97 1.8-0.88 1.2-2.24 2.56-3.55 3.86l-0.38 0.37c-1.2 1.2-2.36 2.34-3.17 3.32-0.36 0.44-0.86 0.98-0.97 1.56 0.37 0.03 0.78-0.16 1.1-0.3 0.96-0.43 2.15-1.2 3.42-2.02l0.3-0.19c1.13-0.75 2.32-1.52 3.32-2.02 0.54-0.27 1.1-0.5 1.61-0.57 0.52-0.08 1.2-0.03 1.67 0.55 0.75 0.92 0.32 2.02-0.08 2.73-0.44 0.77-1.15 1.6-1.78 2.33l-0.04 0.04c-0.65 0.76-1.22 1.42-1.55 1.98-0.1 0.17-0.22 0.37-0.25 0.57 0.09 0.06 0.35 0.18 0.98 0.08 0.7-0.1 1.65-0.46 2.84-1.18 0.41-0.25 0.95-0.11 1.2 0.3s0.11 0.95-0.3 1.2c-1.3 0.78-2.48 1.25-3.46 1.4-0.95 0.16-1.92 0.05-2.56-0.62-0.4-0.42-0.5-0.94-0.43-1.42 0.06-0.45 0.26-0.87 0.48-1.23 0.41-0.7 1.07-1.46 1.67-2.15l0.1-0.12c0.66-0.76 1.24-1.45 1.58-2.05 0.12-0.2 0.26-0.45 0.26-0.69-0.4 0.03-0.8 0.24-1.16 0.42-0.9 0.45-2 1.17-3.18 1.93L13.5 14.9c-1.24 0.8-2.55 1.65-3.66 2.14-0.55 0.24-1.14 0.44-1.68 0.46-0.58 0.03-1.22-0.15-1.63-0.76-0.44-0.66-0.26-1.4-0.03-1.94 0.24-0.55 0.66-1.14 1.14-1.72 0.87-1.06 2.1-2.26 3.28-3.44l0.39-0.38c1.33-1.32 2.59-2.59 3.37-3.65 0.4-0.54 0.62-0.95 0.7-1.24 0.02-0.07 0.04-0.16 0.02-0.23-0.03-0.01-0.09-0.02-0.21 0-0.26 0.01-0.63 0.12-1.12 0.34-0.99 0.43-2.24 1.21-3.61 2.21Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_draw_24_dark_onsurface.xml b/app/src/main/res/drawable/symbol_draw_24_dark_onsurface.xml
new file mode 100644
index 0000000000..4c97642b07
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_draw_24_dark_onsurface.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="@color/signal_dark_colorOnSurface"
+        android:pathData="M10.45 6.7c-2.74 1.99-5.8 4.73-7.81 6.9-0.33 0.35-0.88 0.37-1.24 0.04-0.35-0.33-0.37-0.88-0.04-1.24 2.1-2.24 5.23-5.06 8.05-7.12 1.41-1.03 2.79-1.9 3.94-2.4 0.57-0.26 1.14-0.44 1.67-0.5 0.52-0.04 1.14 0.04 1.6 0.5 0.58 0.58 0.6 1.32 0.43 1.96-0.16 0.6-0.54 1.22-0.97 1.8-0.88 1.2-2.24 2.56-3.55 3.86l-0.38 0.37c-1.2 1.2-2.36 2.34-3.17 3.32-0.36 0.44-0.86 0.98-0.97 1.56 0.37 0.03 0.78-0.16 1.1-0.3 0.96-0.43 2.15-1.2 3.42-2.02l0.3-0.19c1.13-0.75 2.32-1.52 3.32-2.02 0.54-0.27 1.1-0.5 1.61-0.57 0.52-0.08 1.2-0.03 1.67 0.55 0.75 0.92 0.32 2.02-0.08 2.73-0.44 0.77-1.15 1.6-1.78 2.33l-0.04 0.04c-0.65 0.76-1.22 1.42-1.55 1.98-0.1 0.17-0.22 0.37-0.25 0.57 0.09 0.06 0.35 0.18 0.98 0.08 0.7-0.1 1.65-0.46 2.84-1.18 0.41-0.25 0.95-0.11 1.2 0.3s0.11 0.95-0.3 1.2c-1.3 0.78-2.48 1.25-3.46 1.4-0.95 0.16-1.92 0.05-2.56-0.62-0.4-0.42-0.5-0.94-0.43-1.42 0.06-0.45 0.26-0.87 0.48-1.23 0.41-0.7 1.07-1.46 1.67-2.15l0.1-0.12c0.66-0.76 1.24-1.45 1.58-2.05 0.12-0.2 0.26-0.45 0.26-0.69-0.4 0.03-0.8 0.24-1.16 0.42-0.9 0.45-2 1.17-3.18 1.93L13.5 14.9c-1.24 0.8-2.55 1.65-3.66 2.14-0.55 0.24-1.14 0.44-1.68 0.46-0.58 0.03-1.22-0.15-1.63-0.76-0.44-0.66-0.26-1.4-0.03-1.94 0.24-0.55 0.66-1.14 1.14-1.72 0.87-1.06 2.1-2.26 3.28-3.44l0.39-0.38c1.33-1.32 2.59-2.59 3.37-3.65 0.4-0.54 0.62-0.95 0.7-1.24 0.02-0.07 0.04-0.16 0.02-0.23-0.03-0.01-0.09-0.02-0.21 0-0.26 0.01-0.63 0.12-1.12 0.34-0.99 0.43-2.24 1.21-3.61 2.21Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_sticker_smiley_24.xml b/app/src/main/res/drawable/symbol_sticker_smiley_24.xml
new file mode 100644
index 0000000000..ecf6321dbc
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_sticker_smiley_24.xml
@@ -0,0 +1,15 @@
+<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.75 11.25c0.83 0 1.5-0.9 1.5-2s-0.67-2-1.5-2-1.5 0.9-1.5 2 0.67 2 1.5 2Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.25 11.25c0.83 0 1.5-0.9 1.5-2s-0.67-2-1.5-2-1.5 0.9-1.5 2 0.67 2 1.5 2Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.48 21.88c-1.03 0-1.62 0-2.12-0.1-2.09-0.42-3.72-2.05-4.14-4.14-0.1-0.5-0.1-1.1-0.1-2.12V10.2c0-1.3 0-2.32 0.07-3.14C2.26 6.24 2.4 5.58 2.7 5 3.2 4 4 3.2 5 2.7c0.6-0.3 1.25-0.43 2.07-0.5 0.82-0.06 1.83-0.06 3.14-0.06h3.6c1.3 0 2.32 0 3.14 0.06 0.82 0.07 1.48 0.2 2.07 0.5C20 3.2 20.8 4 21.3 5c0.3 0.6 0.43 1.25 0.5 2.07 0.07 0.82 0.07 1.83 0.07 3.14v0.76c0 0.52 0 0.88-0.1 1.22-0.09 0.3-0.23 0.58-0.42 0.83-0.22 0.28-0.5 0.5-0.93 0.81L10.32 21.3l-0.28 0.2C9.7 21.7 9.3 21.84 8.9 21.87H8.57 8.48Zm2.4-2.77l0.78-0.73 0.05-0.03 5.5-4 0.04-0.04 1-0.55-2 0.12c-0.88 0-1.52 0-2.02 0.03s-0.83 0.1-1.11 0.2c-0.93 0.36-1.65 1.08-2.01 2-0.1 0.29-0.17 0.62-0.2 1.12-0.03 0.48-0.03 1.07-0.04 1.88Zm-2.74 1.02l0.35-0.01c0.32-0.05 0.58-0.3 0.63-0.63v-0.35-0.28c0-0.67 0-1.2 0.03-1.66-0.8-0.4-1.5-0.96-2.07-1.64-0.3-0.38-0.25-0.93 0.12-1.23 0.37-0.31 0.92-0.26 1.23 0.11 0.3 0.38 0.67 0.7 1.08 0.96 0.62-1.51 1.9-2.67 3.5-3.1 0.67-0.18 1.47-0.18 2.85-0.18h2.77l0.78-0.01c0.17-0.01 0.25-0.04 0.3-0.07 0.15-0.07 0.26-0.18 0.33-0.32 0.03-0.06 0.06-0.14 0.07-0.31l0.02-0.79V9.79c0-1.13 0-1.95-0.06-2.6-0.05-0.63-0.15-1.05-0.33-1.4-0.33-0.65-0.87-1.19-1.53-1.52-0.34-0.18-0.76-0.28-1.4-0.33-0.64-0.05-1.46-0.06-2.58-0.06H9.77c-1.13 0-1.95 0-2.6 0.06-0.63 0.05-1.05 0.15-1.4 0.33C5.14 4.59 4.6 5.13 4.27 5.79c-0.18 0.34-0.28 0.76-0.33 1.4-0.05 0.64-0.05 1.46-0.05 2.58v6.1c0 0.72 0 1.03 0.03 1.28 0.23 1.52 1.42 2.7 2.94 2.94 0.25 0.03 0.56 0.04 1.29 0.04Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_sticker_smiley_24_dark_onsurface.xml b/app/src/main/res/drawable/symbol_sticker_smiley_24_dark_onsurface.xml
new file mode 100644
index 0000000000..9752104aa8
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_sticker_smiley_24_dark_onsurface.xml
@@ -0,0 +1,15 @@
+<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="@color/signal_dark_colorOnSurface"
+        android:pathData="M8.75 11.25c0.83 0 1.5-0.9 1.5-2s-0.67-2-1.5-2-1.5 0.9-1.5 2 0.67 2 1.5 2Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M15.25 11.25c0.83 0 1.5-0.9 1.5-2s-0.67-2-1.5-2-1.5 0.9-1.5 2 0.67 2 1.5 2Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M8.48 21.88c-1.03 0-1.62 0-2.12-0.1-2.09-0.42-3.72-2.05-4.14-4.14-0.1-0.5-0.1-1.1-0.1-2.12V10.2c0-1.3 0-2.32 0.07-3.14C2.26 6.24 2.4 5.58 2.7 5 3.2 4 4 3.2 5 2.7c0.6-0.3 1.25-0.43 2.07-0.5 0.82-0.06 1.83-0.06 3.14-0.06h3.6c1.3 0 2.32 0 3.14 0.06 0.82 0.07 1.48 0.2 2.07 0.5C20 3.2 20.8 4 21.3 5c0.3 0.6 0.43 1.25 0.5 2.07 0.07 0.82 0.07 1.83 0.07 3.14v0.76c0 0.52 0 0.88-0.1 1.22-0.09 0.3-0.23 0.58-0.42 0.83-0.22 0.28-0.5 0.5-0.93 0.81L10.32 21.3l-0.28 0.2C9.7 21.7 9.3 21.84 8.9 21.87H8.57 8.48Zm2.4-2.77l0.78-0.73 0.05-0.03 5.5-4 0.04-0.04 1-0.55-2 0.12c-0.88 0-1.52 0-2.02 0.03s-0.83 0.1-1.11 0.2c-0.93 0.36-1.65 1.08-2.01 2-0.1 0.29-0.17 0.62-0.2 1.12-0.03 0.48-0.03 1.07-0.04 1.88Zm-2.74 1.02l0.35-0.01c0.32-0.05 0.58-0.3 0.63-0.63v-0.35-0.28c0-0.67 0-1.2 0.03-1.66-0.8-0.4-1.5-0.96-2.07-1.64-0.3-0.38-0.25-0.93 0.12-1.23 0.37-0.31 0.92-0.26 1.23 0.11 0.3 0.38 0.67 0.7 1.08 0.96 0.62-1.51 1.9-2.67 3.5-3.1 0.67-0.18 1.47-0.18 2.85-0.18h2.77l0.78-0.01c0.17-0.01 0.25-0.04 0.3-0.07 0.15-0.07 0.26-0.18 0.33-0.32 0.03-0.06 0.06-0.14 0.07-0.31l0.02-0.79V9.79c0-1.13 0-1.95-0.06-2.6-0.05-0.63-0.15-1.05-0.33-1.4-0.33-0.65-0.87-1.19-1.53-1.52-0.34-0.18-0.76-0.28-1.4-0.33-0.64-0.05-1.46-0.06-2.58-0.06H9.77c-1.13 0-1.95 0-2.6 0.06-0.63 0.05-1.05 0.15-1.4 0.33C5.14 4.59 4.6 5.13 4.27 5.79c-0.18 0.34-0.28 0.76-0.33 1.4-0.05 0.64-0.05 1.46-0.05 2.58v6.1c0 0.72 0 1.03 0.03 1.28 0.23 1.52 1.42 2.7 2.94 2.94 0.25 0.03 0.56 0.04 1.29 0.04Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_text_24.xml b/app/src/main/res/drawable/symbol_text_24.xml
new file mode 100644
index 0000000000..25fa0cd264
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_text_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="M2.32 18.66l1.4-3.79h6.32l1.4 3.78c0.12 0.36 0.46 0.6 0.85 0.6 0.63 0 1.07-0.63 0.85-1.22L8.48 5.23C8.3 4.73 7.8 4.38 7.25 4.38H6.56c-0.54 0-1.03 0.35-1.22 0.86L0.6 18.03c-0.22 0.59 0.22 1.22 0.85 1.22 0.39 0 0.73-0.24 0.86-0.6ZM6.88 6.32l2.56 6.93H4.32l2.56-6.93Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.45 9.86C20.78 10.14 21 10.6 21 11.38c0 0.28-0.03 0.46-0.07 0.59-0.04 0.1-0.1 0.18-0.21 0.26-0.13 0.08-0.34 0.16-0.69 0.23-0.34 0.07-0.8 0.12-1.39 0.16-1.64 0.1-2.83 0.46-3.62 1.08-0.82 0.63-1.15 1.5-1.15 2.43 0 0.93 0.34 1.75 0.98 2.34 0.64 0.6 1.54 0.9 2.6 0.9 1.37 0 2.52-0.4 3.33-1.2L21 17.94v0.43c0 0.49 0.4 0.88 0.87 0.88 0.49 0 0.88-0.4 0.88-0.88V11.5c0-1.1-0.35-2.04-1.09-2.69-0.72-0.64-1.75-0.94-2.99-0.94-1.64 0-3.12 0.62-4.07 1.87-0.4 0.52-0.08 1.18 0.46 1.33 0.38 0.12 0.77-0.05 0.98-0.33 0.63-0.85 1.6-1.35 2.63-1.35 0.86 0 1.43 0.17 1.78 0.47Zm0.55 3.8v1.18c0 0.9-0.23 1.62-0.69 2.12-0.45 0.49-1.2 0.83-2.38 0.83-0.78 0-1.37-0.19-1.74-0.48-0.36-0.27-0.57-0.67-0.57-1.18 0-0.59 0.17-0.98 0.6-1.27 0.48-0.34 1.33-0.6 2.8-0.7 0.84-0.07 1.5-0.21 1.98-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_text_24_dark_onsurface.xml b/app/src/main/res/drawable/symbol_text_24_dark_onsurface.xml
new file mode 100644
index 0000000000..4936cae75d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_text_24_dark_onsurface.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="@color/signal_dark_colorOnSurface"
+        android:pathData="M2.32 18.66l1.4-3.79h6.32l1.4 3.78c0.12 0.36 0.46 0.6 0.85 0.6 0.63 0 1.07-0.63 0.85-1.22L8.48 5.23C8.3 4.73 7.8 4.38 7.25 4.38H6.56c-0.54 0-1.03 0.35-1.22 0.86L0.6 18.03c-0.22 0.59 0.22 1.22 0.85 1.22 0.39 0 0.73-0.24 0.86-0.6ZM6.88 6.32l2.56 6.93H4.32l2.56-6.93Z"/>
+    <path
+        android:fillColor="@color/signal_dark_colorOnSurface"
+        android:pathData="M20.45 9.86C20.78 10.14 21 10.6 21 11.38c0 0.28-0.03 0.46-0.07 0.59-0.04 0.1-0.1 0.18-0.21 0.26-0.13 0.08-0.34 0.16-0.69 0.23-0.34 0.07-0.8 0.12-1.39 0.16-1.64 0.1-2.83 0.46-3.62 1.08-0.82 0.63-1.15 1.5-1.15 2.43 0 0.93 0.34 1.75 0.98 2.34 0.64 0.6 1.54 0.9 2.6 0.9 1.37 0 2.52-0.4 3.33-1.2L21 17.94v0.43c0 0.49 0.4 0.88 0.87 0.88 0.49 0 0.88-0.4 0.88-0.88V11.5c0-1.1-0.35-2.04-1.09-2.69-0.72-0.64-1.75-0.94-2.99-0.94-1.64 0-3.12 0.62-4.07 1.87-0.4 0.52-0.08 1.18 0.46 1.33 0.38 0.12 0.77-0.05 0.98-0.33 0.63-0.85 1.6-1.35 2.63-1.35 0.86 0 1.43 0.17 1.78 0.47Zm0.55 3.8v1.18c0 0.9-0.23 1.62-0.69 2.12-0.45 0.49-1.2 0.83-2.38 0.83-0.78 0-1.37-0.19-1.74-0.48-0.36-0.27-0.57-0.67-0.57-1.18 0-0.59 0.17-0.98 0.6-1.27 0.48-0.34 1.33-0.6 2.8-0.7 0.84-0.07 1.5-0.21 1.98-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_text_square_24.xml b/app/src/main/res/drawable/symbol_text_square_24.xml
new file mode 100644
index 0000000000..82cc5a51bf
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_text_square_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="M8.94 16.9l0.87-2.4h4.38l0.87 2.4c0.13 0.36 0.47 0.6 0.85 0.6 0.64 0 1.08-0.63 0.86-1.22l-3.25-8.96c-0.17-0.5-0.64-0.82-1.17-0.82h-0.7c-0.53 0-1 0.33-1.17 0.82l-3.25 8.96c-0.22 0.6 0.22 1.22 0.86 1.22 0.38 0 0.72-0.24 0.85-0.6ZM12 8.47l1.6 4.4h-3.2l1.6-4.4Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.36 2.13c-1.09 0-1.96 0-2.66 0.05C5.98 2.24 5.36 2.37 4.8 2.66 3.87 3.12 3.12 3.87 2.66 4.79 2.36 5.36 2.24 5.98 2.18 6.7 2.12 7.4 2.12 8.27 2.12 9.36v5.28c0 1.09 0 1.96 0.06 2.66 0.06 0.72 0.19 1.34 0.48 1.91 0.46 0.92 1.21 1.67 2.13 2.13 0.57 0.3 1.19 0.42 1.91 0.48 0.7 0.05 1.57 0.05 2.66 0.05h5.28c1.09 0 1.96 0 2.66-0.05 0.72-0.06 1.34-0.18 1.91-0.48 0.92-0.46 1.67-1.2 2.13-2.13 0.3-0.57 0.42-1.19 0.48-1.91 0.05-0.7 0.05-1.57 0.05-2.66V9.36c0-1.09 0-1.96-0.05-2.66-0.06-0.72-0.18-1.34-0.48-1.91-0.46-0.92-1.2-1.67-2.13-2.13-0.57-0.3-1.19-0.42-1.91-0.48-0.7-0.06-1.57-0.06-2.66-0.06H9.36ZM5.58 4.21c0.29-0.15 0.65-0.24 1.26-0.3 0.63-0.04 1.43-0.04 2.56-0.04h5.2c1.13 0 1.93 0 2.56 0.05 0.6 0.05 0.97 0.14 1.26 0.29 0.59 0.3 1.06 0.77 1.36 1.36 0.15 0.29 0.24 0.65 0.3 1.26 0.04 0.63 0.05 1.43 0.05 2.56v5.2c0 1.13 0 1.93-0.06 2.56-0.05 0.6-0.14 0.97-0.29 1.26-0.3 0.59-0.77 1.06-1.36 1.36-0.29 0.15-0.65 0.24-1.26 0.3-0.63 0.04-1.43 0.05-2.56 0.05H9.4c-1.13 0-1.93 0-2.56-0.06-0.6-0.05-0.97-0.14-1.26-0.29-0.59-0.3-1.06-0.77-1.36-1.36-0.15-0.29-0.24-0.65-0.3-1.26-0.04-0.63-0.04-1.43-0.04-2.56V9.4c0-1.13 0-1.93 0.05-2.56 0.05-0.6 0.14-0.97 0.29-1.26C4.52 5 4.99 4.52 5.58 4.22Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_undo_24.xml b/app/src/main/res/drawable/symbol_undo_24.xml
new file mode 100644
index 0000000000..b76443f9d0
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_undo_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="@color/signal_dark_colorOnSurface"
+        android:pathData="M2.13 9c0-0.23 0.09-0.45 0.25-0.62l5.5-5.5c0.34-0.34 0.9-0.34 1.24 0 0.34 0.34 0.34 0.9 0 1.24L4.99 8.25l1.76-0.13H16c3.52 0 6.38 2.86 6.38 6.38s-2.86 6.38-6.38 6.38h-4c-0.48 0-0.88-0.4-0.88-0.88s0.4-0.88 0.88-0.88h4c2.55 0 4.63-2.07 4.63-4.62 0-2.55-2.08-4.63-4.63-4.63H6.75L4.99 9.76l4.13 4.13c0.34 0.34 0.34 0.9 0 1.24-0.34 0.34-0.9 0.34-1.24 0l-5.5-5.5C2.22 9.45 2.13 9.23 2.13 9Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_view_once_dash_24.xml b/app/src/main/res/drawable/symbol_view_once_dash_24.xml
new file mode 100644
index 0000000000..25d6a02aae
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_view_once_dash_24.xml
@@ -0,0 +1,45 @@
+<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="M10.88 3.03c-0.02-0.48 0.36-0.89 0.84-0.9h0.55c0.49 0.01 0.87 0.41 0.85 0.9 0 0.48-0.41 0.86-0.9 0.85h-0.45c-0.48 0.01-0.88-0.37-0.9-0.85Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.88 20.98c0-0.49 0.41-0.87 0.9-0.85h0.45c0.48-0.02 0.88 0.36 0.9 0.85 0 0.48-0.37 0.88-0.86 0.9h-0.54c-0.49-0.02-0.87-0.42-0.85-0.9Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.97 10.88c0.49-0.02 0.89 0.36 0.9 0.85v0.55c-0.01 0.48-0.41 0.86-0.9 0.85-0.48-0.02-0.86-0.42-0.85-0.9v-0.45c-0.01-0.49 0.37-0.89 0.85-0.9Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.03 10.88c0.48 0.01 0.86 0.41 0.85 0.9v0.45c0.01 0.48-0.37 0.88-0.85 0.9-0.49 0.01-0.89-0.37-0.9-0.85v-0.55c0.01-0.48 0.41-0.87 0.9-0.85Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.41 6.83c-0.25-0.41-0.79-0.54-1.2-0.29-0.41 0.26-0.54 0.8-0.29 1.2l0.23 0.4c0.23 0.42 0.76 0.58 1.18 0.35 0.43-0.23 0.59-0.76 0.36-1.19L20.4 6.83Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.85 15.87c-0.23-0.43-0.76-0.58-1.18-0.35-0.43 0.23-0.59 0.76-0.36 1.18l0.28 0.48c0.25 0.4 0.79 0.54 1.2 0.28 0.41-0.25 0.54-0.79 0.29-1.2l-0.23-0.4Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.51 3.67c0.23-0.43 0.76-0.59 1.19-0.36l0.47 0.28c0.42 0.25 0.54 0.79 0.3 1.2-0.26 0.41-0.8 0.54-1.21 0.29l-0.4-0.23c-0.42-0.23-0.58-0.76-0.35-1.18Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.54 19.21c0.25-0.4 0.79-0.54 1.2-0.28l0.4 0.22c0.42 0.23 0.58 0.76 0.35 1.19-0.23 0.42-0.76 0.58-1.19 0.35l-0.47-0.27c-0.42-0.26-0.54-0.8-0.3-1.2Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.83 3.59c-0.42 0.25-0.54 0.8-0.3 1.2 0.26 0.41 0.8 0.54 1.21 0.29l0.4-0.23C8.55 4.62 8.71 4.1 8.48 3.67 8.26 3.24 7.73 3.08 7.3 3.3L6.83 3.6Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.87 19.15c-0.43 0.23-0.59 0.76-0.36 1.19 0.23 0.42 0.76 0.58 1.19 0.35l0.47-0.27c0.42-0.26 0.54-0.8 0.3-1.2-0.26-0.42-0.8-0.55-1.21-0.3l-0.4 0.23Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.67 8.49C3.24 8.26 3.08 7.73 3.3 7.3L3.6 6.83c0.25-0.41 0.79-0.54 1.2-0.29 0.41 0.25 0.54 0.8 0.29 1.2l-0.23 0.4C4.62 8.56 4.1 8.72 3.67 8.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.21 17.46c-0.41-0.25-0.54-0.79-0.29-1.2l0.23-0.4c0.23-0.42 0.76-0.57 1.18-0.34 0.43 0.22 0.59 0.76 0.36 1.18l-0.28 0.48c-0.25 0.4-0.79 0.54-1.2 0.28Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.8 7.5c0.14-0.15 0.34-0.25 0.57-0.25 0.42 0 0.76 0.34 0.76 0.76v7.87c0 0.48-0.4 0.87-0.88 0.87s-0.88-0.4-0.88-0.88V9.75H10.4c-0.42 0-0.77-0.34-0.77-0.76 0-0.4 0.3-0.72 0.68-0.76 0.37-0.05 0.63-0.11 0.86-0.22 0.22-0.1 0.42-0.26 0.64-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_x_circle_24.xml b/app/src/main/res/drawable/symbol_x_circle_24.xml
index a5c8fa2d34..a055ebd880 100644
--- a/app/src/main/res/drawable/symbol_x_circle_24.xml
+++ b/app/src/main/res/drawable/symbol_x_circle_24.xml
@@ -3,11 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M7.881,7.881a0.875,0.875 0,0 1,1.238 0L12,10.763l2.881,-2.882A0.875,0.875 0,1 1,16.12 9.12L13.237,12l2.882,2.881a0.875,0.875 0,1 1,-1.238 1.238L12,13.237 9.119,16.12a0.875,0.875 0,0 1,-1.239 -1.24L10.763,12 7.88,9.119a0.875,0.875 0,0 1,0 -1.238Z"
-      android:fillColor="#000"/>
-  <path
-      android:pathData="M1.125,12C1.125,5.994 5.994,1.125 12,1.125S22.875,5.994 22.875,12 18.006,22.875 12,22.875 1.125,18.006 1.125,12ZM12,2.875a9.125,9.125 0,1 0,0 18.25,9.125 9.125,0 0,0 0,-18.25Z"
-      android:fillColor="#000"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.88 7.88c0.34-0.34 0.9-0.34 1.24 0L12 10.76l2.88-2.88c0.34-0.34 0.9-0.34 1.24 0 0.34 0.34 0.34 0.9 0 1.24L13.24 12l2.88 2.88c0.34 0.34 0.34 0.9 0 1.24-0.34 0.34-0.9 0.34-1.24 0L12 13.24l-2.88 2.88c-0.34 0.34-0.9 0.34-1.24 0-0.34-0.34-0.34-0.9 0-1.24L10.76 12 7.88 9.12c-0.34-0.34-0.34-0.9 0-1.24Z"/>
+    <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/call_toast_popup_window.xml b/app/src/main/res/layout/call_toast_popup_window.xml
index 78737fe25a..ccbe396af5 100644
--- a/app/src/main/res/layout/call_toast_popup_window.xml
+++ b/app/src/main/res/layout/call_toast_popup_window.xml
@@ -26,7 +26,7 @@
             android:gravity="center"
             android:text="@string/CallToastPopupWindow__swipe_to_view_screen_share"
             android:textAppearance="@style/TextAppearance.Signal.Body2"
-            app:drawableStartCompat="@drawable/ic_arrow_down"
+            app:drawableStartCompat="@drawable/symbol_arrow_down_24"
             app:drawableTint="@color/signal_text_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/group_call_speaker_hint.xml b/app/src/main/res/layout/group_call_speaker_hint.xml
index e0d42fd8aa..0285227235 100644
--- a/app/src/main/res/layout/group_call_speaker_hint.xml
+++ b/app/src/main/res/layout/group_call_speaker_hint.xml
@@ -17,7 +17,7 @@
         android:minHeight="48dp"
         android:padding="12dp"
         android:text="@string/WebRtcCallScreen_swipe_up_to_change_views"
-        app:drawableStartCompat="@drawable/ic_arrow_up_16"
+        app:drawableStartCompat="@drawable/symbol_arrow_up_24"
         android:drawablePadding="8dp"
         android:textColor="@color/signal_light_colorOnSecondaryContainer"
         app:drawableTint="@color/signal_light_colorOnSecondaryContainer" />
diff --git a/app/src/main/res/layout/revealable_message_view.xml b/app/src/main/res/layout/revealable_message_view.xml
index a8999a9728..e0cf80aceb 100644
--- a/app/src/main/res/layout/revealable_message_view.xml
+++ b/app/src/main/res/layout/revealable_message_view.xml
@@ -21,7 +21,7 @@
             android:layout_height="40dp"
             android:scaleType="center"
             tools:background="@color/transparent_white_20"
-            tools:src="@drawable/ic_viewed_once_24"/>
+            tools:src="@drawable/symbol_view_once_dash_24"/>
 
         <com.pnikosis.materialishprogress.ProgressWheel
             android:id="@+id/revealable_progress"
diff --git a/app/src/main/res/layout/stories_slate_view.xml b/app/src/main/res/layout/stories_slate_view.xml
index 5462815779..44459489b0 100644
--- a/app/src/main/res/layout/stories_slate_view.xml
+++ b/app/src/main/res/layout/stories_slate_view.xml
@@ -45,7 +45,7 @@
         android:layout_gravity="center"
         android:scaleType="centerInside"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_arrow_down_24"
+        app:srcCompat="@drawable/symbol_arrow_down_24"
         app:tint="@color/core_white"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/v2_media_image_editor_hud.xml b/app/src/main/res/layout/v2_media_image_editor_hud.xml
index 77dce2a1d7..2985014115 100644
--- a/app/src/main/res/layout/v2_media_image_editor_hud.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_hud.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:parentTag="android.widget.FrameLayout">
+    tools:parentTag="android.widget.FrameLayout"
+    tools:viewBindingIgnore="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -39,7 +39,7 @@
             android:paddingBottom="7dp"
             android:text="@string/ImageEditorHud__clear_all"
             android:textAppearance="@style/Signal.Text.Body"
-            android:textColor="@color/core_white"
+            android:textColor="@color/signal_dark_colorOnSecondaryContainer"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -65,6 +65,8 @@
             android:layout_marginStart="10dp"
             android:layout_marginBottom="10dp"
             android:alpha="0"
+            android:background="@drawable/circle_tintable"
+            android:backgroundTint="@color/signal_dark_colorPrimaryContainer"
             android:contentDescription="@string/ImageEditorHud__cancel"
             android:padding="6dp"
             android:translationY="56dp"
@@ -72,8 +74,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_goneMarginEnd="10dp"
-            app:srcCompat="@drawable/ic_cancel_36"
-            app:tint="@color/core_white"
+            app:srcCompat="@drawable/symbol_x_24"
+            app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:translationY="0dp"
             tools:visibility="visible" />
@@ -165,6 +167,8 @@
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="10dp"
             android:alpha="0"
+            android:background="@drawable/circle_tintable"
+            android:backgroundTint="@color/signal_dark_colorPrimaryContainer"
             android:contentDescription="@string/ImageEditorHud__done_editing"
             android:padding="6dp"
             android:translationY="56dp"
@@ -172,8 +176,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_goneMarginStart="10dp"
-            app:srcCompat="@drawable/ic_confirm_36"
-            app:tint="@color/core_white"
+            app:srcCompat="@drawable/symbol_check_24"
+            app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:translationY="0dp"
             tools:visibility="visible" />
@@ -228,6 +232,7 @@
             app:layout_constraintBottom_toBottomOf="@id/image_editor_hud_draw_color_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/image_editor_hud_draw_color_bar"
+            app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:visibility="visible" />
 
@@ -245,8 +250,8 @@
             app:layout_constraintBottom_toBottomOf="@id/image_editor_hud_draw_color_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/image_editor_hud_draw_color_bar"
-            app:srcCompat="@drawable/ic_text_tool_24"
-            app:tint="@color/core_white"
+            app:srcCompat="@drawable/symbol_text_square_24"
+            app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:visibility="visible" />
 
@@ -322,8 +327,8 @@
             app:layout_constraintStart_toEndOf="@id/image_editor_hud_flip_button"
             app:layout_goneMarginEnd="10dp"
             app:layout_goneMarginStart="10dp"
-            app:srcCompat="@drawable/ic_crop_unlock_24"
-            app:tint="@color/core_white"
+            app:srcCompat="@drawable/symbol_crop_unlock_24"
+            app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:translationY="0dp"
             tools:visibility="visible" />
@@ -394,8 +399,8 @@
                 android:textColor="@color/core_white" />
 
             <com.google.android.material.materialswitch.MaterialSwitch
-                style="@style/Widget.Signal.CompoundButton.MaterialSwitch"
                 android:id="@+id/image_editor_hud_blur_toggle"
+                style="@style/Widget.Signal.CompoundButton.MaterialSwitch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="false"
diff --git a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
index f6f573fe3f..752277da9e 100644
--- a/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_text_entry_fragment.xml
@@ -47,7 +47,7 @@
             app:backgroundTint="@color/transparent_black_40"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/ic_text_tool_24"
+            app:srcCompat="@drawable/symbol_text_square_24"
             app:tint="@color/core_white" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
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 b0fb269fd9..4e8e0eb23e 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -52,9 +52,10 @@
             android:paddingEnd="14dp"
             android:paddingBottom="8dp"
             android:textAppearance="@style/TextAppearance.Signal.Body2"
-            android:textColor="@color/core_white"
+            android:textColor="@color/signal_dark_colorOnSurface"
             android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_arrow_right_16"
+            app:drawableStartCompat="@drawable/symbol_arrow_right_24"
+            app:drawableTint="@color/signal_dark_colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:alpha="1"
@@ -240,7 +241,7 @@
             app:layout_constraintStart_toEndOf="@id/draw_tool"
             app:layout_goneMarginStart="10dp"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
-            app:srcCompat="@drawable/ic_crop_rotate_24"
+            app:srcCompat="@drawable/symbol_crop_rotate_24"
             app:tint="@color/signal_dark_colorOnSurface"
             tools:alpha="1"
             tools:visibility="visible" />