diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings.xml
deleted file mode 100644
index 6ee4e7f661..0000000000
--- a/app/src/main/res/navigation/app_settings.xml
+++ /dev/null
@@ -1,1048 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/app_settings"
-    app:startDestination="@id/appSettingsFragment">
-
-    <fragment
-        android:id="@+id/appSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.AppSettingsFragment"
-        android:label="app_settings_fragment"
-        tools:layout="@layout/dsl_settings_fragment">
-        <action
-            android:id="@+id/action_appSettingsFragment_to_usernameLinkSettingsFragment"
-            app:destination="@id/username_link_settings"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_usernameEducationFragment"
-            app:destination="@id/manageProfileActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit">
-            <argument
-                android:name="start_at_username"
-                android:defaultValue="true"
-                app:argType="boolean" />
-        </action>
-        <action
-            android:id="@+id/action_appSettingsFragment_to_backupsSettingsFragment"
-            app:destination="@id/backupsSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_accountSettingsFragment"
-            app:destination="@id/accountSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_linkDeviceFragment"
-            app:destination="@id/linkDeviceFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_paymentsActivity"
-            app:destination="@id/paymentsActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_appearanceSettingsFragment"
-            app:destination="@id/appearanceSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_chatsSettingsFragment"
-            app:destination="@id/chatsSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_notificationsSettingsFragment"
-            app:destination="@id/notificationsSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_privacySettingsFragment"
-            app:destination="@id/privacy_settings"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_dataAndStorageSettingsFragment"
-            app:destination="@id/dataAndStorageSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_manageProfileActivity"
-            app:destination="@id/manageProfileActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_helpSettingsFragment"
-            app:destination="@id/helpSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_inviteActivity"
-            app:destination="@id/inviteActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_appUpdatesSettingsFragment"
-            app:destination="@id/appUpdatesFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_internalSettingsFragment"
-            app:destination="@id/internalSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_manageDonationsFragment"
-            app:destination="@id/manageDonationsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_appSettingsFragment_to_storyPrivacySettings"
-            app:destination="@+id/story_privacy_settings"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit">
-
-            <argument
-                android:name="title_id"
-                app:argType="integer"
-                app:nullable="false" />
-        </action>
-    </fragment>
-
-    <activity
-        android:id="@+id/manageProfileActivity"
-        android:name="org.thoughtcrime.securesms.profiles.manage.EditProfileActivity"
-        android:label="manage_profile_activity" />
-
-    <!-- region Account Settings and subpages -->
-    <fragment
-        android:id="@+id/accountSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.account.AccountSettingsFragment"
-        android:label="account_settings_fragment"
-        tools:layout="@layout/dsl_settings_fragment">
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_changePhoneNumberFragment"
-            app:destination="@id/app_settings_change_number"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_deleteAccountFragment"
-            app:destination="@id/deleteAccountFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_advancedPinSettingsActivity"
-            app:destination="@id/advancedPinSettingsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_oldDeviceTransferActivity"
-            app:destination="@id/oldDeviceTransferActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_exportAccountFragment"
-            app:destination="@id/exportAccountDataFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <include app:graph="@navigation/app_settings_change_number" />
-
-    <fragment
-        android:id="@+id/advancedPinSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedAdvancedPinPreferenceFragment"
-        android:label="advanced_pin_settings_fragment" />
-
-    <fragment
-        android:id="@+id/deleteAccountFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedDeleteAccountFragment"
-        android:label="delete_account_fragment"
-        tools:layout="@layout/delete_account_fragment" />
-
-    <fragment
-        android:id="@+id/exportAccountDataFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.account.export.ExportAccountDataFragment"
-        android:label="export_account_data_fragment" />
-
-    <activity
-        android:id="@+id/oldDeviceTransferActivity"
-        android:name="org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity"
-        android:label="old_device_transfer_Activity"
-        tools:layout="@layout/old_device_transfer_activity" />
-
-    <!-- CreateKbsPinActivity -->
-
-    <!-- endregion -->
-
-    <!-- Linked Devices -->
-    <fragment
-        android:id="@+id/linkDeviceFragment"
-        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceFragment"
-        android:label="link_device_fragment">
-        <action
-            android:id="@+id/action_linkDeviceFragment_to_addLinkDeviceFragment"
-            app:destination="@id/addLinkDeviceFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_linkDeviceFragment_to_linkDeviceFinishedSheet"
-            app:destination="@id/linkDeviceFinishedSheet" />
-        <action
-            android:id="@+id/action_linkDeviceFragment_to_linkDeviceLearnMoreBottomSheet"
-            app:destination="@id/linkDeviceLearnMoreBottomSheet" />
-    </fragment>
-    <dialog
-        android:id="@+id/linkDeviceFinishedSheet"
-        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceFinishedSheet" />
-    <dialog
-        android:id="@+id/linkDeviceLearnMoreBottomSheet"
-        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceLearnMoreBottomSheetFragment" />
-
-    <fragment
-        android:id="@+id/addLinkDeviceFragment"
-        android:name="org.thoughtcrime.securesms.linkdevice.AddLinkDeviceFragment"
-        android:label="link_device_add_fragment">
-        <action
-            android:id="@+id/action_addLinkDeviceFragment_to_linkDeviceIntroBottomSheet"
-            app:destination="@id/linkDeviceIntroBottomSheet" />
-    </fragment>
-    <dialog
-        android:id="@+id/linkDeviceIntroBottomSheet"
-        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceIntroBottomSheet" />
-
-    <!-- Payments -->
-    <activity
-        android:id="@+id/paymentsActivity"
-        android:name="org.thoughtcrime.securesms.payments.preferences.PaymentsActivity"
-        android:label="payments_activity" />
-
-    <!-- region Appearance settings and Subpages -->
-    <fragment
-        android:id="@+id/appearanceSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.appearance.AppearanceSettingsFragment"
-        android:label="appearance_settings_fragment"
-        tools:layout="@layout/dsl_settings_fragment">
-        <action
-            android:id="@+id/action_appearanceSettings_to_wallpaperActivity"
-            app:destination="@id/wallpaperActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_appearanceSettings_to_appIconActivity"
-            app:destination="@id/appIconSelectionFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <activity
-        android:id="@+id/wallpaperActivity"
-        android:name="org.thoughtcrime.securesms.wallpaper.ChatWallpaperActivity"
-        android:label="wallpaper_activity" />
-
-    <!-- App Icon settings and Subpages -->
-
-    <fragment
-        android:id="@+id/appIconSelectionFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.appearance.appicon.AppIconSelectionFragment"
-        android:label="@string/preferences__app_icon">
-        <action
-            android:id="@+id/action_appIconSelectionFragment_to_appIconTutorialFragment"
-            app:destination="@id/appIconTutorialFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-    <fragment
-        android:id="@+id/appIconTutorialFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.appearance.appicon.AppIconTutorialFragment"
-        android:label="@string/preferences__app_icon" />
-
-    <!-- endregion -->
-
-    <!-- region Chats settings and subpages -->
-
-    <fragment
-        android:id="@+id/chatsSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.chats.ChatsSettingsFragment"
-        android:label="chats_settings_fragment"
-        tools:layout="@layout/dsl_settings_fragment">
-        <action
-            android:id="@+id/action_chatsSettingsFragment_to_backupsPreferenceFragment"
-            app:destination="@id/backupsPreferenceFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_chatsSettingsFragment_to_editReactionsFragment"
-            app:destination="@id/editReactionsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/backupsPreferenceFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedBackupsPreferenceFragment"
-        android:label="backups_preference_fragment"
-        tools:layout="@layout/fragment_backups" />
-
-    <fragment
-        android:id="@+id/editReactionsFragment"
-        android:name="org.thoughtcrime.securesms.reactions.edit.EditReactionsFragment"
-        android:label="edit_reactions_fragment"
-        tools:layout="@layout/edit_reactions_fragment" />
-
-    <!-- endregion -->
-
-    <fragment
-        android:id="@+id/chatFoldersFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFoldersFragment"
-        android:label="chat_folders_fragment">
-        <action
-            android:id="@+id/action_chatFoldersFragment_to_createFoldersFragment"
-            app:destination="@id/createFoldersFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/createFoldersFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.chats.folders.CreateFoldersFragment"
-        android:label="create_folders_fragment">
-
-        <argument
-            android:name="folder_id"
-            app:argType="long" />
-
-        <argument
-            android:name="thread_id"
-            app:argType="long" />
-
-        <action
-            android:id="@+id/action_createFoldersFragment_to_chooseChatsFragment"
-            app:destination="@id/chooseChatsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit">
-            <argument
-                android:name="include_chats"
-                app:argType="boolean" />
-        </action>
-    </fragment>
-
-    <fragment
-        android:id="@+id/chooseChatsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.chats.folders.ChooseChatsFragment"
-        android:label="choose_chats_fragment" />
-
-    <action
-        android:id="@+id/action_direct_to_chatFoldersFragment"
-        app:destination="@id/chatFoldersFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_createFoldersFragment"
-        app:destination="@id/createFoldersFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <!-- Notifications -->
-    <fragment
-        android:id="@+id/notificationsSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.NotificationsSettingsFragment"
-        android:label="notifications_settings_fragment">
-
-        <action
-            android:id="@+id/action_notificationsSettingsFragment_to_notificationProfilesFragment"
-            app:destination="@id/notificationProfilesFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-    </fragment>
-
-    <!-- region Privacy -->
-
-    <include app:graph="@navigation/privacy_settings" />
-
-    <!-- region Data and Storage -->
-
-    <fragment
-        android:id="@+id/dataAndStorageSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.data.DataAndStorageSettingsFragment"
-        android:label="data_and_storage_settings_fragment">
-        <action
-            android:id="@+id/action_dataAndStorageSettingsFragment_to_storagePreferenceFragment"
-            app:destination="@id/storagePreferenceFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_dataAndStorageSettingsFragment_to_editProxyFragment"
-            app:destination="@id/editProxyFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/storagePreferenceFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.storage.ManageStorageSettingsFragment"
-        android:label="storage_preference_fragment" />
-
-    <fragment
-        android:id="@+id/editProxyFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedEditProxyFragment"
-        android:label="edit_proxy_fragment" />
-
-    <!-- endregion -->
-
-    <!-- region Help -->
-    <fragment
-        android:id="@+id/helpSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.help.HelpSettingsFragment"
-        android:label="help_settings_fragment">
-        <action
-            android:id="@+id/action_helpSettingsFragment_to_helpFragment"
-            app:destination="@id/helpFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_helpSettingsFragment_to_submitDebugLogActivity"
-            app:destination="@id/submitDebugLogActivity"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_helpSettingsFragment_to_licenseFragment"
-            app:destination="@id/licenseFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/helpFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedHelpFragment"
-        android:label="help_fragment">
-
-        <argument
-            android:name="start_category_index"
-            android:defaultValue="0"
-            app:argType="integer"
-            app:nullable="false" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/licenseFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.help.LicenseFragment"
-        android:label="license_fragment" />
-
-    <activity
-        android:id="@+id/submitDebugLogActivity"
-        android:name="org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity"
-        android:label="submit_debug_log_activity" />
-    <!-- endregion -->
-
-    <activity
-        android:id="@+id/inviteActivity"
-        android:name="org.thoughtcrime.securesms.InviteActivity"
-        android:label="invite_activity"
-        tools:layout="@layout/invite_activity" />
-
-    <!-- region Direct-To-Page actions -->
-
-
-    <action
-        android:id="@+id/action_direct_to_backupsPreferenceFragment"
-        app:destination="@id/backupsPreferenceFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_helpFragment"
-        app:destination="@id/helpFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_editProxyFragment"
-        app:destination="@id/editProxyFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_notificationsSettingsFragment"
-        app:destination="@id/notificationsSettingsFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_changeNumberFragment"
-        app:destination="@id/app_settings_change_number"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_manageDonations"
-        app:destination="@id/manageDonationsFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true">
-
-        <argument
-            android:name="direct_to_checkout_type"
-            android:defaultValue="UNKNOWN"
-            app:argType="org.signal.donations.InAppPaymentType" />
-    </action>
-
-    <action
-        android:id="@+id/action_direct_to_notificationProfiles"
-        app:destination="@id/notificationProfilesFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <action
-        android:id="@+id/action_direct_to_createNotificationProfiles"
-        app:destination="@id/editNotificationProfileFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_notificationProfileDetails"
-        app:destination="@id/notificationProfileDetailsFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_privacy"
-        app:destination="@id/privacy_settings"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_devices"
-        app:destination="@id/linkDeviceFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_usernameLinkSettings"
-        app:destination="@id/username_link_settings"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true" />
-
-    <action
-        android:id="@+id/action_direct_to_usernameRecovery"
-        app:destination="@id/createUsernameFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/app_settings"
-        app:popUpToInclusive="true">
-        <argument
-            android:name="mode"
-            android:defaultValue="RECOVERY"
-            app:argType="org.thoughtcrime.securesms.profiles.manage.UsernameEditMode" />
-    </action>
-
-    <action
-        android:id="@+id/action_direct_to_remoteBackupsSettingsFragment"
-        app:destination="@id/remoteBackupsSettingsFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
-    <!-- endregion -->
-
-    <!-- Internal Settings -->
-
-    <fragment
-        android:id="@+id/internalSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalSettingsFragment"
-        android:label="internal_settings_fragment">
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_donorErrorConfigurationFragment"
-            app:destination="@id/donorErrorConfigurationFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_storyDialogsLauncherFragment"
-            app:destination="@id/storyDialogsLauncherFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_internalSearchFragment"
-            app:destination="@id/internalSearchFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_internalSvrPlaygroundFragment"
-            app:destination="@id/internalSvrPlaygroundFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_internalConversationSpringboardFragment"
-            app:destination="@id/internalConversationSpringboardFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_oneTimeDonationConfigurationFragment"
-            app:destination="@id/oneTimeDonationConfigurationFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_terminalDonationConfigurationFragment"
-            app:destination="@id/terminalDonationConfigurationFragment" />
-        <action
-            android:id="@+id/action_internalSettingsFragment_to_internalBackupPlaygroundFragment"
-            app:destination="@id/internalBackupPlaygroundFragment" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/terminalDonationConfigurationFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalTerminalDonationConfigurationFragment"
-        android:label="terminal_donation_configuration_fragment" />
-
-    <fragment
-        android:id="@+id/oneTimeDonationConfigurationFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalPendingOneTimeDonationConfigurationFragment"
-        android:label="one_time_donation_configuration_fragment" />
-
-    <fragment
-        android:id="@+id/donorErrorConfigurationFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.donor.InternalDonorErrorConfigurationFragment"
-        android:label="donor_error_configuration_fragment" />
-
-    <fragment
-        android:id="@+id/storyDialogsLauncherFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalStoryDialogLauncherFragment"
-        android:label="story_dialogs_launcher_fragment" />
-
-    <fragment
-        android:id="@+id/internalSearchFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.search.InternalSearchFragment"
-        android:label="internal_search_fragment" />
-
-    <fragment
-        android:id="@+id/internalSvrPlaygroundFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.svr.InternalSvrPlaygroundFragment"
-        android:label="internal_svr_playground_fragment" />
-
-    <fragment
-        android:id="@+id/internalConversationSpringboardFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.conversation.springboard.InternalConversationSpringboardFragment"
-        android:label="internal_conversation_springboard_fragment">
-
-        <action
-            android:id="@+id/action_internalConversationSpringboardFragment_to_internalConversationTestFragment"
-            app:destination="@id/internalConversationTestFragment" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/internalConversationTestFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.conversation.test.InternalConversationTestFragment"
-        android:label="internal_conversation_test_fragment" />
-
-    <fragment
-        android:id="@+id/internalBackupPlaygroundFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundFragment"
-        android:label="internal_backup_playground_fragment" />
-
-    <!-- endregion -->
-
-    <!-- App updates -->
-
-    <fragment
-        android:id="@+id/appUpdatesFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.updates.AppUpdatesSettingsFragment"
-        android:label="app_update_fragment" />
-
-    <!-- Subscriptions -->
-    <fragment
-        android:id="@+id/manageDonationsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment"
-        android:label="manage_donations_fragment"
-        tools:layout="@layout/dsl_settings_fragment">
-        <action
-            android:id="@+id/action_manageDonationsFragment_to_manage_badges"
-            app:destination="@id/manage_badges"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_manageDonationsFragment_to_donationReceiptListFragment"
-            app:destination="@id/donationReceiptListFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-        <action
-            android:id="@+id/action_manageDonationsFragment_to_subscribeLearnMoreBottomSheetDialog"
-            app:destination="@id/subscribeLearnMoreBottomSheetDialog" />
-        <argument
-            android:name="direct_to_checkout_type"
-            android:defaultValue="UNKNOWN"
-            app:argType="org.signal.donations.InAppPaymentType" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/donationReceiptListFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list.DonationReceiptListFragment"
-        android:label="donation_receipt_list_fragment"
-        tools:layout="@layout/donation_receipt_list_fragment">
-        <action
-            android:id="@+id/action_donationReceiptListFragment_to_donationReceiptDetailFragment"
-            app:destination="@id/donationReceiptDetailFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/donationReceiptDetailFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail.DonationReceiptDetailFragment"
-        android:label="donation_receipt_detail_fragment"
-        tools:layout="@layout/donation_receipt_detail_fragment">
-
-        <argument
-            android:name="id"
-            app:argType="long" />
-    </fragment>
-
-    <dialog
-        android:id="@+id/subscribeLearnMoreBottomSheetDialog"
-        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.subscribe.SubscribeLearnMoreBottomSheetDialogFragment"
-        android:label="subscribe_learn_more_bottom_sheet_dialog"
-        tools:layout="@layout/subscribe_learn_more_bottom_sheet_dialog_fragment" />
-
-    <include app:graph="@navigation/manage_badges" />
-
-    <!-- endregion -->
-
-    <!-- Notification Profiles -->
-    <fragment
-        android:id="@+id/notificationProfilesFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.NotificationProfilesFragment"
-        tools:layout="@layout/notification_profiles_empty">
-
-        <action
-            android:id="@+id/action_notificationProfilesFragment_to_editNotificationProfileFragment"
-            app:destination="@id/editNotificationProfileFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_notificationProfilesFragment_to_notificationProfileDetailsFragment"
-            app:destination="@id/notificationProfileDetailsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/editNotificationProfileFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileFragment"
-        tools:layout="@layout/fragment_edit_notification_profile">
-
-        <argument
-            android:name="profileId"
-            android:defaultValue="-1L"
-            app:argType="long" />
-
-        <action
-            android:id="@+id/action_editNotificationProfileFragment_to_addAllowedMembersFragment"
-            app:destination="@id/addAllowedMembersFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            app:popUpTo="@id/editNotificationProfileFragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/addAllowedMembersFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.AddAllowedMembersFragment"
-        tools:layout="@layout/fragment_add_allowed_members">
-
-        <argument
-            android:name="profileId"
-            app:argType="long" />
-
-        <action
-            android:id="@+id/action_addAllowedMembersFragment_to_selectRecipientsFragment"
-            app:destination="@id/selectRecipientsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_addAllowedMembersFragment_to_editNotificationProfileScheduleFragment"
-            app:destination="@id/editNotificationProfileScheduleFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/selectRecipientsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.SelectRecipientsFragment"
-        tools:layout="@layout/fragment_select_recipients_fragment">
-
-        <argument
-            android:name="profileId"
-            app:argType="long" />
-
-        <argument
-            android:name="currentSelection"
-            android:defaultValue="@null"
-            app:argType="org.thoughtcrime.securesms.recipients.RecipientId[]"
-            app:nullable="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/notificationProfileDetailsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.NotificationProfileDetailsFragment"
-        tools:layout="@layout/dsl_settings_fragment">
-
-        <argument
-            android:name="profileId"
-            app:argType="long" />
-
-        <action
-            android:id="@+id/action_notificationProfileDetailsFragment_to_selectRecipientsFragment"
-            app:destination="@id/selectRecipientsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_notificationProfileDetailsFragment_to_editNotificationProfileFragment"
-            app:destination="@id/editNotificationProfileFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_notificationProfileDetailsFragment_to_editNotificationProfileScheduleFragment"
-            app:destination="@id/editNotificationProfileScheduleFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/editNotificationProfileScheduleFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileScheduleFragment"
-        tools:layout="@layout/fragment_edit_notification_profile_schedule">
-
-        <argument
-            android:name="profileId"
-            app:argType="long" />
-
-        <argument
-            android:name="createMode"
-            app:argType="boolean" />
-
-        <action
-            android:id="@+id/action_editNotificationProfileScheduleFragment_to_notificationProfileCreatedFragment"
-            app:destination="@id/notificationProfileCreatedFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            app:popUpTo="@id/addAllowedMembersFragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/notificationProfileCreatedFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.notifications.profiles.NotificationProfileCreatedFragment"
-        tools:layout="@layout/fragment_notification_profile_created">
-
-        <argument
-            android:name="profileId"
-            app:argType="long" />
-
-        <action
-            android:id="@+id/action_notificationProfileCreatedFragment_to_notificationProfileDetailsFragment"
-            app:destination="@id/notificationProfileDetailsFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            app:popUpTo="@id/notificationProfileCreatedFragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/createUsernameFragment"
-        android:name="org.thoughtcrime.securesms.profiles.manage.UsernameEditFragment"
-        tools:layout="@layout/username_edit_fragment">
-
-        <argument
-            android:name="mode"
-            android:defaultValue="NORMAL"
-            app:argType="org.thoughtcrime.securesms.profiles.manage.UsernameEditMode" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/backupsSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.backups.BackupsSettingsFragment">
-
-        <action
-            android:id="@+id/action_backupsSettingsFragment_to_backupsPreferenceFragment"
-            app:destination="@id/backupsPreferenceFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/remoteBackupsSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.backups.remote.RemoteBackupsSettingsFragment">
-
-        <action
-            android:id="@+id/action_remoteBackupsSettingsFragment_to_backupKeyDisplayFragment"
-            app:destination="@id/backupKeyDisplayFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <argument
-            android:name="backup_later_selected"
-            app:argType="boolean"
-            android:defaultValue="false" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/backupKeyDisplayFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeyDisplayFragment" />
-
-    <include app:graph="@navigation/username_link_settings" />
-    <include app:graph="@navigation/story_privacy_settings" />
-
-</navigation>
\ No newline at end of file