diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
index 04221bbff6..3fda7366b3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.components.settings
 
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
@@ -230,7 +232,9 @@ class ExternalLinkPreferenceViewHolder(itemView: View) : PreferenceViewHolder<Ex
   override fun bind(model: ExternalLinkPreference) {
     super.bind(model)
 
-    val externalLinkIcon = requireNotNull(ContextCompat.getDrawable(context, R.drawable.ic_open_20))
+    val externalLinkIcon = requireNotNull(ContextCompat.getDrawable(context, R.drawable.symbol_open_20)).apply {
+      colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.signal_icon_tint_primary), PorterDuff.Mode.SRC_IN)
+    }
     externalLinkIcon.setBounds(0, 0, ViewUtil.dpToPx(20), ViewUtil.dpToPx(20))
 
     if (ViewUtil.isLtr(itemView)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index 1c80b8297d..d0d7c1917d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -55,7 +55,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.AccountSettingsFragment__account),
-        icon = DSLSettingsIcon.from(R.drawable.ic_profile_circle_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_person_circle_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_accountSettingsFragment)
         }
@@ -63,7 +63,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__linked_devices),
-        icon = DSLSettingsIcon.from(R.drawable.ic_linked_devices_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_devices_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)
         }
@@ -72,8 +72,8 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
       if (state.allowUserToGoToDonationManagementScreen) {
         clickPref(
           title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
-          icon = DSLSettingsIcon.from(R.drawable.ic_heart_24),
-          iconEnd = if (state.hasExpiredGiftBadge) DSLSettingsIcon.from(R.drawable.ic_info_solid_24, R.color.signal_accent_primary) else null,
+          icon = DSLSettingsIcon.from(R.drawable.symbol_heart_24),
+          iconEnd = if (state.hasExpiredGiftBadge) DSLSettingsIcon.from(R.drawable.symbol_info_fill_24, R.color.signal_accent_primary) else null,
           onClick = {
             findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToManageDonationsFragment())
           },
@@ -82,7 +82,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
       } else {
         externalLinkPref(
           title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
-          icon = DSLSettingsIcon.from(R.drawable.ic_heart_24),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_heart_24),
           linkId = R.string.donate_url
         )
       }
@@ -91,7 +91,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__appearance),
-        icon = DSLSettingsIcon.from(R.drawable.ic_appearance_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_appearance_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appearanceSettingsFragment)
         }
@@ -99,7 +99,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences_chats__chats),
-        icon = DSLSettingsIcon.from(R.drawable.ic_chat_message_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_chat_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
         }
@@ -107,7 +107,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__stories),
-        icon = DSLSettingsIcon.from(R.drawable.ic_stories_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_stories_24),
         onClick = {
           findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
         }
@@ -115,7 +115,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__notifications),
-        icon = DSLSettingsIcon.from(R.drawable.ic_bell_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_bell_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
         }
@@ -123,7 +123,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__privacy),
-        icon = DSLSettingsIcon.from(R.drawable.ic_lock_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_lock_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
         }
@@ -131,7 +131,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__data_and_storage),
-        icon = DSLSettingsIcon.from(R.drawable.ic_archive_24dp),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_data_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_dataAndStorageSettingsFragment)
         }
@@ -153,7 +153,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__help),
-        icon = DSLSettingsIcon.from(R.drawable.ic_help_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_help_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_helpSettingsFragment)
         }
@@ -161,7 +161,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
 
       clickPref(
         title = DSLSettingsText.from(R.string.AppSettingsFragment__invite_your_friends),
-        icon = DSLSettingsIcon.from(R.drawable.ic_invite_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_invite_24),
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_inviteActivity)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
index a1551e616c..c4d5f01908 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/EditNotificationProfileFragment.kt
@@ -178,7 +178,7 @@ class EditNotificationProfileFragment : DSLSettingsFragment(layoutId = R.layout.
       emojiView?.setImageDrawable(drawable)
       viewModel.onEmojiSelected(emoji)
     } else {
-      emojiView?.setImageResource(R.drawable.ic_add_emoji)
+      emojiView?.setImageResource(R.drawable.symbol_emoji_plus_24)
       viewModel.onEmojiSelected("")
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
index 415a108131..95e10c6444 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
@@ -218,7 +218,7 @@ class ManageDonationsFragment :
 
     clickPref(
       title = DSLSettingsText.from(R.string.ManageDonationsFragment__manage_subscription),
-      icon = DSLSettingsIcon.from(R.drawable.ic_person_white_24dp),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_person_24),
       isEnabled = redemptionState != ManageDonationsState.SubscriptionRedemptionState.IN_PROGRESS,
       onClick = {
         findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonateToSignalFragment(DonateToSignalType.MONTHLY))
@@ -248,7 +248,7 @@ class ManageDonationsFragment :
     if (FeatureFlags.giftBadgeSendSupport() && Recipient.self().giftBadgesCapability == Recipient.Capability.SUPPORTED) {
       clickPref(
         title = DSLSettingsText.from(R.string.ManageDonationsFragment__donate_for_a_friend),
-        icon = DSLSettingsIcon.from(R.drawable.ic_gift_24),
+        icon = DSLSettingsIcon.from(R.drawable.symbol_gift_24),
         onClick = {
           startActivity(Intent(requireContext(), GiftFlowActivity::class.java))
         }
@@ -259,7 +259,7 @@ class ManageDonationsFragment :
   private fun DSLConfiguration.presentBadges() {
     clickPref(
       title = DSLSettingsText.from(R.string.ManageDonationsFragment__badges),
-      icon = DSLSettingsIcon.from(R.drawable.ic_badge_24),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_badge_multi_24),
       onClick = {
         findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToManageBadges())
       }
@@ -269,7 +269,7 @@ class ManageDonationsFragment :
   private fun DSLConfiguration.presentReceipts() {
     clickPref(
       title = DSLSettingsText.from(R.string.ManageDonationsFragment__donation_receipts),
-      icon = DSLSettingsIcon.from(R.drawable.ic_receipt_24),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_receipt_24),
       onClick = {
         findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonationReceiptListFragment())
       }
@@ -285,7 +285,7 @@ class ManageDonationsFragment :
 
     externalLinkPref(
       title = DSLSettingsText.from(R.string.ManageDonationsFragment__subscription_faq),
-      icon = DSLSettingsIcon.from(R.drawable.ic_help_24),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_help_24),
       linkId = R.string.donate_url
     )
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
index 4c2697f558..0f885040d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
@@ -107,7 +107,7 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
 
   @Override
   protected @DrawableRes int getArchiveIconRes() {
-    return R.drawable.ic_unarchive_24;
+    return R.drawable.symbol_archive_android_up_24;
   }
 
   @Override
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 2acc74b211..eaea90bd9d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1344,9 +1344,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     }));
 
     if (conversation.getThreadRecord().isArchived()) {
-      items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, 1), () -> handleArchive(id, false)));
+      items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, 1), () -> handleArchive(id, false)));
     } else {
-      items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false)));
+      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)));
@@ -1449,9 +1449,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     }
 
     if (isArchived()) {
-      items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(selectionIds, true)));
+      items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(selectionIds, true)));
     } else {
-      items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(selectionIds, true)));
+      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)));
@@ -1480,7 +1480,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   }
 
   protected @DrawableRes int getArchiveIconRes() {
-    return R.drawable.ic_archive_24;
+    return R.drawable.symbol_archive_android_24;
   }
 
   @WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
