diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
index cf7de8c2f2..837926e95c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
@@ -204,7 +204,7 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
       }.toMutableList()
     if (allowScheduling && listener?.canSchedule() == true) {
       items += ActionItem(
-        iconRes = R.drawable.ic_calendar_24,
+        iconRes = R.drawable.symbol_calendar_24,
         title = context.getString(R.string.conversation_activity__option_schedule_message),
         action = { listener.onSendScheduled() }
       )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt
index ad48196588..0face1436b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfileDetailsFragment.kt
@@ -170,7 +170,7 @@ class NotificationProfileDetailsFragment : DSLSettingsFragment() {
       clickPref(
         title = DSLSettingsText.from(profile.schedule.describe()),
         summary = DSLSettingsText.from(if (profile.schedule.enabled) R.string.NotificationProfileDetails__on else R.string.NotificationProfileDetails__off),
-        icon = DSLSettingsIcon.from(R.drawable.ic_recent_20, NO_TINT),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_recent_24),
         onClick = {
           findNavController().safeNavigate(NotificationProfileDetailsFragmentDirections.actionNotificationProfileDetailsFragmentToEditNotificationProfileScheduleFragment(profile.id, false))
         }
@@ -181,7 +181,7 @@ class NotificationProfileDetailsFragment : DSLSettingsFragment() {
       switchPref(
         title = DSLSettingsText.from(R.string.NotificationProfileDetails__allow_all_calls),
         isChecked = profile.allowAllCalls,
-        icon = DSLSettingsIcon.from(R.drawable.ic_phone_right_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_phone_24),
         onClick = {
           lifecycleDisposable += viewModel.toggleAllowAllCalls()
             .subscribe()
@@ -189,7 +189,7 @@ class NotificationProfileDetailsFragment : DSLSettingsFragment() {
       )
       switchPref(
         title = DSLSettingsText.from(R.string.NotificationProfileDetails__notify_for_all_mentions),
-        icon = DSLSettingsIcon.from(R.drawable.ic_at_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_at_24),
         isChecked = profile.allowAllMentions,
         onClick = {
           lifecycleDisposable += viewModel.toggleAllowAllMentions()
@@ -200,7 +200,7 @@ class NotificationProfileDetailsFragment : DSLSettingsFragment() {
       dividerPref()
       clickPref(
         title = DSLSettingsText.from(R.string.NotificationProfileDetails__delete_profile, ContextCompat.getColor(requireContext(), R.color.signal_alert_primary)),
-        icon = DSLSettingsIcon.from(R.drawable.ic_delete_24, R.color.signal_alert_primary),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_trash_24, R.color.signal_alert_primary),
         onClick = {
           MaterialAlertDialogBuilder(requireContext())
             .setMessage(R.string.NotificationProfileDetails__permanently_delete_profile)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
index c3036fb70c..e36759a049 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
@@ -122,7 +122,7 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences
             ) { _, _ -> viewModel.disablePushMessages() }
           }
 
-          val icon: Drawable = requireNotNull(ContextCompat.getDrawable(builder.context, R.drawable.ic_info_outline))
+          val icon: Drawable = requireNotNull(ContextCompat.getDrawable(builder.context, R.drawable.symbol_info_24))
           icon.setBounds(0, 0, ViewUtil.dpToPx(32), ViewUtil.dpToPx(32))
 
           val title = TextView(builder.context)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
index 0b4cd8b8e1..0e3a2c5a00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
@@ -199,7 +199,7 @@ open class ContactSearchAdapter(
 
     private fun getMyStoryContextMenuActions(model: StoryModel, callbacks: StoryContextMenuCallbacks): List<ActionItem> {
       return listOf(
-        ActionItem(R.drawable.ic_settings_24, context.getString(R.string.ContactSearchItems__story_settings)) {
+        ActionItem(R.drawable.symbol_settings_android_24, context.getString(R.string.ContactSearchItems__story_settings)) {
           callbacks.onOpenStorySettings(model.story)
         }
       )
@@ -207,7 +207,7 @@ open class ContactSearchAdapter(
 
     private fun getGroupStoryContextMenuActions(model: StoryModel, callbacks: StoryContextMenuCallbacks): List<ActionItem> {
       return listOf(
-        ActionItem(R.drawable.ic_minus_circle_20, context.getString(R.string.ContactSearchItems__remove_story)) {
+        ActionItem(R.drawable.symbol_minus_circle_24, context.getString(R.string.ContactSearchItems__remove_story)) {
           callbacks.onRemoveGroupStory(model.story, model.isSelected)
         }
       )
@@ -215,10 +215,10 @@ open class ContactSearchAdapter(
 
     private fun getPrivateStoryContextMenuActions(model: StoryModel, callbacks: StoryContextMenuCallbacks): List<ActionItem> {
       return listOf(
-        ActionItem(R.drawable.ic_settings_24, context.getString(R.string.ContactSearchItems__story_settings)) {
+        ActionItem(R.drawable.symbol_settings_android_24, context.getString(R.string.ContactSearchItems__story_settings)) {
           callbacks.onOpenStorySettings(model.story)
         },
-        ActionItem(R.drawable.ic_delete_24, context.getString(R.string.ContactSearchItems__delete_story), R.color.signal_colorError) {
+        ActionItem(R.drawable.symbol_trash_24, context.getString(R.string.ContactSearchItems__delete_story), R.color.signal_colorError) {
           callbacks.onDeletePrivateStory(model.story, model.isSelected)
         }
       )
@@ -234,7 +234,7 @@ open class ContactSearchAdapter(
 
     private class MyStoryFallbackPhotoProvider(private val name: String, private val targetSize: Int) : Recipient.FallbackPhotoProvider() {
       override fun getPhotoForLocalNumber(): FallbackContactPhoto {
-        return GeneratedContactPhoto(name, R.drawable.ic_profile_outline_40, targetSize)
+        return GeneratedContactPhoto(name, R.drawable.symbol_person_40, targetSize)
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardButton.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardButton.java
index 793fd339e7..20812700f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardButton.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboardButton.java
@@ -7,11 +7,11 @@ import org.thoughtcrime.securesms.R;
 
 public enum AttachmentKeyboardButton {
 
-  GALLERY(R.string.AttachmentKeyboard_gallery, R.drawable.ic_gallery_outline_24),
-  FILE(R.string.AttachmentKeyboard_file, R.drawable.ic_file_outline_24),
-  PAYMENT(R.string.AttachmentKeyboard_payment, R.drawable.ic_payments_24),
-  CONTACT(R.string.AttachmentKeyboard_contact, R.drawable.ic_contact_outline_24),
-  LOCATION(R.string.AttachmentKeyboard_location, R.drawable.ic_location_outline_24);
+  GALLERY(R.string.AttachmentKeyboard_gallery, R.drawable.symbol_album_tilt_24),
+  FILE(R.string.AttachmentKeyboard_file, R.drawable.symbol_file_24),
+  PAYMENT(R.string.AttachmentKeyboard_payment, R.drawable.symbol_payment_24),
+  CONTACT(R.string.AttachmentKeyboard_contact, R.drawable.symbol_person_circle_24),
+  LOCATION(R.string.AttachmentKeyboard_location, R.drawable.symbol_location_circle_24);
 
   private final int titleRes;
   private final int iconRes;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 009bbb7afc..9f6e8b8fdd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -819,7 +819,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     List<ActionItem> items = new ArrayList<>();
 
     if (menuState.shouldShowReplyAction()) {
-      items.add(new ActionItem(R.drawable.ic_reply_24_tinted, getResources().getString(R.string.conversation_selection__menu_reply), () -> {
+      items.add(new ActionItem(R.drawable.symbol_reply_24, getResources().getString(R.string.conversation_selection__menu_reply), () -> {
         maybeShowSwipeToReplyTooltip();
         handleReplyMessage(getSelectedConversationMessage());
         if (actionMode != null) {
@@ -829,11 +829,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
 
     if (menuState.shouldShowForwardAction()) {
-      items.add(new ActionItem(R.drawable.ic_forward_24_tinted, getResources().getString(R.string.conversation_selection__menu_forward), () -> handleForwardMessageParts(selectedParts)));
+      items.add(new ActionItem(R.drawable.symbol_forward_24, getResources().getString(R.string.conversation_selection__menu_forward), () -> handleForwardMessageParts(selectedParts)));
     }
 
     if (menuState.shouldShowSaveAttachmentAction()) {
-      items.add(new ActionItem(R.drawable.ic_save_24_tinted, getResources().getString(R.string.conversation_selection__menu_save), () -> {
+      items.add(new ActionItem(R.drawable.symbol_save_android_24, getResources().getString(R.string.conversation_selection__menu_save), () -> {
         handleSaveAttachment((MediaMmsMessageRecord) getSelectedConversationMessage().getMessageRecord());
         if (actionMode != null) {
           actionMode.finish();
@@ -842,7 +842,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
 
     if (menuState.shouldShowCopyAction()) {
-      items.add(new ActionItem(R.drawable.ic_copy_24_tinted, getResources().getString(R.string.conversation_selection__menu_copy), () -> {
+      items.add(new ActionItem(R.drawable.symbol_copy_android_24, getResources().getString(R.string.conversation_selection__menu_copy), () -> {
         handleCopyMessage(selectedParts);
         if (actionMode != null) {
           actionMode.finish();
@@ -851,7 +851,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
 
     if (menuState.shouldShowDetailsAction()) {
-      items.add(new ActionItem(R.drawable.ic_info_tinted_24, getResources().getString(R.string.conversation_selection__menu_message_details), () -> {
+      items.add(new ActionItem(R.drawable.symbol_info_24, getResources().getString(R.string.conversation_selection__menu_message_details), () -> {
         handleDisplayDetails(getSelectedConversationMessage());
         if (actionMode != null) {
           actionMode.finish();
@@ -860,7 +860,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
 
     if (menuState.shouldShowDeleteAction()) {
-      items.add(new ActionItem(R.drawable.ic_delete_tinted_24, getResources().getString(R.string.conversation_selection__menu_delete), () -> {
+      items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.conversation_selection__menu_delete), () -> {
         handleDeleteMessages(selectedParts);
         if (actionMode != null) {
           actionMode.finish();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 91f96116b0..8dddd9a0b3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -3938,7 +3938,7 @@ public class ConversationParentFragment extends Fragment
 
         reviewBanner.get().setBannerMessage(message);
 
-        Drawable drawable = ContextUtil.requireDrawable(requireContext(), R.drawable.ic_info_white_24).mutate();
+        Drawable drawable = ContextUtil.requireDrawable(requireContext(), R.drawable.symbol_info_24).mutate();
         DrawableCompat.setTint(drawable, ContextCompat.getColor(requireContext(), R.color.signal_icon_tint_primary));
 
         reviewBanner.get().setBannerIcon(drawable);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 954af4084b..d41966889b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -735,39 +735,39 @@ public final class ConversationReactionOverlay extends FrameLayout {
     List<ActionItem> items = new ArrayList<>();
 
     if (menuState.shouldShowReplyAction()) {
-      items.add(new ActionItem(R.drawable.ic_reply_24_tinted, getResources().getString(R.string.conversation_selection__menu_reply), () -> handleActionItemClicked(Action.REPLY)));
+      items.add(new ActionItem(R.drawable.symbol_reply_24, getResources().getString(R.string.conversation_selection__menu_reply), () -> handleActionItemClicked(Action.REPLY)));
     }
 
     if (menuState.shouldShowForwardAction()) {
-      items.add(new ActionItem(R.drawable.ic_forward_24_tinted, getResources().getString(R.string.conversation_selection__menu_forward), () -> handleActionItemClicked(Action.FORWARD)));
+      items.add(new ActionItem(R.drawable.symbol_forward_24, getResources().getString(R.string.conversation_selection__menu_forward), () -> handleActionItemClicked(Action.FORWARD)));
     }
 
     if (menuState.shouldShowResendAction()) {
-      items.add(new ActionItem(R.drawable.ic_retry_24, getResources().getString(R.string.conversation_selection__menu_resend_message), () -> handleActionItemClicked(Action.RESEND)));
+      items.add(new ActionItem(R.drawable.symbol_refresh_24, getResources().getString(R.string.conversation_selection__menu_resend_message), () -> handleActionItemClicked(Action.RESEND)));
     }
 
     if (menuState.shouldShowSaveAttachmentAction()) {
-      items.add(new ActionItem(R.drawable.ic_save_24_tinted, getResources().getString(R.string.conversation_selection__menu_save), () -> handleActionItemClicked(Action.DOWNLOAD)));
+      items.add(new ActionItem(R.drawable.symbol_save_android_24, getResources().getString(R.string.conversation_selection__menu_save), () -> handleActionItemClicked(Action.DOWNLOAD)));
     }
 
     if (menuState.shouldShowCopyAction()) {
-      items.add(new ActionItem(R.drawable.ic_copy_24_tinted, getResources().getString(R.string.conversation_selection__menu_copy), () -> handleActionItemClicked(Action.COPY)));
+      items.add(new ActionItem(R.drawable.symbol_copy_android_24, getResources().getString(R.string.conversation_selection__menu_copy), () -> handleActionItemClicked(Action.COPY)));
     }
 
     if (menuState.shouldShowPaymentDetails()) {
-      items.add(new ActionItem(R.drawable.ic_payments_24, getResources().getString(R.string.conversation_selection__menu_payment_details), () -> handleActionItemClicked(Action.PAYMENT_DETAILS)));
+      items.add(new ActionItem(R.drawable.symbol_payment_24, getResources().getString(R.string.conversation_selection__menu_payment_details), () -> handleActionItemClicked(Action.PAYMENT_DETAILS)));
     }
 
-    items.add(new ActionItem(R.drawable.ic_select_24_tinted, getResources().getString(R.string.conversation_selection__menu_multi_select), () -> handleActionItemClicked(Action.MULTISELECT)));
+    items.add(new ActionItem(R.drawable.symbol_check_circle_24, getResources().getString(R.string.conversation_selection__menu_multi_select), () -> handleActionItemClicked(Action.MULTISELECT)));
 
     if (menuState.shouldShowDetailsAction()) {
-      items.add(new ActionItem(R.drawable.ic_info_tinted_24, getResources().getString(R.string.conversation_selection__menu_message_details), () -> handleActionItemClicked(Action.VIEW_INFO)));
+      items.add(new ActionItem(R.drawable.symbol_info_24, getResources().getString(R.string.conversation_selection__menu_message_details), () -> handleActionItemClicked(Action.VIEW_INFO)));
     }
 
     backgroundView.setVisibility(menuState.shouldShowReactions() ? View.VISIBLE : View.INVISIBLE);
     foregroundView.setVisibility(menuState.shouldShowReactions() ? View.VISIBLE : View.INVISIBLE);
 
-    items.add(new ActionItem(R.drawable.ic_delete_tinted_24, getResources().getString(R.string.conversation_selection__menu_delete), () -> handleActionItemClicked(Action.DELETE)));
+    items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.conversation_selection__menu_delete), () -> handleActionItemClicked(Action.DELETE)));
 
     return items;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageContextMenu.kt
index c3657b1160..9828c29de5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageContextMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageContextMenu.kt
@@ -28,7 +28,7 @@ class ScheduleMessageContextMenu {
             action(it)
           }
         } else {
-          ActionItem(R.drawable.ic_calendar_24, anchor.context.getString(R.string.ScheduledMessages_pick_time)) {
+          ActionItem(R.drawable.symbol_calendar_24, anchor.context.getString(R.string.ScheduledMessages_pick_time)) {
             action(it)
           }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
index cd964e901b..4aebbbd353 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
@@ -159,12 +159,12 @@ class ScheduledMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment
     val message = ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(requireContext(), messageRecord)
     val canCopy = message.multiselectCollection.toSet().any { it !is Attachments && messageRecord.body.isNotEmpty() }
     val items: MutableList<ActionItem> = ArrayList()
-    items.add(ActionItem(R.drawable.ic_delete_tinted_24, resources.getString(R.string.conversation_selection__menu_delete), action = { handleDeleteMessage(messageRecord) }))
+    items.add(ActionItem(R.drawable.symbol_trash_24, resources.getString(R.string.conversation_selection__menu_delete), action = { handleDeleteMessage(messageRecord) }))
     if (canCopy) {
-      items.add(ActionItem(R.drawable.ic_copy_24_tinted, resources.getString(R.string.conversation_selection__menu_copy), action = { handleCopyMessage(message) }))
+      items.add(ActionItem(R.drawable.symbol_copy_android_24, resources.getString(R.string.conversation_selection__menu_copy), action = { handleCopyMessage(message) }))
     }
     items.add(ActionItem(R.drawable.ic_send_outline_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_send_now), action = { handleSendMessageNow(messageRecord) }))
-    items.add(ActionItem(R.drawable.ic_calendar_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_reschedule), action = { handleRescheduleMessage(messageRecord) }))
+    items.add(ActionItem(R.drawable.symbol_calendar_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_reschedule), action = { handleRescheduleMessage(messageRecord) }))
     return items
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 08d4560a04..1d33371f1c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -383,7 +383,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       Permissions.with(this)
                  .request(Manifest.permission.CAMERA)
                  .ifNecessary()
-                 .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_24)
+                 .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.symbol_camera_24)
                  .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
                  .onAllGranted(() -> startActivity(MediaSelectionActivity.camera(requireContext())))
                  .onAnyDenied(() -> Toast.makeText(requireContext(), R.string.ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video, Toast.LENGTH_LONG).show())
@@ -1395,25 +1395,25 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
     if (!conversation.getThreadRecord().isArchived()) {
       if (conversation.getThreadRecord().isRead()) {
-        items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, 1), () -> handleMarkAsUnread(id)));
+        items.add(new ActionItem(R.drawable.symbol_chat_badge_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, 1), () -> handleMarkAsUnread(id)));
       } else {
-        items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, 1), () -> handleMarkAsRead(id)));
+        items.add(new ActionItem(R.drawable.symbol_chat_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, 1), () -> handleMarkAsRead(id)));
       }
 
       if (conversation.getThreadRecord().isPinned()) {
-        items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, 1), () -> handleUnpin(id)));
+        items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, 1), () -> handleUnpin(id)));
       } else {
-        items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, 1), () -> handlePin(Collections.singleton(conversation))));
+        items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, 1), () -> handlePin(Collections.singleton(conversation))));
       }
 
       if (conversation.getThreadRecord().getRecipient().live().get().isMuted()) {
-        items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, 1), () -> handleUnmute(Collections.singleton(conversation))));
+        items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, 1), () -> handleUnmute(Collections.singleton(conversation))));
       } else {
-        items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, 1), () -> handleMute(Collections.singleton(conversation))));
+        items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, 1), () -> handleMute(Collections.singleton(conversation))));
       }
     }
 
-    items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select), () -> {
+    items.add(new ActionItem(R.drawable.symbol_check_circle_24, getString(R.string.ConversationListFragment_select), () -> {
       viewModel.startSelection(conversation);
       startActionMode();
     }));
@@ -1424,7 +1424,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false)));
     }
 
-    items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, 1), () -> handleDelete(id)));
+    items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, 1), () -> handleDelete(id)));
 
     activeContextMenu = new SignalContextMenu.Builder(view, list)
         .offsetX(ViewUtil.dpToPx(12))
@@ -1510,15 +1510,15 @@ public class ConversationListFragment extends MainFragment implements ActionMode
                                       .collect(Collectors.toSet());
 
     if (hasUnread) {
-      items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, count), () -> handleMarkAsRead(selectionIds)));
+      items.add(new ActionItem(R.drawable.symbol_chat_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, count), () -> handleMarkAsRead(selectionIds)));
     } else {
-      items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, count), () -> handleMarkAsUnread(selectionIds)));
+      items.add(new ActionItem(R.drawable.symbol_chat_badge_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, count), () -> handleMarkAsUnread(selectionIds)));
     }
 
     if (!isArchived() && hasUnpinned && canPin) {
-      items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, count), () -> handlePin(viewModel.currentSelectedConversations())));
+      items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, count), () -> handlePin(viewModel.currentSelectedConversations())));
     } else if (!isArchived() && !hasUnpinned) {
-      items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, count), () -> handleUnpin(selectionIds)));
+      items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, count), () -> handleUnpin(selectionIds)));
     }
 
     if (isArchived()) {
@@ -1527,15 +1527,15 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(selectionIds, true)));
     }
 
-    items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds)));
+    items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds)));
 
     if (hasUnmuted) {
-      items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations())));
+      items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations())));
     } else {
-      items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, count), () -> handleUnmute(viewModel.currentSelectedConversations())));
+      items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, count), () -> handleUnmute(viewModel.currentSelectedConversations())));
     }
 
-    items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select_all), viewModel::onSelectAllClick));
+    items.add(new ActionItem(R.drawable.symbol_check_circle_24, getString(R.string.ConversationListFragment_select_all), viewModel::onSelectAllClick));
 
     bottomActionBar.setItems(items);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/InMemoryMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/InMemoryMessageRecord.java
index 72bf5c70bc..48d9c5e597 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/InMemoryMessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/InMemoryMessageRecord.java
@@ -95,7 +95,7 @@ public class InMemoryMessageRecord extends MessageRecord {
     public @Nullable UpdateDescription getUpdateDisplayBody(@NonNull Context context, @Nullable Consumer<RecipientId> recipientClickHandler) {
       return UpdateDescription.staticDescription(context.getString(isGroup ? R.string.ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully
                                                                            : R.string.ConversationUpdateItem_no_groups_in_common_review_requests_carefully),
-                                                 R.drawable.ic_update_info_16);
+                                                 R.drawable.symbol_info_compact_16);
     }
 
     @Override
