diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index f9a6c62078..182683d3f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -476,9 +476,9 @@ class ConversationSettingsFragment : DSLSettingsFragment(
 
       val summary = DSLSettingsText.from(formatDisappearingMessagesLifespan(state.disappearingMessagesLifespan))
       val icon = if (state.disappearingMessagesLifespan <= 0 || state.recipient.isBlocked) {
-        R.drawable.ic_update_timer_disabled_16
+        R.drawable.symbol_timer_slash_24
       } else {
-        R.drawable.ic_update_timer_16
+        R.drawable.symbol_timer_24
       }
 
       var enabled = !state.recipient.isBlocked
@@ -521,7 +521,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
       if (!state.recipient.isReleaseNotes) {
         clickPref(
           title = DSLSettingsText.from(R.string.preferences__chat_color_and_wallpaper),
-          icon = DSLSettingsIcon.from(R.drawable.ic_color_24),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_color_24),
           onClick = {
             startActivity(ChatWallpaperActivity.createIntent(requireContext(), state.recipient.id))
           }
@@ -531,7 +531,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
       if (!state.recipient.isSelf) {
         clickPref(
           title = DSLSettingsText.from(R.string.ConversationSettingsFragment__sounds_and_notifications),
-          icon = DSLSettingsIcon.from(R.drawable.ic_speaker_24),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_speaker_24),
           isEnabled = !state.isDeprecatedOrUnregistered,
           onClick = {
             val action = ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToSoundsAndNotificationsSettingsFragment(state.recipient.id)
@@ -576,7 +576,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
         if (!state.recipient.isReleaseNotes && !state.recipient.isSelf) {
           clickPref(
             title = DSLSettingsText.from(R.string.ConversationSettingsFragment__view_safety_number),
-            icon = DSLSettingsIcon.from(R.drawable.ic_safety_number_24),
+            icon = DSLSettingsIcon.from(R.drawable.symbol_safety_number_24),
             isEnabled = !state.isDeprecatedOrUnregistered,
             onClick = {
               VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireActivity(), recipientState.identityRecord)
diff --git a/app/src/main/res/drawable/symbol_safety_number_24.xml b/app/src/main/res/drawable/symbol_safety_number_24.xml
new file mode 100644
index 0000000000..2dd5fb6e12
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_safety_number_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="M16.74 7.96c0.26-0.4 0.13-0.95-0.28-1.2-0.4-0.26-0.95-0.13-1.2 0.28l-4.35 6.95-2.23-2.79c-0.3-0.37-0.85-0.44-1.23-0.13-0.37 0.3-0.44 0.85-0.13 1.23l3 3.75c0.17 0.22 0.45 0.34 0.73 0.32 0.28-0.01 0.54-0.17 0.7-0.4l5-8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.17 22.63c1.06 0.87 2.6 0.87 3.66 0l3.98-3.29c2.26-1.85 3.67-4.54 3.93-7.45l0.5-5.72c0.11-1.34-0.72-2.58-2-2.99l-6.17-1.94c-1.35-0.43-2.8-0.43-4.14 0L3.77 3.18c-1.29 0.4-2.12 1.65-2 3l0.5 5.71c0.25 2.91 1.66 5.6 3.92 7.45l3.98 3.29Zm2.55-1.35c-0.42 0.34-1.02 0.34-1.44 0L7.3 17.99c-1.9-1.55-3.08-3.8-3.3-6.25L3.52 6.02C3.46 5.5 3.8 5.01 4.3 4.85l6.17-1.95c1-0.31 2.08-0.31 3.08 0l6.17 1.95c0.5 0.16 0.82 0.65 0.78 1.17l-0.5 5.72c-0.21 2.44-1.4 4.7-3.29 6.25l-3.98 3.29Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_timer_24.xml b/app/src/main/res/drawable/symbol_timer_24.xml
new file mode 100644
index 0000000000..b0776b9227
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_timer_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 6.63c0.48 0 0.88 0.39 0.88 0.87v4.38c0.45 0.29 0.74 0.8 0.74 1.37 0 0.9-0.72 1.63-1.62 1.63-0.9 0-1.63-0.73-1.63-1.63 0-0.58 0.3-1.08 0.76-1.37V7.5c0-0.48 0.39-0.88 0.87-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12 0.63c0.48 0 0.88 0.39 0.88 0.87v1.16c2.06 0.18 3.95 1 5.46 2.27l0.82-0.83c0.34-0.34 0.9-0.34 1.24 0 0.34 0.34 0.34 0.9 0 1.24l-0.83 0.82c1.44 1.72 2.3 3.93 2.3 6.34 0 5.45-4.42 9.88-9.87 9.88-5.45 0-9.88-4.43-9.88-9.88 0-5.16 3.96-9.4 9-9.84V1.5c0-0.48 0.4-0.88 0.88-0.88Zm5.74 6.12c-1.47-1.47-3.5-2.38-5.74-2.38-4.49 0-8.13 3.64-8.13 8.13s3.64 8.13 8.13 8.13 8.13-3.64 8.13-8.13c0-2.24-0.91-4.27-2.38-5.74l-0.01-0.01Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_timer_slash_24.xml b/app/src/main/res/drawable/symbol_timer_slash_24.xml
new file mode 100644
index 0000000000..b74bf0f445
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_timer_slash_24.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.88 1.5c0-0.48-0.4-0.88-0.88-0.88s-0.88 0.4-0.88 0.88v1.16C9.6 2.8 8.15 3.28 6.9 4.04l1.28 1.29C9.32 4.72 10.62 4.37 12 4.37c2.24 0 4.27 0.91 5.74 2.38l0.01 0.01c1.47 1.47 2.38 3.5 2.38 5.74 0 1.38-0.35 2.68-0.96 3.82l1.29 1.28c0.9-1.49 1.41-3.23 1.41-5.1 0-2.41-0.86-4.62-2.3-6.34l0.83-0.82c0.34-0.34 0.34-0.9 0-1.24-0.34-0.34-0.9-0.34-1.24 0l-0.82 0.83c-1.5-1.26-3.4-2.09-5.46-2.27V1.5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.54 7.4c-0.9 1.49-1.42 3.23-1.42 5.1 0 5.45 4.43 9.88 9.88 9.88 1.87 0 3.61-0.52 5.1-1.42l-1.28-1.29c-1.14 0.61-2.44 0.95-3.82 0.95-4.49 0-8.13-3.63-8.13-8.12 0-1.38 0.35-2.68 0.96-3.82L3.54 7.4Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.13 8.27V7.5c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88v2.52l-1.76-1.75Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.62 2.88c-0.34-0.34-0.9-0.34-1.24 0-0.34 0.34-0.34 0.9 0 1.24l17.97 17.97c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24L3.62 2.88Z"/>
+</vector>