diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
index 7e67b5515e..c5b92ed979 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
@@ -77,7 +77,7 @@ class EditCallLinkNameDialogFragment : ComposeDialogFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.EditCallLinkNameDialogFragment__edit_call_name),
       onNavigationClick = this::dismiss,
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { paddingValues ->
       val focusRequester = remember { FocusRequester() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
index b992e9ba53..eef7e83f86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
@@ -283,7 +283,7 @@ private fun CallLinkDetails(
       YouAreAlreadyInACallSnackbar(showAlreadyInACall)
     },
     onNavigationClick = callback::onNavigationClicked,
-    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
   ) { paddingValues ->
     if (state.callLink == null) {
       return@Settings
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
index 9a90489b87..c29bf61aae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -50,7 +50,7 @@ public class SearchToolbar extends LinearLayout {
 
     Toolbar toolbar = findViewById(R.id.toolbar);
 
-    Drawable drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_arrow_left_24);
+    Drawable drawable = ContextCompat.getDrawable(getContext(), R.drawable.symbol_arrow_start_24);
     toolbar.setNavigationIcon(drawable);
     toolbar.setCollapseIcon(drawable);
     toolbar.inflateMenu(R.menu.conversation_list_search);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt
index 154ea71b3a..afd43ad79d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataFragment.kt
@@ -93,7 +93,7 @@ class ExportAccountDataFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.AccountSettingsFragment__request_account_data),
       onNavigationClick = onNavigationClick,
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding ->
       Surface(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
index f9831566dd..305e88348d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
@@ -72,7 +72,7 @@ class AppIconSelectionFragment : ComposeFragment() {
       onNavigationClick = {
         findNavController().popBackStack()
       },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       IconSelectionScreen(appIconUtility.currentAppIcon, ::updateAppIcon, ::openLearnMore, Modifier.padding(contentPadding))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt
index 7a5b91954f..16707712e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconTutorialFragment.kt
@@ -43,7 +43,7 @@ class AppIconTutorialFragment : ComposeFragment() {
       onNavigationClick = {
         findNavController().popBackStack()
       },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       TutorialScreen(Modifier.padding(contentPadding))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
index 1e807639e0..806434aff6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt
@@ -79,7 +79,7 @@ class ChatFoldersFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.ChatsSettingsFragment__chat_folders),
       onNavigationClick = { requireActivity().onNavigateUp() },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       FoldersScreen(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
index 2ad56bb8f8..2d517170fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt
@@ -119,7 +119,7 @@ class CreateFoldersFragment : ComposeFragment() {
           requireActivity().onNavigateUp()
         }
       },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       CreateFolderScreen(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
index 4269efd5e4..3bd08a5ccf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
@@ -42,7 +42,7 @@ class HelpSettingsFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(R.string.preferences__help),
       onNavigationClick = { navController.popBackStack() },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding ->
       LazyColumn(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
index de0a47974e..8ca9c04ea9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
@@ -46,7 +46,7 @@ class LicenseFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.HelpSettingsFragment__licenses),
       onNavigationClick = findNavController()::popBackStack,
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) {
       LicenseScreen(licenseTextLines = textState.value, modifier = Modifier.padding(it))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
index c292907fed..ab7dd116c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
@@ -104,7 +104,7 @@ private fun Screen(
   Scaffolds.Settings(
     title = stringResource(id = R.string.preferences_app_protection__phone_number),
     onNavigationClick = onNavigationClick,
-    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
     navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close),
     snackbarHost = {
       SnackbarHost(snackbarHostState)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt
index 9b5a8d8d20..2cdb7207ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/screenlock/ScreenLockSettingsFragment.kt
@@ -112,7 +112,7 @@ class ScreenLockSettingsFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.preferences_app_protection__screen_lock),
       onNavigationClick = { navController.popBackStack() },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       ScreenLockScreen(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
index 6254d34cc2..2c185fe5f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
@@ -273,7 +273,7 @@ private fun ManageStorageSettingsScreen(
   Scaffolds.Settings(
     title = stringResource(id = R.string.preferences__storage),
     onNavigationClick = onNavigationClick,
-    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
   ) { contentPadding ->
     Column(
       modifier = Modifier
@@ -378,7 +378,7 @@ private fun SetKeepMessagesScreen(
   Scaffolds.Settings(
     title = stringResource(id = R.string.preferences__keep_messages),
     onNavigationClick = onNavigationClick,
-    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
   ) { contentPadding ->
     Column(
       modifier = Modifier
@@ -418,7 +418,7 @@ private fun SetChatLengthLimitScreen(
   Scaffolds.Settings(
     title = stringResource(id = R.string.preferences__conversation_length_limit),
     onNavigationClick = onNavigationClick,
-    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24)
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24)
   ) { contentPadding ->
     Column(
       modifier = Modifier
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 26939fa98e..65c454f632 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -1384,7 +1384,7 @@ class ConversationFragment :
 
   private fun presentNavigationIconForNormal() {
     if (!resources.getWindowSizeClass().isSplitPane()) {
-      binding.toolbar.setNavigationIcon(R.drawable.ic_arrow_left_24)
+      binding.toolbar.setNavigationIcon(R.drawable.symbol_arrow_start_24)
       binding.toolbar.setNavigationContentDescription(R.string.ConversationFragment__content_description_back_button)
       binding.toolbar.setNavigationOnClickListener {
         binding.root.hideKeyboard(composeText)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java
index be1bbf1841..12e3720f48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java
@@ -89,7 +89,7 @@ public class AddMembersActivity extends PushContactSelectionActivity implements
 
   @Override
   protected void initializeToolbar() {
-    getToolbar().setNavigationIcon(R.drawable.ic_arrow_left_24);
+    getToolbar().setNavigationIcon(R.drawable.symbol_arrow_start_24);
     getToolbar().setNavigationOnClickListener(v -> {
       setResult(RESULT_CANCELED);
       finish();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
index c57a8ede89..1789747a95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
@@ -110,9 +110,9 @@ class KeyboardPageSearchView @JvmOverloads constructor(
   fun showRequested(): Boolean = state == State.SHOW_REQUESTED
 
   fun enableBackNavigation(enable: Boolean = true) {
-    navButton.setImageResource(if (enable) R.drawable.ic_arrow_left_24 else R.drawable.ic_search_24)
+    navButton.setImageResource(if (enable) R.drawable.symbol_arrow_start_24 else R.drawable.ic_search_24)
     if (enable) {
-      navButton.setImageResource(R.drawable.ic_arrow_left_24)
+      navButton.setImageResource(R.drawable.symbol_arrow_start_24)
       navButton.setOnClickListener { callbacks?.onNavigationClicked() }
     } else {
       navButton.setImageResource(R.drawable.ic_search_24)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt
index 1cd092f27c..4cbb4348f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/EditDeviceNameFragment.kt
@@ -83,7 +83,7 @@ class EditDeviceNameFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.EditDeviceNameFragment__edit),
       onNavigationClick = { navController.popBackStack() },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       EditNameScreen(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
index d611409344..12dc9155ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
@@ -197,7 +197,7 @@ class LinkDeviceFragment : ComposeFragment() {
     Scaffolds.Settings(
       title = stringResource(id = R.string.preferences__linked_devices),
       onNavigationClick = { navController.popOrFinish() },
-      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_start_24),
       navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
     ) { contentPadding: PaddingValues ->
       DeviceListScreen(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropActivity.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropActivity.java
index 16801ffebc..c4fea529b9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropActivity.java
@@ -102,7 +102,7 @@ public final class WallpaperCropActivity extends BaseActivity {
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
     ActionBar supportActionBar = Objects.requireNonNull(getSupportActionBar());
-    supportActionBar.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24));
+    supportActionBar.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.symbol_arrow_start_24));
     supportActionBar.setDisplayHomeAsUpEnabled(true);
 
     blur.setOnCheckedChangeListener((v, checked) -> viewModel.setBlur(checked));
diff --git a/app/src/main/res/drawable/symbol_arrow_start_24.xml b/app/src/main/res/drawable/symbol_arrow_start_24.xml
index 52f15926d6..8b33a69334 100644
--- a/app/src/main/res/drawable/symbol_arrow_start_24.xml
+++ b/app/src/main/res/drawable/symbol_arrow_start_24.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/signal_colorOnSurface"
         android:pathData="M3.88 12c0 0.23 0.09 0.45 0.25 0.62l6.5 6.5c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24l-5.13-5.13 1.76 0.13h11.25c0.48 0 0.88-0.4 0.88-0.88s-0.4-0.88-0.88-0.88H8.5l-1.76 0.13 5.13-5.13c0.34-0.34 0.34-0.9 0-1.24-0.34-0.34-0.9-0.34-1.24 0l-6.5 6.5C3.97 11.55 3.88 11.77 3.88 12Z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_contact_share_edit.xml b/app/src/main/res/layout/activity_contact_share_edit.xml
index 322dbcd3f0..75806c180a 100644
--- a/app/src/main/res/layout/activity_contact_share_edit.xml
+++ b/app/src/main/res/layout/activity_contact_share_edit.xml
@@ -12,7 +12,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/ContactShareEditActivity__send_contact"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/add_group_details_fragment.xml b/app/src/main/res/layout/add_group_details_fragment.xml
index e276f7334b..b249b61b21 100644
--- a/app/src/main/res/layout/add_group_details_fragment.xml
+++ b/app/src/main/res/layout/add_group_details_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
         tools:title="@string/AddGroupDetailsFragment__name_this_group" />
 
diff --git a/app/src/main/res/layout/add_members_activity.xml b/app/src/main/res/layout/add_members_activity.xml
index 1a3694b95d..626d3ac5d2 100644
--- a/app/src/main/res/layout/add_members_activity.xml
+++ b/app/src/main/res/layout/add_members_activity.xml
@@ -20,7 +20,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/AddMembersActivity__add_members"
             app:titleTextAppearance="@style/Signal.Text.Title" />
 
diff --git a/app/src/main/res/layout/add_to_group_activity.xml b/app/src/main/res/layout/add_to_group_activity.xml
index 0e4a4d2d42..37a284a134 100644
--- a/app/src/main/res/layout/add_to_group_activity.xml
+++ b/app/src/main/res/layout/add_to_group_activity.xml
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/AddToGroupActivity_add_to_a_group"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
diff --git a/app/src/main/res/layout/blocked_users_activity.xml b/app/src/main/res/layout/blocked_users_activity.xml
index a16f7b80b2..a8c7a35b49 100644
--- a/app/src/main/res/layout/blocked_users_activity.xml
+++ b/app/src/main/res/layout/blocked_users_activity.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:theme="?attr/settingsToolbarStyle"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.Title"
         app:title="@string/BlockedUsersActivity__blocked_users" />
 
diff --git a/app/src/main/res/layout/chat_color_selection_fragment.xml b/app/src/main/res/layout/chat_color_selection_fragment.xml
index 90ec1a0922..a0794cb673 100644
--- a/app/src/main/res/layout/chat_color_selection_fragment.xml
+++ b/app/src/main/res/layout/chat_color_selection_fragment.xml
@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/ChatColorSelectionFragment__chat_color"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
diff --git a/app/src/main/res/layout/chat_wallpaper_fragment.xml b/app/src/main/res/layout/chat_wallpaper_fragment.xml
index 4318bf0c54..30be234833 100644
--- a/app/src/main/res/layout/chat_wallpaper_fragment.xml
+++ b/app/src/main/res/layout/chat_wallpaper_fragment.xml
@@ -82,7 +82,7 @@
                 android:layout_marginBottom="4dp"
                 app:layout_constraintBottom_toBottomOf="@id/chat_wallpaper_preview_top_bar"
                 app:layout_constraintStart_toStartOf="@id/chat_wallpaper_preview_top_bar"
-                app:srcCompat="@drawable/ic_arrow_left_24"
+                app:srcCompat="@drawable/symbol_arrow_start_24"
                 app:tint="@color/core_white" />
 
             <org.thoughtcrime.securesms.components.AvatarImageView
diff --git a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
index 6651b89dd9..7910af78ad 100644
--- a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
+++ b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml
@@ -31,7 +31,7 @@
         android:background="@color/signal_background_primary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/ChatWallpaperPreviewActivity__preview" />
 
     <TextView
diff --git a/app/src/main/res/layout/choose_chats_fragment.xml b/app/src/main/res/layout/choose_chats_fragment.xml
index b3813decbb..f860900b1e 100644
--- a/app/src/main/res/layout/choose_chats_fragment.xml
+++ b/app/src/main/res/layout/choose_chats_fragment.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <org.thoughtcrime.securesms.components.ContactFilterView
         android:id="@+id/contact_filter_edit_text"
diff --git a/app/src/main/res/layout/contact_selection_activity.xml b/app/src/main/res/layout/contact_selection_activity.xml
index bb5278192d..2971a1aa26 100644
--- a/app/src/main/res/layout/contact_selection_activity.xml
+++ b/app/src/main/res/layout/contact_selection_activity.xml
@@ -18,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/NewConversationActivity__new_message"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/conversation_list_archive_toolbar.xml b/app/src/main/res/layout/conversation_list_archive_toolbar.xml
index 47d4f467c1..6aa596021d 100644
--- a/app/src/main/res/layout/conversation_list_archive_toolbar.xml
+++ b/app/src/main/res/layout/conversation_list_archive_toolbar.xml
@@ -10,5 +10,5 @@
     android:theme="?attr/actionBarStyle"
     android:visibility="gone"
     app:layout_constraintTop_toTopOf="parent"
-    app:navigationIcon="@drawable/ic_arrow_left_24"
+    app:navigationIcon="@drawable/symbol_arrow_start_24"
     app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
diff --git a/app/src/main/res/layout/conversation_settings_toolbar.xml b/app/src/main/res/layout/conversation_settings_toolbar.xml
index fbf55120de..bcfbaf105e 100644
--- a/app/src/main/res/layout/conversation_settings_toolbar.xml
+++ b/app/src/main/res/layout/conversation_settings_toolbar.xml
@@ -26,7 +26,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24">
+        app:navigationIcon="@drawable/symbol_arrow_start_24">
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/create_group_activity.xml b/app/src/main/res/layout/create_group_activity.xml
index f22de9cad2..8fe8b62ecf 100644
--- a/app/src/main/res/layout/create_group_activity.xml
+++ b/app/src/main/res/layout/create_group_activity.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/CreateGroupActivity__select_members"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/create_payment_fragment.xml b/app/src/main/res/layout/create_payment_fragment.xml
index d189a50409..262b1fc4c7 100644
--- a/app/src/main/res/layout/create_payment_fragment.xml
+++ b/app/src/main/res/layout/create_payment_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
diff --git a/app/src/main/res/layout/create_profile_fragment.xml b/app/src/main/res/layout/create_profile_fragment.xml
index 03787ed541..8b73cc8cec 100644
--- a/app/src/main/res/layout/create_profile_fragment.xml
+++ b/app/src/main/res/layout/create_profile_fragment.xml
@@ -31,7 +31,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:navigationIcon="@drawable/ic_arrow_left_24"
+                    app:navigationIcon="@drawable/symbol_arrow_start_24"
                     app:title="@string/CreateProfileActivity__profile" />
 
                 <TextView
diff --git a/app/src/main/res/layout/credit_card_fragment.xml b/app/src/main/res/layout/credit_card_fragment.xml
index 5dd2187911..033a51f51d 100644
--- a/app/src/main/res/layout/credit_card_fragment.xml
+++ b/app/src/main/res/layout/credit_card_fragment.xml
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/CreditCardFragment__credit_or_debit_card"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/custom_chat_color_creator_fragment.xml b/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
index 2ebafdc069..58c6f411b6 100644
--- a/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
+++ b/app/src/main/res/layout/custom_chat_color_creator_fragment.xml
@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.Title"
         app:title="@string/ChatColorSelectionFragment__chat_color" />
 
diff --git a/app/src/main/res/layout/deactivate_wallet_fragment.xml b/app/src/main/res/layout/deactivate_wallet_fragment.xml
index 45f9705f1e..d15e0fbcc1 100644
--- a/app/src/main/res/layout/deactivate_wallet_fragment.xml
+++ b/app/src/main/res/layout/deactivate_wallet_fragment.xml
@@ -14,7 +14,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/DeactivateWalletFragment__deactivate_wallet"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/delete_account_country_picker.xml b/app/src/main/res/layout/delete_account_country_picker.xml
index 165f766157..c7624de04e 100644
--- a/app/src/main/res/layout/delete_account_country_picker.xml
+++ b/app/src/main/res/layout/delete_account_country_picker.xml
@@ -13,7 +13,7 @@
         android:layout_height="?attr/actionBarSize"
         app:contentInsetEnd="16dp"
         app:contentInsetStartWithNavigation="0dp"
-        app:navigationIcon="@drawable/ic_arrow_left_24">
+        app:navigationIcon="@drawable/symbol_arrow_start_24">
 
         <EditText
             android:id="@+id/delete_account_country_picker_filter"
diff --git a/app/src/main/res/layout/donation_receipt_list_fragment.xml b/app/src/main/res/layout/donation_receipt_list_fragment.xml
index a36c254f7a..0b80bcdaf2 100644
--- a/app/src/main/res/layout/donation_receipt_list_fragment.xml
+++ b/app/src/main/res/layout/donation_receipt_list_fragment.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/DonationReceiptListFragment__all_activity" />
 
         <org.thoughtcrime.securesms.components.ControllableTabLayout
diff --git a/app/src/main/res/layout/dsl_settings_toolbar.xml b/app/src/main/res/layout/dsl_settings_toolbar.xml
index 38493bfde6..8cf26a497e 100644
--- a/app/src/main/res/layout/dsl_settings_toolbar.xml
+++ b/app/src/main/res/layout/dsl_settings_toolbar.xml
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge"
         tools:title="Settings" />
 
diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml
index 5bb293652f..e3577227b7 100644
--- a/app/src/main/res/layout/edit_about_fragment.xml
+++ b/app/src/main/res/layout/edit_about_fragment.xml
@@ -15,7 +15,7 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:navigationIcon="@drawable/ic_arrow_left_24"
+      app:navigationIcon="@drawable/symbol_arrow_start_24"
       app:title="@string/EditAboutFragment_about" />
 
   <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/edit_note_fragment.xml b/app/src/main/res/layout/edit_note_fragment.xml
index 17cdbd926c..42cd35e5c2 100644
--- a/app/src/main/res/layout/edit_note_fragment.xml
+++ b/app/src/main/res/layout/edit_note_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/CreatePaymentFragment__add_note"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/edit_profile_fragment.xml b/app/src/main/res/layout/edit_profile_fragment.xml
index 9dce276078..7d9fb33dd6 100644
--- a/app/src/main/res/layout/edit_profile_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_fragment.xml
@@ -22,7 +22,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:navigationIcon="@drawable/ic_arrow_left_24"
+                app:navigationIcon="@drawable/symbol_arrow_start_24"
                 app:title="@string/CreateProfileActivity__profile"
                 app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/fragment_add_allowed_members.xml b/app/src/main/res/layout/fragment_add_allowed_members.xml
index 1153250d44..de6be97a14 100644
--- a/app/src/main/res/layout/fragment_add_allowed_members.xml
+++ b/app/src/main/res/layout/fragment_add_allowed_members.xml
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
     <TextView
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 b8e061539e..470f06df44 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile.xml
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_media_preview_v2.xml b/app/src/main/res/layout/fragment_media_preview_v2.xml
index 196da61edf..622371e0fd 100644
--- a/app/src/main/res/layout/fragment_media_preview_v2.xml
+++ b/app/src/main/res/layout/fragment_media_preview_v2.xml
@@ -70,7 +70,7 @@
             android:background="@android:color/transparent"
             android:minHeight="@dimen/signal_m3_toolbar_height"
             android:theme="?actionBarStyle"
-            app:navigationIcon="@drawable/ic_arrow_left_white_24" />
+            app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/full_screen_dialog_fragment.xml b/app/src/main/res/layout/full_screen_dialog_fragment.xml
index 6ba53d1709..923baf6ba0 100644
--- a/app/src/main/res/layout/full_screen_dialog_fragment.xml
+++ b/app/src/main/res/layout/full_screen_dialog_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge"
         tools:title="Dialog Title" />
 
diff --git a/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml b/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
index 39bc9b3cc0..4c012078fe 100644
--- a/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/gift_flow_recipient_selection_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:title="@string/GiftFlowRecipientSelectionFragment__choose_recipient"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/multiselect_container"
diff --git a/app/src/main/res/layout/gift_flow_start_fragment.xml b/app/src/main/res/layout/gift_flow_start_fragment.xml
index 7b804b9f09..24836041a6 100644
--- a/app/src/main/res/layout/gift_flow_start_fragment.xml
+++ b/app/src/main/res/layout/gift_flow_start_fragment.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
diff --git a/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml b/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
index 876bc2c83d..0a6ebe5aea 100644
--- a/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
+++ b/app/src/main/res/layout/group_link_share_qr_dialog_fragment.xml
@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/GroupLinkShareQrDialogFragment__qr_code" />
 
     <org.thoughtcrime.securesms.components.qr.QrView
diff --git a/app/src/main/res/layout/material3_serarch_toolbar.xml b/app/src/main/res/layout/material3_serarch_toolbar.xml
index 3fe73bb1c0..2a50dc1c58 100644
--- a/app/src/main/res/layout/material3_serarch_toolbar.xml
+++ b/app/src/main/res/layout/material3_serarch_toolbar.xml
@@ -31,7 +31,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/background"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_arrow_left_24"
+        app:srcCompat="@drawable/symbol_arrow_start_24"
         app:tint="@color/signal_colorOnSurface" />
 
     <EditText
diff --git a/app/src/main/res/layout/multiselect_forward_activity.xml b/app/src/main/res/layout/multiselect_forward_activity.xml
index e45e5a2c25..6f721e136b 100644
--- a/app/src/main/res/layout/multiselect_forward_activity.xml
+++ b/app/src/main/res/layout/multiselect_forward_activity.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:minHeight="64dp"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
diff --git a/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml b/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
index ce278e1f2b..2d92d318a4 100644
--- a/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
+++ b/app/src/main/res/layout/old_device_transfer_instructions_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payment_details_fragment.xml b/app/src/main/res/layout/payment_details_fragment.xml
index abde7225c6..e3427aa37d 100644
--- a/app/src/main/res/layout/payment_details_fragment.xml
+++ b/app/src/main/res/layout/payment_details_fragment.xml
@@ -14,7 +14,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsDetailsFragment__details"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payment_recipient_selection_fragment.xml b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
index c666043b81..6bf5517b7c 100644
--- a/app/src/main/res/layout/payment_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
@@ -21,7 +21,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/PaymentRecipientSelectionFragment__new_payment"
             app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_activity_fragment.xml b/app/src/main/res/layout/payments_activity_fragment.xml
index 167229891f..317729ece9 100644
--- a/app/src/main/res/layout/payments_activity_fragment.xml
+++ b/app/src/main/res/layout/payments_activity_fragment.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/signal_m3_toolbar_height"
             android:minHeight="@dimen/signal_m3_toolbar_height"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/PaymentsActivityFragment__all_activity"
             app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_add_money_fragment.xml b/app/src/main/res/layout/payments_add_money_fragment.xml
index 45329b836a..d339ee175d 100644
--- a/app/src/main/res/layout/payments_add_money_fragment.xml
+++ b/app/src/main/res/layout/payments_add_money_fragment.xml
@@ -18,7 +18,7 @@
             android:minHeight="@dimen/signal_m3_toolbar_height"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/PaymentsAddMoneyFragment__add_funds"
             app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_home_fragment.xml b/app/src/main/res/layout/payments_home_fragment.xml
index 45da33cc89..72a6c1b603 100644
--- a/app/src/main/res/layout/payments_home_fragment.xml
+++ b/app/src/main/res/layout/payments_home_fragment.xml
@@ -16,7 +16,7 @@
         android:theme="?actionBarStyle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/preferences__payments"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_recovery_entry_fragment.xml b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
index 10871563bf..15fd52e0b4 100644
--- a/app/src/main/res/layout/payments_recovery_entry_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_recovery_paste_fragment.xml b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
index bd4a7e5fe7..8f5a69aa35 100644
--- a/app/src/main/res/layout/payments_recovery_paste_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsRecoveryPasteFragment__paste_recovery_phrase"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
index 905ba9ad96..fe61016208 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
index 9581e48dce..09d0276870 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_recovery_start_fragment.xml b/app/src/main/res/layout/payments_recovery_start_fragment.xml
index f63c6201a7..4a8c19fd42 100644
--- a/app/src/main/res/layout/payments_recovery_start_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_start_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_security_setup_fragment.xml b/app/src/main/res/layout/payments_security_setup_fragment.xml
index f28c96d797..99de59b20a 100644
--- a/app/src/main/res/layout/payments_security_setup_fragment.xml
+++ b/app/src/main/res/layout/payments_security_setup_fragment.xml
@@ -11,7 +11,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsSecuritySetupFragment__security_setup"
         app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
 
diff --git a/app/src/main/res/layout/payments_transfer_fragment.xml b/app/src/main/res/layout/payments_transfer_fragment.xml
index a4dee8b42e..88ddff46b2 100644
--- a/app/src/main/res/layout/payments_transfer_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_fragment.xml
@@ -13,7 +13,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsTransferFragment__transfer"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
index 1fb7aeefe8..8062fb46ba 100644
--- a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
@@ -13,7 +13,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/PaymentsTransferQrScanFragment__scan_address_qr_code"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/set_currency_fragment.xml b/app/src/main/res/layout/set_currency_fragment.xml
index 45d1a9908c..c8a71d04e0 100644
--- a/app/src/main/res/layout/set_currency_fragment.xml
+++ b/app/src/main/res/layout/set_currency_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/SetCurrencyFragment__set_currency"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/share_interstitial_activity.xml b/app/src/main/res/layout/share_interstitial_activity.xml
index ba8c398ed4..2d1e03c0f6 100644
--- a/app/src/main/res/layout/share_interstitial_activity.xml
+++ b/app/src/main/res/layout/share_interstitial_activity.xml
@@ -9,7 +9,7 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/ShareInterstitialActivity__share"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize" />
diff --git a/app/src/main/res/layout/sms_export_help_fragment.xml b/app/src/main/res/layout/sms_export_help_fragment.xml
index 18b2958d1c..fe76dc23cf 100644
--- a/app/src/main/res/layout/sms_export_help_fragment.xml
+++ b/app/src/main/res/layout/sms_export_help_fragment.xml
@@ -11,7 +11,7 @@
         android:layout_height="64dp"
         android:minHeight="64dp"
         app:title="@string/preferences__help"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/sms_export_help_fragment_fragment"
diff --git a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
index be1b262828..2bc0489a0c 100644
--- a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_height="64dp"
         android:minHeight="64dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiEditText
diff --git a/app/src/main/res/layout/stories_create_with_recipients_fragment.xml b/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
index 48d4c57522..570766ccae 100644
--- a/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
+++ b/app/src/main/res/layout/stories_create_with_recipients_fragment.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge"
         tools:title="Settings" />
 
diff --git a/app/src/main/res/layout/stories_multiselect_forward_activity.xml b/app/src/main/res/layout/stories_multiselect_forward_activity.xml
index 5eaf2475d4..ff2634db63 100644
--- a/app/src/main/res/layout/stories_multiselect_forward_activity.xml
+++ b/app/src/main/res/layout/stories_multiselect_forward_activity.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/signal_m3_toolbar_height"
         android:minHeight="@dimen/signal_m3_toolbar_height"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/conversation_activity__send"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/text_avatar_creation_fragment.xml b/app/src/main/res/layout/text_avatar_creation_fragment.xml
index 86704de310..a5c1dfc98a 100644
--- a/app/src/main/res/layout/text_avatar_creation_fragment.xml
+++ b/app/src/main/res/layout/text_avatar_creation_fragment.xml
@@ -19,7 +19,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:title="@string/TextAvatarCreationFragment__preview"
             app:titleTextAppearance="@style/Signal.Text.Title" />
 
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index d67d9451c3..d835e8f247 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/UsernameEditFragment_username"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/v2_media_gallery_fragment.xml b/app/src/main/res/layout/v2_media_gallery_fragment.xml
index dbd5f60484..d4c3d875eb 100644
--- a/app/src/main/res/layout/v2_media_gallery_fragment.xml
+++ b/app/src/main/res/layout/v2_media_gallery_fragment.xml
@@ -19,7 +19,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/v2_media_gallery_fragment_toolbar_menu"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/AttachmentKeyboard_gallery"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/vector_avatar_creation_fragment.xml b/app/src/main/res/layout/vector_avatar_creation_fragment.xml
index d6d4249c2e..d644972351 100644
--- a/app/src/main/res/layout/vector_avatar_creation_fragment.xml
+++ b/app/src/main/res/layout/vector_avatar_creation_fragment.xml
@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/TextAvatarCreationFragment__preview"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
diff --git a/app/src/main/res/layout/verify_display_fragment.xml b/app/src/main/res/layout/verify_display_fragment.xml
index b7d864df2b..72429b5aab 100644
--- a/app/src/main/res/layout/verify_display_fragment.xml
+++ b/app/src/main/res/layout/verify_display_fragment.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge"
         tools:title="@string/AndroidManifest__verify_safety_number" />
 
diff --git a/app/src/main/res/layout/view_all_signal_connections_fragment.xml b/app/src/main/res/layout/view_all_signal_connections_fragment.xml
index d5068c9969..3e84dea1bf 100644
--- a/app/src/main/res/layout/view_all_signal_connections_fragment.xml
+++ b/app/src/main/res/layout/view_all_signal_connections_fragment.xml
@@ -14,7 +14,7 @@
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?attr/settingsToolbarStyle"
         app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
-        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:navigationIcon="@drawable/symbol_arrow_start_24"
         app:title="@string/MyStorySettingsFragment__all_signal_connections"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index 5a8df2ed6d..5f2eeab7f8 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -160,7 +160,7 @@
             android:minHeight="@dimen/signal_m3_toolbar_height"
             app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
             app:menu="@menu/webrtc_toolbar_menu"
-            app:navigationIcon="@drawable/ic_arrow_left_24" />
+            app:navigationIcon="@drawable/symbol_arrow_start_24" />
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/webrtc_call_view_toolbar_text"
@@ -169,7 +169,7 @@
             android:minHeight="@dimen/signal_m3_toolbar_height"
             app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
             app:menu="@menu/webrtc_toolbar_menu"
-            app:navigationIcon="@drawable/ic_arrow_left_24"
+            app:navigationIcon="@drawable/symbol_arrow_start_24"
             app:subtitleTextAppearance="@style/Signal.Text.BodyMedium"
             app:titleTextAppearance="@style/Signal.Text.TitleMedium" />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f5d346d168..df80905ddf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -199,8 +199,8 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
-        <item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
+        <item name="homeAsUpIndicator">@drawable/symbol_arrow_start_24</item>
+        <item name="android:homeAsUpIndicator">@drawable/symbol_arrow_start_24</item>
 
         <item name="settingsToolbarStyle">@style/TextSecure.LightActionBar.Settings</item>
 
@@ -290,8 +290,8 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
-        <item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
+        <item name="homeAsUpIndicator">@drawable/symbol_arrow_start_24</item>
+        <item name="android:homeAsUpIndicator">@drawable/symbol_arrow_start_24</item>
 
         <item name="settingsToolbarStyle">@style/TextSecure.DarkActionBar.Settings</item>