@@ -133,7 +133,7 @@ public class InMemoryMessageRecord extends MessageRecord {
       String update = context.getString(R.string.ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them,
                                         ExpirationUtil.getExpirationDisplayValue(context, SignalStore.settings().getUniversalExpireTimer()));
 
-      return UpdateDescription.staticDescription(update, R.drawable.ic_update_timer_16);
+      return UpdateDescription.staticDescription(update, R.drawable.symbol_timer_compact_24);
     }
 
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
index 5ca8ed3ae6..438b9ede39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
@@ -322,13 +322,13 @@ public final class MediaOverviewPageFragment extends Fragment
       int selectionCount = getListAdapter().getSectionCount();
 
       bottomActionBar.setItems(Arrays.asList(
-          new ActionItem(R.drawable.ic_save_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_save_plural, selectionCount), () -> {
+          new ActionItem(R.drawable.symbol_save_android_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_save_plural, selectionCount), () -> {
             MediaActions.handleSaveMedia(MediaOverviewPageFragment.this,
                                          getListAdapter().getSelectedMedia(),
                                          this::exitMultiSelect);
           }),
-          new ActionItem(R.drawable.ic_select_24, getString(R.string.MediaOverviewActivity_select_all), this::handleSelectAllMedia),
-          new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete_plural, selectionCount), () -> {
+          new ActionItem(R.drawable.symbol_check_circle_24, getString(R.string.MediaOverviewActivity_select_all), this::handleSelectAllMedia),
+          new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete_plural, selectionCount), () -> {
             MediaActions.handleDeleteMedia(requireContext(), getListAdapter().getSelectedMedia());
             exitMultiSelect();
           })
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
index 7345fe279a..7040f9311d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
@@ -284,7 +284,7 @@ public class Camera1Fragment extends LoggingFragment implements CameraFragment,
            .into(thumbnail);
     } else {
       thumbBackground.setBackgroundResource(R.drawable.media_selection_camera_switch_background);
-      thumbnail.setImageResource(R.drawable.ic_gallery_outline_24);
+      thumbnail.setImageResource(R.drawable.symbol_album_tilt_24);
       thumbnail.setColorFilter(Color.WHITE);
       thumbnail.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index 448846b3a1..a97d695674 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -261,7 +261,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
            .into(thumbnail);
     } else {
       thumbBackground.setBackgroundResource(R.drawable.media_selection_camera_switch_background);
-      thumbnail.setImageResource(R.drawable.ic_gallery_outline_24);
+      thumbnail.setImageResource(R.drawable.symbol_album_tilt_24);
       thumbnail.setColorFilter(Color.WHITE);
       thumbnail.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
index 24136b5564..c83a3a571f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
@@ -210,13 +210,13 @@ sealed class NotificationBuilder(protected val context: Context) {
         val actionName: String = context.getString(R.string.MessageNotifier_reply)
         val label: String = context.getString(replyMethod.toLongDescription())
         val replyAction: NotificationCompat.Action? = if (Build.VERSION.SDK_INT >= 24 && remoteReply != null) {
-          NotificationCompat.Action.Builder(R.drawable.ic_reply_white_36dp, actionName, remoteReply)
+          NotificationCompat.Action.Builder(R.drawable.symbol_reply_36, actionName, remoteReply)
             .addRemoteInput(RemoteInput.Builder(DefaultMessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
             .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
             .setShowsUserInterface(false)
             .build()
         } else if (quickReply != null) {
-          NotificationCompat.Action(R.drawable.ic_reply_white_36dp, actionName, quickReply)
+          NotificationCompat.Action(R.drawable.symbol_reply_36, actionName, quickReply)
         } else {
           null
         }
@@ -224,7 +224,7 @@ sealed class NotificationBuilder(protected val context: Context) {
         builder.addAction(replyAction)
 
         if (remoteReply != null) {
-          val wearableReplyAction = NotificationCompat.Action.Builder(R.drawable.ic_reply, actionName, remoteReply)
+          val wearableReplyAction = NotificationCompat.Action.Builder(R.drawable.symbol_reply_24, actionName, remoteReply)
             .addRemoteInput(RemoteInput.Builder(DefaultMessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
             .build()
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
index 2c7e094e7d..4fb87e6910 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
@@ -341,7 +341,7 @@ object NotificationFactory {
 
     builder.apply {
       setSmallIcon(R.drawable.ic_notification)
-      setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.ic_info_outline))
+      setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.symbol_info_24))
       setContentTitle(context.getString(R.string.MessageNotifier_message_delivery_paused))
       setContentText(context.getString(R.string.MessageNotifier_verify_to_continue_messaging_on_signal))
       setContentIntent(NotificationPendingIntentHelper.getActivity(context, 0, intent, PendingIntentFlags.mutable()))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java
index c6fdd3a793..02343fac71 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java
@@ -179,7 +179,7 @@ public class CreatePaymentFragment extends LoggingFragment {
 
   private void initializeInfoIcon() {
     spacer   = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.payment_info_pad));
-    infoIcon = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_update_info_16));
+    infoIcon = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.symbol_info_compact_16));
 
     DrawableCompat.setTint(infoIcon, exchange.getCurrentTextColor());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenu.kt
index 30d14d7fdf..29d166f317 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryContextMenu.kt
@@ -197,13 +197,13 @@ object StoryContextMenu {
       if (!isFromSelf || isToGroup) {
         if (canHide) {
           add(
-            ActionItem(R.drawable.ic_circle_x_24_tinted, context.getString(R.string.StoriesLandingItem__hide_story)) {
+            ActionItem(R.drawable.symbol_x_circle_24, context.getString(R.string.StoriesLandingItem__hide_story)) {
               callbacks.onHide()
             }
           )
         } else {
           add(
-            ActionItem(R.drawable.ic_check_circle_24, context.getString(R.string.StoriesLandingItem__unhide_story)) {
+            ActionItem(R.drawable.symbol_check_circle_24, context.getString(R.string.StoriesLandingItem__unhide_story)) {
               callbacks.onUnhide()
             }
           )
@@ -212,22 +212,22 @@ object StoryContextMenu {
 
       if (isFromSelf) {
         add(
-          ActionItem(R.drawable.ic_forward_24_tinted, context.getString(R.string.StoriesLandingItem__forward)) {
+          ActionItem(R.drawable.symbol_forward_24, context.getString(R.string.StoriesLandingItem__forward)) {
             callbacks.onForward()
           }
         )
         add(
-          ActionItem(R.drawable.ic_share_24_tinted, context.getString(R.string.StoriesLandingItem__share)) {
+          ActionItem(R.drawable.symbol_share_android_24, context.getString(R.string.StoriesLandingItem__share)) {
             callbacks.onShare()
           }
         )
         add(
-          ActionItem(R.drawable.ic_delete_24_tinted, context.getString(R.string.delete)) {
+          ActionItem(R.drawable.symbol_trash_24, context.getString(R.string.delete)) {
             callbacks.onDelete()
           }
         )
         add(
-          ActionItem(R.drawable.ic_save_24_tinted, context.getString(R.string.save)) {
+          ActionItem(R.drawable.symbol_save_android_24, context.getString(R.string.save)) {
             callbacks.onSave()
           }
         )
@@ -235,14 +235,14 @@ object StoryContextMenu {
 
       if ((isToGroup || !isFromSelf) && !isFromReleaseChannel) {
         add(
-          ActionItem(R.drawable.ic_open_24_tinted, context.getString(R.string.StoriesLandingItem__go_to_chat)) {
+          ActionItem(R.drawable.symbol_open_20, context.getString(R.string.StoriesLandingItem__go_to_chat)) {
             callbacks.onGoToChat()
           }
         )
       }
 
       add(
-        ActionItem(R.drawable.ic_info_outline_message_details_24, context.getString(R.string.StoriesLandingItem__info)) {
+        ActionItem(R.drawable.symbol_info_24, context.getString(R.string.StoriesLandingItem__info)) {
           callbacks.onInfo()
         }
       )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
index f01ede7b4a..48de725bfe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
@@ -232,7 +232,7 @@ object StoriesLandingItem {
       icon.setImageResource(
         when {
           model.data.hasReplies -> R.drawable.ic_messages_solid_20
-          else -> R.drawable.ic_reply_24_solid_tinted
+          else -> R.drawable.symbol_reply_fill_24
         }
       )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
index e1806af0cb..55e1078c2c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
@@ -185,10 +185,10 @@ object MyStoriesItem {
         .offsetY(DimensionUnit.DP.toPixels(12f).toInt())
         .show(
           listOf(
-            ActionItem(R.drawable.ic_delete_24_tinted, context.getString(R.string.delete)) { model.onDeleteClick(model) },
-            ActionItem(R.drawable.ic_forward_24_tinted, context.getString(R.string.MyStories_forward)) { model.onForwardClick(model) },
-            ActionItem(R.drawable.ic_share_24_tinted, context.getString(R.string.StoriesLandingItem__share)) { model.onShareClick(model) },
-            ActionItem(R.drawable.ic_info_outline_message_details_24, context.getString(R.string.StoriesLandingItem__info)) { model.onInfoClick(model, storyPreview) }
+            ActionItem(R.drawable.symbol_trash_24, context.getString(R.string.delete)) { model.onDeleteClick(model) },
+            ActionItem(R.drawable.symbol_forward_24, context.getString(R.string.MyStories_forward)) { model.onForwardClick(model) },
+            ActionItem(R.drawable.symbol_share_android_24, context.getString(R.string.StoriesLandingItem__share)) { model.onShareClick(model) },
+            ActionItem(R.drawable.symbol_info_24, context.getString(R.string.StoriesLandingItem__info)) { model.onInfoClick(model, storyPreview) }
           )
         )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
index f29b5c4033..bece0807f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
@@ -982,14 +982,14 @@ class StoryViewerPageFragment :
   }
 
   private fun presentPartialSendBottomBar() {
-    viewsAndReplies.setIconResource(R.drawable.ic_error_outline_24)
+    viewsAndReplies.setIconResource(R.drawable.symbol_error_circle_24)
     viewsAndReplies.iconTint = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.signal_light_colorError))
     viewsAndReplies.iconSize = 20.dp
     viewsAndReplies.setText(R.string.StoryViewerPageFragment__partially_sent)
   }
 
   private fun presentSendFailureBottomBar() {
-    viewsAndReplies.setIconResource(R.drawable.ic_error_outline_24)
+    viewsAndReplies.setIconResource(R.drawable.symbol_error_circle_24)
     viewsAndReplies.iconTint = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.signal_light_colorError))
     viewsAndReplies.iconSize = 20.dp
     viewsAndReplies.setText(R.string.StoryViewerPageFragment__send_failed)
@@ -1002,12 +1002,12 @@ class StoryViewerPageFragment :
     if (Recipient.self() == post.sender) {
       if (isReceiptsEnabled) {
         if (post.replyCount == 0) {
-          viewsAndReplies.setIconResource(R.drawable.ic_chevron_end_bold_16)
+          viewsAndReplies.setIconResource(R.drawable.symbol_chevron_right_compact_bold_16)
           viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(16f).toInt()
           viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_END
           viewsAndReplies.text = views
         } else {
-          viewsAndReplies.setIconResource(R.drawable.ic_chevron_end_bold_16)
+          viewsAndReplies.setIconResource(R.drawable.symbol_chevron_right_compact_bold_16)
           viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(16f).toInt()
           viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_END
           viewsAndReplies.text = getString(R.string.StoryViewerFragment__s_s, views, replies)
@@ -1017,24 +1017,24 @@ class StoryViewerPageFragment :
           viewsAndReplies.icon = null
           viewsAndReplies.setText(R.string.StoryViewerPageFragment__views_off)
         } else {
-          viewsAndReplies.setIconResource(R.drawable.ic_chevron_end_bold_16)
+          viewsAndReplies.setIconResource(R.drawable.symbol_chevron_right_compact_bold_16)
           viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(16f).toInt()
           viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_END
           viewsAndReplies.text = replies
         }
       }
     } else if (post.replyCount > 0) {
-      viewsAndReplies.setIconResource(R.drawable.ic_chevron_end_bold_16)
+      viewsAndReplies.setIconResource(R.drawable.symbol_chevron_right_compact_bold_16)
       viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(16f).toInt()
       viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_END
       viewsAndReplies.text = replies
     } else if (post.group != null) {
-      viewsAndReplies.setIconResource(R.drawable.ic_reply_24_outline)
+      viewsAndReplies.setIconResource(R.drawable.symbol_reply_24)
       viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(20f).toInt()
       viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
       viewsAndReplies.setText(R.string.StoryViewerPageFragment__reply_to_group)
     } else {
-      viewsAndReplies.setIconResource(R.drawable.ic_reply_24_outline)
+      viewsAndReplies.setIconResource(R.drawable.symbol_reply_24)
       viewsAndReplies.iconSize = DimensionUnit.DP.toPixels(20f).toInt()
       viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
       viewsAndReplies.setText(R.string.StoryViewerPageFragment__reply)
@@ -1288,7 +1288,7 @@ class StoryViewerPageFragment :
 
   private class FallbackPhotoProvider : Recipient.FallbackPhotoProvider() {
     override fun getPhotoForGroup(): FallbackContactPhoto {
-      return FallbackPhoto20dp(R.drawable.ic_group_outline_20)
+      return FallbackPhoto20dp(R.drawable.symbol_group_20)
     }
 
     override fun getPhotoForResolvingRecipient(): FallbackContactPhoto {
@@ -1300,11 +1300,11 @@ class StoryViewerPageFragment :
     }
 
     override fun getPhotoForRecipientWithName(name: String, targetSize: Int): FallbackContactPhoto {
-      return FixedSizeGeneratedContactPhoto(name, R.drawable.ic_profile_outline_20)
+      return FixedSizeGeneratedContactPhoto(name, R.drawable.symbol_person_20)
     }
 
     override fun getPhotoForRecipientWithoutName(): FallbackContactPhoto {
-      return FallbackPhoto20dp(R.drawable.ic_profile_outline_20)
+      return FallbackPhoto20dp(R.drawable.symbol_person_20)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
index d3e27af4ec..b2b28e260c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
@@ -203,7 +203,7 @@ object StoryGroupReplyItem {
 
       val actions = mutableListOf<ActionItem>()
       if (model.onCopyClick != null) {
-        actions += ActionItem(R.drawable.ic_copy_24_tinted, context.getString(R.string.StoryGroupReplyItem__copy)) {
+        actions += ActionItem(R.drawable.symbol_copy_android_24, context.getString(R.string.StoryGroupReplyItem__copy)) {
           val toCopy: CharSequence = when (model) {
             is TextModel -> model.text.message.getDisplayBody(context)
             else -> model.messageRecord.getDisplayBody(context)
@@ -211,7 +211,7 @@ object StoryGroupReplyItem {
           model.onCopyClick.invoke(toCopy)
         }
       }
-      actions += ActionItem(R.drawable.ic_trash_24, context.getString(R.string.StoryGroupReplyItem__delete)) { model.onDeleteClick(model.messageRecord) }
+      actions += ActionItem(R.drawable.symbol_trash_24, context.getString(R.string.StoryGroupReplyItem__delete)) { model.onDeleteClick(model.messageRecord) }
 
       SignalContextMenu.Builder(itemView, itemView.rootView as ViewGroup)
         .preferredHorizontalPosition(SignalContextMenu.HorizontalPosition.START)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
index 66fcb1e9e8..a63547e9fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
@@ -35,7 +35,7 @@ public class Dialogs {
     new MaterialAlertDialogBuilder(context)
         .setTitle(title)
         .setMessage(message)
-        .setIcon(R.drawable.ic_info_outline)
+        .setIcon(R.drawable.symbol_info_24)
         .setPositiveButton(android.R.string.ok, null)
         .show();
   }
diff --git a/app/src/main/res/drawable-hdpi/flash_auto_32.webp b/app/src/main/res/drawable-hdpi/flash_auto_32.webp
deleted file mode 100644
index b2f9129a9a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/flash_auto_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_right.webp b/app/src/main/res/drawable-hdpi/ic_arrow_right.webp
deleted file mode 100644
index c984c8e7ca..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline.webp b/app/src/main/res/drawable-hdpi/ic_info_outline.webp
deleted file mode 100644
index dd8ff5944d..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_plus_28.webp b/app/src/main/res/drawable-hdpi/ic_plus_28.webp
deleted file mode 100644
index ec7a96b7f8..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_plus_28.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reply.webp b/app/src/main/res/drawable-hdpi/ic_reply.webp
deleted file mode 100644
index bd9741a6ee..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-hdpi/ic_reply_white_36dp.webp
deleted file mode 100644
index e733061334..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_reply_white_36dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/import_database.webp b/app/src/main/res/drawable-hdpi/import_database.webp
deleted file mode 100644
index 7d1779cb0a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/import_database.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-ldltr-night/ic_forward_24.xml b/app/src/main/res/drawable-ldltr-night/ic_forward_24.xml
deleted file mode 100644
index 13e6fc5df0..0000000000
--- a/app/src/main/res/drawable-ldltr-night/ic_forward_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M2.116,21.426A14.706,14.706 0,0 1,13.021 16v4.793c0,0.664 0.384,0.823 0.853,0.353l8.793,-8.792a0.5,0.5 0,0 0,0 -0.708L13.874,2.854c-0.469,-0.47 -0.853,-0.311 -0.853,0.353V8C5.757,8.934 2.2,14.051 1.217,21.059 1.071,22.1 1.463,22.249 2.116,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldltr-night/ic_reply_24.xml b/app/src/main/res/drawable-ldltr-night/ic_reply_24.xml
deleted file mode 100644
index e710d82264..0000000000
--- a/app/src/main/res/drawable-ldltr-night/ic_reply_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M21.905,21.426A14.706,14.706 0,0 0,11 16v4.793c0,0.664 -0.384,0.823 -0.854,0.353L1.354,12.354a0.5,0.5 0,0 1,0 -0.708l8.792,-8.792c0.47,-0.47 0.854,-0.311 0.854,0.353V8c7.264,0.934 10.822,6.051 11.8,13.059C22.95,22.1 22.558,22.249 21.905,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldltr/ic_forward_24.xml b/app/src/main/res/drawable-ldltr/ic_forward_24.xml
deleted file mode 100644
index f77ad2becb..0000000000
--- a/app/src/main/res/drawable-ldltr/ic_forward_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="#FFFFFFFF"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldltr/ic_forward_24_tinted.xml b/app/src/main/res/drawable-ldltr/ic_forward_24_tinted.xml
deleted file mode 100644
index 0e77677c20..0000000000
--- a/app/src/main/res/drawable-ldltr/ic_forward_24_tinted.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="@color/signal_icon_tint_primary"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldltr/ic_reply_24.xml b/app/src/main/res/drawable-ldltr/ic_reply_24.xml
deleted file mode 100644
index 726dae1927..0000000000
--- a/app/src/main/res/drawable-ldltr/ic_reply_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldltr/ic_reply_24_outline.xml b/app/src/main/res/drawable-ldltr/ic_reply_24_outline.xml
deleted file mode 100644
index 726dae1927..0000000000
--- a/app/src/main/res/drawable-ldltr/ic_reply_24_outline.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_arrow_right.webp b/app/src/main/res/drawable-ldrtl-hdpi/ic_arrow_right.webp
deleted file mode 100644
index f2ae8895fa..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml b/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml
deleted file mode 100644
index e710d82264..0000000000
--- a/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M21.905,21.426A14.706,14.706 0,0 0,11 16v4.793c0,0.664 -0.384,0.823 -0.854,0.353L1.354,12.354a0.5,0.5 0,0 1,0 -0.708l8.792,-8.792c0.47,-0.47 0.854,-0.311 0.854,0.353V8c7.264,0.934 10.822,6.051 11.8,13.059C22.95,22.1 22.558,22.249 21.905,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml b/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml
deleted file mode 100644
index 13e6fc5df0..0000000000
--- a/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M2.116,21.426A14.706,14.706 0,0 1,13.021 16v4.793c0,0.664 0.384,0.823 0.853,0.353l8.793,-8.792a0.5,0.5 0,0 0,0 -0.708L13.874,2.854c-0.469,-0.47 -0.853,-0.311 -0.853,0.353V8C5.757,8.934 2.2,14.051 1.217,21.059 1.071,22.1 1.463,22.249 2.116,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_right.webp
deleted file mode 100644
index ff7c04a7c2..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_right.webp
deleted file mode 100644
index eca60e5203..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_right.webp
deleted file mode 100644
index e4cec78bc2..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl/ic_forward_24.xml b/app/src/main/res/drawable-ldrtl/ic_forward_24.xml
deleted file mode 100644
index 726dae1927..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_forward_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_forward_24_tinted.xml b/app/src/main/res/drawable-ldrtl/ic_forward_24_tinted.xml
deleted file mode 100644
index a4074dded0..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_forward_24_tinted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_reply_24.xml b/app/src/main/res/drawable-ldrtl/ic_reply_24.xml
deleted file mode 100644
index f77ad2becb..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_reply_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="#FFFFFFFF"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_reply_24_outline.xml b/app/src/main/res/drawable-ldrtl/ic_reply_24_outline.xml
deleted file mode 100644
index f77ad2becb..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_reply_24_outline.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="#FFFFFFFF"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_reply_24_solid_tinted.xml b/app/src/main/res/drawable-ldrtl/ic_reply_24_solid_tinted.xml
deleted file mode 100644
index ec6c6ac412..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_reply_24_solid_tinted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M2.116,21.426A14.706,14.706 0,0 1,13.021 16v4.793c0,0.664 0.384,0.823 0.853,0.353l8.793,-8.792a0.5,0.5 0,0 0,0 -0.708L13.874,2.854c-0.469,-0.47 -0.853,-0.311 -0.853,0.353V8C5.757,8.934 2.2,14.051 1.217,21.059 1.071,22.1 1.463,22.249 2.116,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_reply_24_tinted.xml b/app/src/main/res/drawable-ldrtl/ic_reply_24_tinted.xml
deleted file mode 100644
index 0e77677c20..0000000000
--- a/app/src/main/res/drawable-ldrtl/ic_reply_24_tinted.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="@color/signal_icon_tint_primary"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-mdpi/flash_auto_32.webp b/app/src/main/res/drawable-mdpi/flash_auto_32.webp
deleted file mode 100644
index b92093f095..0000000000
Binary files a/app/src/main/res/drawable-mdpi/flash_auto_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_right.webp b/app/src/main/res/drawable-mdpi/ic_arrow_right.webp
deleted file mode 100644
index 970a3704df..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline.webp b/app/src/main/res/drawable-mdpi/ic_info_outline.webp
deleted file mode 100644
index 3e7b427240..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_message_24.webp b/app/src/main/res/drawable-mdpi/ic_message_24.webp
deleted file mode 100644
index 3a98fd1935..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_plus_28.webp b/app/src/main/res/drawable-mdpi/ic_plus_28.webp
deleted file mode 100644
index 58be340632..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_plus_28.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reply.webp b/app/src/main/res/drawable-mdpi/ic_reply.webp
deleted file mode 100644
index 7144445f99..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-mdpi/ic_reply_white_36dp.webp
deleted file mode 100644
index 7ee6e6aae6..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_reply_white_36dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/import_database.webp b/app/src/main/res/drawable-mdpi/import_database.webp
deleted file mode 100644
index a47e06f069..0000000000
Binary files a/app/src/main/res/drawable-mdpi/import_database.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-hdpi/ic_info_outline.webp b/app/src/main/res/drawable-night-hdpi/ic_info_outline.webp
deleted file mode 100644
index df5cc35269..0000000000
Binary files a/app/src/main/res/drawable-night-hdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/ic_info_outline.webp b/app/src/main/res/drawable-night-mdpi/ic_info_outline.webp
deleted file mode 100644
index cde86a5507..0000000000
Binary files a/app/src/main/res/drawable-night-mdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/ic_message_24.webp b/app/src/main/res/drawable-night-mdpi/ic_message_24.webp
deleted file mode 100644
index 15703fef6f..0000000000
Binary files a/app/src/main/res/drawable-night-mdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/ic_info_outline.webp b/app/src/main/res/drawable-night-xhdpi/ic_info_outline.webp
deleted file mode 100644
index e059b233ac..0000000000
Binary files a/app/src/main/res/drawable-night-xhdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/ic_message_24.webp b/app/src/main/res/drawable-night-xhdpi/ic_message_24.webp
deleted file mode 100644
index 51af9ca294..0000000000
Binary files a/app/src/main/res/drawable-night-xhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_info_outline.webp b/app/src/main/res/drawable-night-xxhdpi/ic_info_outline.webp
deleted file mode 100644
index 2b8039b183..0000000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_message_24.webp b/app/src/main/res/drawable-night-xxhdpi/ic_message_24.webp
deleted file mode 100644
index 55b621399f..0000000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_message_24.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_message_24.webp
deleted file mode 100644
index 079e5ec930..0000000000
Binary files a/app/src/main/res/drawable-night-xxxhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night/ic_grid_20.xml b/app/src/main/res/drawable-night/ic_grid_20.xml
deleted file mode 100644
index 158e745e65..0000000000
--- a/app/src/main/res/drawable-night/ic_grid_20.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M2,4.39L3.95,4.39A1.25,1.25 0,0 1,5.2 5.64L5.2,7.58A1.25,1.25 0,0 1,3.95 8.83L2,8.83A1.25,1.25 0,0 1,0.75 7.58L0.75,5.64A1.25,1.25 0,0 1,2 4.39z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9.03,4.39L10.98,4.39A1.25,1.25 0,0 1,12.23 5.64L12.23,7.58A1.25,1.25 0,0 1,10.98 8.83L9.03,8.83A1.25,1.25 0,0 1,7.78 7.58L7.78,5.64A1.25,1.25 0,0 1,9.03 4.39z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16.05,4.39L18,4.39A1.25,1.25 0,0 1,19.25 5.64L19.25,7.58A1.25,1.25 0,0 1,18 8.83L16.05,8.83A1.25,1.25 0,0 1,14.8 7.58L14.8,5.64A1.25,1.25 0,0 1,16.05 4.39z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M2,11.17L3.95,11.17A1.25,1.25 0,0 1,5.2 12.42L5.2,14.36A1.25,1.25 0,0 1,3.95 15.61L2,15.61A1.25,1.25 0,0 1,0.75 14.36L0.75,12.42A1.25,1.25 0,0 1,2 11.17z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9.03,11.17L10.98,11.17A1.25,1.25 0,0 1,12.23 12.42L12.23,14.36A1.25,1.25 0,0 1,10.98 15.61L9.03,15.61A1.25,1.25 0,0 1,7.78 14.36L7.78,12.42A1.25,1.25 0,0 1,9.03 11.17z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16.05,11.17L18,11.17A1.25,1.25 0,0 1,19.25 12.42L19.25,14.36A1.25,1.25 0,0 1,18 15.61L16.05,15.61A1.25,1.25 0,0 1,14.8 14.36L14.8,12.42A1.25,1.25 0,0 1,16.05 11.17z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_info_white_24.xml b/app/src/main/res/drawable-night/ic_info_white_24.xml
deleted file mode 100644
index 6b57d443c1..0000000000
--- a/app/src/main/res/drawable-night/ic_info_white_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="false" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1ZM10.94,5.939A1.5,1.5 0,0 1,13.5 7a1.5,1.5 0,0 1,-2.56 1.06,1.5 1.5,0 0,1 0,-2.121ZM15,18H9V16.5h2.5v-5h-2V10H13v6.5h2Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_20.xml b/app/src/main/res/drawable-night/ic_list_20.xml
deleted file mode 100644
index 459afe225f..0000000000
--- a/app/src/main/res/drawable-night/ic_list_20.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M3.25,7.75L5.25,7.75A1.25,1.25 0,0 1,6.5 9L6.5,11A1.25,1.25 0,0 1,5.25 12.25L3.25,12.25A1.25,1.25 0,0 1,2 11L2,9A1.25,1.25 0,0 1,3.25 7.75z"
-      android:fillColor="#DEDEDE"/>
-  <path
-      android:pathData="M3.25,13.5L5.25,13.5A1.25,1.25 0,0 1,6.5 14.75L6.5,16.75A1.25,1.25 0,0 1,5.25 18L3.25,18A1.25,1.25 0,0 1,2 16.75L2,14.75A1.25,1.25 0,0 1,3.25 13.5z"
-      android:fillColor="#DEDEDE"/>
-  <path
-      android:pathData="M3.25,2L5.25,2A1.25,1.25 0,0 1,6.5 3.25L6.5,5.25A1.25,1.25 0,0 1,5.25 6.5L3.25,6.5A1.25,1.25 0,0 1,2 5.25L2,3.25A1.25,1.25 0,0 1,3.25 2z"
-      android:fillColor="#DEDEDE"/>
-  <path
-      android:pathData="M8,4.25H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#DEDEDE"/>
-  <path
-      android:pathData="M8,10H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#DEDEDE"/>
-  <path
-      android:pathData="M8,15.75H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#DEDEDE"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_update_info_16.xml b/app/src/main/res/drawable-night/ic_update_info_16.xml
deleted file mode 100644
index 6822e13c4b..0000000000
--- a/app/src/main/res/drawable-night/ic_update_info_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:pathData="M8,0.6666C6.5496,0.6666 5.1318,1.0967 3.9258,1.9025C2.7199,2.7083 1.7799,3.8536 1.2249,5.1936C0.6698,6.5336 0.5246,8.0081 0.8076,9.4306C1.0905,10.8531 1.789,12.1598 2.8145,13.1854C3.8401,14.211 5.1468,14.9094 6.5693,15.1924C7.9919,15.4753 9.4663,15.3301 10.8063,14.7751C12.1463,14.22 13.2916,13.2801 14.0974,12.0741C14.9032,10.8682 15.3333,9.4504 15.3333,8C15.3333,6.055 14.5607,4.1898 13.1854,2.8145C11.8102,1.4392 9.9449,0.6666 8,0.6666ZM7.2933,3.9593C7.4332,3.8196 7.6114,3.7245 7.8053,3.686C7.9992,3.6475 8.2002,3.6673 8.3829,3.743C8.5655,3.8187 8.7216,3.9469 8.8315,4.1113C8.9413,4.2757 9,4.4689 9,4.6666C8.9998,4.8643 8.9411,5.0574 8.8312,5.2217C8.7213,5.386 8.5652,5.5141 8.3826,5.5897C8.1999,5.6653 7.999,5.6851 7.8052,5.6466C7.6113,5.6081 7.4332,5.513 7.2933,5.3733C7.1059,5.1858 7.0005,4.9315 7.0005,4.6663C7.0005,4.4011 7.1059,4.1468 7.2933,3.9593ZM10,12H6V11H7.6667V7.6666H6.3333V6.6666H8.6667V11H10V12Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable-xhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xhdpi/flash_auto_32.webp
deleted file mode 100644
index 7b87a058e6..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/flash_auto_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xhdpi/ic_arrow_right.webp
deleted file mode 100644
index 8568bd8a3e..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline.webp b/app/src/main/res/drawable-xhdpi/ic_info_outline.webp
deleted file mode 100644
index 1412a25337..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_message_24.webp b/app/src/main/res/drawable-xhdpi/ic_message_24.webp
deleted file mode 100644
index 98bbe5a36a..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_plus_28.webp b/app/src/main/res/drawable-xhdpi/ic_plus_28.webp
deleted file mode 100644
index 0d25b48af4..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_plus_28.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reply.webp b/app/src/main/res/drawable-xhdpi/ic_reply.webp
deleted file mode 100644
index 62ebaa9fb0..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xhdpi/ic_reply_white_36dp.webp
deleted file mode 100644
index 8b2db850f1..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_reply_white_36dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/import_database.webp b/app/src/main/res/drawable-xhdpi/import_database.webp
deleted file mode 100644
index 8cf88dca85..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/import_database.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xxhdpi/flash_auto_32.webp
deleted file mode 100644
index 39aeefa3b9..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/flash_auto_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp
deleted file mode 100644
index 3348ce3ea5..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline.webp b/app/src/main/res/drawable-xxhdpi/ic_info_outline.webp
deleted file mode 100644
index f12bbc6e10..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_outline.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_message_24.webp b/app/src/main/res/drawable-xxhdpi/ic_message_24.webp
deleted file mode 100644
index b04fd8c463..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_plus_28.webp b/app/src/main/res/drawable-xxhdpi/ic_plus_28.webp
deleted file mode 100644
index 0f40546460..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_plus_28.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reply.webp b/app/src/main/res/drawable-xxhdpi/ic_reply.webp
deleted file mode 100644
index 0b7dcec5ac..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.webp
deleted file mode 100644
index 5872a85d9e..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_auto_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_auto_32.webp
deleted file mode 100644
index f59bc30556..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/flash_auto_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.webp
deleted file mode 100644
index baa6404008..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message_24.webp b/app/src/main/res/drawable-xxxhdpi/ic_message_24.webp
deleted file mode 100644
index 330cc223b5..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_message_24.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.webp
deleted file mode 100644
index 593155d04d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/camerax_flash_toggle.xml b/app/src/main/res/drawable/camerax_flash_toggle.xml
index 8540548e0d..317c2e154d 100644
--- a/app/src/main/res/drawable/camerax_flash_toggle.xml
+++ b/app/src/main/res/drawable/camerax_flash_toggle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_flash_auto="true" android:drawable="@drawable/flash_auto_32" />
-    <item app:state_flash_off="true" android:drawable="@drawable/ic_flash_24" />
-    <item app:state_flash_on="true" android:drawable="@drawable/ic_flash_filled_24" />
+    <item app:state_flash_auto="true" android:drawable="@drawable/symbol_flash_auto_24" />
+    <item app:state_flash_off="true" android:drawable="@drawable/symbol_flash_slash_24" />
+    <item app:state_flash_on="true" android:drawable="@drawable/symbol_flash_24" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down_14.xml b/app/src/main/res/drawable/ic_arrow_down_14.xml
deleted file mode 100644
index e395ff178c..0000000000
--- a/app/src/main/res/drawable/ic_arrow_down_14.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M12,7.0018L11.0377,6.0395L8.4348,8.6434L7.7065,9.6637V2H6.3461V9.6637L5.6713,8.7196L2.9559,6.0368L2,7.0045L7.029,11.9737L12,7.0018Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_calendar_24.xml b/app/src/main/res/drawable/ic_calendar_24.xml
deleted file mode 100644
index 140cdfa9d8..0000000000
--- a/app/src/main/res/drawable/ic_calendar_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:pathData="M5.4,21.6C4.9,21.6 4.475,21.421 4.125,21.062C3.775,20.704 3.6,20.283 3.6,19.8V6.6C3.6,6.117 3.775,5.696 4.125,5.338C4.475,4.979 4.9,4.8 5.4,4.8H7.2V2.4H9V4.8H15V2.4H16.8V4.8H18.6C19.1,4.8 19.524,4.979 19.874,5.338C20.224,5.696 20.4,6.117 20.4,6.6V19.8C20.4,20.283 20.224,20.704 19.874,21.062C19.524,21.421 19.1,21.6 18.6,21.6H5.4ZM5.4,19.8H18.6V10.8H5.4V19.8ZM5.4,9H18.6V6.6H5.4V9ZM5.4,9V6.6V9ZM12,14.4C11.75,14.4 11.538,14.312 11.362,14.137C11.187,13.962 11.1,13.75 11.1,13.5C11.1,13.25 11.187,13.038 11.362,12.863C11.538,12.688 11.75,12.6 12,12.6C12.249,12.6 12.462,12.688 12.637,12.863C12.812,13.038 12.9,13.25 12.9,13.5C12.9,13.75 12.812,13.962 12.637,14.137C12.462,14.312 12.249,14.4 12,14.4ZM8.1,14.4C7.85,14.4 7.638,14.312 7.462,14.137C7.287,13.962 7.2,13.75 7.2,13.5C7.2,13.25 7.287,13.038 7.462,12.863C7.638,12.688 7.85,12.6 8.1,12.6C8.349,12.6 8.562,12.688 8.737,12.863C8.912,13.038 9,13.25 9,13.5C9,13.75 8.912,13.962 8.737,14.137C8.562,14.312 8.349,14.4 8.1,14.4ZM15.9,14.4C15.65,14.4 15.438,14.312 15.262,14.137C15.087,13.962 15,13.75 15,13.5C15,13.25 15.087,13.038 15.262,12.863C15.438,12.688 15.65,12.6 15.9,12.6C16.149,12.6 16.362,12.688 16.537,12.863C16.712,13.038 16.8,13.25 16.8,13.5C16.8,13.75 16.712,13.962 16.537,14.137C16.362,14.312 16.149,14.4 15.9,14.4ZM12,18C11.75,18 11.538,17.912 11.362,17.737C11.187,17.562 11.1,17.35 11.1,17.1C11.1,16.85 11.187,16.638 11.362,16.463C11.538,16.288 11.75,16.2 12,16.2C12.249,16.2 12.462,16.288 12.637,16.463C12.812,16.638 12.9,16.85 12.9,17.1C12.9,17.35 12.812,17.562 12.637,17.737C12.462,17.912 12.249,18 12,18ZM8.1,18C7.85,18 7.638,17.912 7.462,17.737C7.287,17.562 7.2,17.35 7.2,17.1C7.2,16.85 7.287,16.638 7.462,16.463C7.638,16.288 7.85,16.2 8.1,16.2C8.349,16.2 8.562,16.288 8.737,16.463C8.912,16.638 9,16.85 9,17.1C9,17.35 8.912,17.562 8.737,17.737C8.562,17.912 8.349,18 8.1,18ZM15.9,18C15.65,18 15.438,17.912 15.262,17.737C15.087,17.562 15,17.35 15,17.1C15,16.85 15.087,16.638 15.262,16.463C15.438,16.288 15.65,16.2 15.9,16.2C16.149,16.2 16.362,16.288 16.537,16.463C16.712,16.638 16.8,16.85 16.8,17.1C16.8,17.35 16.712,17.562 16.537,17.737C16.362,17.912 16.149,18 15.9,18Z"
-      android:fillColor="#1B1B1D"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_end_bold_16.xml b/app/src/main/res/drawable/ic_chevron_end_bold_16.xml
deleted file mode 100644
index 639f0826e4..0000000000
--- a/app/src/main/res/drawable/ic_chevron_end_bold_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="#000000"
-        android:pathData="M4,2.41L9.308,8L4,13.59L5.341,15L12,8L5.341,1L4,2.41Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_circle_x_24_tinted.xml b/app/src/main/res/drawable/ic_circle_x_24_tinted.xml
deleted file mode 100644
index c333b4ae3a..0000000000
--- a/app/src/main/res/drawable/ic_circle_x_24_tinted.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="M12,2.5a10,10 0,0 1,5.3 1.6,9.5 9.5,0 0,1 4,9.8 9.1,9.1 0,0 1,-2.6 4.8,9.1 9.1,0 0,1 -4.8,2.6 9.5,9.5 0,0 1,-9.8 -4A10,10 0,0 1,2.5 12,9.6 9.6,0 0,1 12,2.5ZM12,1A10.3,10.3 0,0 0,5.9 2.9,11.5 11.5,0 0,0 1.8,7.8a11.2,11.2 0,0 0,2.4 12,11.2 11.2,0 0,0 12,2.4 11.5,11.5 0,0 0,4.9 -4.1A10.3,10.3 0,0 0,23 12a11.4,11.4 0,0 0,-3.2 -7.8A11.4,11.4 0,0 0,12 1Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-  <path
-      android:pathData="M16.7,8.4l-1.1,-1.1l-3.6,3.6l-3.6,-3.6l-1.1,1.1l3.6,3.6l-3.6,3.6l1.1,1.1l3.6,-3.6l3.6,3.6l1.1,-1.1l-3.6,-3.6l3.6,-3.6z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_compose_outline_24.xml b/app/src/main/res/drawable/ic_compose_outline_24.xml
deleted file mode 100644
index 69edd59654..0000000000
--- a/app/src/main/res/drawable/ic_compose_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="@color/core_black"
-      android:pathData="M21.561,4.561 L19.439,2.439a1.5,1.5 0,0 0,-2.121 0L3.823,15.934a1.5,1.5 0,0 0,-0.394 0.7L2.317,21.076a0.5,0.5 0,0 0,0.607 0.607l4.445,-1.112a1.5,1.5 0,0 0,0.7 -0.394l13.5,-13.495A1.5,1.5 0,0 0,21.561 4.561ZM7.005,19.116l-2.828,0.707L4.884,17l9.772,-9.773 2.122,2.122ZM17.838,8.283 L15.717,6.162 18.379,3.5 20.5,5.621Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_contact_outline_24.xml b/app/src/main/res/drawable/ic_contact_outline_24.xml
deleted file mode 100644
index 0f587e03e1..0000000000
--- a/app/src/main/res/drawable/ic_contact_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:pathData="M12,1C9.824,1 7.698,1.645 5.889,2.854C4.08,4.063 2.67,5.78 1.837,7.79C1.005,9.8 0.787,12.012 1.211,14.146C1.636,16.28 2.683,18.24 4.222,19.778C5.76,21.317 7.72,22.364 9.854,22.789C11.988,23.213 14.2,22.995 16.209,22.163C18.219,21.33 19.938,19.92 21.146,18.111C22.355,16.302 23,14.176 23,12C23,9.083 21.841,6.285 19.778,4.222C17.715,2.159 14.917,1 12,1V1ZM12,2.5C13.762,2.496 15.49,2.984 16.991,3.908C18.491,4.832 19.704,6.155 20.494,7.73C21.284,9.305 21.62,11.069 21.463,12.824C21.306,14.579 20.663,16.256 19.607,17.666C19.062,17.01 18.383,16.478 17.615,16.106C16.847,15.734 16.009,15.531 15.156,15.51C16.354,14.175 17.012,12.441 17,10.647C17,7.333 14.761,5 12,5C9.239,5 7,7.333 7,10.647C6.988,12.441 7.646,14.175 8.844,15.51C7.991,15.531 7.153,15.734 6.385,16.106C5.617,16.478 4.938,17.01 4.393,17.666C3.336,16.256 2.694,14.579 2.537,12.824C2.38,11.069 2.716,9.305 3.506,7.73C4.296,6.155 5.509,4.832 7.009,3.908C8.51,2.984 10.238,2.496 12,2.5V2.5ZM8.5,10.647C8.5,8.283 10.005,6.5 12,6.5C13.995,6.5 15.5,8.283 15.5,10.647C15.5,13.187 13.832,15.5 12,15.5C10.168,15.5 8.5,13.187 8.5,10.647ZM5.408,18.825C5.822,18.261 6.363,17.802 6.987,17.485C7.611,17.168 8.3,17.002 9,17H15C15.7,17.002 16.389,17.168 17.013,17.485C17.637,17.802 18.178,18.261 18.592,18.825C16.826,20.54 14.462,21.5 12,21.5C9.538,21.5 7.174,20.54 5.408,18.825V18.825Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_copy_24.xml b/app/src/main/res/drawable/ic_copy_24.xml
deleted file mode 100644
index 70a745ef6d..0000000000
--- a/app/src/main/res/drawable/ic_copy_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M15.95,19.5A3,3 0,0 1,13 22H6a3,3 0,0 1,-3 -3V9A3,3 0,0 1,6 6h0.5V7.5H6A1.5,1.5 0,0 0,4.5 9V19A1.5,1.5 0,0 0,6 20.5h7a1.5,1.5 0,0 0,1.408 -1ZM18,3.5H11A1.5,1.5 0,0 0,9.5 5V15A1.5,1.5 0,0 0,11 16.5h7A1.5,1.5 0,0 0,19.5 15V5A1.5,1.5 0,0 0,18 3.5M18,2a3,3 0,0 1,3 3V15a3,3 0,0 1,-3 3H11a3,3 0,0 1,-3 -3V5a3,3 0,0 1,3 -3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_copy_24_tinted.xml b/app/src/main/res/drawable/ic_copy_24_tinted.xml
deleted file mode 100644
index 6d80ab036e..0000000000
--- a/app/src/main/res/drawable/ic_copy_24_tinted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_colorOnSurface" android:pathData="M15.95,19.5A3,3 0,0 1,13 22H6a3,3 0,0 1,-3 -3V9A3,3 0,0 1,6 6h0.5V7.5H6A1.5,1.5 0,0 0,4.5 9V19A1.5,1.5 0,0 0,6 20.5h7a1.5,1.5 0,0 0,1.408 -1ZM18,3.5H11A1.5,1.5 0,0 0,9.5 5V15A1.5,1.5 0,0 0,11 16.5h7A1.5,1.5 0,0 0,19.5 15V5A1.5,1.5 0,0 0,18 3.5M18,2a3,3 0,0 1,3 3V15a3,3 0,0 1,-3 3H11a3,3 0,0 1,-3 -3V5a3,3 0,0 1,3 -3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml
deleted file mode 100644
index e26e02a2c1..0000000000
--- a/app/src/main/res/drawable/ic_delete_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:pathData="M22,4.5H16.35C16.1356,3.5056 15.5869,2.6147 14.7954,1.9756C14.0038,1.3366 13.0173,0.9881 12,0.9881C10.9827,0.9881 9.9962,1.3366 9.2046,1.9756C8.4131,2.6147 7.8644,3.5056 7.65,4.5H2V6H3.5L4.86,20C4.9216,20.5507 5.1842,21.0593 5.5975,21.4284C6.0109,21.7974 6.5459,22.001 7.1,22H16.9C17.4541,22.001 17.9891,21.7974 18.4025,21.4284C18.8158,21.0593 19.0784,20.5507 19.14,20L20.5,6H22V4.5ZM12,2.5C12.6189,2.5017 13.2222,2.6949 13.7271,3.0529C14.2319,3.411 14.6137,3.9165 14.82,4.5H9.18C9.3863,3.9165 9.7681,3.411 10.2729,3.0529C10.7778,2.6949 11.3811,2.5017 12,2.5V2.5ZM17.65,19.83C17.6281,20.0139 17.5398,20.1834 17.4017,20.3068C17.2636,20.4302 17.0852,20.4989 16.9,20.5H7.1C6.9148,20.4989 6.7364,20.4302 6.5983,20.3068C6.4602,20.1834 6.3719,20.0139 6.35,19.83L5,6H19L17.65,19.83ZM11.25,18V8H12.75V18H11.25ZM14.5,18L15,8H16.5L16,18H14.5ZM8,18L7.5,8H9L9.5,18H8Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_24_tinted.xml b/app/src/main/res/drawable/ic_delete_24_tinted.xml
deleted file mode 100644
index a87c94dadd..0000000000
--- a/app/src/main/res/drawable/ic_delete_24_tinted.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:pathData="M22,4.5H16.35C16.1356,3.5056 15.5869,2.6147 14.7954,1.9756C14.0038,1.3366 13.0173,0.9881 12,0.9881C10.9827,0.9881 9.9962,1.3366 9.2046,1.9756C8.4131,2.6147 7.8644,3.5056 7.65,4.5H2V6H3.5L4.86,20C4.9216,20.5507 5.1842,21.0593 5.5975,21.4284C6.0109,21.7974 6.5459,22.001 7.1,22H16.9C17.4541,22.001 17.9891,21.7974 18.4025,21.4284C18.8158,21.0593 19.0784,20.5507 19.14,20L20.5,6H22V4.5ZM12,2.5C12.6189,2.5017 13.2222,2.6949 13.7271,3.0529C14.2319,3.411 14.6137,3.9165 14.82,4.5H9.18C9.3863,3.9165 9.7681,3.411 10.2729,3.0529C10.7778,2.6949 11.3811,2.5017 12,2.5V2.5ZM17.65,19.83C17.6281,20.0139 17.5398,20.1834 17.4017,20.3068C17.2636,20.4302 17.0852,20.4989 16.9,20.5H7.1C6.9148,20.4989 6.7364,20.4302 6.5983,20.3068C6.4602,20.1834 6.3719,20.0139 6.35,19.83L5,6H19L17.65,19.83ZM11.25,18V8H12.75V18H11.25ZM14.5,18L15,8H16.5L16,18H14.5ZM8,18L7.5,8H9L9.5,18H8Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_tinted_24.xml b/app/src/main/res/drawable/ic_delete_tinted_24.xml
deleted file mode 100644
index a87c94dadd..0000000000
--- a/app/src/main/res/drawable/ic_delete_tinted_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:pathData="M22,4.5H16.35C16.1356,3.5056 15.5869,2.6147 14.7954,1.9756C14.0038,1.3366 13.0173,0.9881 12,0.9881C10.9827,0.9881 9.9962,1.3366 9.2046,1.9756C8.4131,2.6147 7.8644,3.5056 7.65,4.5H2V6H3.5L4.86,20C4.9216,20.5507 5.1842,21.0593 5.5975,21.4284C6.0109,21.7974 6.5459,22.001 7.1,22H16.9C17.4541,22.001 17.9891,21.7974 18.4025,21.4284C18.8158,21.0593 19.0784,20.5507 19.14,20L20.5,6H22V4.5ZM12,2.5C12.6189,2.5017 13.2222,2.6949 13.7271,3.0529C14.2319,3.411 14.6137,3.9165 14.82,4.5H9.18C9.3863,3.9165 9.7681,3.411 10.2729,3.0529C10.7778,2.6949 11.3811,2.5017 12,2.5V2.5ZM17.65,19.83C17.6281,20.0139 17.5398,20.1834 17.4017,20.3068C17.2636,20.4302 17.0852,20.4989 16.9,20.5H7.1C6.9148,20.4989 6.7364,20.4302 6.5983,20.3068C6.4602,20.1834 6.3719,20.0139 6.35,19.83L5,6H19L17.65,19.83ZM11.25,18V8H12.75V18H11.25ZM14.5,18L15,8H16.5L16,18H14.5ZM8,18L7.5,8H9L9.5,18H8Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_download_24.xml b/app/src/main/res/drawable/ic_download_24.xml
deleted file mode 100644
index 688b0cbd70..0000000000
--- a/app/src/main/res/drawable/ic_download_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="M4,20.5H20V22H4ZM20.65,10.35 L12,19 3.35,10.35a0.5,0.5 0,0 1,0.36 -0.85H8V3h8V9.5h4.29C21,9.5 21.12,9.88 20.65,10.35ZM17.88,11H14.5V4.5h-5V11H6.12L12,16.88Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_download_24_tinted.xml b/app/src/main/res/drawable/ic_download_24_tinted.xml
deleted file mode 100644
index 000e495daa..0000000000
--- a/app/src/main/res/drawable/ic_download_24_tinted.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="@color/signal_icon_tint_primary"
-      android:pathData="M4,20.5H20V22H4ZM20.65,10.35 L12,19 3.35,10.35a0.5,0.5 0,0 1,0.36 -0.85H8V3h8V9.5h4.29C21,9.5 21.12,9.88 20.65,10.35ZM17.88,11H14.5V4.5h-5V11H6.12L12,16.88Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_file_outline_24.xml b/app/src/main/res/drawable/ic_file_outline_24.xml
deleted file mode 100644
index 545037705c..0000000000
--- a/app/src/main/res/drawable/ic_file_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="M18.93,9.36 L12.61,3.05a2.3,2.3 0,0 0,-1.93 -1L6.32,2.05A2.32,2.32 0,0 0,4 4.32L4,19.67A2.32,2.32 0,0 0,6.32 22L17.66,22A2.33,2.33 0,0 0,20 19.67L20,11.3A2.33,2.33 0,0 0,18.93 9.36ZM13,5.2l0.68,1 2.08,2.09 1,0.67h-3A0.82,0.82 0,0 1,13 8.16L13,6.25h0ZM18.48,19.67a0.82,0.82 0,0 1,-0.82 0.82L6.32,20.49a0.82,0.82 0,0 1,-0.82 -0.82L5.5,4.32a0.82,0.82 0,0 1,0.82 -0.82h4.36a0.75,0.75 0,0 1,0.48 0.18l0,0L11.4,4a0.75,0.75 0,0 1,0.1 0.36L11.5,8.16a2.32,2.32 0,0 0,2.32 2.32h3.84a0.74,0.74 0,0 1,0.36 0.09l0.1,0.1 0,0a0.81,0.81 0,0 1,0.34 0.65Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_flash_24.xml b/app/src/main/res/drawable/ic_flash_24.xml
deleted file mode 100644
index 2148febaf8..0000000000
--- a/app/src/main/res/drawable/ic_flash_24.xml
+++ /dev/null
@@ -1,13 +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="M0,0h24v24h-24z"/>
-    <path
-        android:fillColor="@color/core_white"
-        android:pathData="M12,4.9 L11,8.6l-0.4,1.9h8.7L12,19.1l1,-3.7 0.4,-1.9H4.7L12,4.9m1.7,-4 l-0.5,0.2L2.5,13.8A0.7,0.7 0,0 0,3.1 15h8.4L9.7,22.3a0.6,0.6 0,0 0,0.6 0.8l0.5,-0.2L21.5,10.2A0.7,0.7 0,0 0,20.9 9H12.5l1.8,-7.3a0.6,0.6 0,0 0,-0.6 -0.8"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_flash_filled_24.xml b/app/src/main/res/drawable/ic_flash_filled_24.xml
deleted file mode 100644
index 32121cc087..0000000000
--- a/app/src/main/res/drawable/ic_flash_filled_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="@color/core_white"
-      android:pathData="M20.9,9H12.5l1.8,-7.3a0.6,0.6 0,0 0,-0.6 -0.8l-0.5,0.2L2.5,13.8A0.7,0.7 0,0 0,3.1 15h8.4L9.7,22.3a0.6,0.6 0,0 0,0.6 0.8l0.5,-0.2L21.5,10.2A0.7,0.7 0,0 0,20.9 9Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_forward_24.xml b/app/src/main/res/drawable/ic_forward_24.xml
deleted file mode 100644
index a19dc52632..0000000000
--- a/app/src/main/res/drawable/ic_forward_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_forward_24_tinted.xml b/app/src/main/res/drawable/ic_forward_24_tinted.xml
deleted file mode 100644
index bf809d6b8d..0000000000
--- a/app/src/main/res/drawable/ic_forward_24_tinted.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/signal_icon_tint_primary"
-      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_forward_outline_24.xml b/app/src/main/res/drawable/ic_forward_outline_24.xml
deleted file mode 100644
index 296d94b36f..0000000000
--- a/app/src/main/res/drawable/ic_forward_outline_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_colorOnSurface" android:pathData="M14.521,5.621V9.321L13.212,9.49C11.119,9.672 9.123,10.452 7.462,11.738C5.801,13.025 4.546,14.762 3.847,16.743C3.687,17.149 3.047,18.499 3.047,18.499C3.516,18.041 4.007,17.607 4.52,17.199C7.039,15.597 9.926,14.668 12.906,14.5L14.521,14.376V18.376L20.9,12L14.521,5.621ZM13.384,2.584C13.576,2.608 13.751,2.704 13.874,2.854L22.667,11.646C22.714,11.692 22.75,11.748 22.776,11.808C22.801,11.869 22.814,11.934 22.814,12C22.814,12.066 22.801,12.131 22.776,12.192C22.75,12.252 22.714,12.307 22.667,12.354L13.874,21.146C13.751,21.295 13.576,21.392 13.384,21.416C13.165,21.416 13.021,21.199 13.021,20.793V16C10.922,16.074 8.863,16.596 6.983,17.532C5.103,18.468 3.445,19.796 2.121,21.426C1.839,21.781 1.607,21.955 1.444,21.955C1.23,21.955 1.139,21.655 1.222,21.055C2.2,14.051 5.757,8.934 13.021,8V3.207C13.021,2.801 13.165,2.584 13.384,2.584V2.584Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_grid_20.xml b/app/src/main/res/drawable/ic_grid_20.xml
deleted file mode 100644
index 136b041f3a..0000000000
--- a/app/src/main/res/drawable/ic_grid_20.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M2,4.89L3.94,4.89A0.75,0.75 0,0 1,4.69 5.64L4.69,7.58A0.75,0.75 0,0 1,3.94 8.33L2,8.33A0.75,0.75 0,0 1,1.25 7.58L1.25,5.64A0.75,0.75 0,0 1,2 4.89z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M9.03,4.89L10.97,4.89A0.75,0.75 0,0 1,11.72 5.64L11.72,7.58A0.75,0.75 0,0 1,10.97 8.33L9.03,8.33A0.75,0.75 0,0 1,8.28 7.58L8.28,5.64A0.75,0.75 0,0 1,9.03 4.89z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M16.06,4.89L18,4.89A0.75,0.75 0,0 1,18.75 5.64L18.75,7.58A0.75,0.75 0,0 1,18 8.33L16.06,8.33A0.75,0.75 0,0 1,15.31 7.58L15.31,5.64A0.75,0.75 0,0 1,16.06 4.89z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M2,11.67L3.94,11.67A0.75,0.75 0,0 1,4.69 12.42L4.69,14.36A0.75,0.75 0,0 1,3.94 15.11L2,15.11A0.75,0.75 0,0 1,1.25 14.36L1.25,12.42A0.75,0.75 0,0 1,2 11.67z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M9.03,11.67L10.97,11.67A0.75,0.75 0,0 1,11.72 12.42L11.72,14.36A0.75,0.75 0,0 1,10.97 15.11L9.03,15.11A0.75,0.75 0,0 1,8.28 14.36L8.28,12.42A0.75,0.75 0,0 1,9.03 11.67z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M16.06,11.67L18,11.67A0.75,0.75 0,0 1,18.75 12.42L18.75,14.36A0.75,0.75 0,0 1,18 15.11L16.06,15.11A0.75,0.75 0,0 1,15.31 14.36L15.31,12.42A0.75,0.75 0,0 1,16.06 11.67z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help_24.xml b/app/src/main/res/drawable/ic_help_24.xml
deleted file mode 100644
index 08c9d55fde..0000000000
--- a/app/src/main/res/drawable/ic_help_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="false" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M10.75,17.25A1.26,1.26 0,0 1,12 16a1.18,1.18 0,0 1,0.88 0.37,1.23 1.23,0 0,1 0,1.76 1.18,1.18 0,0 1,-0.88 0.37,1.26 1.26,0 0,1 -1.25,-1.25ZM12,2.5A9.5,9.5 0,1 0,21.5 12,9.51 9.51,0 0,0 12,2.5M12,1A11,11 0,1 1,1 12,11 11,0 0,1 12,1ZM11.12,14.49h1.73v-0.11a2.67,2.67 0,0 1,1.45 -2.65A3.24,3.24 0,0 0,16 8.8c0,-2 -1.48,-3.29 -3.7,-3.29A3.44,3.44 0,0 0,8.59 8.87h1.84A1.83,1.83 0,0 1,12.34 7,1.74 1.74,0 0,1 14.2,8.78a2.33,2.33 0,0 1,-1.28 2c-1.12,0.69 -1.79,1.38 -1.8,3.62Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_message_details_24.xml b/app/src/main/res/drawable/ic_info_outline_message_details_24.xml
deleted file mode 100644
index 128119c3c7..0000000000
--- a/app/src/main/res/drawable/ic_info_outline_message_details_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M12,2.5A9.5,9.5 0,1 1,2.5 12,9.511 9.511,0 0,1 12,2.5M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1ZM12,8.5A1.5,1.5 0,0 0,13.5 7a1.5,1.5 0,1 0,-2.56 1.06A1.435,1.435 0,0 0,12 8.5ZM13,16.5L13,10L9.5,10v1.5h2v5L9,16.5L9,18h6L15,16.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_tinted_24.xml b/app/src/main/res/drawable/ic_info_tinted_24.xml
deleted file mode 100644
index fb601a2e95..0000000000
--- a/app/src/main/res/drawable/ic_info_tinted_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="@color/signal_icon_tint_primary"
-        android:pathData="M12,2.5A9.5,9.5 0,1 1,2.5 12,9.511 9.511,0 0,1 12,2.5M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1ZM12,8.5A1.5,1.5 0,0 0,13.5 7a1.5,1.5 0,1 0,-2.56 1.06A1.435,1.435 0,0 0,12 8.5ZM13,16.5L13,10L9.5,10v1.5h2v5L9,16.5L9,18h6L15,16.5Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_white_24.xml b/app/src/main/res/drawable/ic_info_white_24.xml
deleted file mode 100644
index 27437af495..0000000000
--- a/app/src/main/res/drawable/ic_info_white_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="#ffffff"
-        android:pathData="M12,2.5A9.5,9.5 0,1 1,2.5 12,9.511 9.511,0 0,1 12,2.5M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1ZM12,8.5A1.5,1.5 0,0 0,13.5 7a1.5,1.5 0,1 0,-2.56 1.06A1.435,1.435 0,0 0,12 8.5ZM13,16.5L13,10L9.5,10v1.5h2v5L9,16.5L9,18h6L15,16.5Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_list_20.xml b/app/src/main/res/drawable/ic_list_20.xml
deleted file mode 100644
index 08491aebf3..0000000000
--- a/app/src/main/res/drawable/ic_list_20.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M3.5,8.5L5,8.5A0.75,0.75 0,0 1,5.75 9.25L5.75,10.75A0.75,0.75 0,0 1,5 11.5L3.5,11.5A0.75,0.75 0,0 1,2.75 10.75L2.75,9.25A0.75,0.75 0,0 1,3.5 8.5z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-  <path
-      android:pathData="M3.5,14.25L5,14.25A0.75,0.75 0,0 1,5.75 15L5.75,16.5A0.75,0.75 0,0 1,5 17.25L3.5,17.25A0.75,0.75 0,0 1,2.75 16.5L2.75,15A0.75,0.75 0,0 1,3.5 14.25z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-  <path
-      android:pathData="M3.5,2.75L5,2.75A0.75,0.75 0,0 1,5.75 3.5L5.75,5A0.75,0.75 0,0 1,5 5.75L3.5,5.75A0.75,0.75 0,0 1,2.75 5L2.75,3.5A0.75,0.75 0,0 1,3.5 2.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-  <path
-      android:pathData="M8,4.25H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-  <path
-      android:pathData="M8,10H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-  <path
-      android:pathData="M8,15.75H18"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#5E5E5E"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_location_outline_24.xml b/app/src/main/res/drawable/ic_location_outline_24.xml
deleted file mode 100644
index e8ce27cbe1..0000000000
--- a/app/src/main/res/drawable/ic_location_outline_24.xml
+++ /dev/null
@@ -1,10 +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="M21.5,12C21.5,17.247 17.247,21.5 12,21.5C6.753,21.5 2.5,17.247 2.5,12C2.5,6.753 6.753,2.5 12,2.5C17.247,2.5 21.5,6.753 21.5,12ZM23,12C23,18.075 18.075,23 12,23C5.925,23 1,18.075 1,12C1,5.925 5.925,1 12,1C18.075,1 23,5.925 23,12ZM7.303,11.929L15.585,8.415L12.071,16.697L11.217,13.492C11.124,13.146 10.854,12.876 10.508,12.783L7.303,11.929ZM17.449,7.862C17.8,7.034 16.965,6.2 16.138,6.551L5.377,11.116C4.501,11.488 4.59,12.758 5.51,13.003L9.842,14.158L10.997,18.49C11.242,19.41 12.512,19.499 12.884,18.623L17.449,7.862Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_media_skipback_outline_24.xml b/app/src/main/res/drawable/ic_media_skipback_outline_24.xml
deleted file mode 100644
index 0209c9255c..0000000000
--- a/app/src/main/res/drawable/ic_media_skipback_outline_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="M8.75,5.433C8.417,5.241 8.417,4.759 8.75,4.567L13.25,1.969C13.583,1.776 14,2.017 14,2.402V4.2C18.565,5.127 22,9.162 22,14C22,19.523 17.523,24 12,24C6.477,24 2,19.523 2,14C2,11.037 3.289,8.374 5.337,6.543L6.4,7.606C4.622,9.164 3.5,11.451 3.5,14C3.5,18.694 7.306,22.5 12,22.5C16.694,22.5 20.5,18.694 20.5,14C20.5,9.994 17.729,6.636 14,5.737V7.598C14,7.983 13.583,8.223 13.25,8.031L8.75,5.433Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-  <path
-      android:pathData="M10.398,11.084V17.5H9.234V12.442L7.691,12.952V12.011L10.266,11.084H10.398Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-  <path
-      android:pathData="M13.523,14.556L12.595,14.332L12.951,11.102H16.472V12.064H13.914L13.747,13.558C13.838,13.502 13.97,13.447 14.142,13.391C14.318,13.333 14.516,13.303 14.736,13.303C15.04,13.303 15.313,13.353 15.553,13.453C15.793,13.549 15.997,13.69 16.164,13.875C16.334,14.059 16.461,14.285 16.546,14.551C16.634,14.815 16.678,15.114 16.678,15.448C16.678,15.741 16.634,16.016 16.546,16.274C16.461,16.529 16.331,16.756 16.155,16.955C15.979,17.151 15.758,17.307 15.491,17.421C15.225,17.532 14.911,17.588 14.551,17.588C14.279,17.588 14.016,17.548 13.764,17.469C13.516,17.387 13.291,17.269 13.092,17.113C12.893,16.955 12.733,16.762 12.613,16.533C12.496,16.305 12.432,16.042 12.42,15.747H13.567C13.587,15.943 13.64,16.11 13.725,16.248C13.81,16.385 13.921,16.491 14.059,16.564C14.2,16.637 14.362,16.674 14.547,16.674C14.714,16.674 14.857,16.643 14.977,16.581C15.1,16.517 15.201,16.428 15.281,16.313C15.36,16.199 15.418,16.065 15.456,15.909C15.495,15.754 15.514,15.584 15.514,15.399C15.514,15.221 15.491,15.058 15.448,14.912C15.404,14.762 15.336,14.633 15.245,14.525C15.155,14.417 15.04,14.333 14.903,14.274C14.768,14.216 14.61,14.186 14.428,14.186C14.185,14.186 13.997,14.223 13.866,14.296C13.737,14.37 13.622,14.456 13.523,14.556Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_media_skipforward_outline_24.xml b/app/src/main/res/drawable/ic_media_skipforward_outline_24.xml
deleted file mode 100644
index 9296554730..0000000000
--- a/app/src/main/res/drawable/ic_media_skipforward_outline_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="M15.25,5.433C15.583,5.241 15.583,4.759 15.25,4.567L10.75,1.969C10.417,1.776 10,2.017 10,2.402V4.2C5.436,5.127 2,9.162 2,14C2,19.523 6.477,24 12,24C17.523,24 22,19.523 22,14C22,11.037 20.711,8.374 18.663,6.543L17.6,7.606C19.378,9.164 20.5,11.451 20.5,14C20.5,18.694 16.694,22.5 12,22.5C7.306,22.5 3.5,18.694 3.5,14C3.5,9.994 6.271,6.636 10,5.737V7.598C10,7.983 10.417,8.223 10.75,8.031L15.25,5.433Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-  <path
-      android:pathData="M10.398,11.084V17.5H9.234V12.442L7.691,12.952V12.011L10.266,11.084H10.398Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-  <path
-      android:pathData="M13.523,14.556L12.595,14.332L12.951,11.102H16.472V12.064H13.914L13.747,13.558C13.838,13.502 13.97,13.447 14.142,13.391C14.318,13.333 14.516,13.303 14.736,13.303C15.04,13.303 15.313,13.353 15.553,13.453C15.793,13.549 15.997,13.69 16.164,13.875C16.334,14.059 16.461,14.285 16.546,14.551C16.634,14.815 16.678,15.114 16.678,15.448C16.678,15.741 16.634,16.016 16.546,16.274C16.461,16.529 16.331,16.756 16.155,16.955C15.979,17.151 15.758,17.307 15.491,17.421C15.225,17.532 14.911,17.588 14.551,17.588C14.279,17.588 14.016,17.548 13.764,17.469C13.516,17.387 13.291,17.269 13.092,17.113C12.893,16.955 12.733,16.762 12.613,16.533C12.496,16.305 12.432,16.042 12.42,15.747H13.567C13.587,15.943 13.64,16.11 13.725,16.248C13.81,16.385 13.921,16.491 14.059,16.564C14.2,16.637 14.362,16.674 14.547,16.674C14.714,16.674 14.857,16.643 14.977,16.581C15.1,16.517 15.201,16.428 15.281,16.313C15.36,16.199 15.418,16.065 15.456,15.909C15.495,15.754 15.514,15.584 15.514,15.399C15.514,15.221 15.491,15.058 15.448,14.912C15.404,14.762 15.336,14.633 15.245,14.525C15.155,14.417 15.04,14.333 14.903,14.274C14.768,14.216 14.61,14.186 14.428,14.186C14.185,14.186 13.997,14.223 13.866,14.296C13.737,14.37 13.622,14.456 13.523,14.556Z"
-      android:fillColor="@color/signal_colorOnSurface"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml b/app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml
deleted file mode 100644
index 88903a7c28..0000000000
--- a/app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="@color/signal_icon_tint_primary"
-    android:src="@drawable/ic_message_24" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_mute_24.xml b/app/src/main/res/drawable/ic_mute_24.xml
deleted file mode 100644
index 85b2fe56a9..0000000000
--- a/app/src/main/res/drawable/ic_mute_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="M21.057,4.1L20.1,2.944L17.314,5.262C16.7527,4.1617 15.8644,3.2622 14.7712,2.687C13.6781,2.1118 12.4337,1.8892 11.2089,2.0498C9.9841,2.2103 8.8391,2.7461 7.9312,3.5836C7.0232,4.4211 6.3968,5.5192 6.138,6.727L4.711,13.57C4.4847,14.9278 3.8783,16.1937 2.962,17.221L0.943,18.9L1.9,20.056L21.057,4.1ZM6.18,13.876L7.6,7.044C7.805,6.113 8.3004,5.2711 9.0147,4.6398C9.7291,4.0085 10.6255,3.6203 11.5747,3.5313C12.5239,3.4423 13.4768,3.6571 14.296,4.1446C15.1153,4.6322 15.7585,5.3673 16.133,6.244L5.81,14.849C5.9805,14.5446 6.1051,14.2167 6.18,13.876V13.876Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M21.264,16.216C20.7668,15.9393 20.3337,15.5604 19.9933,15.1044C19.6529,14.6483 19.4129,14.1254 19.289,13.57L18.215,8.419L16.909,9.507L17.824,13.894C17.9906,14.6482 18.3138,15.3589 18.7727,15.9802C19.2317,16.6014 19.8161,17.1192 20.488,17.5H7.313L5.517,19H20.5C20.8267,18.9975 21.1436,18.8885 21.4027,18.6894C21.6617,18.4903 21.8487,18.2121 21.9351,17.897C22.0216,17.582 22.0028,17.2473 21.8817,16.9439C21.7605,16.6405 21.5437,16.3849 21.264,16.216Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M12,22.5C12.5763,22.5001 13.135,22.3011 13.5815,21.9367C14.0279,21.5722 14.3347,21.0647 14.45,20.5H9.55C9.6653,21.0647 9.9721,21.5722 10.4186,21.9367C10.865,22.3011 11.4237,22.5001 12,22.5Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_payments_24.xml b/app/src/main/res/drawable/ic_payments_24.xml
deleted file mode 100644
index 14a9083f19..0000000000
--- a/app/src/main/res/drawable/ic_payments_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="@color/signal_icon_tint_primary"
-      android:pathData="M19.5,4L4.5,4a2.9,2.9 0,0 0,-3 3L1.5,17a2.9,2.9 0,0 0,3 3h15a2.9,2.9 0,0 0,3 -3L22.5,7A2.9,2.9 0,0 0,19.5 4ZM4.5,5.5h15A1.5,1.5 0,0 1,21 7L21,9L3,9L3,7A1.5,1.5 0,0 1,4.5 5.5ZM19.5,18.5L4.5,18.5A1.5,1.5 0,0 1,3 17L3,11.5L21,11.5L21,17A1.5,1.5 0,0 1,19.5 18.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pin_24.xml b/app/src/main/res/drawable/ic_pin_24.xml
deleted file mode 100644
index 9518551d54..0000000000
--- a/app/src/main/res/drawable/ic_pin_24.xml
+++ /dev/null
@@ -1,10 +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.6483,3.9356C15.0147,3.7432 15.3295,3.5144 15.5823,3.2596H7.9194C8.1723,3.5144 8.4922,3.7432 8.8534,3.9356L9.6842,4.3724V5.3188V9.0472V10.1184L8.6934,10.5032C7.2744,11.0544 6.2062,12.0008 5.6902,13.1396H17.8115C17.2955,12.0008 16.2274,11.0544 14.8083,10.5032L13.8175,10.1184V9.0472V5.3188V4.3724L14.6483,3.9356ZM6.779,1.6996H16.7227C17.3729,1.6996 17.8373,2.36 17.6,2.9736C17.2233,3.946 16.4131,4.7624 15.3604,5.3188V9.0472C17.342,9.8168 18.8694,11.278 19.4422,13.0824C19.695,13.878 19.0861,14.6996 18.2502,14.6996H12.5V21.0816L11.75,22.5L11,21.0816V14.6996H5.2464C4.4156,14.6996 3.8016,13.878 4.0596,13.0772C4.6324,11.2728 6.1598,9.8116 8.1413,9.042V5.3136C7.0835,4.7624 6.2785,3.9408 5.9018,2.9684C5.6644,2.36 6.1288,1.6996 6.779,1.6996Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_read_24.xml b/app/src/main/res/drawable/ic_read_24.xml
deleted file mode 100644
index 2bbc15b7a5..0000000000
--- a/app/src/main/res/drawable/ic_read_24.xml
+++ /dev/null
@@ -1,11 +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="M4.3928,17.0682L4.453,16.707L4.2052,16.4375C2.9653,15.0885 2.2688,13.3283 2.25,11.4963C2.2523,7.0454 6.5031,3.25 12,3.25C17.429,3.25 21.75,7.0506 21.75,11.5C21.75,15.9524 17.4986,19.7498 12.0004,19.75C10.841,19.7493 9.6885,19.5697 8.5838,19.2174L8.3509,19.1432L8.1189,19.2205L3.7942,20.6617L4.3928,17.0682Z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reply_24.xml b/app/src/main/res/drawable/ic_reply_24.xml
deleted file mode 100644
index 535336fdd3..0000000000
--- a/app/src/main/res/drawable/ic_reply_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reply_24_outline.xml b/app/src/main/res/drawable/ic_reply_24_outline.xml
deleted file mode 100644
index 535336fdd3..0000000000
--- a/app/src/main/res/drawable/ic_reply_24_outline.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reply_24_solid_tinted.xml b/app/src/main/res/drawable/ic_reply_24_solid_tinted.xml
deleted file mode 100644
index cdd7b1a31c..0000000000
--- a/app/src/main/res/drawable/ic_reply_24_solid_tinted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M21.905,21.426A14.706,14.706 0,0 0,11 16v4.793c0,0.664 -0.384,0.823 -0.854,0.353L1.354,12.354a0.5,0.5 0,0 1,0 -0.708l8.792,-8.792c0.47,-0.47 0.854,-0.311 0.854,0.353V8c7.264,0.934 10.822,6.051 11.8,13.059C22.95,22.1 22.558,22.249 21.905,21.426Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reply_24_tinted.xml b/app/src/main/res/drawable/ic_reply_24_tinted.xml
deleted file mode 100644
index 5494c4ce9d..0000000000
--- a/app/src/main/res/drawable/ic_reply_24_tinted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_retry_24.xml b/app/src/main/res/drawable/ic_retry_24.xml
deleted file mode 100644
index f8b3e0dadc..0000000000
--- a/app/src/main/res/drawable/ic_retry_24.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="20"
-    android:viewportWidth="20" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_icon_tint_primary" android:pathData="M14.189,10.329l-1.4,-1.385 -1.061,1.061 3.9,3.884 3.865,-3.866 -1.06,-1.06 -1.055,1.055L16.5,11.344V10a7.75,7.75 0,1 0,-2.27 5.48l-1.061,-1.061A6.249,6.249 0,1 1,15 10v1.671Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_save_24.xml b/app/src/main/res/drawable/ic_save_24.xml
deleted file mode 100644
index 70ed503c40..0000000000
--- a/app/src/main/res/drawable/ic_save_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:pathData="M22,10V19C22,19.7956 21.6839,20.5587 21.1213,21.1213C20.5587,21.6839 19.7956,22 19,22H5C4.2043,22 3.4413,21.6839 2.8787,21.1213C2.3161,20.5587 2,19.7956 2,19V10C2,9.2044 2.3161,8.4413 2.8787,7.8787C3.4413,7.3161 4.2043,7 5,7H9.75V8.5H5C4.6022,8.5 4.2206,8.658 3.9393,8.9393C3.658,9.2206 3.5,9.6022 3.5,10V19C3.5,19.3978 3.658,19.7794 3.9393,20.0607C4.2206,20.342 4.6022,20.5 5,20.5H19C19.3978,20.5 19.7794,20.342 20.0607,20.0607C20.342,19.7794 20.5,19.3978 20.5,19V10C20.5,9.6022 20.342,9.2206 20.0607,8.9393C19.7794,8.658 19.3978,8.5 19,8.5H14.25V7H19C19.7956,7 20.5587,7.3161 21.1213,7.8787C21.6839,8.4413 22,9.2044 22,10ZM15.419,11.47L13.586,13.3L12.766,14.448V2H11.266V14.45L10.524,13.411L8.581,11.485L7.525,12.55L12.012,17L16.479,12.532L15.419,11.47Z"
-      android:fillColor="@color/signal_icon_tint_action"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_save_24_tinted.xml b/app/src/main/res/drawable/ic_save_24_tinted.xml
deleted file mode 100644
index 3923861d5f..0000000000
--- a/app/src/main/res/drawable/ic_save_24_tinted.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:pathData="M22,10V19C22,19.7956 21.6839,20.5587 21.1213,21.1213C20.5587,21.6839 19.7956,22 19,22H5C4.2043,22 3.4413,21.6839 2.8787,21.1213C2.3161,20.5587 2,19.7956 2,19V10C2,9.2044 2.3161,8.4413 2.8787,7.8787C3.4413,7.3161 4.2043,7 5,7H9.75V8.5H5C4.6022,8.5 4.2206,8.658 3.9393,8.9393C3.658,9.2206 3.5,9.6022 3.5,10V19C3.5,19.3978 3.658,19.7794 3.9393,20.0607C4.2206,20.342 4.6022,20.5 5,20.5H19C19.3978,20.5 19.7794,20.342 20.0607,20.0607C20.342,19.7794 20.5,19.3978 20.5,19V10C20.5,9.6022 20.342,9.2206 20.0607,8.9393C19.7794,8.658 19.3978,8.5 19,8.5H14.25V7H19C19.7956,7 20.5587,7.3161 21.1213,7.8787C21.6839,8.4413 22,9.2044 22,10ZM15.419,11.47L13.586,13.3L12.766,14.448V2H11.266V14.45L10.524,13.411L8.581,11.485L7.525,12.55L12.012,17L16.479,12.532L15.419,11.47Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_select_24.xml b/app/src/main/res/drawable/ic_select_24.xml
deleted file mode 100644
index f074f1a2d7..0000000000
--- a/app/src/main/res/drawable/ic_select_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:pathData="M12,2.5C13.8789,2.5 15.7156,3.0572 17.2779,4.101C18.8402,5.1449 20.0578,6.6286 20.7769,8.3645C21.4959,10.1004 21.684,12.0105 21.3175,13.8534C20.9509,15.6962 20.0461,17.3889 18.7175,18.7175C17.3889,20.0461 15.6962,20.9509 13.8534,21.3175C12.0105,21.684 10.1004,21.4959 8.3645,20.7769C6.6286,20.0578 5.1449,18.8402 4.101,17.2779C3.0572,15.7157 2.5,13.8789 2.5,12C2.5029,9.4813 3.5047,7.0667 5.2857,5.2857C7.0667,3.5047 9.4813,2.5029 12,2.5V2.5ZM12,1C9.8244,1 7.6977,1.6451 5.8887,2.8538C4.0798,4.0625 2.6699,5.7805 1.8373,7.7905C1.0048,9.8005 0.7869,12.0122 1.2114,14.146C1.6358,16.2798 2.6834,18.2398 4.2218,19.7782C5.7602,21.3166 7.7202,22.3642 9.854,22.7886C11.9878,23.2131 14.1995,22.9952 16.2095,22.1627C18.2195,21.3301 19.9375,19.9202 21.1462,18.1113C22.3549,16.3023 23,14.1756 23,12C23,9.0826 21.8411,6.2847 19.7782,4.2218C17.7153,2.1589 14.9174,1 12,1V1ZM17.834,9.4L16.773,8.338L10.232,14.879L7.232,11.879L6.171,12.939L10.232,17L17.834,9.4Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_select_24_tinted.xml b/app/src/main/res/drawable/ic_select_24_tinted.xml
deleted file mode 100644
index 13fa4864a4..0000000000
--- a/app/src/main/res/drawable/ic_select_24_tinted.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:pathData="M12,2.5C13.8789,2.5 15.7156,3.0572 17.2779,4.101C18.8402,5.1449 20.0578,6.6286 20.7769,8.3645C21.4959,10.1004 21.684,12.0105 21.3175,13.8534C20.9509,15.6962 20.0461,17.3889 18.7175,18.7175C17.3889,20.0461 15.6962,20.9509 13.8534,21.3175C12.0105,21.684 10.1004,21.4959 8.3645,20.7769C6.6286,20.0578 5.1449,18.8402 4.101,17.2779C3.0572,15.7157 2.5,13.8789 2.5,12C2.5029,9.4813 3.5047,7.0667 5.2857,5.2857C7.0667,3.5047 9.4813,2.5029 12,2.5V2.5ZM12,1C9.8244,1 7.6977,1.6451 5.8887,2.8538C4.0798,4.0625 2.6699,5.7805 1.8373,7.7905C1.0048,9.8005 0.7869,12.0122 1.2114,14.146C1.6358,16.2798 2.6834,18.2398 4.2218,19.7782C5.7602,21.3166 7.7202,22.3642 9.854,22.7886C11.9878,23.2131 14.1995,22.9952 16.2095,22.1627C18.2195,21.3301 19.9375,19.9202 21.1462,18.1113C22.3549,16.3023 23,14.1756 23,12C23,9.0826 21.8411,6.2847 19.7782,4.2218C17.7153,2.1589 14.9174,1 12,1V1ZM17.834,9.4L16.773,8.338L10.232,14.879L7.232,11.879L6.171,12.939L10.232,17L17.834,9.4Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share_24_outline.xml b/app/src/main/res/drawable/ic_share_24_outline.xml
deleted file mode 100644
index 3f5ee1e8f5..0000000000
--- a/app/src/main/res/drawable/ic_share_24_outline.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/signal_colorOnSurface" android:pathData="M18,16.2C17.292,16.234 16.619,16.517 16.1,17L8.6,12.8C8.712,12.547 8.78,12.276 8.8,12C8.8,11.8 8.7,11.5 8.7,11.3L16.1,7C16.603,7.507 17.286,7.795 18,7.8C18.735,7.775 19.433,7.472 19.952,6.952C20.472,6.432 20.775,5.735 20.8,5C20.8,4.257 20.505,3.545 19.98,3.02C19.455,2.495 18.743,2.2 18,2.2C17.257,2.2 16.545,2.495 16.02,3.02C15.495,3.545 15.2,4.257 15.2,5C15.2,5.2 15.3,5.5 15.3,5.7L7.9,10C7.397,9.492 6.714,9.205 6,9.2C5.265,9.225 4.568,9.528 4.048,10.048C3.528,10.568 3.225,11.265 3.2,12C3.225,12.735 3.528,13.432 4.048,13.952C4.568,14.472 5.265,14.775 6,14.8C6.662,14.779 7.298,14.532 7.8,14.1L15.3,18.4C15.3,18.6 15.2,18.8 15.2,19C15.2,19.554 15.364,20.095 15.672,20.556C15.98,21.016 16.417,21.375 16.928,21.587C17.44,21.799 18.003,21.854 18.546,21.746C19.089,21.638 19.588,21.371 19.98,20.98C20.372,20.588 20.638,20.089 20.746,19.546C20.854,19.003 20.799,18.44 20.587,17.928C20.375,17.417 20.016,16.979 19.556,16.672C19.095,16.364 18.554,16.2 18,16.2V16.2ZM18,3.8C18.318,3.8 18.624,3.926 18.848,4.151C19.074,4.376 19.2,4.682 19.2,5C19.2,5.318 19.074,5.623 18.848,5.848C18.624,6.074 18.318,6.2 18,6.2C17.682,6.2 17.376,6.074 17.152,5.848C16.926,5.623 16.8,5.318 16.8,5C16.8,4.682 16.926,4.376 17.152,4.151C17.376,3.926 17.682,3.8 18,3.8V3.8ZM6,13.2C5.682,13.2 5.377,13.073 5.151,12.849C4.926,12.623 4.8,12.318 4.8,12C4.8,11.682 4.926,11.377 5.151,11.151C5.377,10.926 5.682,10.8 6,10.8C6.318,10.8 6.623,10.926 6.849,11.151C7.074,11.377 7.2,11.682 7.2,12C7.2,12.318 7.074,12.623 6.849,12.849C6.623,13.073 6.318,13.2 6,13.2V13.2ZM18,20.2C17.763,20.2 17.531,20.13 17.333,19.998C17.136,19.866 16.982,19.678 16.891,19.459C16.801,19.24 16.777,18.999 16.823,18.766C16.869,18.533 16.984,18.319 17.152,18.151C17.319,17.984 17.533,17.869 17.766,17.823C17.999,17.777 18.24,17.801 18.459,17.891C18.678,17.982 18.866,18.136 18.998,18.333C19.13,18.531 19.2,18.763 19.2,19C19.2,19.318 19.074,19.623 18.848,19.848C18.624,20.073 18.318,20.2 18,20.2V20.2Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_switch_camera_24.xml b/app/src/main/res/drawable/ic_switch_camera_24.xml
deleted file mode 100644
index ef18de3047..0000000000
--- a/app/src/main/res/drawable/ic_switch_camera_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="@color/core_white"
-      android:pathData="M18.36,5.64 L17.3,6.7A7.43,7.43 0,0 0,12 4.5,7.5 7.5,0 0,0 4.5,12v0.7l0.71,-1.22 1,-1 1.07,1.07L3.75,15.06 0.21,11.53l1.07,-1.07 1,1L3,12.7L3,12A9,9 0,0 1,18.36 5.64ZM20.25,8.94 L16.71,12.47 17.78,13.54 18.78,12.54 19.49,11.32L19.49,12A7.5,7.5 0,0 1,12 19.5a7.43,7.43 0,0 1,-5.3 -2.2L5.64,18.36A9,9 0,0 0,21 12v-0.7l0.71,1.22 1,1 1.07,-1.07Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_unmute_24.xml b/app/src/main/res/drawable/ic_unmute_24.xml
deleted file mode 100644
index da453d9d48..0000000000
--- a/app/src/main/res/drawable/ic_unmute_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:pathData="M14.45,20.5C14.3352,21.0651 14.0286,21.5732 13.5821,21.9382C13.1356,22.3031 12.5767,22.5025 12,22.5025C11.4233,22.5025 10.8644,22.3031 10.4179,21.9382C9.9714,21.5732 9.6648,21.0651 9.55,20.5H14.45ZM12,3.5C10.9731,3.5032 9.978,3.8559 9.1782,4.5001C8.3785,5.1442 7.8219,6.0414 7.6,7.044L6.18,13.876C6.0131,14.6337 5.6888,15.3478 5.2281,15.9722C4.7675,16.5965 4.1807,17.117 3.506,17.5H20.488C19.8167,17.1198 19.2327,16.6029 18.7738,15.9828C18.3149,15.3627 17.9913,14.6531 17.824,13.9L16.393,7.033C16.1699,6.0332 15.6135,5.139 14.8153,4.4971C14.0171,3.8551 13.0243,3.5035 12,3.5V3.5ZM12,2C13.3699,2.0003 14.6985,2.4694 15.7649,3.3294C16.8313,4.1893 17.5713,5.3883 17.862,6.727L19.289,13.57C19.4129,14.1254 19.6529,14.6483 19.9933,15.1044C20.3337,15.5604 20.7668,15.9393 21.264,16.216C21.5437,16.3849 21.7606,16.6405 21.8817,16.9439C22.0028,17.2473 22.0216,17.582 21.9351,17.897C21.8487,18.2121 21.6617,18.4903 21.4027,18.6894C21.1436,18.8884 20.8267,18.9975 20.5,19H3.5C3.171,18.9965 2.8523,18.8848 2.593,18.6824C2.3337,18.4799 2.1482,18.1978 2.065,17.8795C1.9817,17.5612 2.0055,17.2244 2.1325,16.9209C2.2596,16.6174 2.4829,16.3641 2.768,16.2C3.2574,15.9214 3.6832,15.5435 4.0178,15.0906C4.3524,14.6376 4.5885,14.1197 4.711,13.57L6.138,6.727C6.4287,5.3883 7.1687,4.1893 8.2351,3.3294C9.3015,2.4694 10.6301,2.0003 12,2Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_unpin_24.xml b/app/src/main/res/drawable/ic_unpin_24.xml
deleted file mode 100644
index d3f315968a..0000000000
--- a/app/src/main/res/drawable/ic_unpin_24.xml
+++ /dev/null
@@ -1,10 +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.6483,3.9356C15.0147,3.7432 15.3295,3.5144 15.5823,3.2596H7.9194C8.1723,3.5144 8.4922,3.7432 8.8534,3.9356L9.6842,4.3724V5.3188V9.0472V10.1184L8.6934,10.5032C7.2744,11.0544 6.2062,12.0008 5.6902,13.1396H8.8423L13.8175,8.9649V5.3188V4.3724L14.6483,3.9356ZM15.3604,7.6702V5.3188C16.4131,4.7624 17.2233,3.946 17.6,2.9736C17.8373,2.36 17.3729,1.6996 16.7227,1.6996H6.779C6.1288,1.6996 5.6644,2.36 5.9018,2.9684C6.2785,3.9408 7.0834,4.7624 8.1413,5.3136V9.042C6.1598,9.8116 4.6323,11.2728 4.0596,13.0772C3.8015,13.878 4.4156,14.6996 5.2464,14.6996H6.9832L2.0358,18.8509L3,20L21.3851,4.5731L20.4209,3.424L15.3604,7.6702ZM11,15.2068L13.4635,13.1396H17.8115C17.4428,12.3259 16.7923,11.6105 15.9333,11.0672L17.1678,10.0313C18.2521,10.8263 19.0598,11.8779 19.4422,13.0824C19.695,13.878 19.0861,14.6996 18.2502,14.6996H12.5V21.0816L11.75,22.5L11,21.0816V15.2068Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_unread_24.xml b/app/src/main/res/drawable/ic_unread_24.xml
deleted file mode 100644
index dacebb8a50..0000000000
--- a/app/src/main/res/drawable/ic_unread_24.xml
+++ /dev/null
@@ -1,10 +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="M22.1528,9.2109C22.9843,8.3944 23.5,7.2574 23.5,6C23.5,3.5147 21.4853,1.5 19,1.5C17.6424,1.5 16.4251,2.1012 15.6,3.052C14.4733,2.6949 13.2597,2.5 12,2.5C6.2,2.5 1.5,6.529 1.5,11.5C1.5197,13.5188 2.2868,15.4586 3.653,16.945L3.014,20.781C2.924,21.323 3.277,21.625 3.798,21.451L8.356,19.932C9.5342,20.3077 10.7633,20.4993 12,20.5C17.8,20.5 22.5,16.471 22.5,11.5C22.5,10.709 22.3791,9.9418 22.1528,9.2109ZM20.8378,10.1088C20.9444,10.5638 21,11.0293 21,11.5C21,15.4338 17.1972,18.9996 12.0009,19C10.9186,18.9994 9.8428,18.8317 8.8117,18.5029L8.3457,18.3543L7.8818,18.5089L4.7387,19.5564L5.1326,17.1915L5.253,16.4691L4.7573,15.9299C3.6438,14.7184 3.0179,13.1379 3,11.4927C3.0047,7.5616 6.8064,4 12,4C12.9872,4 13.9276,4.1322 14.8028,4.3738C14.6073,4.8781 14.5,5.4265 14.5,6C14.5,8.4853 16.5147,10.5 19,10.5C19.6547,10.5 20.2767,10.3602 20.8378,10.1088ZM22,6C22,7.6568 20.6569,9 19,9C17.3431,9 16,7.6568 16,6C16,4.3432 17.3431,3 19,3C20.6569,3 22,4.3432 22,6Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_view_all_20.xml b/app/src/main/res/drawable/ic_view_all_20.xml
deleted file mode 100644
index 64481809a1..0000000000
--- a/app/src/main/res/drawable/ic_view_all_20.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M10,15.1L3.5,8.5L4.5,7.5L10,12.9L15.5,7.5L16.5,8.5L10,15.1Z"
-      android:fillColor="@color/signal_icon_tint_primary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_x_18.xml b/app/src/main/res/drawable/ic_x_18.xml
deleted file mode 100644
index ac495aa0e3..0000000000
--- a/app/src/main/res/drawable/ic_x_18.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@color/signal_icon_tint_primary"
-      android:pathData="M16.03,5.03l-1.06,-1.06l-4.97,4.969l-4.97,-4.969l-1.06,1.06l4.969,4.97l-4.969,4.97l1.06,1.06l4.97,-4.969l4.97,4.969l1.06,-1.06l-4.969,-4.97l4.969,-4.97z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_x_conversation.xml b/app/src/main/res/drawable/ic_x_conversation.xml
deleted file mode 100644
index 17a76fceae..0000000000
--- a/app/src/main/res/drawable/ic_x_conversation.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="@color/signal_text_toolbar_subtitle"
-      android:pathData="M20.5,4.5l-1,-1l-7.5,7.4l-7.5,-7.4l-1,1l7.4,7.5l-7.4,7.5l1,1l7.5,-7.4l7.5,7.4l1,-1l-7.4,-7.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/symbol_album_24.xml b/app/src/main/res/drawable/symbol_album_24.xml
new file mode 100644
index 0000000000..80cc206dec
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_album_24.xml
@@ -0,0 +1,13 @@
+<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="M9,11.875a1.5,1.5 0,1 1,3 0,1.5 1.5,0 0,1 -3,0Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M18.875,7.128a17.51,17.51 0,0 0,-0.037 -1.341c-0.038,-0.471 -0.121,-0.908 -0.33,-1.32a3.374,3.374 0,0 0,-1.476 -1.474c-0.411,-0.21 -0.848,-0.293 -1.319,-0.331 -0.452,-0.037 -1.008,-0.037 -1.677,-0.037L5.964,2.625c-0.67,0 -1.225,0 -1.677,0.037 -0.471,0.038 -0.908,0.121 -1.32,0.33a3.375,3.375 0,0 0,-1.474 1.476c-0.21,0.411 -0.293,0.848 -0.331,1.319 -0.037,0.452 -0.037,1.008 -0.037,1.677v4.072c0,0.67 0,1.225 0.037,1.677 0.038,0.471 0.121,0.908 0.33,1.32a3.38,3.38 0,0 0,1.476 1.474c0.411,0.21 0.848,0.293 1.319,0.331 0.248,0.02 0.527,0.03 0.838,0.034v0.164c0,0.67 0,1.224 0.037,1.677 0.038,0.471 0.121,0.908 0.33,1.32a3.38,3.38 0,0 0,1.476 1.474c0.411,0.21 0.848,0.293 1.319,0.331 0.452,0.037 1.008,0.037 1.677,0.037h8.072c0.67,0 1.224,0 1.677,-0.037 0.471,-0.038 0.908,-0.121 1.32,-0.33a3.374,3.374 0,0 0,1.474 -1.476c0.21,-0.411 0.293,-0.848 0.331,-1.319 0.037,-0.453 0.037,-1.008 0.037,-1.677v-4.572c0,-0.67 0,-1.225 -0.037,-1.677 -0.038,-0.471 -0.121,-0.908 -0.33,-1.32a3.374,3.374 0,0 0,-1.476 -1.474c-0.411,-0.21 -0.848,-0.293 -1.319,-0.331a12.54,12.54 0,0 0,-0.838 -0.034ZM17.125,7.125a15.967,15.967 0,0 0,-0.031 -1.196c-0.03,-0.363 -0.083,-0.543 -0.146,-0.667a1.625,1.625 0,0 0,-0.71 -0.71c-0.124,-0.063 -0.304,-0.116 -0.667,-0.146 -0.373,-0.03 -0.857,-0.031 -1.571,-0.031L6,4.375c-0.715,0 -1.198,0 -1.57,0.031 -0.364,0.03 -0.544,0.083 -0.668,0.146a1.625,1.625 0,0 0,-0.71 0.71c-0.063,0.124 -0.116,0.304 -0.146,0.667 -0.03,0.373 -0.031,0.856 -0.031,1.571v4c0,0.714 0,1.198 0.031,1.57 0.03,0.364 0.083,0.544 0.146,0.668 0.156,0.306 0.405,0.554 0.71,0.71 0.124,0.063 0.304,0.116 0.667,0.146 0.196,0.016 0.422,0.024 0.696,0.027v-2.657c0,-0.67 0,-1.225 0.037,-1.677 0.038,-0.471 0.121,-0.908 0.33,-1.32a3.375,3.375 0,0 1,1.476 -1.474c0.411,-0.21 0.848,-0.293 1.319,-0.331 0.452,-0.037 1.008,-0.037 1.677,-0.037h7.16ZM20.948,9.762c0.063,0.124 0.116,0.304 0.146,0.667 0.03,0.373 0.031,0.857 0.031,1.571v3.388l-1.946,-1.946a2.375,2.375 0,0 0,-3.358 0L13,16.262l-0.82,-0.82a2.375,2.375 0,0 0,-3.36 0l-1.94,1.942c-0.004,-0.25 -0.004,-0.54 -0.004,-0.884L6.876,12c0,-0.714 0,-1.198 0.031,-1.57 0.03,-0.364 0.083,-0.544 0.146,-0.668a1.63,1.63 0,0 1,0.71 -0.71c0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.857,-0.031 1.571,-0.031h8c0.715,0 1.198,0 1.57,0.031 0.363,0.03 0.544,0.083 0.668,0.146 0.306,0.156 0.554,0.405 0.71,0.71ZM17.942,14.679 L21.108,17.846c-0.004,0.08 -0.008,0.154 -0.014,0.225 -0.03,0.362 -0.083,0.543 -0.146,0.667a1.625,1.625 0,0 1,-0.71 0.71c-0.124,0.063 -0.305,0.116 -0.667,0.146 -0.373,0.03 -0.857,0.031 -1.571,0.031h-8c-0.714,0 -1.198,0 -1.57,-0.031 -0.364,-0.03 -0.544,-0.083 -0.668,-0.146a1.628,1.628 0,0 1,-0.286 -0.186l2.582,-2.583a0.625,0.625 0,0 1,0.884 0l1.44,1.44a0.875,0.875 0,0 0,1.237 0l3.44,-3.44a0.625,0.625 0,0 1,0.883 0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_album_tilt_24.xml b/app/src/main/res/drawable/symbol_album_tilt_24.xml
new file mode 100644
index 0000000000..1b01582d76
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_album_tilt_24.xml
@@ -0,0 +1,13 @@
+<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="M9,11.875a1.5,1.5 0,1 1,3 0,1.5 1.5,0 0,1 -3,0Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="m18.748,6.316 l0.107,0.812c0.32,0.004 0.605,0.013 0.858,0.034 0.471,0.038 0.908,0.121 1.32,0.33a3.38,3.38 0,0 1,1.474 1.476c0.21,0.411 0.293,0.848 0.331,1.319 0.037,0.452 0.037,1.008 0.037,1.677v4.572c0,0.67 0,1.224 -0.037,1.677 -0.038,0.471 -0.121,0.908 -0.33,1.32a3.374,3.374 0,0 1,-1.476 1.474c-0.411,0.21 -0.848,0.293 -1.319,0.331 -0.452,0.037 -1.008,0.037 -1.677,0.037L9.964,21.375c-0.67,0 -1.225,0 -1.677,-0.037 -0.471,-0.038 -0.908,-0.121 -1.32,-0.33a3.374,3.374 0,0 1,-1.474 -1.476c-0.21,-0.411 -0.293,-0.848 -0.331,-1.319a15.915,15.915 0,0 1,-0.036 -1.187,3.101 3.101,0 0,1 -1.034,-0.164 3.375,3.375 0,0 1,-1.655 -1.27c-0.262,-0.38 -0.4,-0.802 -0.5,-1.264 -0.096,-0.444 -0.168,-0.994 -0.256,-1.658L1.15,8.633C1.062,7.969 0.99,7.419 0.967,6.965c-0.023,-0.472 0.002,-0.916 0.156,-1.35a3.375,3.375 0,0 1,1.27 -1.656c0.38,-0.261 0.803,-0.4 1.265,-0.5 0.444,-0.096 0.994,-0.168 1.658,-0.256l8.002,-1.053c0.664,-0.088 1.215,-0.16 1.668,-0.182 0.472,-0.024 0.916,0.001 1.351,0.156a3.375,3.375 0,0 1,1.655 1.27c0.261,0.38 0.4,0.802 0.5,1.264 0.096,0.444 0.168,0.994 0.256,1.658ZM5.125,15.276a1.355,1.355 0,0 1,-0.45 -0.063,1.625 1.625,0 0,1 -0.796,-0.612c-0.078,-0.114 -0.155,-0.286 -0.232,-0.642 -0.079,-0.366 -0.142,-0.845 -0.236,-1.553L2.89,8.44c-0.093,-0.708 -0.155,-1.188 -0.174,-1.561 -0.018,-0.364 0.012,-0.55 0.058,-0.68 0.114,-0.324 0.328,-0.603 0.611,-0.797 0.114,-0.079 0.287,-0.156 0.643,-0.232 0.365,-0.08 0.844,-0.143 1.553,-0.236L13.51,3.89c0.709,-0.094 1.188,-0.156 1.562,-0.175 0.363,-0.017 0.55,0.012 0.68,0.058 0.323,0.115 0.602,0.329 0.797,0.612 0.078,0.114 0.155,0.286 0.232,0.642 0.078,0.366 0.142,0.845 0.235,1.553l0.072,0.545L9.964,7.125c-0.67,0 -1.225,0 -1.677,0.037 -0.471,0.038 -0.908,0.121 -1.32,0.33a3.375,3.375 0,0 0,-1.474 1.476c-0.21,0.411 -0.293,0.848 -0.331,1.319 -0.037,0.452 -0.037,1.008 -0.037,1.677v3.311ZM20.948,9.762c0.063,0.124 0.116,0.304 0.146,0.667 0.03,0.373 0.031,0.857 0.031,1.571v3.388l-1.946,-1.946a2.375,2.375 0,0 0,-3.358 0L13,16.262l-0.82,-0.82a2.375,2.375 0,0 0,-3.36 0l-1.94,1.942c-0.004,-0.25 -0.004,-0.54 -0.004,-0.884L6.876,12c0,-0.714 0,-1.198 0.031,-1.57 0.03,-0.364 0.083,-0.544 0.146,-0.668a1.63,1.63 0,0 1,0.71 -0.71c0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.857,-0.031 1.571,-0.031h8c0.715,0 1.198,0 1.57,0.031 0.363,0.03 0.544,0.083 0.668,0.146 0.306,0.156 0.554,0.405 0.71,0.71ZM17.942,14.679 L21.108,17.846c-0.004,0.08 -0.008,0.154 -0.014,0.225 -0.03,0.362 -0.083,0.543 -0.146,0.667a1.625,1.625 0,0 1,-0.71 0.71c-0.124,0.063 -0.305,0.116 -0.667,0.146 -0.373,0.03 -0.857,0.031 -1.571,0.031h-8c-0.714,0 -1.198,0 -1.57,-0.031 -0.364,-0.03 -0.544,-0.083 -0.668,-0.146a1.628,1.628 0,0 1,-0.286 -0.186l2.582,-2.583a0.625,0.625 0,0 1,0.884 0l1.44,1.44a0.875,0.875 0,0 0,1.237 0l3.44,-3.44a0.625,0.625 0,0 1,0.883 0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_arrow_down_24.xml b/app/src/main/res/drawable/symbol_arrow_down_24.xml
new file mode 100644
index 0000000000..49de1708c1
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_down_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:pathData="M11.125,4.25V15.5l0.126,1.764 -5.132,-5.133A0.875,0.875 0,0 0,4.88 13.37l6.5,6.5a0.875,0.875 0,0 0,1.238 0l6.5,-6.5a0.875,0.875 0,1 0,-1.238 -1.238l-5.132,5.133 0.126,-1.764V4.25a0.875,0.875 0,1 0,-1.75 0Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_arrow_down_compact_bold_16.xml b/app/src/main/res/drawable/symbol_arrow_down_compact_bold_16.xml
new file mode 100644
index 0000000000..43b81151da
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_arrow_down_compact_bold_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,13.375a0.75,0.75 0,0 1,-0.53 -0.22l-4,-4a0.75,0.75 0,0 1,1.06 -1.06l2.797,2.796 -0.077,-1.266v-6.5a0.75,0.75 0,0 1,1.5 0v6.5l-0.077,1.266 2.797,-2.796a0.75,0.75 0,1 1,1.06 1.06l-4,4a0.75,0.75 0,0 1,-0.53 0.22Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_bell_slash_24.xml b/app/src/main/res/drawable/symbol_bell_slash_24.xml
new file mode 100644
index 0000000000..fdff6c746e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_bell_slash_24.xml
@@ -0,0 +1,13 @@
+<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="M4.791,8.413a6.74,6.74 0,0 1,0.013 -0.25L6.46,9.819c-0.253,2.928 -0.955,4.382 -1.745,5.315a7.087,7.087 0,0 1,-0.698 0.708,5.05 5.05,0 0,0 -0.306,0.298c-0.14,0.154 -0.211,0.27 -0.211,0.562a0.66,0.66 0,0 0,0.645 0.673h9.871l2.173,2.173c-0.536,1.807 -2.177,3.077 -4.189,3.077 -2.166,0 -3.901,-1.471 -4.292,-3.5L4.145,19.125c-1.338,0 -2.395,-1.1 -2.395,-2.423 0,-0.79 0.277,-1.312 0.666,-1.74a7.07,7.07 0,0 1,0.431 -0.422l0.075,-0.069c0.16,-0.149 0.31,-0.294 0.457,-0.469 0.552,-0.651 1.285,-1.952 1.412,-5.59ZM9.512,19.125c0.344,1.042 1.298,1.75 2.488,1.75s2.144,-0.708 2.488,-1.75L9.512,19.125Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20.5,16.702c0,0.13 -0.034,0.247 -0.092,0.347l1.249,1.249a2.44,2.44 0,0 0,0.593 -1.596c0,-0.79 -0.277,-1.312 -0.666,-1.74a7.684,7.684 0,0 0,-0.431 -0.422l-0.075,-0.069a5.364,5.364 0,0 1,-0.457 -0.469c-0.552,-0.651 -1.285,-1.952 -1.412,-5.59 -0.143,-4.1 -3.389,-7.037 -7.209,-7.037a7.192,7.192 0,0 0,-5.135 2.13l1.237,1.238A5.439,5.439 0,0 1,12 3.125c2.896,0 5.35,2.21 5.46,5.35 0.135,3.846 0.922,5.593 1.825,6.659a7.087,7.087 0,0 0,0.698 0.709c0.133,0.122 0.225,0.207 0.306,0.297 0.14,0.154 0.211,0.27 0.211,0.562ZM3.119,1.881A0.875,0.875 0,1 0,1.88 3.12l19,19a0.875,0.875 0,1 0,1.238 -1.238l-19,-19Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_calendar_24.xml b/app/src/main/res/drawable/symbol_calendar_24.xml
new file mode 100644
index 0000000000..d0b641bdbd
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_calendar_24.xml
@@ -0,0 +1,13 @@
+<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="M7.5,11.25a1.375,1.375 0,1 0,0 2.75,1.375 1.375,0 0,0 0,-2.75ZM6.125,17.125a1.375,1.375 0,1 1,2.75 0,1.375 1.375,0 0,1 -2.75,0ZM16.5,11.25a1.375,1.375 0,1 0,0 2.75,1.375 1.375,0 0,0 0,-2.75ZM15.125,17.125a1.375,1.375 0,1 1,2.75 0,1.375 1.375,0 0,1 -2.75,0ZM12,11.25A1.375,1.375 0,1 0,12 14a1.375,1.375 0,0 0,0 -2.75ZM10.625,17.125a1.375,1.375 0,1 1,2.75 0,1.375 1.375,0 0,1 -2.75,0Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M7.5,0.75a1,1 0,0 1,1 1v1.875h7L15.5,1.75a1,1 0,1 1,2 0v1.877c0.362,0.003 0.683,0.012 0.963,0.035 0.471,0.038 0.908,0.121 1.32,0.33a3.38,3.38 0,0 1,1.474 1.476c0.21,0.411 0.293,0.848 0.331,1.319 0.037,0.452 0.037,1.008 0.037,1.677v8.572c0,0.67 0,1.224 -0.037,1.677 -0.038,0.471 -0.121,0.908 -0.33,1.32a3.374,3.374 0,0 1,-1.476 1.474c-0.411,0.21 -0.848,0.293 -1.319,0.331 -0.453,0.037 -1.008,0.037 -1.677,0.037L7.214,21.875c-0.67,0 -1.225,0 -1.677,-0.037 -0.471,-0.038 -0.908,-0.121 -1.32,-0.33a3.374,3.374 0,0 1,-1.474 -1.476c-0.21,-0.411 -0.293,-0.848 -0.331,-1.319 -0.037,-0.453 -0.037,-1.008 -0.037,-1.677L2.375,8.464c0,-0.67 0,-1.225 0.037,-1.677 0.038,-0.471 0.121,-0.908 0.33,-1.32a3.375,3.375 0,0 1,1.476 -1.474c0.411,-0.21 0.848,-0.293 1.319,-0.331 0.28,-0.023 0.6,-0.032 0.963,-0.035L6.5,1.75a1,1 0,0 1,1 -1ZM5.012,5.552c0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.856,-0.031 1.571,-0.031h9.5c0.715,0 1.198,0 1.57,0.031 0.363,0.03 0.544,0.083 0.668,0.146 0.306,0.156 0.554,0.405 0.71,0.71 0.063,0.124 0.116,0.304 0.146,0.667 0.02,0.253 0.027,0.555 0.03,0.946L4.126,7.875c0.003,-0.39 0.01,-0.693 0.03,-0.946 0.03,-0.363 0.083,-0.543 0.146,-0.667 0.156,-0.305 0.405,-0.554 0.71,-0.71ZM4.125,9.625L4.125,17c0,0.715 0,1.198 0.031,1.57 0.03,0.363 0.083,0.544 0.146,0.668 0.156,0.306 0.405,0.554 0.71,0.71 0.124,0.063 0.304,0.116 0.667,0.146 0.373,0.03 0.856,0.031 1.571,0.031h9.5c0.715,0 1.198,0 1.57,-0.031 0.363,-0.03 0.544,-0.083 0.668,-0.146 0.306,-0.156 0.554,-0.404 0.71,-0.71 0.063,-0.124 0.116,-0.305 0.146,-0.667 0.03,-0.373 0.031,-0.857 0.031,-1.571L19.875,9.625L4.125,9.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_chat_badge_24.xml b/app/src/main/res/drawable/symbol_chat_badge_24.xml
new file mode 100644
index 0000000000..1652c7de58
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_chat_badge_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:pathData="M20.375,12c0,-0.845 -0.125,-1.662 -0.358,-2.43a4.488,4.488 0,0 0,1.572 -0.829A10.1,10.1 0,0 1,22.125 12c0,5.592 -4.533,10.125 -10.125,10.125a10.08,10.08 0,0 1,-4.641 -1.124l-4.063,1.462c-1.095,0.395 -2.153,-0.664 -1.76,-1.76L3,16.642A10.086,10.086 0,0 1,1.875 12C1.875,6.408 6.408,1.875 12,1.875a10.1,10.1 0,0 1,3.259 0.536c-0.373,0.458 -0.658,0.99 -0.828,1.572a8.375,8.375 0,0 0,-9.816 11.97c0.18,0.338 0.223,0.747 0.086,1.129l-1.248,3.465 3.465,-1.248a1.39,1.39 0,0 1,1.128 0.086A8.375,8.375 0,0 0,20.375 12Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M15.75,5.25a3,3 0,1 1,6 0,3 3,0 0,1 -6,0Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_check_circle_24.xml b/app/src/main/res/drawable/symbol_check_circle_24.xml
new file mode 100644
index 0000000000..623ca3f4ae
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_check_circle_24.xml
@@ -0,0 +1,13 @@
+<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="M16.742,8.714a0.875,0.875 0,0 0,-1.484 -0.928l-4.346,6.954 -2.229,-2.787a0.875,0.875 0,0 0,-1.366 1.094l3,3.75a0.875,0.875 0,0 0,1.425 -0.083l5,-8Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M12,1.125C5.994,1.125 1.125,5.994 1.125,12S5.994,22.875 12,22.875 22.875,18.006 22.875,12 18.006,1.125 12,1.125ZM2.875,12a9.125,9.125 0,1 1,18.25 0,9.125 9.125,0 0,1 -18.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_chevron_right_24.xml b/app/src/main/res/drawable/symbol_chevron_right_24.xml
new file mode 100644
index 0000000000..8831e7c587
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_chevron_right_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="#000"
+        android:pathData="M8.881,4.381a0.875,0.875 0,0 1,1.238 0l7,7a0.875,0.875 0,0 1,0 1.238l-7,7A0.875,0.875 0,0 1,8.88 18.38L15.263,12 8.88,5.619a0.875,0.875 0,0 1,0 -1.238Z" />
+</vector>
diff --git a/app/src/main/res/drawable/symbol_chevron_right_compact_bold_16.xml b/app/src/main/res/drawable/symbol_chevron_right_compact_bold_16.xml
new file mode 100644
index 0000000000..0a2ae303ca
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_chevron_right_compact_bold_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M5.47,2.47a0.75,0.75 0,0 1,1.06 0l5,5a0.75,0.75 0,0 1,0 1.06l-5,5a0.75,0.75 0,0 1,-1.06 -1.06L9.94,8 5.47,3.53a0.75,0.75 0,0 1,0 -1.06Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_copy_android_24.xml b/app/src/main/res/drawable/symbol_copy_android_24.xml
new file mode 100644
index 0000000000..7655a04b13
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_copy_android_24.xml
@@ -0,0 +1,10 @@
+<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="M11.714,1.125c-0.67,0 -1.225,0 -1.677,0.037 -0.471,0.038 -0.908,0.121 -1.32,0.33a3.375,3.375 0,0 0,-1.474 1.476c-0.21,0.411 -0.293,0.848 -0.331,1.319 -0.02,0.249 -0.03,0.529 -0.034,0.841a12.57,12.57 0,0 0,-0.841 0.034c-0.471,0.038 -0.908,0.121 -1.32,0.33a3.375,3.375 0,0 0,-1.474 1.476c-0.21,0.411 -0.293,0.848 -0.331,1.319 -0.037,0.452 -0.037,1.008 -0.037,1.677v8.072c0,0.67 0,1.224 0.037,1.677 0.038,0.471 0.121,0.908 0.33,1.32a3.38,3.38 0,0 0,1.476 1.474c0.411,0.21 0.848,0.293 1.319,0.331 0.452,0.037 1.008,0.037 1.677,0.037h4.572c0.67,0 1.225,0 1.677,-0.037 0.471,-0.038 0.908,-0.121 1.32,-0.33a3.374,3.374 0,0 0,1.474 -1.476c0.21,-0.411 0.293,-0.848 0.331,-1.319 0.02,-0.249 0.03,-0.529 0.034,-0.841 0.313,-0.005 0.592,-0.014 0.841,-0.034 0.471,-0.038 0.908,-0.121 1.32,-0.33a3.374,3.374 0,0 0,1.474 -1.476c0.21,-0.411 0.293,-0.848 0.331,-1.319 0.037,-0.452 0.037,-1.007 0.037,-1.677L21.125,5.964c0,-0.67 0,-1.225 -0.037,-1.677 -0.038,-0.471 -0.121,-0.908 -0.33,-1.32a3.374,3.374 0,0 0,-1.476 -1.474c-0.411,-0.21 -0.848,-0.293 -1.319,-0.331 -0.453,-0.037 -1.008,-0.037 -1.677,-0.037h-4.572ZM15.371,18.875h-3.657c-0.67,0 -1.225,0 -1.677,-0.037 -0.471,-0.038 -0.908,-0.121 -1.32,-0.33a3.374,3.374 0,0 1,-1.474 -1.476c-0.21,-0.411 -0.293,-0.848 -0.331,-1.319 -0.037,-0.452 -0.037,-1.008 -0.037,-1.677L6.875,6.879c-0.274,0.003 -0.5,0.011 -0.696,0.027 -0.363,0.03 -0.543,0.083 -0.667,0.146a1.625,1.625 0,0 0,-0.71 0.71c-0.063,0.124 -0.116,0.304 -0.146,0.667 -0.03,0.373 -0.031,0.857 -0.031,1.571v8c0,0.715 0,1.198 0.031,1.57 0.03,0.363 0.083,0.544 0.146,0.668 0.156,0.306 0.405,0.554 0.71,0.71 0.124,0.063 0.304,0.116 0.667,0.146 0.373,0.03 0.856,0.031 1.571,0.031h4.5c0.714,0 1.198,0 1.57,-0.031 0.364,-0.03 0.544,-0.083 0.668,-0.146 0.306,-0.156 0.554,-0.404 0.71,-0.71 0.063,-0.124 0.116,-0.305 0.146,-0.667 0.016,-0.196 0.024,-0.422 0.027,-0.696ZM9.512,3.052c0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.857,-0.031 1.571,-0.031h4.5c0.715,0 1.198,0 1.57,0.031 0.363,0.03 0.544,0.083 0.668,0.146 0.306,0.156 0.554,0.405 0.71,0.71 0.063,0.124 0.116,0.304 0.146,0.667 0.03,0.373 0.031,0.856 0.031,1.571v8c0,0.714 0,1.198 -0.031,1.57 -0.03,0.364 -0.083,0.544 -0.146,0.668a1.625,1.625 0,0 1,-0.71 0.71c-0.124,0.063 -0.305,0.116 -0.667,0.146 -0.373,0.03 -0.857,0.031 -1.571,0.031h-4.5c-0.714,0 -1.198,0 -1.57,-0.031 -0.364,-0.03 -0.544,-0.083 -0.668,-0.146a1.625,1.625 0,0 1,-0.71 -0.71c-0.063,-0.124 -0.116,-0.304 -0.146,-0.667 -0.03,-0.373 -0.031,-0.857 -0.031,-1.571L8.625,6c0,-0.715 0,-1.198 0.031,-1.57 0.03,-0.364 0.083,-0.544 0.146,-0.668 0.156,-0.305 0.405,-0.554 0.71,-0.71Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_error_circle_24.xml b/app/src/main/res/drawable/symbol_error_circle_24.xml
new file mode 100644
index 0000000000..3acb54407e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_error_circle_24.xml
@@ -0,0 +1,13 @@
+<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="M12,6.5c-0.696,0 -1.244,0.592 -1.191,1.286l0.423,5.503a0.77,0.77 0,0 0,1.536 0l0.423,-5.503A1.195,1.195 0,0 0,12 6.5ZM10.75,16.5a1.25,1.25 0,1 1,2.5 0,1.25 1.25,0 0,1 -2.5,0Z"
+      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"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_file_24.xml b/app/src/main/res/drawable/symbol_file_24.xml
new file mode 100644
index 0000000000..2db98174d9
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_file_24.xml
@@ -0,0 +1,10 @@
+<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="M12.683,1.69c-0.276,-0.066 -0.56,-0.065 -0.86,-0.065h-2.56c-0.809,0 -1.469,0 -2.005,0.044 -0.554,0.045 -1.052,0.142 -1.517,0.378a3.875,3.875 0,0 0,-1.694 1.694c-0.236,0.465 -0.333,0.963 -0.378,1.517 -0.044,0.536 -0.044,1.196 -0.044,2.005v9.474c0,0.809 0,1.469 0.044,2.005 0.045,0.554 0.142,1.052 0.378,1.517 0.372,0.73 0.965,1.322 1.694,1.694 0.465,0.236 0.963,0.333 1.517,0.378 0.536,0.044 1.196,0.044 2.005,0.044h5.474c0.809,0 1.469,0 2.005,-0.044 0.554,-0.045 1.052,-0.142 1.517,-0.378a3.875,3.875 0,0 0,1.694 -1.694c0.236,-0.465 0.333,-0.963 0.378,-1.517 0.044,-0.536 0.044,-1.196 0.044,-2.005v-6.56c0,-0.3 0,-0.584 -0.066,-0.86a2.376,2.376 0,0 0,-0.284 -0.687c-0.148,-0.242 -0.35,-0.442 -0.562,-0.655l-5.438,-5.438c-0.213,-0.213 -0.413,-0.413 -0.655,-0.562a2.374,2.374 0,0 0,-0.687 -0.284ZM11.125,3.375L9.3,3.375c-0.855,0 -1.443,0 -1.9,0.038 -0.445,0.036 -0.688,0.103 -0.865,0.194 -0.4,0.203 -0.725,0.528 -0.928,0.928 -0.09,0.177 -0.158,0.42 -0.194,0.866 -0.037,0.456 -0.038,1.045 -0.038,1.899v9.4c0,0.855 0,1.443 0.038,1.9 0.036,0.445 0.103,0.688 0.194,0.865 0.203,0.4 0.528,0.725 0.928,0.928 0.177,0.09 0.42,0.158 0.866,0.194 0.456,0.037 1.044,0.038 1.899,0.038h5.4c0.855,0 1.443,0 1.9,-0.038 0.445,-0.036 0.688,-0.103 0.865,-0.194 0.4,-0.203 0.725,-0.528 0.928,-0.928 0.09,-0.177 0.158,-0.42 0.194,-0.866 0.037,-0.456 0.038,-1.044 0.038,-1.899v-5.825h-1.862c-0.809,0 -1.469,0 -2.005,-0.044 -0.554,-0.045 -1.052,-0.141 -1.517,-0.378a3.875,3.875 0,0 1,-1.694 -1.694c-0.237,-0.465 -0.333,-0.963 -0.378,-1.517 -0.044,-0.536 -0.044,-1.196 -0.044,-2.005L11.125,3.375ZM18.338,9.125L17.013,8l-2.988,-2.988 -1.15,-1.35L12.875,5.2c0,0.855 0,1.443 0.038,1.9 0.036,0.445 0.103,0.688 0.194,0.865 0.203,0.4 0.528,0.725 0.928,0.928 0.177,0.09 0.42,0.158 0.866,0.194 0.456,0.037 1.044,0.038 1.899,0.038h1.538Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_flash_24.xml b/app/src/main/res/drawable/symbol_flash_24.xml
new file mode 100644
index 0000000000..eddb38304e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_flash_24.xml
@@ -0,0 +1,10 @@
+<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="M11.605,1.734c1,-1.333 3.12,-0.477 2.913,1.177l-0.777,6.214L19,9.125c1.34,0 2.104,1.529 1.3,2.6l-7.905,10.54c-1,1.334 -3.12,0.478 -2.913,-1.176l0.777,-6.214L5,14.875c-1.339,0 -2.103,-1.529 -1.3,-2.6l7.905,-10.54ZM12.723,3.161L5.25,13.125h6a0.875,0.875 0,0 1,0.868 0.983l-0.841,6.731 7.473,-9.964h-6a0.875,0.875 0,0 1,-0.868 -0.984l0.841,-6.73Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_flash_auto_24.xml b/app/src/main/res/drawable/symbol_flash_auto_24.xml
new file mode 100644
index 0000000000..991ebf937f
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_flash_auto_24.xml
@@ -0,0 +1,10 @@
+<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.518,2.91c0.207,-1.653 -1.913,-2.509 -2.913,-1.176L3.7,12.275c-0.803,1.071 -0.04,2.6 1.3,2.6h5.259l-0.777,6.214c-0.207,1.654 1.913,2.51 2.913,1.177L20.3,11.725c0.803,-1.071 0.04,-2.6 -1.3,-2.6h-5.259l0.777,-6.214ZM5.25,13.126l7.473,-9.964 -0.841,6.73a0.875,0.875 0,0 0,0.868 0.984h6l-7.473,9.964 0.841,-6.73a0.875,0.875 0,0 0,-0.868 -0.984h-6ZM19.33,16.49c0.347,-0.807 1.493,-0.807 1.84,0l2.02,4.715a0.75,0.75 0,1 1,-1.38 0.59l-0.287,-0.67h-2.546l-0.288,0.67a0.75,0.75 0,1 1,-1.378 -0.59l2.02,-4.714ZM20.25,18 L20.988,19.875h-1.476L20.25,18Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_flash_slash_24.xml b/app/src/main/res/drawable/symbol_flash_slash_24.xml
new file mode 100644
index 0000000000..17fafd85b2
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_flash_slash_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:pathData="m12.723,3.16 l-2.659,3.546 -1.25,-1.25 2.791,-3.722c1,-1.333 3.12,-0.477 2.913,1.177l-0.777,6.214H19c1.34,0 2.104,1.529 1.3,2.6l-2.236,2.98 -1.25,-1.25 1.936,-2.58h-4.516l-2.2,-2.2 0.69,-5.514ZM5.936,9.294l1.25,1.25 -1.936,2.581h4.516l2.2,2.2 -0.69,5.514 2.66,-3.545 1.25,1.25 -2.791,3.722c-1,1.333 -3.12,0.477 -2.913,-1.177l0.777,-6.214H5c-1.339,0 -2.103,-1.529 -1.3,-2.6l2.236,-2.98ZM4.119,2.881A0.875,0.875 0,1 0,2.88 4.12l16.97,16.97a0.875,0.875 0,0 0,1.238 -1.237L4.12,2.882Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_forward_24.xml b/app/src/main/res/drawable/symbol_forward_24.xml
new file mode 100644
index 0000000000..ec97cec78d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_forward_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:pathData="M13.42,2.22c-1.053,-0.912 -2.69,-0.164 -2.69,1.228v2.268c-4.932,0.672 -9.21,4.846 -9.21,10.009 0,1.936 0.546,3.748 1.492,5.286 0.412,0.669 1.148,0.615 1.535,0.443 0.382,-0.17 0.81,-0.59 0.81,-1.208 0,-1.37 0.403,-2.648 1.323,-3.594 0.801,-0.822 2.077,-1.477 4.05,-1.656v2.056c0,1.392 1.637,2.14 2.69,1.229l7.854,-6.803a1.625,1.625 0,0 0,0 -2.456L13.42,2.22ZM12.48,3.722 L20.02,10.25 12.48,16.779v-2.705a0.875,0.875 0,0 0,-0.89 -0.875c-2.817,0.048 -4.843,0.877 -6.163,2.232 -0.89,0.914 -1.409,2.016 -1.652,3.16a8.336,8.336 0,0 1,-0.504 -2.866c0,-4.397 3.91,-8.094 8.383,-8.34a0.875,0.875 0,0 0,0.827 -0.875L12.481,3.722Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_grid_square_24.xml b/app/src/main/res/drawable/symbol_grid_square_24.xml
new file mode 100644
index 0000000000..45196b375c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_grid_square_24.xml
@@ -0,0 +1,10 @@
+<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="M6.165,2.125c-0.53,0 -0.98,0 -1.35,0.03 -0.387,0.032 -0.762,0.101 -1.12,0.283a2.881,2.881 0,0 0,-1.257 1.257c-0.182,0.358 -0.251,0.733 -0.283,1.12 -0.03,0.37 -0.03,0.82 -0.03,1.35v1.17c0,0.53 0,0.98 0.03,1.35 0.032,0.387 0.101,0.762 0.283,1.12 0.276,0.541 0.716,0.981 1.257,1.257 0.358,0.182 0.733,0.251 1.12,0.283 0.37,0.03 0.82,0.03 1.35,0.03h1.17c0.53,0 0.98,0 1.35,-0.03 0.387,-0.032 0.762,-0.101 1.12,-0.283a2.881,2.881 0,0 0,1.257 -1.257c0.182,-0.358 0.251,-0.733 0.283,-1.12 0.03,-0.37 0.03,-0.82 0.03,-1.35v-1.17c0,-0.53 0,-0.98 -0.03,-1.35 -0.032,-0.387 -0.101,-0.762 -0.283,-1.12a2.875,2.875 0,0 0,-1.257 -1.257c-0.358,-0.182 -0.733,-0.251 -1.12,-0.283 -0.37,-0.03 -0.82,-0.03 -1.35,-0.03h-1.17ZM4.49,3.998c0.07,-0.036 0.19,-0.076 0.469,-0.099 0.29,-0.023 0.668,-0.024 1.242,-0.024h1.1c0.574,0 0.953,0 1.242,0.024 0.28,0.023 0.399,0.063 0.469,0.099 0.211,0.107 0.384,0.28 0.491,0.491 0.036,0.07 0.076,0.19 0.099,0.469 0.023,0.29 0.024,0.668 0.024,1.242v1.1c0,0.574 0,0.953 -0.024,1.242 -0.023,0.28 -0.063,0.399 -0.099,0.469a1.12,1.12 0,0 1,-0.491 0.491c-0.07,0.036 -0.19,0.076 -0.469,0.099 -0.29,0.023 -0.668,0.024 -1.242,0.024L6.2,9.625c-0.574,0 -0.953,0 -1.242,-0.024 -0.28,-0.023 -0.399,-0.063 -0.469,-0.099a1.125,1.125 0,0 1,-0.491 -0.491c-0.036,-0.07 -0.076,-0.19 -0.099,-0.469 -0.023,-0.29 -0.024,-0.668 -0.024,-1.242L3.875,6.2c0,-0.574 0,-0.953 0.024,-1.242 0.023,-0.28 0.063,-0.399 0.099,-0.469a1.12,1.12 0,0 1,0.491 -0.491ZM6.165,12.625c-0.53,0 -0.98,0 -1.35,0.03 -0.387,0.032 -0.762,0.101 -1.12,0.283a2.881,2.881 0,0 0,-1.257 1.257c-0.182,0.358 -0.251,0.732 -0.283,1.12 -0.03,0.37 -0.03,0.82 -0.03,1.35v1.17c0,0.53 0,0.98 0.03,1.35 0.032,0.388 0.101,0.762 0.283,1.12 0.276,0.541 0.716,0.981 1.257,1.257 0.358,0.182 0.733,0.251 1.12,0.283 0.37,0.03 0.82,0.03 1.35,0.03h1.17c0.53,0 0.98,0 1.35,-0.03 0.387,-0.032 0.762,-0.101 1.12,-0.283a2.881,2.881 0,0 0,1.257 -1.257c0.182,-0.358 0.251,-0.732 0.283,-1.12 0.03,-0.37 0.03,-0.82 0.03,-1.35v-1.17c0,-0.53 0,-0.98 -0.03,-1.35 -0.032,-0.387 -0.101,-0.762 -0.283,-1.12a2.874,2.874 0,0 0,-1.257 -1.257c-0.358,-0.182 -0.733,-0.251 -1.12,-0.283 -0.37,-0.03 -0.82,-0.03 -1.35,-0.03h-1.17ZM4.49,14.498c0.07,-0.036 0.19,-0.076 0.469,-0.099 0.29,-0.023 0.668,-0.024 1.242,-0.024h1.1c0.574,0 0.953,0 1.242,0.024 0.28,0.023 0.399,0.063 0.469,0.099 0.211,0.107 0.384,0.28 0.491,0.491 0.036,0.07 0.076,0.19 0.099,0.469 0.023,0.29 0.024,0.667 0.024,1.242v1.1c0,0.575 0,0.953 -0.024,1.242 -0.023,0.28 -0.063,0.399 -0.099,0.469a1.12,1.12 0,0 1,-0.491 0.491c-0.07,0.036 -0.19,0.076 -0.469,0.099 -0.29,0.023 -0.668,0.024 -1.242,0.024L6.2,20.125c-0.574,0 -0.953,0 -1.242,-0.024 -0.28,-0.023 -0.399,-0.063 -0.469,-0.099a1.125,1.125 0,0 1,-0.491 -0.491c-0.036,-0.07 -0.076,-0.19 -0.099,-0.469 -0.023,-0.29 -0.024,-0.668 -0.024,-1.242v-1.1c0,-0.575 0,-0.953 0.024,-1.242 0.023,-0.28 0.063,-0.399 0.099,-0.469a1.12,1.12 0,0 1,0.491 -0.491ZM16.665,2.125h1.17c0.53,0 0.98,0 1.35,0.03 0.388,0.032 0.762,0.101 1.12,0.283 0.541,0.276 0.981,0.716 1.257,1.257 0.182,0.358 0.251,0.733 0.283,1.12 0.03,0.37 0.03,0.82 0.03,1.35v1.17c0,0.53 0,0.98 -0.03,1.35 -0.032,0.387 -0.101,0.762 -0.283,1.12a2.881,2.881 0,0 1,-1.257 1.257c-0.358,0.182 -0.732,0.251 -1.12,0.283 -0.37,0.03 -0.82,0.03 -1.35,0.03h-1.17c-0.53,0 -0.98,0 -1.35,-0.03 -0.387,-0.032 -0.762,-0.101 -1.12,-0.283a2.874,2.874 0,0 1,-1.257 -1.257c-0.182,-0.358 -0.251,-0.733 -0.283,-1.12 -0.03,-0.37 -0.03,-0.82 -0.03,-1.35v-1.17c0,-0.53 0,-0.98 0.03,-1.35 0.032,-0.387 0.101,-0.762 0.283,-1.12a2.881,2.881 0,0 1,1.257 -1.257c0.358,-0.182 0.732,-0.251 1.12,-0.283 0.37,-0.03 0.82,-0.03 1.35,-0.03ZM15.458,3.899c-0.28,0.023 -0.399,0.063 -0.469,0.099a1.12,1.12 0,0 0,-0.491 0.491c-0.036,0.07 -0.076,0.19 -0.099,0.469 -0.023,0.29 -0.024,0.668 -0.024,1.242v1.1c0,0.574 0,0.953 0.024,1.242 0.023,0.28 0.063,0.399 0.099,0.469 0.107,0.211 0.28,0.384 0.491,0.491 0.07,0.036 0.19,0.076 0.469,0.099 0.29,0.023 0.667,0.024 1.242,0.024h1.1c0.575,0 0.953,0 1.242,-0.024 0.28,-0.023 0.399,-0.063 0.469,-0.099a1.12,1.12 0,0 0,0.491 -0.491c0.036,-0.07 0.076,-0.19 0.099,-0.469 0.023,-0.29 0.024,-0.668 0.024,-1.242L20.125,6.2c0,-0.574 0,-0.953 -0.024,-1.242 -0.023,-0.28 -0.063,-0.399 -0.099,-0.469a1.125,1.125 0,0 0,-0.491 -0.491c-0.07,-0.036 -0.19,-0.076 -0.469,-0.099 -0.29,-0.023 -0.668,-0.024 -1.242,-0.024h-1.1c-0.575,0 -0.953,0 -1.242,0.024ZM16.665,12.625c-0.53,0 -0.98,0 -1.35,0.03 -0.387,0.032 -0.762,0.101 -1.12,0.283a2.881,2.881 0,0 0,-1.257 1.257c-0.182,0.358 -0.251,0.732 -0.283,1.12 -0.03,0.37 -0.03,0.82 -0.03,1.35v1.17c0,0.53 0,0.98 0.03,1.35 0.032,0.388 0.101,0.762 0.283,1.12 0.276,0.541 0.716,0.981 1.257,1.257 0.358,0.182 0.732,0.251 1.12,0.283 0.37,0.03 0.82,0.03 1.35,0.03h1.17c0.53,0 0.98,0 1.35,-0.03 0.388,-0.032 0.762,-0.101 1.12,-0.283a2.881,2.881 0,0 0,1.257 -1.257c0.182,-0.358 0.251,-0.732 0.283,-1.12 0.03,-0.37 0.03,-0.82 0.03,-1.35v-1.17c0,-0.53 0,-0.98 -0.03,-1.35 -0.032,-0.387 -0.101,-0.762 -0.283,-1.12a2.874,2.874 0,0 0,-1.257 -1.257c-0.358,-0.182 -0.732,-0.251 -1.12,-0.283 -0.37,-0.03 -0.82,-0.03 -1.35,-0.03h-1.17ZM14.989,14.498c0.07,-0.036 0.19,-0.076 0.469,-0.099 0.29,-0.023 0.667,-0.024 1.242,-0.024h1.1c0.575,0 0.953,0 1.242,0.024 0.28,0.023 0.399,0.063 0.469,0.099 0.211,0.107 0.384,0.28 0.491,0.491 0.036,0.07 0.076,0.19 0.099,0.469 0.023,0.29 0.024,0.667 0.024,1.242v1.1c0,0.575 0,0.953 -0.024,1.242 -0.023,0.28 -0.063,0.399 -0.099,0.469a1.12,1.12 0,0 1,-0.491 0.491c-0.07,0.036 -0.19,0.076 -0.469,0.099 -0.29,0.023 -0.668,0.024 -1.242,0.024h-1.1c-0.575,0 -0.953,0 -1.242,-0.024 -0.28,-0.023 -0.399,-0.063 -0.469,-0.099a1.126,1.126 0,0 1,-0.491 -0.491c-0.036,-0.07 -0.076,-0.19 -0.099,-0.469 -0.023,-0.29 -0.024,-0.668 -0.024,-1.242v-1.1c0,-0.575 0,-0.953 0.024,-1.242 0.023,-0.28 0.063,-0.399 0.099,-0.469a1.12,1.12 0,0 1,0.491 -0.491Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_group_20.xml b/app/src/main/res/drawable/symbol_group_20.xml
new file mode 100644
index 0000000000..a567b109f3
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_group_20.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,7.148c0,-2.133 1.434,-4.023 3.5,-4.023S20,5.015 20,7.148c0,1.082 -0.353,2.11 -0.952,2.885 -0.599,0.774 -1.49,1.342 -2.548,1.342 -1.057,0 -1.949,-0.568 -2.548,-1.342 -0.6,-0.774 -0.952,-1.803 -0.952,-2.885ZM16.5,4.875c-0.833,0 -1.75,0.817 -1.75,2.273 0,0.713 0.235,1.36 0.586,1.814 0.35,0.453 0.771,0.663 1.164,0.663 0.393,0 0.813,-0.21 1.164,-0.663 0.351,-0.453 0.586,-1.1 0.586,-1.814 0,-1.456 -0.917,-2.273 -1.75,-2.273Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.5,12.625c1.115,0 2.186,0.242 3.136,0.676a7.726,7.726 0,0 0,-1.237 1.382,5.887 5.887,0 0,0 -1.899,-0.308c-2.675,0 -4.72,1.705 -5.072,3.75h5.723a7.34,7.34 0,0 0,0.061 1.75H1.757A1.128,1.128 0,0 1,0.625 18.75c0,-3.489 3.191,-6.125 6.875,-6.125Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M16.5,12.625c-3.684,0 -6.875,2.636 -6.875,6.125 0,0.654 0.54,1.125 1.132,1.125h11.486c0.593,0 1.132,-0.471 1.132,-1.125 0,-3.489 -3.191,-6.125 -6.875,-6.125ZM16.5,14.375c2.675,0 4.72,1.705 5.072,3.75L11.428,18.125c0.351,-2.045 2.397,-3.75 5.072,-3.75ZM7.5,3.125c-2.066,0 -3.5,1.89 -3.5,4.023 0,1.082 0.353,2.11 0.952,2.885 0.599,0.774 1.49,1.342 2.548,1.342 1.057,0 1.949,-0.568 2.548,-1.342 0.6,-0.774 0.952,-1.803 0.952,-2.885 0,-2.133 -1.434,-4.023 -3.5,-4.023ZM5.75,7.148c0,-1.456 0.917,-2.273 1.75,-2.273s1.75,0.817 1.75,2.273c0,0.713 -0.235,1.36 -0.586,1.814 -0.35,0.453 -0.771,0.663 -1.164,0.663 -0.393,0 -0.813,-0.21 -1.164,-0.663 -0.351,-0.453 -0.586,-1.1 -0.586,-1.814Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_group_24.xml b/app/src/main/res/drawable/symbol_group_24.xml
new file mode 100644
index 0000000000..9418b74976
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_group_24.xml
@@ -0,0 +1,17 @@
+<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="M13,7.148c0,-2.133 1.434,-4.023 3.5,-4.023S20,5.015 20,7.148c0,1.082 -0.353,2.11 -0.952,2.885 -0.599,0.774 -1.49,1.342 -2.548,1.342 -1.057,0 -1.949,-0.568 -2.548,-1.342 -0.6,-0.774 -0.952,-1.803 -0.952,-2.885ZM16.5,4.875c-0.833,0 -1.75,0.817 -1.75,2.273 0,0.713 0.235,1.36 0.586,1.814 0.35,0.453 0.771,0.663 1.164,0.663 0.393,0 0.813,-0.21 1.164,-0.663 0.351,-0.453 0.586,-1.1 0.586,-1.814 0,-1.456 -0.917,-2.273 -1.75,-2.273Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.5,12.625c1.115,0 2.186,0.242 3.136,0.676a7.726,7.726 0,0 0,-1.237 1.382,5.887 5.887,0 0,0 -1.899,-0.308c-2.675,0 -4.72,1.705 -5.072,3.75h5.723a7.34,7.34 0,0 0,0.061 1.75H1.757A1.128,1.128 0,0 1,0.625 18.75c0,-3.489 3.191,-6.125 6.875,-6.125Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M16.5,12.625c-3.684,0 -6.875,2.636 -6.875,6.125 0,0.654 0.54,1.125 1.132,1.125h11.486c0.593,0 1.132,-0.471 1.132,-1.125 0,-3.489 -3.191,-6.125 -6.875,-6.125ZM16.5,14.375c2.675,0 4.72,1.705 5.072,3.75L11.428,18.125c0.351,-2.045 2.397,-3.75 5.072,-3.75ZM7.5,3.125c-2.066,0 -3.5,1.89 -3.5,4.023 0,1.082 0.353,2.11 0.952,2.885 0.599,0.774 1.49,1.342 2.548,1.342 1.057,0 1.949,-0.568 2.548,-1.342 0.6,-0.774 0.952,-1.803 0.952,-2.885 0,-2.133 -1.434,-4.023 -3.5,-4.023ZM5.75,7.148c0,-1.456 0.917,-2.273 1.75,-2.273s1.75,0.817 1.75,2.273c0,0.713 -0.235,1.36 -0.586,1.814 -0.35,0.453 -0.771,0.663 -1.164,0.663 -0.393,0 -0.813,-0.21 -1.164,-0.663 -0.351,-0.453 -0.586,-1.1 -0.586,-1.814Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_info_24.xml b/app/src/main/res/drawable/symbol_info_24.xml
new file mode 100644
index 0000000000..c62d3c6632
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_info_24.xml
@@ -0,0 +1,13 @@
+<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="M13.125,16.125v-4.914c0,-0.093 0,-0.19 -0.007,-0.273a0.88,0.88 0,0 0,-0.088 -0.335,0.875 0.875,0 0,0 -0.383,-0.383 0.88,0.88 0,0 0,-0.335 -0.088c-0.083,-0.007 -0.18,-0.007 -0.273,-0.007L10.5,10.125a0.75,0.75 0,0 0,0 1.5h0.875v4.5L10.25,16.125a0.75,0.75 0,0 0,0 1.5h4a0.75,0.75 0,0 0,0 -1.5h-1.125ZM10.624,7.251a1.376,1.376 0,1 1,2.752 0,1.376 1.376,0 0,1 -2.752,0Z"
+      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"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_info_compact_16.xml b/app/src/main/res/drawable/symbol_info_compact_16.xml
new file mode 100644
index 0000000000..966a8ef6ec
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_info_compact_16.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M0,0h16v16H0z"/>
+    <path
+        android:pathData="M7.475,10.85L7.475,7.775h-0.662a0.587,0.587 0,1 1,0 -1.175h1.232a0.903,0.903 0,0 1,0.281 0.032,0.65 0.65,0 0,1 0.417,0.417 0.893,0.893 0,0 1,0.032 0.281v3.52h0.913a0.587,0.587 0,1 1,0 1.175L6.563,12.025a0.587,0.587 0,1 1,0 -1.175h0.912ZM6.975,4.688a0.962,0.962 0,1 1,1.925 0,0.962 0.962,0 0,1 -1.925,0Z"
+        android:fillColor="#000"/>
+    <path
+        android:pathData="M0.85,8a7.15,7.15 0,1 1,14.3 0A7.15,7.15 0,0 1,0.85 8ZM8,2.15a5.85,5.85 0,1 0,0 11.7,5.85 5.85,0 0,0 0,-11.7Z"
+        android:fillColor="#000"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_list_bullet_24.xml b/app/src/main/res/drawable/symbol_list_bullet_24.xml
new file mode 100644
index 0000000000..834c281f65
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_list_bullet_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:pathData="M2.25,5.5a1.5,1.5 0,1 1,3 0,1.5 1.5,0 0,1 -3,0ZM8.5,4.625a0.875,0.875 0,1 0,0 1.75L21,6.375a0.875,0.875 0,0 0,0 -1.75L8.5,4.625ZM8.5,11.125a0.875,0.875 0,0 0,0 1.75L21,12.875a0.875,0.875 0,0 0,0 -1.75L8.5,11.125ZM7.625,18.5c0,-0.483 0.392,-0.875 0.875,-0.875L21,17.625a0.875,0.875 0,0 1,0 1.75L8.5,19.375a0.875,0.875 0,0 1,-0.875 -0.875ZM3.75,10.5a1.5,1.5 0,1 0,0 3,1.5 1.5,0 0,0 0,-3ZM2.25,18.5a1.5,1.5 0,1 1,3 0,1.5 1.5,0 0,1 -3,0Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_location_circle_24.xml b/app/src/main/res/drawable/symbol_location_circle_24.xml
new file mode 100644
index 0000000000..8b6a280c4c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_location_circle_24.xml
@@ -0,0 +1,14 @@
+<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="M16.954,8.682c0.432,-1.032 -0.605,-2.068 -1.636,-1.636l-8.962,3.752c-1.074,0.45 -1.004,1.994 0.107,2.345l3.34,1.054 1.054,3.34c0.351,1.11 1.896,1.18 2.345,0.107l3.752,-8.962ZM7.916,11.92l1.584,-0.541 3.75,-1.57 1.743,-0.802 -0.802,1.743 -1.57,3.75 -0.54,1.586 -0.348,-1.586 -0.34,-1.078a1.25,1.25 0,0 0,-0.816 -0.815l-1.077,-0.34 -1.584,-0.347Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,1.125C5.994,1.125 1.125,5.994 1.125,12S5.994,22.875 12,22.875 22.875,18.006 22.875,12 18.006,1.125 12,1.125ZM2.875,12a9.125,9.125 0,1 1,18.25 0,9.125 9.125,0 0,1 -18.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_minus_circle_24.xml b/app/src/main/res/drawable/symbol_minus_circle_24.xml
new file mode 100644
index 0000000000..81543cfc5d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_minus_circle_24.xml
@@ -0,0 +1,13 @@
+<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="M16.5,12.875a0.875,0.875 0,0 0,0 -1.75h-9a0.875,0.875 0,0 0,0 1.75h9Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M12,1.125C5.994,1.125 1.125,5.994 1.125,12S5.994,22.875 12,22.875 22.875,18.006 22.875,12 18.006,1.125 12,1.125ZM2.875,12a9.125,9.125 0,1 1,18.25 0,9.125 9.125,0 0,1 -18.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_more_vertical_24.xml b/app/src/main/res/drawable/symbol_more_vertical_24.xml
new file mode 100644
index 0000000000..c3a34e9db6
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_more_vertical_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="12"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,6.75A1.625,1.625 0,1 0,6 3.5a1.625,1.625 0,0 0,0 3.25ZM7.625,12a1.625,1.625 0,1 1,-3.25 0,1.625 1.625,0 0,1 3.25,0ZM7.625,18.875a1.625,1.625 0,1 1,-3.25 0,1.625 1.625,0 0,1 3.25,0Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_open_24.xml b/app/src/main/res/drawable/symbol_open_24.xml
new file mode 100644
index 0000000000..2fc9aef17c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_open_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:pathData="M9.362,2.125c-1.088,0 -1.958,0 -2.66,0.057 -0.722,0.06 -1.343,0.183 -1.915,0.474a4.875,4.875 0,0 0,-2.13 2.13c-0.292,0.573 -0.416,1.194 -0.475,1.916 -0.057,0.702 -0.057,1.572 -0.057,2.66v5.276c0,1.088 0,1.958 0.057,2.66 0.06,0.722 0.183,1.344 0.474,1.915a4.875,4.875 0,0 0,2.13 2.13c0.573,0.292 1.194,0.416 1.916,0.475 0.702,0.057 1.572,0.057 2.66,0.057h5.276c1.088,0 1.958,0 2.66,-0.057 0.722,-0.06 1.344,-0.183 1.915,-0.474a4.875,4.875 0,0 0,2.13 -2.13c0.292,-0.572 0.416,-1.194 0.475,-1.916 0.057,-0.702 0.057,-1.572 0.057,-2.66V13a0.875,0.875 0,0 0,-1.75 0v1.6c0,1.135 0,1.933 -0.052,2.556 -0.05,0.613 -0.144,0.979 -0.289,1.263a3.125,3.125 0,0 1,-1.365 1.365c-0.284,0.145 -0.65,0.24 -1.263,0.29 -0.623,0.05 -1.421,0.051 -2.556,0.051H9.4c-1.135,0 -1.933,0 -2.556,-0.052 -0.613,-0.05 -0.979,-0.144 -1.263,-0.289a3.125,3.125 0,0 1,-1.365 -1.365c-0.145,-0.284 -0.24,-0.65 -0.29,-1.263 -0.05,-0.623 -0.051,-1.421 -0.051,-2.556V9.4c0,-1.135 0,-1.933 0.052,-2.556 0.05,-0.613 0.144,-0.979 0.289,-1.263 0.3,-0.588 0.777,-1.066 1.365,-1.365 0.284,-0.145 0.65,-0.24 1.263,-0.29 0.623,-0.05 1.421,-0.051 2.556,-0.051H11a0.875,0.875 0,0 0,0 -1.75H9.362Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M21.875,3A0.875,0.875 0,0 0,21 2.125h-6.5a0.875,0.875 0,0 0,0 1.75h4.639L17.63,5.131l-7.75,7.75a0.875,0.875 0,1 0,1.238 1.238l7.75,-7.75 1.256,-1.508V9.5a0.875,0.875 0,0 0,1.75 0V3Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_payment_bold_16.xml b/app/src/main/res/drawable/symbol_payment_bold_16.xml
new file mode 100644
index 0000000000..56f8ffb185
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_payment_bold_16.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,8.96c0,-0.666 0,-1.226 -0.037,-1.683 -0.04,-0.48 -0.124,-0.934 -0.345,-1.366a3.5,3.5 0,0 0,-1.529 -1.53c-0.432,-0.22 -0.887,-0.304 -1.366,-0.344C19.266,4 18.706,4 18.04,4L5.96,4c-0.666,0 -1.226,0 -1.683,0.037 -0.48,0.04 -0.934,0.124 -1.366,0.344a3.5,3.5 0,0 0,-1.53 1.53c-0.22,0.432 -0.304,0.887 -0.344,1.366C1,7.734 1,8.294 1,8.96v6.08c0,0.666 0,1.226 0.037,1.683 0.04,0.48 0.124,0.934 0.344,1.366a3.5,3.5 0,0 0,1.53 1.53c0.432,0.22 0.887,0.305 1.366,0.344C4.734,20 5.294,20 5.96,20h12.08c0.666,0 1.226,0 1.683,-0.037 0.48,-0.04 0.934,-0.124 1.366,-0.345a3.5,3.5 0,0 0,1.53 -1.529c0.22,-0.432 0.305,-0.887 0.344,-1.366 0.037,-0.457 0.037,-1.017 0.037,-1.683L23,8.96ZM20.837,6.819c0.052,0.103 0.103,0.265 0.132,0.62 0.023,0.274 0.029,0.61 0.03,1.061L3.001,8.5c0.001,-0.451 0.007,-0.787 0.03,-1.06 0.029,-0.356 0.08,-0.518 0.132,-0.621a1.5,1.5 0,0 1,0.656 -0.656c0.103,-0.052 0.265,-0.103 0.62,-0.132C4.806,6 5.283,6 6,6h12c0.717,0 1.194,0 1.56,0.03 0.356,0.03 0.518,0.081 0.621,0.133a1.5,1.5 0,0 1,0.655 0.656ZM3,15v-4h18v4c0,0.717 0,1.194 -0.03,1.56 -0.03,0.356 -0.081,0.518 -0.133,0.621a1.5,1.5 0,0 1,-0.656 0.655c-0.103,0.053 -0.265,0.104 -0.62,0.133C19.194,18 18.717,18 18,18L6,18c-0.717,0 -1.194,0 -1.56,-0.03 -0.356,-0.03 -0.518,-0.081 -0.621,-0.133a1.5,1.5 0,0 1,-0.656 -0.656c-0.052,-0.103 -0.103,-0.265 -0.132,-0.62C3,16.194 3,15.717 3,15Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_person_20.xml b/app/src/main/res/drawable/symbol_person_20.xml
new file mode 100644
index 0000000000..2771f5ea8b
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_20.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1.125c-2.62,0 -4.5,2.413 -4.5,5.234 0,1.427 0.464,2.777 1.244,3.787 0.78,1.01 1.922,1.729 3.256,1.729 1.334,0 2.476,-0.719 3.256,-1.729 0.78,-1.01 1.244,-2.36 1.244,-3.787 0,-2.821 -1.88,-5.234 -4.5,-5.234ZM9.25,6.359c0,-2.149 1.366,-3.484 2.75,-3.484s2.75,1.335 2.75,3.484c0,1.06 -0.347,2.029 -0.88,2.718 -0.532,0.69 -1.202,1.048 -1.87,1.048 -0.668,0 -1.338,-0.359 -1.87,-1.048 -0.533,-0.689 -0.88,-1.659 -0.88,-2.718ZM12,13.125c-4.59,0 -8.599,2.808 -9.277,6.73 -0.204,1.182 0.791,2.02 1.777,2.02h15c0.986,0 1.981,-0.838 1.777,-2.02 -0.678,-3.922 -4.687,-6.73 -9.277,-6.73ZM4.454,20.116c0.516,-2.85 3.585,-5.241 7.546,-5.241 3.961,0 7.03,2.39 7.546,5.241a0.117,0.117 0,0 1,-0.046 0.009h-15a0.116,0.116 0,0 1,-0.046 -0.009Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_person_40.xml b/app/src/main/res/drawable/symbol_person_40.xml
new file mode 100644
index 0000000000..7dde37bf2b
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_40.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1.125c-2.62,0 -4.5,2.413 -4.5,5.234 0,1.427 0.464,2.777 1.244,3.787 0.78,1.01 1.922,1.729 3.256,1.729 1.334,0 2.476,-0.719 3.256,-1.729 0.78,-1.01 1.244,-2.36 1.244,-3.787 0,-2.821 -1.88,-5.234 -4.5,-5.234ZM9.25,6.359c0,-2.149 1.366,-3.484 2.75,-3.484s2.75,1.335 2.75,3.484c0,1.06 -0.347,2.029 -0.88,2.718 -0.532,0.69 -1.202,1.048 -1.87,1.048 -0.668,0 -1.338,-0.359 -1.87,-1.048 -0.533,-0.689 -0.88,-1.659 -0.88,-2.718ZM12,13.125c-4.59,0 -8.599,2.808 -9.277,6.73 -0.204,1.182 0.791,2.02 1.777,2.02h15c0.986,0 1.981,-0.838 1.777,-2.02 -0.678,-3.922 -4.687,-6.73 -9.277,-6.73ZM4.454,20.116c0.516,-2.85 3.585,-5.241 7.546,-5.241 3.961,0 7.03,2.39 7.546,5.241a0.117,0.117 0,0 1,-0.046 0.009h-15a0.116,0.116 0,0 1,-0.046 -0.009Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_phone_24.xml b/app/src/main/res/drawable/symbol_phone_24.xml
new file mode 100644
index 0000000000..a5ba47d6d1
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_phone_24.xml
@@ -0,0 +1,10 @@
+<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="M4.255,2.726a2.904,2.904 0,0 1,4.365 0.296l2.169,2.853a2.904,2.904 0,0 1,-0.259 3.81l-1.05,1.051c0.033,0.094 0.09,0.224 0.182,0.39 0.275,0.496 0.767,1.14 1.42,1.793 0.652,0.652 1.296,1.144 1.791,1.419 0.167,0.092 0.297,0.15 0.39,0.182l1.051,-1.05a2.904,2.904 0,0 1,3.81 -0.259l2.854,2.169a2.904,2.904 0,0 1,0.296 4.365l-0.435,0.436c-1.57,1.569 -3.91,2.43 -6.163,1.658a20.074,20.074 0,0 1,-7.702 -4.813,20.073 20.073,0 0,1 -4.813,-7.701C1.39,7.07 2.251,4.73 3.82,3.16l0.436,-0.435ZM7.227,4.08a1.154,1.154 0,0 0,-1.735 -0.118l-0.435,0.436c-1.218,1.217 -1.745,2.884 -1.24,4.358a18.323,18.323 0,0 0,4.395 7.031,18.323 18.323,0 0,0 7.03,4.395c1.475,0.506 3.142,-0.022 4.36,-1.24l0.435,-0.435a1.154,1.154 0,0 0,-0.118 -1.735l-2.853,-2.168a1.154,1.154 0,0 0,-1.514 0.102L14.31,15.95c-0.414,0.414 -0.958,0.382 -1.262,0.323 -0.34,-0.066 -0.693,-0.22 -1.025,-0.404 -0.673,-0.375 -1.445,-0.978 -2.179,-1.712 -0.734,-0.734 -1.337,-1.506 -1.711,-2.18 -0.185,-0.33 -0.339,-0.683 -0.405,-1.024 -0.059,-0.304 -0.09,-0.848 0.323,-1.262l1.242,-1.242a1.154,1.154 0,0 0,0.102 -1.514L7.227,4.081ZM13.416,14.557h-0.013,0.013ZM9.442,10.583v0.013,-0.013Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_pin_24.xml b/app/src/main/res/drawable/symbol_pin_24.xml
new file mode 100644
index 0000000000..47aadf5a91
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_pin_24.xml
@@ -0,0 +1,10 @@
+<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="M16.68,1.778a2.281,2.281 0,0 0,-1.765 -0.675,1.907 1.907,0 0,0 -1.625,1.133 6.172,6.172 0,0 0,-0.425 3.663l-2.644,2.04c-1.984,-0.694 -4.115,-0.644 -5.879,0.277A1.934,1.934 0,0 0,3.295 9.85a2.288,2.288 0,0 0,0.679 1.726l3.474,3.475 -4.864,4.864a2,2 0,0 0,-0.483 0.782l-0.443,1.328a0.25,0.25 0,0 0,0.316 0.316l1.328,-0.443a2,2 0,0 0,0.782 -0.483l4.864,-4.864 3.475,3.475a2.288,2.288 0,0 0,1.726 0.678,1.933 1.933,0 0,0 1.636,-1.047c0.92,-1.763 0.97,-3.895 0.277,-5.879l2.04,-2.644a6.173,6.173 0,0 0,3.662 -0.425,1.907 1.907,0 0,0 1.133,-1.625 2.28,2.28 0,0 0,-0.675 -1.765l-5.541,-5.542ZM14.886,2.955a0.168,0.168 0,0 1,0.059 -0.077,0.206 0.206,0 0,1 0.1,-0.03 0.535,0.535 0,0 1,0.398 0.168l5.542,5.541a0.54,0.54 0,0 1,0.167 0.399,0.207 0.207,0 0,1 -0.03,0.1 0.168,0.168 0,0 1,-0.077 0.058,4.46 4.46,0 0,1 -3.052,0.2l-0.57,-0.163 -3.356,4.35 0.195,0.468c0.716,1.724 0.687,3.51 -0.029,4.88a0.188,0.188 0,0 1,-0.068 0.079,0.232 0.232,0 0,1 -0.11,0.03 0.542,0.542 0,0 1,-0.394 -0.169l-8.45,-8.45a0.542,0.542 0,0 1,-0.168 -0.394,0.231 0.231,0 0,1 0.03,-0.11 0.188,0.188 0,0 1,0.079 -0.068c1.37,-0.715 3.155,-0.745 4.88,-0.029l0.468,0.195 4.35,-3.355 -0.164,-0.57a4.46,4.46 0,0 1,0.2 -3.053Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_pin_slash_24.xml b/app/src/main/res/drawable/symbol_pin_slash_24.xml
new file mode 100644
index 0000000000..0d9a5a030c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_pin_slash_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:pathData="M4.69,8.048a6.333,6.333 0,0 0,-0.348 0.168A1.934,1.934 0,0 0,3.295 9.85a2.288,2.288 0,0 0,0.679 1.726l3.474,3.475 -4.864,4.864c-0.22,0.22 -0.385,0.487 -0.483,0.782l-0.443,1.328a0.25,0.25 0,0 0,0.316 0.316l1.328,-0.443a2,2 0,0 0,0.782 -0.483l4.864,-4.864 3.475,3.475a2.288,2.288 0,0 0,1.726 0.678,1.933 1.933,0 0,0 1.636,-1.047 6.4,6.4 0,0 0,0.168 -0.347l-1.364,-1.363a4.695,4.695 0,0 1,-0.356 0.9,0.188 0.188,0 0,1 -0.068,0.08 0.232,0.232 0,0 1,-0.11 0.03,0.542 0.542,0 0,1 -0.394,-0.169l-8.45,-8.45a0.542,0.542 0,0 1,-0.168 -0.394,0.232 0.232,0 0,1 0.03,-0.11 0.188,0.188 0,0 1,0.079 -0.068c0.284,-0.148 0.585,-0.267 0.9,-0.356L4.69,8.048ZM15.283,11.924 L17.423,9.151 17.993,9.314a4.46,4.46 0,0 0,3.052 -0.2,0.167 0.167,0 0,0 0.077,-0.058 0.204,0.204 0,0 0,0.03 -0.1,0.535 0.535,0 0,0 -0.167,-0.399l-5.542,-5.541a0.535,0.535 0,0 0,-0.398 -0.167,0.206 0.206,0 0,0 -0.1,0.029 0.168,0.168 0,0 0,-0.059 0.077,4.46 4.46,0 0,0 -0.2,3.053l0.163,0.57 -2.773,2.14 -1.248,-1.248 2.037,-1.571a6.172,6.172 0,0 1,0.425 -3.663,1.907 1.907,0 0,1 1.625,-1.133c0.638,-0.047 1.29,0.2 1.766,0.675l5.541,5.542c0.476,0.475 0.723,1.127 0.675,1.765a1.907,1.907 0,0 1,-1.133 1.625,6.173 6.173,0 0,1 -3.662,0.425l-1.571,2.037 -1.248,-1.248ZM3.619,2.381A0.875,0.875 0,1 0,2.38 3.62l18,18a0.875,0.875 0,1 0,1.238 -1.238l-18,-18Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_plus_24.xml b/app/src/main/res/drawable/symbol_plus_24.xml
new file mode 100644
index 0000000000..74e464cfb9
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_plus_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:pathData="M12.875,4.5a0.875,0.875 0,0 0,-1.75 0v6.625H4.5a0.875,0.875 0,0 0,0 1.75h6.625V19.5a0.875,0.875 0,0 0,1.75 0v-6.625H19.5a0.875,0.875 0,0 0,0 -1.75h-6.625V4.5Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_recent_24.xml b/app/src/main/res/drawable/symbol_recent_24.xml
new file mode 100644
index 0000000000..99db4809c5
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_recent_24.xml
@@ -0,0 +1,13 @@
+<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="M13.14,13.14a0.75,0.75 0,0 0,0.36 -0.666l-0.25,-7.25a0.75,0.75 0,0 0,-1.5 0l-0.217,6.321 -4.319,0.206a0.75,0.75 0,0 0,0 1.498l5.25,0.25a0.75,0.75 0,0 0,0.676 -0.359Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M12,1.125C5.994,1.125 1.125,5.994 1.125,12S5.994,22.875 12,22.875 22.875,18.006 22.875,12 18.006,1.125 12,1.125ZM2.875,12a9.125,9.125 0,1 1,18.25 0,9.125 9.125,0 0,1 -18.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_refresh_24.xml b/app/src/main/res/drawable/symbol_refresh_24.xml
new file mode 100644
index 0000000000..fc10c9add4
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_refresh_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:pathData="M12.632,0.794a0.75,0.75 0,0 0,-1.132 0.645v0.698C6.279,2.397 2.125,6.714 2.125,12c0,5.454 4.421,9.875 9.875,9.875s9.875,-4.421 9.875,-9.875a9.844,9.844 0,0 0,-2.716 -6.802,0.875 0.875,0 0,0 -1.268,1.206A8.125,8.125 0,1 1,11.5 3.89v0.671a0.75,0.75 0,0 0,1.131 0.645l2.635,-1.56a0.75,0.75 0,0 0,0 -1.291L12.632,0.794Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_reply_24.xml b/app/src/main/res/drawable/symbol_reply_24.xml
new file mode 100644
index 0000000000..8d9ffe8981
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_reply_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:pathData="M9.436,2.22c1.053,-0.912 2.689,-0.164 2.689,1.228v2.268c4.933,0.672 9.21,4.846 9.21,10.009a10.06,10.06 0,0 1,-1.492 5.286c-0.411,0.669 -1.147,0.615 -1.535,0.443 -0.381,-0.17 -0.809,-0.59 -0.809,-1.208 0,-1.37 -0.403,-2.648 -1.324,-3.594 -0.8,-0.822 -2.076,-1.477 -4.05,-1.656v2.056c0,1.392 -1.636,2.14 -2.689,1.229l-7.854,-6.803a1.625,1.625 0,0 1,0 -2.456L9.436,2.22ZM10.375,3.722L2.836,10.25l7.539,6.529v-2.705a0.875,0.875 0,0 1,0.89 -0.875c2.817,0.048 4.844,0.877 6.164,2.232 0.89,0.914 1.409,2.016 1.652,3.16a8.336,8.336 0,0 0,0.504 -2.866c0,-4.397 -3.911,-8.094 -8.383,-8.34a0.875,0.875 0,0 1,-0.827 -0.875L10.375,3.722ZM2.727,10.156Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_reply_36.xml b/app/src/main/res/drawable/symbol_reply_36.xml
new file mode 100644
index 0000000000..f153a95293
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_reply_36.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:pathData="M9.436,2.22c1.053,-0.912 2.689,-0.164 2.689,1.228v2.268c4.933,0.672 9.21,4.846 9.21,10.009a10.06,10.06 0,0 1,-1.492 5.286c-0.411,0.669 -1.147,0.615 -1.535,0.443 -0.381,-0.17 -0.809,-0.59 -0.809,-1.208 0,-1.37 -0.403,-2.648 -1.324,-3.594 -0.8,-0.822 -2.076,-1.477 -4.05,-1.656v2.056c0,1.392 -1.636,2.14 -2.689,1.229l-7.854,-6.803a1.625,1.625 0,0 1,0 -2.456L9.436,2.22ZM10.375,3.722L2.836,10.25l7.539,6.529v-2.705a0.875,0.875 0,0 1,0.89 -0.875c2.817,0.048 4.844,0.877 6.164,2.232 0.89,0.914 1.409,2.016 1.652,3.16a8.336,8.336 0,0 0,0.504 -2.866c0,-4.397 -3.911,-8.094 -8.383,-8.34a0.875,0.875 0,0 1,-0.827 -0.875L10.375,3.722ZM2.727,10.156Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_reply_fill_24.xml b/app/src/main/res/drawable/symbol_reply_fill_24.xml
new file mode 100644
index 0000000000..4e8e777e12
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_reply_fill_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:pathData="M11.75,3.448c0,-1.071 -1.259,-1.646 -2.068,-0.945L1.827,9.305a1.25,1.25 0,0 0,0 1.89l7.855,6.802c0.81,0.701 2.068,0.126 2.068,-0.945v-2.46c2.27,0.128 3.76,0.84 4.694,1.799 1.005,1.032 1.43,2.414 1.43,3.855 0,0.432 0.302,0.738 0.587,0.865 0.289,0.128 0.787,0.153 1.063,-0.297a9.685,9.685 0,0 0,1.436 -5.09c0,-5.061 -4.303,-9.17 -9.21,-9.675V3.448Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_save_android_24.xml b/app/src/main/res/drawable/symbol_save_android_24.xml
new file mode 100644
index 0000000000..6a3a0e937b
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_save_android_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:pathData="M11.125,12V2.75a0.875,0.875 0,0 1,1.75 0V12l-0.126,1.764 3.632,-3.633a0.875,0.875 0,1 1,1.238 1.238l-5,5a0.875,0.875 0,0 1,-1.238 0l-5,-5A0.875,0.875 0,1 1,7.62 10.13l3.632,3.633L11.125,12Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M3.875,16.25a0.875,0.875 0,0 0,-1.75 0v1.5A3.375,3.375 0,0 0,5.5 21.125h13a3.375,3.375 0,0 0,3.375 -3.375v-1.5a0.875,0.875 0,0 0,-1.75 0v1.5c0,0.898 -0.727,1.625 -1.625,1.625h-13a1.625,1.625 0,0 1,-1.625 -1.625v-1.5Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_schedulemessage_24.xml b/app/src/main/res/drawable/symbol_schedulemessage_24.xml
new file mode 100644
index 0000000000..d007e77aec
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_schedulemessage_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:pathData="M12,2.875a9.125,9.125 0,0 0,-0.914 18.205,0.875 0.875,0 0,1 -0.172,1.741C5.417,22.276 1.125,17.64 1.125,12 1.125,5.994 5.994,1.125 12,1.125S22.875,5.994 22.875,12c0,0.84 -0.095,1.659 -0.276,2.446a0.875,0.875 0,0 1,-1.706 -0.392A9.125,9.125 0,0 0,12 2.875Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="m13.25,5.224 l0.249,7.223 0.001,0.054a1,1 0,0 1,-0.995 0.999h-0.008c-0.023,0 -0.047,0 -0.07,-0.003l-5.213,-0.248a0.75,0.75 0,0 1,0 -1.498l4.319,-0.206 0.217,-6.32a0.75,0.75 0,0 1,1.5 0ZM14,15.107a0.875,0.875 0,0 1,1.266 -0.783l7.287,3.643a0.875,0.875 0,0 1,0 1.566l-7.287,3.643A0.875,0.875 0,0 1,14 22.393L14,20.77c0,-0.376 0.241,-0.71 0.598,-0.83l3.57,-1.19 -3.57,-1.19a0.875,0.875 0,0 1,-0.598 -0.83v-1.623Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_settings_android_24.xml b/app/src/main/res/drawable/symbol_settings_android_24.xml
new file mode 100644
index 0000000000..f197fb7a99
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_settings_android_24.xml
@@ -0,0 +1,14 @@
+<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="M12,7.625a4.375,4.375 0,1 0,0 8.75,4.375 4.375,0 0,0 0,-8.75ZM9.375,12a2.625,2.625 0,1 1,5.25 0,2.625 2.625,0 0,1 -5.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.074,1.125a2.375,2.375 0,0 0,-2.356 2.08l-0.144,1.15a8.367,8.367 0,0 0,-1.48 0.856L6.026,4.76a2.375,2.375 0,0 0,-2.98 1L2.12,7.364a2.375,2.375 0,0 0,0.624 3.081l0.925,0.701a8.467,8.467 0,0 0,0 1.708l-0.925,0.7a2.375,2.375 0,0 0,-0.624 3.082l0.926,1.603a2.375,2.375 0,0 0,2.98 1.001l1.07,-0.451c0.46,0.332 0.955,0.62 1.479,0.855l0.144,1.15a2.375,2.375 0,0 0,2.356 2.081h1.852a2.375,2.375 0,0 0,2.357 -2.08l0.143,-1.15a8.366,8.366 0,0 0,1.48 -0.856l1.07,0.451a2.375,2.375 0,0 0,2.98 -1l0.925,-1.604a2.375,2.375 0,0 0,-0.623 -3.081l-0.926,-0.701a8.49,8.49 0,0 0,0 -1.708l0.926,-0.7a2.375,2.375 0,0 0,0.623 -3.082l-0.926,-1.603a2.375,2.375 0,0 0,-2.98 -1.001l-1.07,0.451a8.366,8.366 0,0 0,-1.479 -0.855l-0.143,-1.15a2.375,2.375 0,0 0,-2.357 -2.081h-1.852ZM10.454,3.422a0.625,0.625 0,0 1,0.62 -0.547h1.852c0.315,0 0.581,0.235 0.62,0.547l0.207,1.657c0.04,0.324 0.257,0.598 0.563,0.712a6.63,6.63 0,0 1,1.902 1.1,0.875 0.875,0 0,0 0.897,0.131l1.54,-0.65a0.625,0.625 0,0 1,0.785 0.264l0.925,1.603a0.625,0.625 0,0 1,-0.163 0.811l-1.333,1.008a0.875,0.875 0,0 0,-0.335 0.842,6.678 6.678,0 0,1 0,2.2 0.875,0.875 0,0 0,0.335 0.841l1.332,1.009c0.252,0.19 0.322,0.538 0.165,0.81l-0.926,1.604a0.625,0.625 0,0 1,-0.785 0.264l-1.54,-0.65a0.875,0.875 0,0 0,-0.897 0.131,6.618 6.618,0 0,1 -1.902,1.1 0.875,0.875 0,0 0,-0.563 0.712l-0.207,1.657a0.625,0.625 0,0 1,-0.62 0.547h-1.852a0.625,0.625 0,0 1,-0.62 -0.547l-0.207,-1.657a0.875,0.875 0,0 0,-0.562 -0.712,6.62 6.62,0 0,1 -1.902,-1.1 0.875,0.875 0,0 0,-0.898 -0.131l-1.54,0.65a0.625,0.625 0,0 1,-0.784 -0.264l-0.926,-1.603a0.625,0.625 0,0 1,0.164 -0.811l1.332,-1.008a0.875,0.875 0,0 0,0.335 -0.842,6.677 6.677,0 0,1 0,-2.2 0.875,0.875 0,0 0,-0.335 -0.841L3.799,9.05a0.625,0.625 0,0 1,-0.164 -0.81l0.926,-1.604a0.625,0.625 0,0 1,0.784 -0.264l1.54,0.65c0.3,0.127 0.646,0.076 0.898,-0.131a6.617,6.617 0,0 1,1.902 -1.1,0.875 0.875,0 0,0 0.562,-0.712l0.207,-1.657Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_switch_24.xml b/app/src/main/res/drawable/symbol_switch_24.xml
new file mode 100644
index 0000000000..39abfdcae0
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_switch_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:pathData="M2.137,11.5L1.44,11.5a0.75,0.75 0,0 0,-0.646 1.132l1.562,2.635c0.29,0.49 1,0.49 1.29,0l1.561,-2.635a0.75,0.75 0,0 0,-0.645 -1.132h-0.67a8.125,8.125 0,0 1,13.705 -5.39,0.875 0.875,0 1,0 1.206,-1.27A9.844,9.844 0,0 0,12 2.126c-5.286,0 -9.602,4.154 -9.863,9.375ZM19.439,12.375h0.677A8.125,8.125 0,0 1,6.11 17.596a0.875,0.875 0,0 0,-1.268 1.206A9.85,9.85 0,0 0,12 21.875c5.328,0 9.67,-4.22 9.868,-9.5h0.693a0.75,0.75 0,0 0,0.645 -1.132l-1.56,-2.635a0.75,0.75 0,0 0,-1.291 0l-1.562,2.635a0.75,0.75 0,0 0,0.646 1.132Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_timer_compact_24.xml b/app/src/main/res/drawable/symbol_timer_compact_24.xml
new file mode 100644
index 0000000000..209dedba63
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_timer_compact_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,4.35a0.65,0.65 0,0 1,0.65 0.65v3.051A1.149,1.149 0,0 1,8 10.15a1.15,1.15 0,0 1,-0.65 -2.099V5A0.65,0.65 0,0 1,8 4.35Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M8,0.35a0.65,0.65 0,0 1,0.65 0.65v0.881a6.62,6.62 0,0 1,3.57 1.48l0.695,-0.695a0.65,0.65 0,0 1,0.92 0.918l-0.695,0.696a6.65,6.65 0,1 1,-5.79 -2.399L7.35,1A0.65,0.65 0,0 1,8 0.35ZM8,3.15a5.35,5.35 0,1 0,0 10.7,5.35 5.35,0 0,0 0,-10.7Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_trash_24.xml b/app/src/main/res/drawable/symbol_trash_24.xml
new file mode 100644
index 0000000000..78af71f72c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_trash_24.xml
@@ -0,0 +1,13 @@
+<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="M8,17.027a0.75,0.75 0,1 0,1.5 -0.054l-0.25,-7a0.75,0.75 0,1 0,-1.5 0.054l0.25,7ZM12,9.25a0.75,0.75 0,0 1,0.75 0.75v7a0.75,0.75 0,0 1,-1.5 0v-7a0.75,0.75 0,0 1,0.75 -0.75ZM16.25,10.027a0.75,0.75 0,1 0,-1.5 -0.054l-0.25,7a0.75,0.75 0,1 0,1.5 0.054l0.25,-7Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M12,1.125c2.166,0 3.901,1.471 4.292,3.5L21,4.625a0.875,0.875 0,0 1,0 1.75h-0.676l-0.634,10.453c-0.054,0.895 -0.098,1.619 -0.18,2.204 -0.086,0.604 -0.22,1.132 -0.494,1.618a4.375,4.375 0,0 1,-1.895 1.784c-0.501,0.243 -1.036,0.346 -1.644,0.394 -0.59,0.047 -1.315,0.047 -2.212,0.047h-2.53c-0.897,0 -1.622,0 -2.212,-0.047 -0.608,-0.048 -1.143,-0.15 -1.644,-0.394a4.375,4.375 0,0 1,-1.895 -1.784c-0.274,-0.486 -0.408,-1.014 -0.493,-1.618 -0.083,-0.585 -0.127,-1.309 -0.181,-2.204L3.676,6.375L3,6.375a0.875,0.875 0,1 1,0 -1.75h4.708c0.39,-2.029 2.126,-3.5 4.292,-3.5ZM12,2.875c1.19,0 2.144,0.708 2.488,1.75L9.512,4.625c0.344,-1.042 1.298,-1.75 2.488,-1.75ZM5.43,6.375 L6.055,16.685c0.057,0.94 0.097,1.595 0.168,2.103 0.07,0.498 0.162,0.784 0.285,1.002 0.262,0.464 0.658,0.837 1.137,1.07 0.225,0.11 0.516,0.184 1.017,0.224 0.512,0.04 1.167,0.041 2.109,0.041h2.458c0.942,0 1.597,0 2.109,-0.041 0.501,-0.04 0.792,-0.115 1.017,-0.224a2.624,2.624 0,0 0,1.137 -1.07c0.123,-0.218 0.214,-0.504 0.285,-1.002 0.071,-0.508 0.111,-1.162 0.168,-2.102l0.625,-10.311L5.43,6.375Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</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
new file mode 100644
index 0000000000..a5c8fa2d34
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_x_circle_24.xml
@@ -0,0 +1,13 @@
+<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="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"/>
+</vector>
diff --git a/app/src/main/res/layout/camera_controls_portrait.xml b/app/src/main/res/layout/camera_controls_portrait.xml
index 6d751da660..14b564e9a5 100644
--- a/app/src/main/res/layout/camera_controls_portrait.xml
+++ b/app/src/main/res/layout/camera_controls_portrait.xml
@@ -27,6 +27,7 @@
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:src="@drawable/camerax_flash_toggle"
+        android:tint="@color/core_white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -40,9 +41,10 @@
         android:contentDescription="@string/CameraXFragment_change_camera_description"
         android:scaleType="centerInside"
         android:visibility="gone"
+        android:tint="@color/core_white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/ic_switch_camera_28"
+        app:srcCompat="@drawable/symbol_switch_24"
         tools:visibility="visible" />
 
     <FrameLayout
diff --git a/app/src/main/res/layout/chat_colors_fragment_context_menu.xml b/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
index 4117a0fc29..60b6f7c27d 100644
--- a/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
+++ b/app/src/main/res/layout/chat_colors_fragment_context_menu.xml
@@ -15,7 +15,7 @@
         android:gravity="center_vertical"
         android:minHeight="48dp"
         android:text="@string/ChatColorSelectionFragment__edit"
-        app:drawableEndCompat="@drawable/ic_compose_24"
+        app:drawableEndCompat="@drawable/symbol_edit_24"
         app:drawableTint="@color/signal_icon_tint_primary" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -25,7 +25,7 @@
         android:gravity="center_vertical"
         android:minHeight="48dp"
         android:text="@string/ChatColorSelectionFragment__duplicate"
-        app:drawableEndCompat="@drawable/ic_copy_24"
+        app:drawableEndCompat="@drawable/symbol_copy_android_24"
         app:drawableTint="@color/signal_icon_tint_primary" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -35,6 +35,6 @@
         android:gravity="center_vertical"
         android:minHeight="48dp"
         android:text="@string/ChatColorSelectionFragment__delete"
-        app:drawableEndCompat="@drawable/ic_trash_24"
+        app:drawableEndCompat="@drawable/symbol_trash_24"
         app:drawableTint="@color/signal_icon_tint_primary" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index 516332e2ce..189f7392fc 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -31,7 +31,7 @@
             android:layout_gravity="center"
             android:padding="9dp"
             android:tint="@color/signal_icon_tint_primary"
-            app:srcCompat="@drawable/ic_reply_24" />
+            app:srcCompat="@drawable/symbol_reply_24" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index 24fcee604f..70fa9d874f 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -31,7 +31,7 @@
             android:layout_gravity="center"
             android:padding="9dp"
             android:tint="@color/signal_icon_tint_primary"
-            app:srcCompat="@drawable/ic_reply_24" />
+            app:srcCompat="@drawable/symbol_reply_24" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
index 3c6d698f85..f5daccd86a 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -30,7 +30,7 @@
             android:layout_gravity="center"
             android:padding="9dp"
             android:tint="@color/signal_icon_tint_primary"
-            app:srcCompat="@drawable/ic_reply_24" />
+            app:srcCompat="@drawable/symbol_reply_24" />
 
     </FrameLayout>
 
@@ -245,7 +245,7 @@
             android:backgroundTint="@color/signal_colorSurfaceVariant"
             android:padding="6dp"
             android:tint="@color/signal_colorOnSurfaceVariant"
-            app:srcCompat="@drawable/ic_calendar_24" />
+            app:srcCompat="@drawable/symbol_calendar_24" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/conversation_item_sent_text_only.xml b/app/src/main/res/layout/conversation_item_sent_text_only.xml
index c656402608..1f5f78e1c8 100644
--- a/app/src/main/res/layout/conversation_item_sent_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_sent_text_only.xml
@@ -30,7 +30,7 @@
             android:padding="9dp"
             android:tint="@color/signal_icon_tint_primary"
             android:layout_gravity="center"
-            app:srcCompat="@drawable/ic_reply_24" />
+            app:srcCompat="@drawable/symbol_reply_24" />
 
     </FrameLayout>
 
@@ -126,7 +126,7 @@
             android:backgroundTint="@color/signal_colorSurfaceVariant"
             android:padding="6dp"
             android:tint="@color/signal_colorOnSurfaceVariant"
-            app:srcCompat="@drawable/ic_calendar_24" />
+            app:srcCompat="@drawable/symbol_calendar_24" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/copy_button.xml b/app/src/main/res/layout/copy_button.xml
index 8cd6b5bdc5..529ee49feb 100644
--- a/app/src/main/res/layout/copy_button.xml
+++ b/app/src/main/res/layout/copy_button.xml
@@ -12,7 +12,7 @@
     android:textAlignment="viewStart"
     android:textColor="@color/signal_colorOnSurface"
     app:cornerRadius="12dp"
-    app:icon="@drawable/ic_copy_24"
+    app:icon="@drawable/symbol_copy_android_24"
     app:iconGravity="end"
     app:iconSize="24dp"
     app:iconTint="@color/signal_colorOnSurface"
diff --git a/app/src/main/res/layout/database_migration_activity.xml b/app/src/main/res/layout/database_migration_activity.xml
deleted file mode 100644
index 72fc4f554a..0000000000
--- a/app/src/main/res/layout/database_migration_activity.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    tools:viewBindingIgnore="true"
-    android:layout_height="fill_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:fillViewport="true"
-    android:background="@drawable/background_pattern_repeat">
-
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center" >
-        
-        <LinearLayout android:id="@+id/prompt_layout"
-                      android:paddingEnd="16dip"
-                      android:paddingStart="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="gone"
-                      android:orientation="vertical">
-    
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/database_migration_activity__would_you_like_to_import_your_existing_text_messages"/>
-            
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center"
-                       android:src="@drawable/import_database"/>
-        
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginBottom="16dip"
-                      android:layout_marginTop="16dip"
-                      android:text="@string/database_migration_activity__the_default_system_database_will_not_be_modified"/>
-            
-            <LinearLayout android:orientation="horizontal"
-                          android:gravity="center"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="20dip">
-
-                <Button android:id="@+id/skip_button"
-                        android:text="@string/database_migration_activity__skip"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="7dip"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-                
-                <Button android:id="@+id/import_button"
-                        android:text="@string/database_migration_activity__import"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
-            </LinearLayout>
-        </LinearLayout>
-        
-        <LinearLayout android:id="@+id/progress_layout"
-                      android:paddingEnd="16dip"
-                      android:paddingStart="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="visible"
-                      android:orientation="vertical">
-    
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center"
-                       android:src="@drawable/import_database"/>
-            
-            
-            <TextView style="@style/Registration.Description"
-                      android:layout_width="fill_parent"
-                      android:layout_marginTop="34dip"
-                      android:layout_marginBottom="16dip"
-                      android:text="@string/database_migration_activity__this_could_take_a_moment_please_be_patient"/>
-            
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dip"
-                android:layout_weight="1.0" >
-
-                <TextView
-                    android:id="@+id/import_status"
-                    style="@style/Registration.Constant"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    tools:text="0/100"
-                    android:textSize="12.0sp" />
-
-                <TextView
-                    style="@style/Registration.Constant"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:text="@string/database_migration_activity__importing"
-                    android:textAllCaps="true"
-                    android:textSize="12.0sp"
-                    android:textStyle="normal" />
-            </RelativeLayout>
-
-            <ProgressBar
-                android:id="@+id/import_progress"
-                style="@style/Widget.ProgressBar.Horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="14.0dip"
-                android:layout_marginTop="2.0dip" />
-            
-        </LinearLayout>        
-    </FrameLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml b/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
index e05fa3df7f..740a7e426e 100644
--- a/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
+++ b/app/src/main/res/layout/enable_call_notification_settings_dialog_fragment.xml
@@ -25,7 +25,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         app:layout_gravity="center_vertical"
-        app:srcCompat="@drawable/ic_info_white_24"
+        app:srcCompat="@drawable/symbol_info_24"
         app:tint="@color/signal_alert_primary" />
 
     <TextView
@@ -47,7 +47,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         app:layout_gravity="center_vertical"
-        app:srcCompat="@drawable/ic_info_white_24"
+        app:srcCompat="@drawable/symbol_info_24"
         app:tint="@color/signal_alert_primary" />
 
     <TextView
@@ -69,7 +69,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         app:layout_gravity="center_vertical"
-        app:srcCompat="@drawable/ic_info_white_24"
+        app:srcCompat="@drawable/symbol_info_24"
         app:tint="@color/signal_alert_primary" />
 
     <TextView
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_player_control_view.xml
index f76e3b4cf1..c0d1eaeb24 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_player_control_view.xml
@@ -83,7 +83,7 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             android:background="@drawable/circle_touch_highlight_background_material3"
-            app:srcCompat="@drawable/ic_share_24_outline" />
+            app:srcCompat="@drawable/symbol_share_android_24" />
 
         <Space
             android:layout_width="0dp"
@@ -189,7 +189,7 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             android:background="@drawable/circle_touch_highlight_background_material3"
-            app:srcCompat="@drawable/ic_forward_outline_24" />
+            app:srcCompat="@drawable/symbol_forward_24" />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/group_link_share_bottom_sheet.xml b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
index 102e10142f..3c604ad1c9 100644
--- a/app/src/main/res/layout/group_link_share_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
@@ -42,7 +42,7 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share_via_signal"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/ic_message_tinted_bitmap_24" />
+            app:drawableStartCompat="@drawable/symbol_chat_24" />
 
         <TextView
             android:id="@+id/group_link_bottom_sheet_copy_button"
@@ -55,7 +55,7 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_copy"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/ic_copy_24_tinted" />
+            app:drawableStartCompat="@drawable/symbol_copy_android_24" />
 
         <TextView
             android:id="@+id/group_link_bottom_sheet_qr_code_button"
@@ -81,7 +81,7 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/ic_share_24_tinted" />
+            app:drawableStartCompat="@drawable/symbol_share_android_24" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/group_story_education_sheet.xml b/app/src/main/res/layout/group_story_education_sheet.xml
index 54a6e7600c..ad0d9d8495 100644
--- a/app/src/main/res/layout/group_story_education_sheet.xml
+++ b/app/src/main/res/layout/group_story_education_sheet.xml
@@ -49,7 +49,7 @@
         android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/share_story_updates_text"
-        app:srcCompat="@drawable/ic_group_24"
+        app:srcCompat="@drawable/symbol_group_24"
         app:tint="@color/signal_colorOnSurface" />
 
     <ImageView
@@ -60,7 +60,7 @@
         android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/anyone_in_group_text"
-        app:srcCompat="@drawable/ic_plus_24"
+        app:srcCompat="@drawable/symbol_plus_24"
         app:tint="@color/signal_colorOnSurface" />
 
     <ImageView
@@ -71,7 +71,7 @@
         android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/all_group_chat_members_text"
-        app:srcCompat="@drawable/ic_reply_24"
+        app:srcCompat="@drawable/symbol_reply_24"
         app:tint="@color/signal_colorOnSurface" />
 
     <TextView
diff --git a/app/src/main/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml
index e3eccc38d4..fb4113db1a 100644
--- a/app/src/main/res/layout/media_overview_activity.xml
+++ b/app/src/main/res/layout/media_overview_activity.xml
@@ -73,7 +73,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/sort_order"
             app:layout_constraintStart_toEndOf="@+id/sort_order"
             app:layout_constraintTop_toTopOf="@+id/sort_order"
-            app:srcCompat="@drawable/ic_arrow_down_14" />
+            app:srcCompat="@drawable/symbol_arrow_down_compact_bold_16" />
 
 
         <org.thoughtcrime.securesms.components.AnimatingToggle
@@ -99,7 +99,7 @@
                 android:gravity="center_vertical"
                 android:tint="@color/signal_inverse_primary"
                 android:visibility="visible"
-                app:srcCompat="@drawable/ic_grid_20" />
+                app:srcCompat="@drawable/symbol_grid_square_24" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/view_detail"
@@ -113,7 +113,7 @@
                 android:gravity="center_vertical"
                 android:tint="@color/signal_inverse_primary"
                 android:visibility="gone"
-                app:srcCompat="@drawable/ic_list_20" />
+                app:srcCompat="@drawable/symbol_list_bullet_24" />
 
         </org.thoughtcrime.securesms.components.AnimatingToggle>
 
diff --git a/app/src/main/res/layout/message_details_header.xml b/app/src/main/res/layout/message_details_header.xml
index 3918453ba1..d62aef7788 100644
--- a/app/src/main/res/layout/message_details_header.xml
+++ b/app/src/main/res/layout/message_details_header.xml
@@ -58,7 +58,7 @@
                 android:text="@string/message_details_header__issues_need_your_attention"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
-                app:drawableStartCompat="@drawable/ic_info_outline_message_details_24"
+                app:drawableStartCompat="@drawable/symbol_info_24"
                 tools:visibility="visible" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/notification_profile_recipient_list_item.xml b/app/src/main/res/layout/notification_profile_recipient_list_item.xml
index 816166a181..a13c217c7c 100644
--- a/app/src/main/res/layout/notification_profile_recipient_list_item.xml
+++ b/app/src/main/res/layout/notification_profile_recipient_list_item.xml
@@ -62,7 +62,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            app:srcCompat="@drawable/ic_minus_circle_20" />
+            android:tint="@color/core_grey_45"
+            app:srcCompat="@drawable/symbol_minus_circle_24" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/payment_notification_view.xml b/app/src/main/res/layout/payment_notification_view.xml
index bff4bc5f75..4fe9763eff 100644
--- a/app/src/main/res/layout/payment_notification_view.xml
+++ b/app/src/main/res/layout/payment_notification_view.xml
@@ -30,7 +30,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_payments_24"
+        app:srcCompat="@drawable/symbol_payment_24"
         app:tint="@color/signal_background_primary" />
 
     <org.thoughtcrime.securesms.components.AvatarImageView
diff --git a/app/src/main/res/layout/sticker_management_sticker_item.xml b/app/src/main/res/layout/sticker_management_sticker_item.xml
index d7fd68a144..d2bcb3167c 100644
--- a/app/src/main/res/layout/sticker_management_sticker_item.xml
+++ b/app/src/main/res/layout/sticker_management_sticker_item.xml
@@ -90,7 +90,7 @@
         app:layout_constraintEnd_toEndOf="@id/sticker_management_share_button"
         app:layout_constraintStart_toStartOf="@id/sticker_management_share_button"
         app:layout_constraintTop_toTopOf="@id/sticker_management_share_button"
-        app:srcCompat="@drawable/ic_forward_24" />
+        app:srcCompat="@drawable/symbol_forward_24" />
 
     <View
         android:id="@+id/sticker_management_action_button"
@@ -111,7 +111,7 @@
         app:layout_constraintEnd_toEndOf="@id/sticker_management_action_button"
         app:layout_constraintStart_toStartOf="@id/sticker_management_action_button"
         app:layout_constraintTop_toTopOf="@id/sticker_management_action_button"
-        tools:src="@drawable/ic_arrow_down" />
+        tools:src="@drawable/symbol_arrow_down_24" />
 
     <View
         android:id="@+id/sticker_management_divider"
diff --git a/app/src/main/res/layout/sticker_preview_activity.xml b/app/src/main/res/layout/sticker_preview_activity.xml
index 1f79bb143f..7570a0da80 100644
--- a/app/src/main/res/layout/sticker_preview_activity.xml
+++ b/app/src/main/res/layout/sticker_preview_activity.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="@id/sticker_install_title"
         app:layout_constraintBottom_toBottomOf="@id/sticker_install_author"
         app:layout_constraintStart_toStartOf="parent"
-        tools:src="@mipmap/ic_person_shortcut"/>
+        tools:src="@tools:sample/avatars"/>
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/sticker_install_title"
@@ -72,7 +72,7 @@
         android:layout_height="wrap_content"
         android:tint="@color/sticker_management_action_button_color"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_forward_24"
+        app:srcCompat="@drawable/symbol_forward_24"
         app:layout_constraintTop_toTopOf="@id/sticker_install_share_button"
         app:layout_constraintBottom_toBottomOf="@id/sticker_install_share_button"
         app:layout_constraintStart_toStartOf="@id/sticker_install_share_button"
diff --git a/app/src/main/res/layout/stories_my_stories_item.xml b/app/src/main/res/layout/stories_my_stories_item.xml
index 3c55a35ac6..784f9d9bec 100644
--- a/app/src/main/res/layout/stories_my_stories_item.xml
+++ b/app/src/main/res/layout/stories_my_stories_item.xml
@@ -113,7 +113,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/more"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_save_24"
+        app:srcCompat="@drawable/symbol_save_android_24"
         app:tint="@color/signal_colorOnSecondaryContainer" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -126,7 +126,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_more_vert_24"
+        app:srcCompat="@drawable/symbol_more_vertical_24"
         app:tint="@color/signal_colorOnSecondaryContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_media_count_indicator_button.xml b/app/src/main/res/layout/v2_media_count_indicator_button.xml
index 5f7f1f74c4..f2da3f82f9 100644
--- a/app/src/main/res/layout/v2_media_count_indicator_button.xml
+++ b/app/src/main/res/layout/v2_media_count_indicator_button.xml
@@ -39,7 +39,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/media_count_indicator_text"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_chevron_end_24"
+        app:srcCompat="@drawable/symbol_chevron_right_24"
         app:tint="@color/signal_colorOnSurface" />
 
 </merge>
\ No newline at end of file
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 9f79e6381e..e2aac7b2c7 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -275,7 +275,7 @@
             app:layout_constraintStart_toEndOf="@id/quality_selector"
             app:layout_goneMarginStart="10dp"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
-            app:srcCompat="@drawable/ic_save_24"
+            app:srcCompat="@drawable/symbol_save_android_24"
             app:tint="@color/signal_dark_colorOnSurface"
             tools:translationY="0dp" />
 
diff --git a/app/src/main/res/menu/device_add.xml b/app/src/main/res/menu/device_add.xml
index 14c8e2b93a..55aa41eaab 100644
--- a/app/src/main/res/menu/device_add.xml
+++ b/app/src/main/res/menu/device_add.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/device_add_camera_switch"
-        android:icon="@drawable/ic_switch_camera_24"
+        android:icon="@drawable/symbol_switch_24"
         android:title="@string/CameraXFragment_change_camera_description"
         app:iconTint="@color/signal_icon_tint_primary"
         app:showAsAction="always"/>
diff --git a/app/src/main/res/menu/submit_debug_log_normal.xml b/app/src/main/res/menu/submit_debug_log_normal.xml
index 1007f2b7d7..bcddd50f41 100644
--- a/app/src/main/res/menu/submit_debug_log_normal.xml
+++ b/app/src/main/res/menu/submit_debug_log_normal.xml
@@ -5,7 +5,7 @@
 
   <item
       android:id="@+id/menu_search"
-      android:icon="@drawable/ic_search_24"
+      android:icon="@drawable/symbol_search_24"
       android:title="@string/CameraContacts__menu_search"
       android:visible="false"
       app:actionViewClass="org.thoughtcrime.securesms.components.SearchView"
@@ -25,7 +25,7 @@
 
   <item
       android:id="@+id/menu_save"
-      android:icon="@drawable/ic_save_24"
+      android:icon="@drawable/symbol_save_android_24"
       android:title="@string/SubmitDebugLogActivity_save"
       android:visible="false"
       app:showAsAction="never" />