index 79a273becf..cd6e360eef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
@@ -37,7 +37,7 @@ class ChooseStoryTypeBottomSheet : DSLSettingsBottomSheetFragment(
             stringId = R.string.ChooseStoryTypeBottomSheet__visible_only_to
           ),
           icon = DSLSettingsIcon.from(
-            iconId = R.drawable.ic_stories_24,
+            iconId = R.drawable.symbol_stories_24,
             iconTintId = R.color.signal_colorOnSurface,
             backgroundId = R.drawable.circle_tintable,
             backgroundTint = R.color.signal_colorSurface5,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
index d49190ed07..fdb7ab6a2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
@@ -143,7 +143,7 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
       this.emojiView.setImageDrawable(drawable);
       this.selectedEmoji = emoji;
     } else {
-      this.emojiView.setImageResource(R.drawable.ic_add_emoji);
+      this.emojiView.setImageResource(R.drawable.symbol_emoji_plus_24);
       this.selectedEmoji = "";
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java
index 8e28eda17a..c462be7cdb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java
@@ -238,14 +238,14 @@ public class ManageProfileFragment extends LoggingFragment {
 
   private void presentAboutEmoji(@NonNull String aboutEmoji) {
     if (aboutEmoji == null || aboutEmoji.isEmpty()) {
-      binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_compose_24, null));
+      binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.symbol_edit_24, null));
     } else {
       Drawable emoji = EmojiUtil.convertToDrawable(requireContext(), aboutEmoji);
 
       if (emoji != null) {
         binding.manageProfileAboutIcon.setImageDrawable(emoji);
       } else {
-        binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_compose_24, null));
+        binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.symbol_edit_24, null));
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index b9f1188844..4234c79b15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -1362,7 +1362,7 @@ public class Recipient {
     }
 
     public @NonNull FallbackContactPhoto getPhotoForDistributionList() {
-      return new ResourceContactPhoto(R.drawable.ic_stories_24, R.drawable.ic_stories_24, R.drawable.ic_stories_24);
+      return new ResourceContactPhoto(R.drawable.symbol_stories_24, R.drawable.symbol_stories_24, R.drawable.symbol_stories_24);
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
index ebc210707f..f8db6bceb9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
@@ -142,11 +142,11 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
     setEnterSharedElementCallback(object : SharedElementCallback() {
       override fun onSharedElementStart(sharedElementNames: MutableList<String>?, sharedElements: MutableList<View>?, sharedElementSnapshots: MutableList<View>?) {
         if (sharedElementNames?.contains("camera_fab") == true) {
-          cameraFab.setImageResource(R.drawable.ic_compose_outline_24)
+          cameraFab.setImageResource(R.drawable.symbol_edit_24)
           lifecycleDisposable += Single.timer(200, TimeUnit.MILLISECONDS)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribeBy {
-              cameraFab.setImageResource(R.drawable.ic_camera_outline_24)
+              cameraFab.setImageResource(R.drawable.symbol_camera_24)
               sharedElementTarget.alpha = 0f
             }
         }
@@ -157,7 +157,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
       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 {
           startActivityIfAble(MediaSelectionActivity.camera(requireContext(), isStory = true))
diff --git a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp
deleted file mode 100644
index 65cabe34e7..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp
deleted file mode 100644
index ca771d7fc3..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night/ic_share_24.xml b/app/src/main/res/drawable-night/ic_share_24.xml
deleted file mode 100644
index 5f97a4c2a6..0000000000
--- a/app/src/main/res/drawable-night/ic_share_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_ultramarine_light"
-      android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp
deleted file mode 100644
index ee3d356139..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp
deleted file mode 100644
index 9170a6bea7..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp
deleted file mode 100644
index 027cf0e5d1..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_add_emoji.xml b/app/src/main/res/drawable/ic_add_emoji.xml
deleted file mode 100644
index 626e613cc0..0000000000
--- a/app/src/main/res/drawable/ic_add_emoji.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23dp"
-    android:height="18dp"
-    android:viewportWidth="23"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M14,18C12.7735,18.0051 11.5592,17.757 10.433,17.2713C9.3068,16.7855 8.293,16.0725 7.455,15.177L8.545,14.148C9.2437,14.894 10.0887,15.488 11.0273,15.8927C11.9659,16.2974 12.9779,16.5041 14,16.5C15.9891,16.5 17.8968,15.7098 19.3033,14.3033C20.7098,12.8967 21.5,10.9891 21.5,9C21.5,7.0108 20.7098,5.1032 19.3033,3.6967C17.8968,2.2901 15.9891,1.5 14,1.5C12.9779,1.4958 11.9659,1.7025 11.0273,2.1072C10.0887,2.5119 9.2437,3.1059 8.545,3.852L7.455,2.823C8.293,1.9274 9.3068,1.2144 10.433,0.7286C11.5592,0.2429 12.7735,-0.0052 14,-0C16.3869,-0 18.6761,0.9482 20.364,2.636C22.0518,4.3238 23,6.613 23,9C23,11.3869 22.0518,13.6761 20.364,15.3639C18.6761,17.0517 16.3869,18 14,18ZM18.608,12.188C18.7242,12.0267 18.7715,11.8259 18.7396,11.6297C18.7078,11.4336 18.5993,11.2581 18.438,11.142C18.2767,11.0258 18.076,10.9784 17.8798,11.0103C17.6836,11.0422 17.5082,11.1507 17.392,11.312C16.9951,11.8352 16.4827,12.2597 15.8949,12.5524C15.307,12.8452 14.6594,12.9982 14.0027,12.9997C13.346,13.0011 12.6978,12.8509 12.1086,12.5608C11.5194,12.2707 11.0052,11.8484 10.606,11.327C10.5481,11.2474 10.4751,11.18 10.3911,11.1286C10.3071,11.0773 10.2139,11.0429 10.1167,11.0276C10.0194,11.0123 9.9202,11.0163 9.8245,11.0393C9.7288,11.0624 9.6386,11.104 9.559,11.162C9.4794,11.2199 9.412,11.2929 9.3607,11.3768C9.3093,11.4608 9.275,11.5541 9.2597,11.6513C9.2443,11.7485 9.2483,11.8478 9.2714,11.9435C9.2944,12.0392 9.3361,12.1294 9.394,12.209C9.9324,12.9224 10.6295,13.5007 11.43,13.8983C12.2304,14.2959 13.1125,14.5018 14.0062,14.4998C14.9,14.4978 15.7811,14.2878 16.5798,13.8866C17.3784,13.4853 18.0728,12.9038 18.608,12.188ZM11.25,5.75C10.8717,5.8061 10.53,6.0069 10.2968,6.31C10.0637,6.6131 9.9572,6.9949 10,7.375C9.9572,7.755 10.0637,8.1368 10.2968,8.4399C10.53,8.743 10.8717,8.9438 11.25,9C11.6283,8.9438 11.97,8.743 12.2032,8.4399C12.4363,8.1368 12.5428,7.755 12.5,7.375C12.5428,6.9949 12.4363,6.6131 12.2032,6.31C11.97,6.0069 11.6283,5.8061 11.25,5.75ZM16.75,5.75C16.3717,5.8061 16.03,6.0069 15.7968,6.31C15.5637,6.6131 15.4572,6.9949 15.5,7.375C15.4572,7.755 15.5637,8.1368 15.7968,8.4399C16.03,8.743 16.3717,8.9438 16.75,9C17.1283,8.9438 17.47,8.743 17.7032,8.4399C17.9363,8.1368 18.0428,7.755 18,7.375C18.0428,6.9949 17.9363,6.6131 17.7032,6.31C17.47,6.0069 17.1283,5.8061 16.75,5.75ZM8,8.25H4.75V5H3.25V8.25H0V9.75H3.25V13H4.75V9.75H8V8.25Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_appearance_24.xml b/app/src/main/res/drawable/ic_appearance_24.xml
deleted file mode 100644
index 979485e4f9..0000000000
--- a/app/src/main/res/drawable/ic_appearance_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,7.5A4.5,4.5 0,1 1,7.5 12,4.505 4.505,0 0,1 12,7.5M12,6a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6ZM4.5,11.25L1,11.25v1.5L4.5,12.75ZM23,11.25L19.5,11.25v1.5L23,12.75ZM12.75,19.5h-1.5L11.25,23h1.5ZM12.75,1h-1.5L11.25,4.5h1.5ZM7.227,6.167 L4.752,3.691 3.691,4.752 6.166,7.227ZM20.309,19.248l-2.475,-2.475 -1.061,1.061 2.475,2.475ZM7.227,17.834 L6.166,16.773 3.691,19.248l1.061,1.061ZM20.309,4.752 L19.248,3.691 16.773,6.167l1.061,1.06Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_archive_24.xml b/app/src/main/res/drawable/ic_archive_24.xml
deleted file mode 100644
index 49f77523cd..0000000000
--- a/app/src/main/res/drawable/ic_archive_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="M16.605,3.5C16.745,3.5 16.88,3.56 16.975,3.665L18.6241,5.5H5.1699L6.985,3.65C7.075,3.555 7.205,3.5 7.34,3.5H16.605ZM4.5,7H19.5V19C19.5,19.275 19.275,19.5 19,19.5H5C4.725,19.5 4.5,19.275 4.5,19V7ZM16.605,2H7.34C6.805,2 6.29,2.215 5.91,2.6L3.57,4.985C3.205,5.36 3,5.86 3,6.385V19C3,20.105 3.895,21 5,21H19C20.105,21 21,20.105 21,19V6.665C21,6.17 20.82,5.695 20.49,5.33L18.095,2.665C17.715,2.24 17.175,2 16.605,2ZM11.25,9H12.75V13.7856L14.5355,12L15.5962,13.0607L12.0607,16.5962L12.0481,16.5837L12.0355,16.5962L8.5,13.0607L9.5607,12L11.25,13.6894V9Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_archive_24dp.xml b/app/src/main/res/drawable/ic_archive_24dp.xml
deleted file mode 100644
index 25b274837b..0000000000
--- a/app/src/main/res/drawable/ic_archive_24dp.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="M14,13L10,13a1,1 0,0 1,-1 -1L9,12a1,1 0,0 1,1 -1h4a1,1 0,0 1,1 1h0A1,1 0,0 1,14 13ZM22.5,4.5v3A1.5,1.5 0,0 1,21 9L21,19.5A1.5,1.5 0,0 1,19.5 21L4.5,21A1.5,1.5 0,0 1,3 19.5L3,9A1.5,1.5 0,0 1,1.5 7.5v-3A1.5,1.5 0,0 1,3 3L21,3A1.5,1.5 0,0 1,22.5 4.5ZM19.5,9L4.5,9L4.5,19.5h15ZM21,4.5L3,4.5v3L21,7.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_badge_24.xml b/app/src/main/res/drawable/ic_badge_24.xml
deleted file mode 100644
index 0660b97cf3..0000000000
--- a/app/src/main/res/drawable/ic_badge_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,22.5c-0.3,0 -0.5,0 -0.8,-0.1s-0.5,-0.2 -0.7,-0.3l-3.3,-1.9L4,18.4c-0.5,-0.3 -0.8,-0.6 -1.1,-1.1s-0.4,-1 -0.4,-1.5V12V8.2c0,-0.5 0.1,-1.1 0.4,-1.5S3.5,5.9 4,5.6l3.3,-1.9l3.3,-1.9c0.5,-0.3 1,-0.4 1.5,-0.4s1,0.1 1.5,0.4l3.3,1.9L20,5.6c0.5,0.3 0.8,0.6 1.1,1.1s0.4,1 0.4,1.5V12v3.8c0,0.5 -0.1,1.1 -0.4,1.5s-0.6,0.8 -1.1,1.1l-3.3,1.9l-3.3,1.9c-0.2,0.1 -0.5,0.2 -0.7,0.3S12.3,22.5 12,22.5zM12,3c-0.1,0 -0.3,0 -0.4,0.1s-0.2,0.1 -0.4,0.2L8,5L4.7,6.9C4.5,7.1 4.3,7.3 4.2,7.5S4,8 4,8.2V12v3.8C4,16 4,16.3 4.2,16.5s0.3,0.4 0.5,0.5L8,19l3.3,1.9C11.5,21 11.7,21 12,21s0.5,-0.1 0.8,-0.2L16,19l3.3,-1.9c0.2,-0.1 0.4,-0.3 0.5,-0.5S20,16 20,15.8V12V8.2C20,8 20,7.7 19.8,7.5s-0.3,-0.4 -0.5,-0.5L16,5l-3.3,-1.9C12.6,3.1 12.5,3 12.4,3S12.1,3 12,3z"
-      android:fillColor="#1B1B1B"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_gift_24.xml b/app/src/main/res/drawable/ic_gift_24.xml
deleted file mode 100644
index 308543983a..0000000000
--- a/app/src/main/res/drawable/ic_gift_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="M20.775,7h-3.543c0.325,-0.506 0.519,-1.104 0.519,-1.75 0,-1.795 -1.455,-3.25 -3.25,-3.25 -1.012,0 -1.904,0.472 -2.5,1.197 -0.596,-0.725 -1.488,-1.197 -2.5,-1.197 -1.795,0 -3.25,1.455 -3.25,3.25 0,0.646 0.194,1.244 0.519,1.75L3.225,7c-0.677,0 -1.225,0.549 -1.225,1.225v3.55c0,0.677 0.549,1.225 1.225,1.225h0.775v7.21c0,0.988 0.801,1.79 1.79,1.79h12.421c0.988,0 1.79,-0.801 1.79,-1.79v-7.21h0.775c0.677,0 1.225,-0.549 1.225,-1.225v-3.55c0,-0.677 -0.549,-1.225 -1.225,-1.225ZM14.5,3.5c0.965,0 1.75,0.785 1.75,1.75s-0.785,1.75 -1.75,1.75h-1.75v-1.75c0,-0.965 0.785,-1.75 1.75,-1.75ZM7.75,5.25c0,-0.965 0.785,-1.75 1.75,-1.75s1.75,0.785 1.75,1.75v1.75h-1.75c-0.965,0 -1.75,-0.785 -1.75,-1.75ZM3.5,8.5h7.75v3L3.5,11.5v-3ZM5.5,20.21v-7.21h5.75v7.5L5.79,20.5c-0.16,0 -0.29,-0.13 -0.29,-0.29ZM18.5,20.21c0,0.16 -0.13,0.29 -0.29,0.29h-5.46v-7.5h5.75v7.21ZM20.5,11.5h-7.75v-3h7.75v3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_heart_24.xml b/app/src/main/res/drawable/ic_heart_24.xml
deleted file mode 100644
index 262dcade13..0000000000
--- a/app/src/main/res/drawable/ic_heart_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="M17.5,3.5a4,4 0,0 1,4 4c0,5.018 -6.208,10.993 -9.5,13.613C8.706,18.5 2.5,12.529 2.5,7.5A4,4 0,0 1,9.336 4.679a12.607,12.607 0,0 1,1.419 1.626l1.239,1.831 1.248,-1.827A12.682,12.682 0,0 1,14.67 4.673,3.977 3.977,0 0,1 17.5,3.5m0,-1.5a5.484,5.484 0,0 0,-3.891 1.613A13.738,13.738 0,0 0,12 5.467a13.738,13.738 0,0 0,-1.609 -1.854A5.5,5.5 0,0 0,1 7.5C1,15 12,23 12,23S23,15 23,7.5A5.5,5.5 0,0 0,17.5 2Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_solid_24.xml b/app/src/main/res/drawable/ic_info_solid_24.xml
deleted file mode 100644
index 68b0be6979..0000000000
--- a/app/src/main/res/drawable/ic_info_solid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12,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/ic_invite_24.xml b/app/src/main/res/drawable/ic_invite_24.xml
deleted file mode 100644
index eda5cb5143..0000000000
--- a/app/src/main/res/drawable/ic_invite_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="M20,4L4,4A3,3 0,0 0,1 7L1,17a3,3 0,0 0,3 3L20,20a3,3 0,0 0,3 -3L23,7A3,3 0,0 0,20 4ZM21.5,7L21.5,17a1.485,1.485 0,0 1,-0.056 0.384L16.061,12l5.383,-5.384A1.485,1.485 0,0 1,21.5 7ZM20,5.5a1.485,1.485 0,0 1,0.384 0.056L12.53,13.409a0.768,0.768 0,0 1,-1.06 0L3.616,5.556A1.485,1.485 0,0 1,4 5.5ZM2.556,17.384A1.485,1.485 0,0 1,2.5 17L2.5,7a1.485,1.485 0,0 1,0.056 -0.384L7.939,12ZM4,18.5a1.485,1.485 0,0 1,-0.384 -0.056L9,13.061l1.409,1.409a2.252,2.252 0,0 0,3.182 0L15,13.061l5.384,5.383A1.485,1.485 0,0 1,20 18.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_linked_devices_24.xml b/app/src/main/res/drawable/ic_linked_devices_24.xml
deleted file mode 100644
index 2211fd584a..0000000000
--- a/app/src/main/res/drawable/ic_linked_devices_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,8L18,8L18,6a3,3 0,0 0,-3 -3L5,3A3,3 0,0 0,2 6v7a3,3 0,0 0,3 3L6,16v2a3,3 0,0 0,3 3L19,21a3,3 0,0 0,3 -3L22,11A3,3 0,0 0,19 8ZM20.5,18A1.5,1.5 0,0 1,19 19.5L9,19.5A1.5,1.5 0,0 1,7.5 18L7.5,16L15,16a3,3 0,0 0,3 -3L18,11L16.5,11v2A1.5,1.5 0,0 1,15 14.5L5,14.5A1.5,1.5 0,0 1,3.5 13L3.5,6A1.5,1.5 0,0 1,5 4.5L15,4.5A1.5,1.5 0,0 1,16.5 6L16.5,8L9,8a3,3 0,0 0,-3 3v2L7.5,13L7.5,11A1.5,1.5 0,0 1,9 9.5L19,9.5A1.5,1.5 0,0 1,20.5 11Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_profile_name_24.xml b/app/src/main/res/drawable/ic_profile_name_24.xml
deleted file mode 100644
index 23dc66e2c7..0000000000
--- a/app/src/main/res/drawable/ic_profile_name_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="M16.3836,11.8716C17.1821,11.0172 17.7135,9.9481 17.9125,8.7958C18.1115,7.6434 17.9694,6.458 17.5037,5.3853C17.038,4.3126 16.269,3.3994 15.2912,2.758C14.3134,2.1165 13.1694,1.7748 12,1.7748C10.8306,1.7748 9.6867,2.1165 8.7089,2.758C7.7311,3.3994 6.9621,4.3126 6.4963,5.3853C6.0306,6.458 5.8885,7.6434 6.0875,8.7958C6.2865,9.9481 6.8179,11.0172 7.6164,11.8716C6.1365,12.2089 4.8148,13.0382 3.8673,14.2239C2.9198,15.4097 2.4025,16.8818 2.4,18.3996V20.4H4.2V18.3996C4.2016,17.1006 4.7183,15.8553 5.6368,14.9368C6.5553,14.0183 7.8007,13.5016 9.0996,13.5H14.9004C16.1994,13.5016 17.4447,14.0183 18.3632,14.9368C19.2817,15.8553 19.7984,17.1006 19.8,18.3996V20.4H21.6V18.3996C21.5975,16.8818 21.0802,15.4097 20.1327,14.2239C19.1852,13.0382 17.8635,12.2089 16.3836,11.8716V11.8716ZM12,12C11.1693,12 10.3573,11.7537 9.6666,11.2922C8.9759,10.8307 8.4376,10.1747 8.1197,9.4073C7.8018,8.6398 7.7187,7.7953 7.8807,6.9806C8.0428,6.1659 8.4428,5.4175 9.0302,4.8302C9.6176,4.2428 10.3659,3.8428 11.1806,3.6807C11.9954,3.5186 12.8398,3.6018 13.6073,3.9197C14.3747,4.2376 15.0307,4.7759 15.4922,5.4666C15.9537,6.1573 16.2,6.9693 16.2,7.8C16.2,8.9139 15.7575,9.9822 14.9699,10.7698C14.1822,11.5575 13.1139,12 12,12Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_receipt_24.xml b/app/src/main/res/drawable/ic_receipt_24.xml
deleted file mode 100644
index d002b6c4bc..0000000000
--- a/app/src/main/res/drawable/ic_receipt_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="M17,9L7,9L7,7.5L17,7.5ZM17,10.5L7,10.5L7,12L17,12ZM15,13.5L7,13.5L7,15h8ZM21,19.613 L19.323,21.287A1.862,1.862 0,0 1,18 21.836h0a1.858,1.858 0,0 1,-1.326 -0.552l-1.4,-1.4a0.377,0.377 0,0 0,-0.531 0l-1.412,1.409a1.876,1.876 0,0 1,-2.652 0l-1.4,-1.4a0.378,0.378 0,0 0,-0.532 0L7.327,21.289a1.877,1.877 0,0 1,-2.649 0L3,19.613L3,4.122A2.122,2.122 0,0 1,5.122 2L18.878,2A2.122,2.122 0,0 1,21 4.122L21,19.613ZM19.5,4.122a0.623,0.623 0,0 0,-0.622 -0.622L5.122,3.5a0.623,0.623 0,0 0,-0.622 0.622L4.5,18.991l1.237,1.237a0.38,0.38 0,0 0,0.532 0l1.412,-1.41a1.879,1.879 0,0 1,2.651 0l1.4,1.407a0.378,0.378 0,0 0,0.532 0l1.411,-1.409a1.878,1.878 0,0 1,2.651 0l1.4,1.407a0.378,0.378 0,0 0,0.532 0L19.5,18.991Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share_24.xml b/app/src/main/res/drawable/ic_share_24.xml
deleted file mode 100644
index 3018fe04d5..0000000000
--- a/app/src/main/res/drawable/ic_share_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_ultramarine"
-      android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15ZM17,4.5A1.5,1.5 0,1 1,15.5 6,1.5 1.5,0 0,1 17,4.5ZM6,13.5A1.5,1.5 0,1 1,7.5 12,1.5 1.5,0 0,1 6,13.5ZM17,19.5A1.5,1.5 0,1 1,18.5 18,1.5 1.5,0 0,1 17,19.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_stories_16.xml b/app/src/main/res/drawable/ic_stories_16.xml
deleted file mode 100644
index 5b19d63971..0000000000
--- a/app/src/main/res/drawable/ic_stories_16.xml
+++ /dev/null
@@ -1,12 +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="M7.078,2.5C6.249,2.5 5.578,3.172 5.578,4V12C5.578,12.828 6.249,13.5 7.078,13.5H11.578C12.406,13.5 13.078,12.828 13.078,12V4C13.078,3.172 12.406,2.5 11.578,2.5H7.078Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M4.5,4.5C4.5,4.173 4.579,3.864 4.718,3.591L3.487,4.039C2.709,4.322 2.308,5.183 2.591,5.962L4.472,11.13C4.481,11.154 4.49,11.178 4.5,11.201V4.5Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_stories_24.xml b/app/src/main/res/drawable/ic_stories_24.xml
deleted file mode 100644
index 27c10444a0..0000000000
--- a/app/src/main/res/drawable/ic_stories_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">
-  <path
-      android:pathData="M7.156,4C7.156,2.343 8.499,1 10.156,1H19.156C20.813,1 22.156,2.343 22.156,4V20C22.156,21.657 20.813,23 19.156,23H10.156C8.499,23 7.156,21.657 7.156,20V4ZM10.156,2.5H19.156C19.984,2.5 20.656,3.172 20.656,4V20C20.656,20.828 19.984,21.5 19.156,21.5H10.156C9.327,21.5 8.656,20.828 8.656,20V4C8.656,3.172 9.327,2.5 10.156,2.5Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M2.591,7.41L5,14.028V18.403C4.98,18.356 4.962,18.308 4.944,18.26L1.182,7.923C0.615,6.366 1.418,4.645 2.975,4.078L5.436,3.182C5.166,3.71 5.01,4.306 5,4.937L3.488,5.488C2.709,5.771 2.308,6.632 2.591,7.41Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_unarchive_24.xml b/app/src/main/res/drawable/ic_unarchive_24.xml
deleted file mode 100644
index 4d597711f4..0000000000
--- a/app/src/main/res/drawable/ic_unarchive_24.xml
+++ /dev/null
@@ -1,21 +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="M16.605,3.5C16.745,3.5 16.88,3.56 16.975,3.665L19.37,6.33C19.455,6.425 19.5,6.545 19.5,6.665V19C19.5,19.275 19.275,19.5 19,19.5H5C4.725,19.5 4.5,19.275 4.5,19V6.385C4.5,6.255 4.55,6.13 4.645,6.035L6.985,3.65C7.075,3.555 7.205,3.5 7.34,3.5H16.605ZM16.605,2H7.34C6.805,2 6.29,2.215 5.91,2.6L3.57,4.985C3.205,5.36 3,5.86 3,6.385V19C3,20.105 3.895,21 5,21H19C20.105,21 21,20.105 21,19V6.665C21,6.17 20.82,5.695 20.49,5.33L18.095,2.665C17.715,2.24 17.175,2 16.605,2Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M20,5.5H4V7H20V5.5Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M11.3252,16.6644H12.8252V10.1644H11.3252V16.6644Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M14.5145,13.6645L15.5752,12.6038L12.0397,9.0683L10.979,10.1289L14.5145,13.6645Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M9.5397,13.6645L8.4791,12.6038L12.0146,9.0683L13.0753,10.1289L9.5397,13.6645Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_union.xml b/app/src/main/res/drawable/ic_union.xml
deleted file mode 100644
index 0c2c05277a..0000000000
--- a/app/src/main/res/drawable/ic_union.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="10dp"
-    android:viewportWidth="10"
-    android:viewportHeight="10">
-    <path
-        android:fillColor="@color/signal_colorBackground"
-        android:fillType="evenOdd"
-        android:pathData="M5,0C4.655,0 4.375,0.28 4.375,0.625V4.375H0.625C0.28,4.375 0,4.655 0,5C0,5.345 0.28,5.625 0.625,5.625H4.375L4.375,9.375C4.375,9.72 4.655,10 5,10C5.345,10 5.625,9.72 5.625,9.375L5.625,5.625L9.375,5.625C9.72,5.625 10,5.345 10,5C10,4.655 9.72,4.375 9.375,4.375L5.625,4.375V0.625C5.625,0.28 5.345,0 5,0Z" />
-</vector>
diff --git a/app/src/main/res/drawable/symbol_appearance_24.xml b/app/src/main/res/drawable/symbol_appearance_24.xml
new file mode 100644
index 0000000000..91320fda9e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_appearance_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">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24H0z"/>
+    <path
+        android:pathData="M11.5,7.75a0.74,0.74 0,0 1,0.777 -0.742,5 5,0 0,1 0,9.984 0.74,0.74 0,0 1,-0.777 -0.742v-8.5Z"
+        android:fillColor="#000"/>
+    <path
+        android:pathData="M12.972,0.735a1.375,1.375 0,0 0,-1.944 0l-2.64,2.64H4.75c-0.76,0 -1.375,0.616 -1.375,1.375v3.638l-2.64,2.64a1.375,1.375 0,0 0,0 1.944l2.64,2.64v3.638c0,0.76 0.616,1.375 1.375,1.375h3.638l2.64,2.64a1.375,1.375 0,0 0,1.943 0.003l2.642,-2.63 3.641,-0.011a1.375,1.375 0,0 0,1.371 -1.375v-3.64l2.64,-2.639a1.375,1.375 0,0 0,-0.004 -1.947l-2.623,-2.607 -0.011,-3.673a1.375,1.375 0,0 0,-1.375 -1.371h-3.64l-2.64,-2.64ZM9.515,4.722 L12,2.237l2.485,2.485c0.258,0.258 0.607,0.403 0.972,0.403h3.42l0.012,3.455c0,0.364 0.147,0.713 0.405,0.97l2.467,2.452 -2.483,2.483a1.375,1.375 0,0 0,-0.403 0.972v3.42l-3.422,0.012c-0.362,0 -0.71,0.145 -0.966,0.4l-2.486,2.475 -2.486,-2.486a1.375,1.375 0,0 0,-0.972 -0.403H5.125v-3.418c0,-0.365 -0.145,-0.714 -0.403,-0.972L2.237,12l2.485,-2.485c0.258,-0.258 0.403,-0.607 0.403,-0.972V5.125h3.418c0.365,0 0.714,-0.145 0.972,-0.403Z"
+        android:fillColor="#000"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_archive_24.xml b/app/src/main/res/drawable/symbol_archive_24.xml
new file mode 100644
index 0000000000..850a47c11d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_archive_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="M11.125,13.25V9.5a0.875,0.875 0,0 1,1.75 0v3.75l-0.126,1.764 1.882,-1.883a0.875,0.875 0,1 1,1.238 1.238l-3.25,3.25a0.875,0.875 0,0 1,-1.238 0l-3.25,-3.25A0.875,0.875 0,1 1,9.37 13.13l1.882,1.883 -0.126,-1.764Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.774,1.625c-0.615,0 -1.191,0.302 -1.542,0.808L2.281,5.252a0.875,0.875 0,0 0,-0.156 0.498v13A3.375,3.375 0,0 0,5.5 22.125h13a3.375,3.375 0,0 0,3.375 -3.375v-13a0.875,0.875 0,0 0,-0.156 -0.498l-1.951,-2.82a1.875,1.875 0,0 0,-1.542 -0.807L5.774,1.625ZM5.671,3.429a0.125,0.125 0,0 1,0.103 -0.054h12.452c0.041,0 0.08,0.02 0.103,0.054l1.001,1.446L4.67,4.875l1.001,-1.446ZM3.875,6.625h16.25L20.125,18.75c0,0.898 -0.727,1.625 -1.625,1.625h-13a1.625,1.625 0,0 1,-1.625 -1.625L3.875,6.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_archive_android_24.xml b/app/src/main/res/drawable/symbol_archive_android_24.xml
new file mode 100644
index 0000000000..850a47c11d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_archive_android_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="M11.125,13.25V9.5a0.875,0.875 0,0 1,1.75 0v3.75l-0.126,1.764 1.882,-1.883a0.875,0.875 0,1 1,1.238 1.238l-3.25,3.25a0.875,0.875 0,0 1,-1.238 0l-3.25,-3.25A0.875,0.875 0,1 1,9.37 13.13l1.882,1.883 -0.126,-1.764Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.774,1.625c-0.615,0 -1.191,0.302 -1.542,0.808L2.281,5.252a0.875,0.875 0,0 0,-0.156 0.498v13A3.375,3.375 0,0 0,5.5 22.125h13a3.375,3.375 0,0 0,3.375 -3.375v-13a0.875,0.875 0,0 0,-0.156 -0.498l-1.951,-2.82a1.875,1.875 0,0 0,-1.542 -0.807L5.774,1.625ZM5.671,3.429a0.125,0.125 0,0 1,0.103 -0.054h12.452c0.041,0 0.08,0.02 0.103,0.054l1.001,1.446L4.67,4.875l1.001,-1.446ZM3.875,6.625h16.25L20.125,18.75c0,0.898 -0.727,1.625 -1.625,1.625h-13a1.625,1.625 0,0 1,-1.625 -1.625L3.875,6.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_archive_android_up_24.xml b/app/src/main/res/drawable/symbol_archive_android_up_24.xml
new file mode 100644
index 0000000000..06f2e10575
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_archive_android_up_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="M11.125,13.375v3.75a0.875,0.875 0,0 0,1.75 0v-3.75l-0.126,-1.764 1.882,1.883a0.875,0.875 0,1 0,1.238 -1.238l-3.25,-3.25a0.875,0.875 0,0 0,-1.238 0l-3.25,3.25a0.875,0.875 0,1 0,1.238 1.238l1.882,-1.883 -0.126,1.764Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.774,1.625c-0.615,0 -1.191,0.302 -1.542,0.808L2.281,5.252a0.875,0.875 0,0 0,-0.156 0.498L2.125,18.5A3.375,3.375 0,0 0,5.5 21.875h13a3.375,3.375 0,0 0,3.375 -3.375L21.875,5.75a0.875,0.875 0,0 0,-0.156 -0.498l-1.951,-2.82a1.875,1.875 0,0 0,-1.542 -0.807L5.774,1.625ZM5.671,3.429a0.125,0.125 0,0 1,0.103 -0.054h12.452c0.041,0 0.08,0.02 0.103,0.054l1.001,1.446L4.67,4.875l1.001,-1.446ZM3.875,6.625h16.25L20.125,18.5c0,0.898 -0.727,1.625 -1.625,1.625h-13A1.625,1.625 0,0 1,3.875 18.5L3.875,6.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_archive_up_24.xml b/app/src/main/res/drawable/symbol_archive_up_24.xml
new file mode 100644
index 0000000000..06f2e10575
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_archive_up_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="M11.125,13.375v3.75a0.875,0.875 0,0 0,1.75 0v-3.75l-0.126,-1.764 1.882,1.883a0.875,0.875 0,1 0,1.238 -1.238l-3.25,-3.25a0.875,0.875 0,0 0,-1.238 0l-3.25,3.25a0.875,0.875 0,1 0,1.238 1.238l1.882,-1.883 -0.126,1.764Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.774,1.625c-0.615,0 -1.191,0.302 -1.542,0.808L2.281,5.252a0.875,0.875 0,0 0,-0.156 0.498L2.125,18.5A3.375,3.375 0,0 0,5.5 21.875h13a3.375,3.375 0,0 0,3.375 -3.375L21.875,5.75a0.875,0.875 0,0 0,-0.156 -0.498l-1.951,-2.82a1.875,1.875 0,0 0,-1.542 -0.807L5.774,1.625ZM5.671,3.429a0.125,0.125 0,0 1,0.103 -0.054h12.452c0.041,0 0.08,0.02 0.103,0.054l1.001,1.446L4.67,4.875l1.001,-1.446ZM3.875,6.625h16.25L20.125,18.5c0,0.898 -0.727,1.625 -1.625,1.625h-13A1.625,1.625 0,0 1,3.875 18.5L3.875,6.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_at_24.xml b/app/src/main/res/drawable/symbol_at_24.xml
new file mode 100644
index 0000000000..a0e75adf58
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_at_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="M2.875,12a9.125,9.125 0,1 1,18.25 0c0,1.394 -0.293,2.319 -0.683,2.87 -0.366,0.517 -0.85,0.755 -1.442,0.755 -0.733,0 -1.625,-0.785 -1.625,-1.875L17.375,12a5.375,5.375 0,1 0,-1.302 3.508c0.593,1.1 1.706,1.867 2.927,1.867 1.158,0 2.174,-0.512 2.87,-1.494 0.673,-0.95 1.005,-2.275 1.005,-3.881 0,-6.006 -4.869,-10.875 -10.875,-10.875S1.125,5.994 1.125,12 5.994,22.875 12,22.875c1.98,0 3.838,-0.53 5.438,-1.455a0.875,0.875 0,0 0,-0.876 -1.515A9.08,9.08 0,0 1,12 21.125,9.125 9.125,0 0,1 2.875,12ZM15.625,12a3.625,3.625 0,1 0,-7.25 0,3.625 3.625,0 0,0 7.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_badge_multi_24.xml b/app/src/main/res/drawable/symbol_badge_multi_24.xml
new file mode 100644
index 0000000000..407bac89b4
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_badge_multi_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="M3.618,1.875a3.242,3.242 0,0 0,-3.243 3.24c0,2.121 1.264,3.867 2.419,5.018 0.59,0.587 1.187,1.055 1.657,1.378 0.234,0.161 0.444,0.291 0.611,0.385 0.083,0.046 0.165,0.089 0.24,0.122 0.038,0.017 0.085,0.037 0.137,0.054l0.003,0.001a0.98,0.98 0,0 0,0.308 0.052,0.98 0.98,0 0,0 0.308,-0.052h0.003a2.723,2.723 0,0 0,0.376 -0.177,8.01 8.01,0 0,0 0.612,-0.385c0.47,-0.323 1.067,-0.79 1.657,-1.378 1.155,-1.15 2.419,-2.897 2.419,-5.018A3.242,3.242 0,0 0,5.75 2.673a3.233,3.233 0,0 0,-2.132 -0.798ZM2.125,5.115a1.494,1.494 0,0 1,2.838 -0.65,0.875 0.875,0 0,0 1.574,0 1.494,1.494 0,0 1,2.838 0.65c0,1.425 -0.868,2.747 -1.904,3.777 -0.504,0.503 -1.018,0.904 -1.414,1.177 -0.116,0.08 -0.219,0.147 -0.307,0.201a7.36,7.36 0,0 1,-0.307 -0.2c-0.396,-0.274 -0.91,-0.675 -1.414,-1.178 -1.036,-1.03 -1.904,-2.352 -1.904,-3.777ZM13.375,7a5.125,5.125 0,1 1,10.25 0,5.125 5.125,0 0,1 -10.25,0ZM18.5,3.625a3.375,3.375 0,1 0,0 6.75,3.375 3.375,0 0,0 0,-6.75ZM11.063,12.53a1.875,1.875 0,0 1,1.874 0l3.114,1.799c0.58,0.335 0.938,0.954 0.938,1.623v3.596c0,0.67 -0.358,1.289 -0.938,1.623l-3.113,1.798a1.875,1.875 0,0 1,-1.876 0L7.95,21.171a1.875,1.875 0,0 1,-0.938 -1.623v-3.596c0,-0.67 0.358,-1.288 0.938,-1.623l3.114,-1.798ZM12.063,14.046a0.125,0.125 0,0 0,-0.126 0l-3.113,1.798a0.125,0.125 0,0 0,-0.063 0.108v3.596c0,0.044 0.024,0.086 0.063,0.108l3.114,1.798a0.125,0.125 0,0 0,0.124 0l3.114,-1.798a0.125,0.125 0,0 0,0.063 -0.108v-3.596a0.125,0.125 0,0 0,-0.063 -0.108l-3.114,-1.798Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_bell_24.xml b/app/src/main/res/drawable/symbol_bell_24.xml
new file mode 100644
index 0000000000..b731945620
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_bell_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,1.375c-3.82,0 -7.065,2.938 -7.209,7.038 -0.127,3.637 -0.86,4.938 -1.412,5.59 -0.148,0.174 -0.297,0.32 -0.457,0.468l-0.075,0.07a7.07,7.07 0,0 0,-0.431 0.421c-0.389,0.428 -0.666,0.95 -0.666,1.74 0,1.323 1.057,2.423 2.395,2.423h3.563c0.39,2.029 2.126,3.5 4.292,3.5s3.901,-1.471 4.292,-3.5h3.563c1.338,0 2.395,-1.1 2.395,-2.423 0,-0.79 -0.277,-1.312 -0.666,-1.74a7.684,7.684 0,0 0,-0.431 -0.422,5.364 5.364,0 0,1 -0.532,-0.538c-0.552,-0.651 -1.285,-1.952 -1.412,-5.59 -0.143,-4.1 -3.389,-7.037 -7.209,-7.037ZM6.54,8.475c0.11,-3.14 2.564,-5.35 5.46,-5.35s5.35,2.21 5.46,5.35c0.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.562a0.66,0.66 0,0 1,-0.645 0.673L4.145,17.375a0.66,0.66 0,0 1,-0.645 -0.673c0,-0.292 0.07,-0.408 0.21,-0.562 0.082,-0.09 0.174,-0.175 0.306,-0.297l0.098,-0.09c0.175,-0.164 0.385,-0.365 0.6,-0.62 0.904,-1.065 1.691,-2.812 1.826,-6.659ZM14.488,19.125L9.512,19.125c0.344,1.042 1.298,1.75 2.488,1.75s2.144,-0.708 2.488,-1.75Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_camera_24.xml b/app/src/main/res/drawable/symbol_camera_24.xml
new file mode 100644
index 0000000000..9270ddabc5
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_camera_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,6.375a5.875,5.875 0,1 0,0 11.75,5.875 5.875,0 0,0 0,-11.75ZM7.875,12.25a4.125,4.125 0,1 1,8.25 0,4.125 4.125,0 0,1 -8.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10.13,1.625c-0.806,0 -1.575,0.338 -2.12,0.932L6.803,3.875H5.5A4.375,4.375 0,0 0,1.125 8.25v9.25A4.375,4.375 0,0 0,5.5 21.875h13a4.375,4.375 0,0 0,4.375 -4.375V8.25A4.375,4.375 0,0 0,18.5 3.875h-1.303L15.99,2.557a2.875,2.875 0,0 0,-2.12 -0.932h-3.74ZM9.3,3.74c0.214,-0.233 0.514,-0.365 0.83,-0.365h3.74c0.316,0 0.616,0.132 0.83,0.365l1.468,1.601c0.165,0.181 0.4,0.284 0.645,0.284H18.5a2.625,2.625 0,0 1,2.625 2.625v9.25a2.625,2.625 0,0 1,-2.625 2.625h-13A2.625,2.625 0,0 1,2.875 17.5V8.25A2.625,2.625 0,0 1,5.5 5.625h1.688a0.875,0.875 0,0 0,0.645 -0.284L9.3,3.74Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_chat_24.xml b/app/src/main/res/drawable/symbol_chat_24.xml
new file mode 100644
index 0000000000..d893fa1c8c
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_chat_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="M1.875,12C1.875,6.408 6.408,1.875 12,1.875S22.125,6.408 22.125,12 17.592,22.125 12,22.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 12ZM12,3.625a8.375,8.375 0,0 0,-7.385 12.329c0.18,0.337 0.223,0.746 0.086,1.128l-1.248,3.465 3.465,-1.248a1.39,1.39 0,0 1,1.128 0.086A8.375,8.375 0,1 0,12 3.625Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_data_24.xml b/app/src/main/res/drawable/symbol_data_24.xml
new file mode 100644
index 0000000000..f75eb09c53
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_data_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,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.125ZM11.125,2.916a9.126,9.126 0,1 0,5.896 16.704l-5.259,-6.52a2.875,2.875 0,0 1,-0.637 -1.805L11.125,2.916ZM18.383,18.521a9.097,9.097 0,0 0,2.712 -5.771L16,12.75l-2.392,-0.15 4.775,5.921ZM12.875,11h8.196a9.128,9.128 0,0 0,-8.196 -8.084L12.875,11Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_devices_24.xml b/app/src/main/res/drawable/symbol_devices_24.xml
new file mode 100644
index 0000000000..3972863fb0
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_devices_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="M6.367,4.125c-0.392,0 -0.737,0 -1.023,0.023 -0.305,0.025 -0.618,0.08 -0.922,0.236 -0.447,0.228 -0.81,0.59 -1.038,1.038 -0.155,0.304 -0.21,0.617 -0.236,0.922 -0.023,0.286 -0.023,0.631 -0.023,1.023V17H1.5a1,1 0,1 0,0 2h11.943a5.13,5.13 0,0 1,-0.04 -0.346c-0.028,-0.35 -0.028,-0.752 -0.028,-1.117V17h-8.5V7.4c0,-0.434 0,-0.708 0.018,-0.914 0.016,-0.196 0.042,-0.253 0.05,-0.27a0.625,0.625 0,0 1,0.273 -0.273c0.017,-0.008 0.074,-0.034 0.27,-0.05 0.206,-0.017 0.48,-0.018 0.914,-0.018h11.2c0.434,0 0.708,0 0.914,0.018 0.196,0.016 0.253,0.042 0.27,0.05 0.117,0.06 0.213,0.156 0.273,0.273 0.008,0.017 0.035,0.074 0.05,0.27 0.017,0.202 0.018,0.469 0.018,0.889h0.287c0.365,0 0.767,0 1.117,0.028 0.106,0.009 0.222,0.021 0.346,0.04v-0.076c0,-0.392 0,-0.737 -0.023,-1.023 -0.025,-0.305 -0.08,-0.618 -0.236,-0.922a2.375,2.375 0,0 0,-1.038 -1.038c-0.304,-0.155 -0.617,-0.21 -0.921,-0.236a13.478,13.478 0,0 0,-1.024 -0.023H6.367Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M18.117,8.875c-0.392,0 -0.737,0 -1.024,0.023 -0.304,0.025 -0.617,0.08 -0.921,0.236 -0.447,0.228 -0.81,0.59 -1.038,1.038 -0.155,0.304 -0.21,0.617 -0.236,0.922 -0.023,0.286 -0.023,0.631 -0.023,1.023v5.39c0,0.393 0,0.738 0.023,1.024 0.025,0.305 0.08,0.618 0.236,0.922 0.228,0.447 0.59,0.81 1.038,1.038 0.304,0.155 0.617,0.21 0.921,0.236 0.287,0.023 0.632,0.023 1.024,0.023h1.266c0.392,0 0.737,0 1.024,-0.023 0.304,-0.025 0.617,-0.08 0.921,-0.236 0.447,-0.228 0.81,-0.59 1.038,-1.038 0.155,-0.304 0.21,-0.617 0.236,-0.921 0.023,-0.287 0.023,-0.632 0.023,-1.024v-5.39c0,-0.393 0,-0.738 -0.023,-1.024 -0.025,-0.305 -0.08,-0.618 -0.236,-0.922a2.375,2.375 0,0 0,-1.038 -1.038c-0.304,-0.155 -0.617,-0.21 -0.921,-0.236a13.478,13.478 0,0 0,-1.024 -0.023h-1.266ZM16.967,10.693c0.016,-0.008 0.073,-0.034 0.27,-0.05 0.205,-0.017 0.479,-0.018 0.913,-0.018h1.2c0.434,0 0.708,0 0.914,0.018 0.196,0.015 0.253,0.042 0.27,0.05 0.117,0.06 0.213,0.156 0.273,0.273 0.008,0.017 0.035,0.074 0.05,0.27 0.017,0.206 0.018,0.48 0.018,0.914v5.325c0,0.434 0,0.708 -0.017,0.914 -0.017,0.196 -0.043,0.253 -0.051,0.27a0.625,0.625 0,0 1,-0.273 0.273c-0.017,0.008 -0.074,0.035 -0.27,0.05 -0.206,0.017 -0.48,0.018 -0.914,0.018h-1.2c-0.434,0 -0.708,0 -0.914,-0.017 -0.196,-0.017 -0.253,-0.043 -0.27,-0.051a0.625,0.625 0,0 1,-0.273 -0.273c-0.008,-0.017 -0.035,-0.074 -0.05,-0.27 -0.017,-0.206 -0.018,-0.48 -0.018,-0.914L16.625,12.15c0,-0.434 0,-0.708 0.017,-0.914 0.017,-0.196 0.043,-0.253 0.051,-0.27a0.625,0.625 0,0 1,0.273 -0.273Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_edit_24.xml b/app/src/main/res/drawable/symbol_edit_24.xml
new file mode 100644
index 0000000000..f8469bf131
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_edit_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="M20.369,3.631a3.35,3.35 0,0 0,-4.738 0l-11.25,11.25c-0.09,0.09 -0.16,0.2 -0.203,0.32l-1.634,4.493c-0.4,1.097 0.664,2.161 1.762,1.762l4.493,-1.634a0.875,0.875 0,0 0,0.32 -0.203l11.25,-11.25a3.35,3.35 0,0 0,0 -4.738ZM16.869,4.869A1.6,1.6 0,1 1,19.13 7.13L18,8.263 15.737,6l1.132,-1.131ZM14.499,7.237 L5.756,15.981 4.463,19.537 8.018,18.244L16.762,9.5 14.5,7.237Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_emoji_plus_24.xml b/app/src/main/res/drawable/symbol_emoji_plus_24.xml
new file mode 100644
index 0000000000..a0b85b8609
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_emoji_plus_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="M14.25,4.625a7.36,7.36 0,0 0,-5.811 2.833,0.875 0.875,0 1,1 -1.378,-1.079 9.125,9.125 0,1 1,0 11.241,0.875 0.875,0 0,1 1.378,-1.078A7.375,7.375 0,1 0,14.25 4.625Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M10.193,14.213a0.875,0.875 0,0 1,1.231 0.117,3.653 3.653,0 0,0 2.826,1.333 3.653,3.653 0,0 0,2.826 -1.333,0.875 0.875,0 0,1 1.349,1.115 5.403,5.403 0,0 1,-4.175 1.968,5.403 5.403,0 0,1 -4.175,-1.968 0.875,0.875 0,0 1,0.118 -1.232ZM15.942,8.968c0.204,-0.313 0.544,-0.593 0.994,-0.593 0.45,0 0.79,0.28 0.993,0.593 0.207,0.319 0.32,0.729 0.32,1.156 0,0.428 -0.113,0.838 -0.32,1.156 -0.204,0.314 -0.544,0.594 -0.993,0.594 -0.45,0 -0.79,-0.28 -0.994,-0.594a2.137,2.137 0,0 1,-0.319 -1.156c0,-0.427 0.112,-0.837 0.319,-1.156ZM11.563,8.375c-0.45,0 -0.79,0.28 -0.994,0.594a2.139,2.139 0,0 0,-0.319 1.156c0,0.428 0.112,0.838 0.319,1.156 0.204,0.314 0.544,0.594 0.993,0.594 0.45,0 0.79,-0.28 0.994,-0.594 0.207,-0.318 0.319,-0.728 0.319,-1.156 0,-0.428 -0.112,-0.838 -0.319,-1.156 -0.204,-0.314 -0.544,-0.594 -0.993,-0.594ZM5.375,8.75a0.875,0.875 0,1 0,-1.75 0v2.375L1.25,11.125a0.875,0.875 0,0 0,0 1.75h2.375v2.375a0.875,0.875 0,0 0,1.75 0v-2.375L7.75,12.875a0.875,0.875 0,0 0,0 -1.75L5.375,11.125L5.375,8.75Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_gift_24.xml b/app/src/main/res/drawable/symbol_gift_24.xml
new file mode 100644
index 0000000000..5b5148d826
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_gift_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,2.733a3.375,3.375 0,0 0,-5.459 3.892L4.07,6.625c-0.254,0 -0.495,0 -0.698,0.017 -0.22,0.018 -0.472,0.06 -0.723,0.187 -0.353,0.18 -0.64,0.467 -0.82,0.82 -0.127,0.25 -0.17,0.502 -0.187,0.723 -0.017,0.203 -0.017,0.444 -0.017,0.699v0.858c0,0.255 0,0.496 0.017,0.7 0.018,0.22 0.06,0.471 0.187,0.722 0.18,0.353 0.467,0.64 0.82,0.82 0.161,0.082 0.323,0.129 0.476,0.156v4.709c0,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.709c0.154,-0.027 0.315,-0.074 0.476,-0.156 0.353,-0.18 0.64,-0.467 0.82,-0.82 0.128,-0.25 0.17,-0.502 0.188,-0.723 0.016,-0.203 0.016,-0.444 0.016,-0.699v-0.858c0,-0.255 0,-0.496 -0.017,-0.699a1.898,1.898 0,0 0,-0.187 -0.723,1.875 1.875,0 0,0 -0.82,-0.82 1.898,1.898 0,0 0,-0.723 -0.187,9.112 9.112,0 0,0 -0.699,-0.017h-2.47A3.375,3.375 0,0 0,12 2.733ZM9.5,3.375a1.625,1.625 0,0 0,0 3.25h1.625L11.125,5c0,-0.897 -0.727,-1.625 -1.625,-1.625ZM14.5,6.625A1.625,1.625 0,1 0,12.875 5v1.625L14.5,6.625ZM12.875,8.375L19.9,8.375c0.295,0 0.463,0 0.585,0.01 0.045,0.004 0.071,0.009 0.084,0.011 0.014,0.01 0.026,0.02 0.035,0.035a0.581,0.581 0,0 1,0.01 0.083c0.01,0.123 0.011,0.292 0.011,0.586v0.8c0,0.294 0,0.463 -0.01,0.585a0.809,0.809 0,0 1,-0.011 0.084,0.127 0.127,0 0,1 -0.035,0.035 0.835,0.835 0,0 1,-0.084 0.01c-0.122,0.01 -0.29,0.011 -0.585,0.011h-7.025v-2.25ZM11.125,8.375L4.1,8.375c-0.294,0 -0.463,0 -0.586,0.01a0.805,0.805 0,0 0,-0.083 0.011,0.125 0.125,0 0,0 -0.035,0.035 0.803,0.803 0,0 0,-0.01 0.083,8.26 8.26,0 0,0 -0.011,0.586v0.8c0,0.294 0,0.463 0.01,0.585 0.004,0.045 0.009,0.071 0.011,0.084 0.01,0.014 0.02,0.026 0.035,0.035a0.581,0.581 0,0 0,0.083 0.01c0.123,0.01 0.292,0.011 0.586,0.011h7.025v-2.25ZM11.125,12.375h-6.25L4.875,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.031h3.125v-7.75ZM12.875,20.125L16,20.125c0.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.571v-4.625h-6.25v7.75Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_heart_24.xml b/app/src/main/res/drawable/symbol_heart_24.xml
new file mode 100644
index 0000000000..65d42e88d3
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_heart_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="M2.886,4.053c1.12,-1.249 2.672,-1.928 4.364,-1.928 1.929,0 3.659,1.066 4.75,2.606 1.091,-1.54 2.821,-2.606 4.75,-2.606 1.692,0 3.244,0.679 4.364,1.928 1.117,1.245 1.761,3.005 1.761,5.11 0,2.321 -1.254,5.03 -3.12,7.453 -1.882,2.446 -4.481,4.725 -7.364,6.167a0.875,0.875 0,0 1,-0.782 0c-2.883,-1.442 -5.482,-3.72 -7.365,-6.167 -1.865,-2.422 -3.119,-5.132 -3.119,-7.454 0,-2.104 0.644,-3.864 1.761,-5.11ZM4.19,5.22c-0.783,0.873 -1.314,2.194 -1.314,3.941 0,1.766 0.996,4.1 2.756,6.387C7.286,17.7 9.535,19.7 12,21.015c2.465,-1.317 4.714,-3.316 6.37,-5.466 1.76,-2.287 2.755,-4.621 2.755,-6.387 0,-1.747 -0.53,-3.068 -1.314,-3.94 -0.78,-0.87 -1.854,-1.347 -3.061,-1.347 -1.666,0 -3.28,1.246 -3.928,3.02a0.875,0.875 0,0 1,-1.644 0c-0.648,-1.774 -2.262,-3.02 -3.928,-3.02 -1.207,0 -2.28,0.476 -3.061,1.346Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_help_24.xml b/app/src/main/res/drawable/symbol_help_24.xml
new file mode 100644
index 0000000000..e771a985ad
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_help_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.757,6.786c0.577,-0.374 1.301,-0.536 2.118,-0.536 0.974,0 1.813,0.25 2.42,0.736 0.616,0.493 0.955,1.2 0.955,2.016 0,0.659 -0.19,1.159 -0.486,1.566 -0.262,0.363 -0.603,0.643 -0.89,0.879l-0.056,0.046c-0.317,0.26 -0.573,0.481 -0.761,0.763 -0.178,0.266 -0.307,0.608 -0.307,1.119a0.875,0.875 0,0 1,-1.75 0c0,-0.736 0.18,-1.306 0.465,-1.77 0.279,-0.455 0.645,-0.782 0.966,-1.048l0.155,-0.126c0.596,-0.49 0.914,-0.75 0.914,-1.306 0,-0.489 -0.172,-0.81 -0.424,-1.018 -0.264,-0.22 -0.671,-0.357 -1.201,-0.357 -0.515,0 -0.868,0.113 -1.104,0.279 -0.23,0.16 -0.394,0.404 -0.479,0.763 -0.088,0.37 -0.416,0.71 -0.872,0.71 -0.502,0 -0.974,-0.46 -0.826,-1.037 0.185,-0.727 0.575,-1.298 1.163,-1.68ZM10.625,16.625a1.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_info_fill_24.xml b/app/src/main/res/drawable/symbol_info_fill_24.xml
new file mode 100644
index 0000000000..f7e1befeac
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_info_fill_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="M1.5,12C1.5,6.201 6.201,1.5 12,1.5S22.5,6.201 22.5,12 17.799,22.5 12,22.5 1.5,17.799 1.5,12ZM12,5.875a1.376,1.376 0,1 0,0 2.752,1.376 1.376,0 0,0 0,-2.752ZM13.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.125Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_invite_24.xml b/app/src/main/res/drawable/symbol_invite_24.xml
new file mode 100644
index 0000000000..13a948fe06
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_invite_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="M22.375,9.563c0,-0.949 0,-1.714 -0.05,-2.333 -0.053,-0.638 -0.163,-1.198 -0.427,-1.716a4.375,4.375 0,0 0,-1.912 -1.912c-0.518,-0.264 -1.078,-0.374 -1.716,-0.426 -0.62,-0.051 -1.384,-0.051 -2.332,-0.051L8.063,3.125c-0.949,0 -1.714,0 -2.333,0.05 -0.638,0.053 -1.198,0.163 -1.716,0.427a4.375,4.375 0,0 0,-1.912 1.912c-0.264,0.518 -0.374,1.078 -0.426,1.716 -0.051,0.62 -0.051,1.384 -0.051,2.333v4.874c0,0.949 0,1.714 0.05,2.333 0.053,0.638 0.163,1.198 0.427,1.716a4.375,4.375 0,0 0,1.912 1.912c0.518,0.264 1.078,0.374 1.716,0.426 0.62,0.051 1.384,0.051 2.333,0.051h7.874c0.949,0 1.714,0 2.333,-0.05 0.638,-0.053 1.198,-0.163 1.716,-0.427a4.376,4.376 0,0 0,1.912 -1.912c0.264,-0.518 0.374,-1.078 0.426,-1.716 0.051,-0.62 0.051,-1.384 0.051,-2.332L22.375,9.563ZM20.623,8.733 L14.299,13.393a3.875,3.875 0,0 1,-4.598 0l-6.324,-4.66c-0.002,0.261 -0.002,0.549 -0.002,0.867v4.8c0,0.995 0,1.688 0.045,2.228 0.043,0.53 0.124,0.833 0.241,1.064 0.252,0.494 0.653,0.895 1.147,1.147 0.23,0.117 0.535,0.198 1.064,0.241 0.54,0.044 1.233,0.045 2.228,0.045h7.8c0.995,0 1.688,0 2.228,-0.045 0.53,-0.043 0.833,-0.124 1.064,-0.241a2.625,2.625 0,0 0,1.147 -1.147c0.117,-0.23 0.198,-0.535 0.241,-1.064 0.044,-0.54 0.045,-1.233 0.045,-2.228L20.625,9.6c0,-0.318 0,-0.606 -0.002,-0.867ZM20.473,6.67 L13.261,11.984a2.125,2.125 0,0 1,-2.521 0L3.526,6.67a1.79,1.79 0,0 1,0.134 -0.362,2.625 2.625,0 0,1 1.147,-1.147c0.23,-0.117 0.535,-0.198 1.064,-0.241 0.54,-0.044 1.233,-0.045 2.228,-0.045h7.8c0.995,0 1.688,0 2.228,0.045 0.53,0.043 0.833,0.124 1.064,0.241 0.494,0.252 0.895,0.653 1.147,1.147 0.052,0.102 0.097,0.218 0.134,0.362Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_lock_24.xml b/app/src/main/res/drawable/symbol_lock_24.xml
new file mode 100644
index 0000000000..de682a3817
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_lock_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="M11.125,16.244A1.624,1.624 0,0 1,12 13.25a1.625,1.625 0,0 1,0.875 2.994v1.506a0.875,0.875 0,1 1,-1.75 0v-1.506Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.875,6.75a6.125,6.125 0,0 1,12.25 0v2.792a3.374,3.374 0,0 1,1.382 1.426c0.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.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.037L8.964,22.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.677v-4.072c0,-0.67 0,-1.225 0.037,-1.677 0.038,-0.471 0.121,-0.908 0.33,-1.32 0.309,-0.603 0.79,-1.1 1.383,-1.425L5.875,6.75ZM16.375,6.75v2.391c-0.383,-0.016 -0.828,-0.016 -1.34,-0.016h-6.07c-0.512,0 -0.957,0 -1.34,0.016L7.625,6.75a4.375,4.375 0,0 1,8.75 0ZM6.762,11.052c0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.857,-0.031 1.571,-0.031h6c0.714,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.857 0.031,1.571v4c0,0.715 0,1.198 -0.031,1.57 -0.03,0.363 -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.031L9,21.125c-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.305 -0.146,-0.667 -0.03,-0.373 -0.031,-0.857 -0.031,-1.571v-4c0,-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.71Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_open_20.xml b/app/src/main/res/drawable/symbol_open_20.xml
new file mode 100644
index 0000000000..8bdd7dfda3
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_open_20.xml
@@ -0,0 +1,12 @@
+<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="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_24.xml b/app/src/main/res/drawable/symbol_payment_24.xml
new file mode 100644
index 0000000000..8069b84b91
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_payment_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="M22.875,8.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.037L5.964,4.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.677v6.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.452,0.037 1.008,0.037 1.677,0.037h12.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.677L22.875,8.964ZM20.948,6.762c0.063,0.124 0.116,0.304 0.146,0.667 0.02,0.253 0.027,0.555 0.03,0.946L2.876,8.375c0.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.71 0.124,-0.063 0.304,-0.116 0.667,-0.146 0.373,-0.03 0.856,-0.031 1.571,-0.031h12c0.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.71ZM2.875,15v-4.375h18.25L21.125,15c0,0.714 0,1.198 -0.031,1.57 -0.03,0.363 -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.031L6,18.125c-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 1,-0.71 -0.71c-0.063,-0.124 -0.116,-0.305 -0.146,-0.667 -0.03,-0.373 -0.031,-0.857 -0.031,-1.571Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_person_24.xml b/app/src/main/res/drawable/symbol_person_24.xml
new file mode 100644
index 0000000000..8decf852db
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_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,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_circle_24.xml b/app/src/main/res/drawable/symbol_person_circle_24.xml
new file mode 100644
index 0000000000..b7fad710e1
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_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="M7.875,9.814c0,-2.532 1.73,-4.689 4.125,-4.689s4.125,2.157 4.125,4.69c0,1.276 -0.425,2.484 -1.14,3.388 -0.716,0.904 -1.763,1.547 -2.985,1.547s-2.269,-0.643 -2.984,-1.547C8.3,12.3 7.875,11.091 7.875,9.814ZM12,6.875c-1.195,0 -2.375,1.122 -2.375,2.94 0,0.898 0.302,1.72 0.763,2.302C10.85,12.7 11.427,13 12,13c0.573,0 1.151,-0.3 1.612,-0.883 0.461,-0.583 0.763,-1.405 0.763,-2.303 0,-1.817 -1.18,-2.939 -2.375,-2.939Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <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,0 0,-6.613 15.413C7.019,16.713 9.42,15.75 12,15.75s4.981,0.963 6.613,2.538A9.125,9.125 0,0 0,12 2.875ZM17.282,19.442C16.025,18.27 14.166,17.5 12,17.5s-4.025,0.77 -5.282,1.942A9.084,9.084 0,0 0,12 21.125a9.083,9.083 0,0 0,5.282 -1.683Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_plus_compact_16.xml b/app/src/main/res/drawable/symbol_plus_compact_16.xml
new file mode 100644
index 0000000000..0626ca111b
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_plus_compact_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.65,3a0.65,0.65 0,0 0,-1.3 0v4.35H3a0.65,0.65 0,1 0,0 1.3h4.35V13a0.65,0.65 0,1 0,1.3 0V8.65H13a0.65,0.65 0,1 0,0 -1.3H8.65V3Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_receipt_24.xml b/app/src/main/res/drawable/symbol_receipt_24.xml
new file mode 100644
index 0000000000..93d88a2c0f
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_receipt_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,6.75a0.75,0.75 0,0 0,0 1.5h8a0.75,0.75 0,0 0,0 -1.5H8ZM7.25,11a0.75,0.75 0,0 1,0.75 -0.75h8a0.75,0.75 0,0 1,0 1.5H8a0.75,0.75 0,0 1,-0.75 -0.75ZM8,15.25a0.75,0.75 0,0 1,0 -1.5h5a0.75,0.75 0,0 1,0 1.5H8Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M8.464,1.625c-0.67,0 -1.224,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.292,0.848 -0.33,1.319 -0.038,0.452 -0.038,1.008 -0.038,1.677v12.108c0,0.3 0,0.585 0.066,0.861 0.058,0.242 0.154,0.474 0.284,0.687 0.149,0.242 0.35,0.442 0.562,0.655l1.844,1.844a0.875,0.875 0,0 0,1.238 0L9.5,20.737l1.881,1.882a0.875,0.875 0,0 0,1.238 0l1.881,-1.882 1.881,1.882a0.875,0.875 0,0 0,1.238 0l1.844,-1.844c0.213,-0.212 0.414,-0.413 0.562,-0.655 0.13,-0.213 0.226,-0.445 0.285,-0.687 0.066,-0.276 0.066,-0.56 0.065,-0.86V6.463c0,-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 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.037H8.464ZM6.262,3.552c0.124,-0.063 0.305,-0.116 0.667,-0.146 0.373,-0.03 0.857,-0.031 1.571,-0.031h7c0.715,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.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.571v12.006c0,0.408 -0.006,0.47 -0.017,0.519a0.623,0.623 0,0 1,-0.075 0.18c-0.026,0.043 -0.066,0.09 -0.355,0.38L17,20.762l-1.88,-1.882a0.875,0.875 0,0 0,-1.238 0l-1.88,1.882 -1.882,-1.882a0.875,0.875 0,0 0,-1.238 0l-1.88,1.882 -1.18,-1.179c-0.288,-0.289 -0.328,-0.336 -0.354,-0.379a0.624,0.624 0,0 1,-0.075 -0.18c-0.011,-0.049 -0.017,-0.11 -0.017,-0.52V6.5c0,-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_search_24.xml b/app/src/main/res/drawable/symbol_search_24.xml
new file mode 100644
index 0000000000..7db95e8e00
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_search_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="M10,2.125a7.875,7.875 0,1 0,4.716 14.182l4.989,4.989a1.125,1.125 0,0 0,1.59 -1.591l-4.988,-4.989A7.875,7.875 0,0 0,10 2.125ZM3.875,10a6.125,6.125 0,1 1,12.25 0,6.125 6.125,0 0,1 -12.25,0Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_share_android_24.xml b/app/src/main/res/drawable/symbol_share_android_24.xml
new file mode 100644
index 0000000000..84c0f3c657
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_share_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="M17.5,1.75a3.25,3.25 0,0 0,-3.145 4.072L7.763,9.667a3.25,3.25 0,1 0,0 4.666l6.592,3.845A3.254,3.254 0,0 0,17.5 22.25a3.25,3.25 0,1 0,-2.263 -5.583l-6.592,-3.845a3.255,3.255 0,0 0,0 -1.644l6.592,-3.845A3.25,3.25 0,1 0,17.5 1.75ZM15.75,5a1.75,1.75 0,1 1,3.5 0,1.75 1.75,0 0,1 -3.5,0ZM15.75,19a1.75,1.75 0,1 1,3.5 0,1.75 1.75,0 0,1 -3.5,0ZM5.5,10.25a1.75,1.75 0,1 0,0 3.5,1.75 1.75,0 0,0 0,-3.5Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_stories_24.xml b/app/src/main/res/drawable/symbol_stories_24.xml
new file mode 100644
index 0000000000..bfdfe64d88
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_stories_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.263,1.125c-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.005v10.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.044h3.474c0.809,0 1.469,0 2.005,-0.044 0.554,-0.045 1.052,-0.142 1.517,-0.378a3.877,3.877 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.005V6.763c0,-0.809 0,-1.469 -0.044,-2.005 -0.045,-0.554 -0.142,-1.052 -0.378,-1.517a3.876,3.876 0,0 0,-1.694 -1.694c-0.465,-0.236 -0.963,-0.333 -1.517,-0.378 -0.536,-0.044 -1.196,-0.044 -2.005,-0.044h-3.474ZM9.535,3.107c0.177,-0.09 0.42,-0.158 0.866,-0.194 0.456,-0.037 1.044,-0.038 1.899,-0.038h3.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.899v10.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.038h-3.4c-0.855,0 -1.443,0 -1.9,-0.038 -0.445,-0.036 -0.688,-0.103 -0.865,-0.194a2.125,2.125 0,0 1,-0.928 -0.928c-0.09,-0.177 -0.158,-0.42 -0.194,-0.866 -0.037,-0.456 -0.038,-1.044 -0.038,-1.899V6.8c0,-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.928Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5.382,3.405c-0.12,0.425 -0.176,0.84 -0.208,1.231 -0.019,0.225 -0.03,0.467 -0.037,0.721 -0.449,0.165 -0.78,0.292 -1.044,0.413 -0.331,0.152 -0.483,0.264 -0.577,0.365 -0.234,0.251 -0.383,0.57 -0.425,0.91 -0.017,0.138 -0.005,0.326 0.091,0.677 0.1,0.36 0.264,0.815 0.508,1.487l1.435,3.941v4.132c0,0.29 0,0.57 0.003,0.841a6.134,6.134 0,0 1,-0.067 -0.14c-0.19,-0.413 -0.38,-0.935 -0.609,-1.564L2.034,9.773c-0.23,-0.629 -0.42,-1.15 -0.54,-1.588 -0.124,-0.456 -0.196,-0.895 -0.14,-1.353 0.087,-0.707 0.396,-1.37 0.882,-1.89 0.315,-0.338 0.697,-0.565 1.126,-0.762 0.413,-0.19 0.935,-0.38 1.564,-0.609l0.456,-0.166Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml b/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml
new file mode 100644
index 0000000000..447111a6ab
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:pathData="M8.182,1.1h2.136c0.545,0 0.978,0 1.328,0.029 0.358,0.029 0.664,0.09 0.944,0.233a2.4,2.4 0,0 1,1.048 1.048c0.143,0.28 0.204,0.586 0.233,0.944 0.029,0.35 0.029,0.783 0.029,1.328v6.636c0,0.545 0,0.978 -0.029,1.328 -0.029,0.358 -0.09,0.664 -0.233,0.944a2.4,2.4 0,0 1,-1.048 1.048c-0.28,0.143 -0.586,0.204 -0.944,0.233 -0.35,0.029 -0.783,0.029 -1.328,0.029L8.182,14.9c-0.545,0 -0.978,0 -1.328,-0.029 -0.358,-0.029 -0.664,-0.09 -0.944,-0.233a2.4,2.4 0,0 1,-1.048 -1.048c-0.143,-0.28 -0.204,-0.586 -0.233,-0.944a17.75,17.75 0,0 1,-0.029 -1.329L4.6,4.683c0,-0.545 0,-0.978 0.029,-1.328 0.029,-0.358 0.09,-0.664 0.233,-0.944A2.4,2.4 0,0 1,5.91 1.362c0.28,-0.143 0.586,-0.204 0.944,-0.233 0.35,-0.029 0.783,-0.029 1.328,-0.029ZM3.532,3.264c0.02,-0.241 0.054,-0.496 0.123,-0.755l-0.302,0.11c-0.447,0.163 -0.805,0.293 -1.086,0.422 -0.288,0.133 -0.528,0.278 -0.721,0.485a2.15,2.15 0,0 0,-0.562 1.205c-0.035,0.282 0.008,0.558 0.092,0.864 0.082,0.299 0.212,0.657 0.375,1.104l1.517,4.167c0.162,0.446 0.292,0.805 0.422,1.085 0.037,0.082 0.075,0.16 0.116,0.233 -0.006,-0.26 -0.006,-0.538 -0.006,-0.832L3.5,4.648c0,-0.515 0,-0.988 0.032,-1.384Z"
+        android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_x_24.xml b/app/src/main/res/drawable/symbol_x_24.xml
new file mode 100644
index 0000000000..02cb3134da
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_x_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="M18.619,6.619A0.875,0.875 0,0 0,17.38 5.38L12,10.763 6.619,5.38A0.875,0.875 0,1 0,5.38 6.62L10.763,12 5.38,17.381a0.875,0.875 0,1 0,1.24 1.239L12,13.237l5.381,5.382a0.875,0.875 0,1 0,1.238 -1.238L13.237,12l5.382,-5.381Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/layout/about_preset_item.xml b/app/src/main/res/layout/about_preset_item.xml
index 2bbeda7893..82edb6d112 100644
--- a/app/src/main/res/layout/about_preset_item.xml
+++ b/app/src/main/res/layout/about_preset_item.xml
@@ -17,7 +17,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="@id/about_preset_body"
       app:layout_constraintBottom_toBottomOf="@id/about_preset_body"
-      tools:src="@drawable/ic_add_emoji"/>
+      tools:src="@drawable/symbol_emoji_plus_24"/>
 
   <TextView
       android:id="@+id/about_preset_body"
diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index 8a1913a4d1..d05fba7925 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -120,7 +120,7 @@
                 android:transitionName="camera_fab"
                 android:visibility="gone"
                 app:backgroundTint="@color/signal_colorSurfaceVariant"
-                app:srcCompat="@drawable/ic_camera_outline_24"
+                app:srcCompat="@drawable/symbol_camera_24"
                 app:tint="@color/signal_colorOnSurface"
                 tools:visibility="visible" />
 
@@ -136,7 +136,7 @@
                 android:transitionName="new_convo_fab"
                 android:visibility="gone"
                 app:backgroundTint="@color/signal_colorPrimaryContainer"
-                app:srcCompat="@drawable/ic_compose_outline_24"
+                app:srcCompat="@drawable/symbol_edit_24"
                 app:tint="@color/signal_colorOnSurface"
                 tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/dsl_payments_preference.xml b/app/src/main/res/layout/dsl_payments_preference.xml
index 9f87719086..04a9db419a 100644
--- a/app/src/main/res/layout/dsl_payments_preference.xml
+++ b/app/src/main/res/layout/dsl_payments_preference.xml
@@ -17,7 +17,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_payments_24" />
+        app:tint="@color/signal_icon_tint_primary"
+        app:srcCompat="@drawable/symbol_payment_24" />
 
     <TextView
         android:id="@id/title"
diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml
index 37bcb4827d..26b3f4cd4f 100644
--- a/app/src/main/res/layout/edit_about_fragment.xml
+++ b/app/src/main/res/layout/edit_about_fragment.xml
@@ -26,7 +26,7 @@
       android:padding="8dp"
       android:background="?selectableItemBackgroundBorderless"
       android:scaleType="fitCenter"
-      app:srcCompat="@drawable/ic_add_emoji"
+      app:srcCompat="@drawable/symbol_emoji_plus_24"
       app:tint="@color/signal_text_secondary"
       app:layout_constraintTop_toTopOf="@id/edit_about_body"
       app:layout_constraintBottom_toBottomOf="@id/edit_about_body"
@@ -53,7 +53,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="20dp"
-      app:srcCompat="@drawable/ic_x"
+      app:srcCompat="@drawable/symbol_x_24"
       android:background="?selectableItemBackgroundBorderless"
       app:tint="@color/signal_text_secondary"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/edit_proxy_fragment.xml b/app/src/main/res/layout/edit_proxy_fragment.xml
index 30daebaebe..fd74140c6f 100644
--- a/app/src/main/res/layout/edit_proxy_fragment.xml
+++ b/app/src/main/res/layout/edit_proxy_fragment.xml
@@ -66,15 +66,15 @@
       app:layout_constraintTop_toBottomOf="@id/edit_proxy_host"
       tools:text="@string/preferences_connected_to_proxy"/>
 
-  <TextView
+  <androidx.appcompat.widget.AppCompatTextView
       android:id="@+id/edit_proxy_share"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="19dp"
       style="@style/Signal.Text.Body"
       android:text="@string/preferences_share"
-      android:drawableStart="@drawable/ic_share_24"
-      android:drawableTint="@color/signal_text_primary"
+      app:drawableStartCompat="@drawable/symbol_share_android_24"
+      app:drawableTint="@color/signal_text_primary"
       android:drawablePadding="10dp"
       android:paddingStart="13dp"
       android:paddingEnd="13dp"
diff --git a/app/src/main/res/layout/fragment_edit_notification_profile.xml b/app/src/main/res/layout/fragment_edit_notification_profile.xml
index f57f62373d..9571de0fdc 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile.xml
@@ -43,7 +43,7 @@
         app:layout_constraintBottom_toBottomOf="@id/edit_notification_profile_name_wrapper"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/edit_notification_profile_name_wrapper"
-        app:srcCompat="@drawable/ic_add_emoji"
+        app:srcCompat="@drawable/symbol_emoji_plus_24"
         app:tint="@color/signal_text_secondary" />
 
     <com.google.android.material.textfield.TextInputLayout
@@ -78,7 +78,7 @@
         app:layout_constraintBottom_toBottomOf="@id/edit_notification_profile_name_wrapper"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/edit_notification_profile_name_wrapper"
-        app:srcCompat="@drawable/ic_x"
+        app:srcCompat="@drawable/symbol_x_24"
         app:tint="@color/signal_text_secondary" />
 
     <TextView
diff --git a/app/src/main/res/layout/main_activity_list_host_fragment.xml b/app/src/main/res/layout/main_activity_list_host_fragment.xml
index bd257380aa..2648b85ecd 100644
--- a/app/src/main/res/layout/main_activity_list_host_fragment.xml
+++ b/app/src/main/res/layout/main_activity_list_host_fragment.xml
@@ -124,7 +124,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_search_24" />
+                app:srcCompat="@drawable/symbol_search_24" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/manage_profile_fragment.xml b/app/src/main/res/layout/manage_profile_fragment.xml
index 2cd26c24b9..4a67249225 100644
--- a/app/src/main/res/layout/manage_profile_fragment.xml
+++ b/app/src/main/res/layout/manage_profile_fragment.xml
@@ -112,7 +112,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/manage_profile_name_subtitle"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/manage_profile_name"
-                app:srcCompat="@drawable/ic_profile_name_24"
+                app:srcCompat="@drawable/symbol_person_24"
                 app:tint="@color/signal_text_primary" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -157,7 +157,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/manage_profile_username_subtitle"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/manage_profile_username"
-                app:srcCompat="@drawable/ic_at_24"
+                app:srcCompat="@drawable/symbol_at_24"
                 app:tint="@color/signal_text_primary" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -197,7 +197,7 @@
                 android:scaleType="centerInside"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_share_24"
+                app:srcCompat="@drawable/symbol_share_android_24"
                 app:tint="@color/signal_colorOnSurface" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -221,7 +221,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/manage_profile_about_subtitle"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/manage_profile_about"
-                app:srcCompat="@drawable/ic_compose_24"
+                app:srcCompat="@drawable/symbol_edit_24"
                 app:tint="@color/signal_text_primary" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -269,7 +269,7 @@
                 app:layout_constraintBottom_toBottomOf="@id/manage_profile_badges"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/manage_profile_badges"
-                app:srcCompat="@drawable/ic_badge_24"
+                app:srcCompat="@drawable/symbol_badge_multi_24"
                 app:tint="@color/signal_text_primary" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
diff --git a/app/src/main/res/layout/on_reaction_sent_view.xml b/app/src/main/res/layout/on_reaction_sent_view.xml
index e635bcdf70..768c96b0b8 100644
--- a/app/src/main/res/layout/on_reaction_sent_view.xml
+++ b/app/src/main/res/layout/on_reaction_sent_view.xml
@@ -16,7 +16,7 @@
         android:layout_height="56dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_2"
@@ -24,7 +24,7 @@
         android:layout_height="80dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_3"
@@ -32,7 +32,7 @@
         android:layout_height="56dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_4"
@@ -40,7 +40,7 @@
         android:layout_height="70dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_5"
@@ -48,7 +48,7 @@
         android:layout_height="64dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_6"
@@ -56,7 +56,7 @@
         android:layout_height="70dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_7"
@@ -64,7 +64,7 @@
         android:layout_height="40dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_8"
@@ -72,7 +72,7 @@
         android:layout_height="70dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24"
+        tools:background="@drawable/symbol_heart_24"
         tools:layout_editor_absoluteX="20dp"
         tools:layout_editor_absoluteY="591dp" />
 
@@ -82,7 +82,7 @@
         android:layout_height="100dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_10"
@@ -90,7 +90,7 @@
         android:layout_height="60dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/emoji_11"
@@ -98,6 +98,6 @@
         android:layout_height="48dp"
         app:forceJumbo="true"
         app:layout_constraintTag="emoji"
-        tools:background="@drawable/ic_heart_24" />
+        tools:background="@drawable/symbol_heart_24" />
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/share_button.xml b/app/src/main/res/layout/share_button.xml
index cf4659ddf9..8507b65947 100644
--- a/app/src/main/res/layout/share_button.xml
+++ b/app/src/main/res/layout/share_button.xml
@@ -11,6 +11,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/preferences_share"
-        app:icon="@drawable/ic_share_24"
+        app:icon="@drawable/symbol_share_android_24"
         app:iconSize="20dp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/signal_bottom_action_bar_item.xml b/app/src/main/res/layout/signal_bottom_action_bar_item.xml
index 0d8ca7d37b..9924e87610 100644
--- a/app/src/main/res/layout/signal_bottom_action_bar_item.xml
+++ b/app/src/main/res/layout/signal_bottom_action_bar_item.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         app:tint="@color/signal_colorOnSurface"
-        tools:src="@drawable/ic_archive_24"/>
+        tools:src="@drawable/symbol_archive_android_24"/>
 
     <TextView
         android:id="@+id/signal_bottom_action_bar_item_title"
diff --git a/app/src/main/res/layout/signal_context_menu_item.xml b/app/src/main/res/layout/signal_context_menu_item.xml
index c424942b3f..7f8dde82c6 100644
--- a/app/src/main/res/layout/signal_context_menu_item.xml
+++ b/app/src/main/res/layout/signal_context_menu_item.xml
@@ -18,7 +18,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:importantForAccessibility="no"
-        tools:src="@drawable/ic_archive_24dp" />
+        tools:src="@drawable/symbol_archive_android_24" />
 
     <TextView
         android:id="@+id/signal_context_menu_item_title"
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 94ea3bf832..d7fd68a144 100644
--- a/app/src/main/res/layout/sticker_management_sticker_item.xml
+++ b/app/src/main/res/layout/sticker_management_sticker_item.xml
@@ -26,7 +26,7 @@
         app:layout_constraintBottom_toTopOf="@id/sticker_management_divider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_person_white_24dp"
+        tools:src="@drawable/symbol_person_24"
         tools:tint="@color/core_ultramarine" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/stories_landing_item.xml b/app/src/main/res/layout/stories_landing_item.xml
index 53c9cccda4..9aeec2df17 100644
--- a/app/src/main/res/layout/stories_landing_item.xml
+++ b/app/src/main/res/layout/stories_landing_item.xml
@@ -33,12 +33,14 @@
         android:layout_height="24dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="28dp"
+        android:padding="5dp"
         android:background="@drawable/stories_my_story_add_background"
         android:scaleType="centerInside"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@id/avatar"
         app:layout_constraintTop_toTopOf="@id/avatar"
-        app:srcCompat="@drawable/ic_union" />
+        app:tint="@color/signal_colorBackground"
+        app:srcCompat="@drawable/symbol_plus_compact_16" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/sender"
diff --git a/app/src/main/res/layout/stories_landing_item_my_stories.xml b/app/src/main/res/layout/stories_landing_item_my_stories.xml
index 40c41dc5cd..8a3bf57acf 100644
--- a/app/src/main/res/layout/stories_landing_item_my_stories.xml
+++ b/app/src/main/res/layout/stories_landing_item_my_stories.xml
@@ -21,13 +21,14 @@
         android:id="@+id/add_to_story"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:padding="5dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="28dp"
         android:background="@drawable/stories_my_story_add_background"
-        android:scaleType="centerInside"
         app:layout_constraintStart_toStartOf="@id/avatar"
         app:layout_constraintTop_toTopOf="@id/avatar"
-        app:srcCompat="@drawable/ic_union" />
+        app:tint="@color/signal_colorBackground"
+        app:srcCompat="@drawable/symbol_plus_compact_16" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/sender"
diff --git a/app/src/main/res/layout/stories_viewer_fragment_page.xml b/app/src/main/res/layout/stories_viewer_fragment_page.xml
index 7b0dd75427..2611a9cd13 100644
--- a/app/src/main/res/layout/stories_viewer_fragment_page.xml
+++ b/app/src/main/res/layout/stories_viewer_fragment_page.xml
@@ -306,7 +306,7 @@
         android:maxLines="1"
         android:textAppearance="@style/Signal.Text.MaterialCaption"
         android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_stories_16"
+        app:drawableStartCompat="@drawable/symbol_stories_fill_compact_12"
         app:drawableTint="@color/transparent_white_80"
         app:layout_constraintBottom_toTopOf="@id/progress"
         app:layout_constraintEnd_toStartOf="@id/more"
diff --git a/app/src/main/res/layout/tooltip.xml b/app/src/main/res/layout/tooltip.xml
index 8870aae79c..f68bcbc505 100644
--- a/app/src/main/res/layout/tooltip.xml
+++ b/app/src/main/res/layout/tooltip.xml
@@ -61,7 +61,7 @@
             android:layout_marginEnd="2dp"
             android:visibility="gone"
             app:tint="@color/signal_colorPrimaryContainer"
-            tools:src="@drawable/ic_person_white_24dp"
+            tools:src="@drawable/symbol_person_24"
             tools:visibility="visible" />
 
         <TextView