diff --git a/src/main/resources/music/settings/host/values/arrays.xml b/src/main/resources/music/settings/host/values/arrays.xml
index 525a55888e..aaaaac2e98 100644
--- a/src/main/resources/music/settings/host/values/arrays.xml
+++ b/src/main/resources/music/settings/host/values/arrays.xml
@@ -37,6 +37,16 @@
         <item>https://github.com/polymorphicshade/Tubular/releases/latest</item>
         <item>https://github.com/deniscerri/ytdlnis/releases/latest</item>
     </string-array>
+    <string-array name="revanced_return_youtube_username_display_format_entries">
+        <item>@string/revanced_return_youtube_username_display_format_username_only</item>
+        <item>@string/revanced_return_youtube_username_display_format_username_handle</item>
+        <item>@string/revanced_return_youtube_username_display_format_handle_username</item>
+    </string-array>
+    <string-array name="revanced_return_youtube_username_display_format_entry_values">
+        <item>USERNAME_ONLY</item>
+        <item>USERNAME_HANDLE</item>
+        <item>HANDLE_USERNAME</item>
+    </string-array>
     <string-array name="revanced_spoof_app_version_target_entries">
         <item>@string/revanced_spoof_app_version_target_entry_6_11_52</item>
         <item>@string/revanced_spoof_app_version_target_entry_4_27_53</item>
diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml
index 62ae07ec22..a4bf4a33a2 100644
--- a/src/main/resources/music/settings/host/values/strings.xml
+++ b/src/main/resources/music/settings/host/values/strings.xml
@@ -323,6 +323,11 @@ Some features may not work properly in the old player layout."</string>
 
     <string name="revanced_return_youtube_username_enabled_title">Enable Return YouTube Username</string>
     <string name="revanced_return_youtube_username_enabled_summary">Replaces handles with usernames in comments.</string>
+    <string name="revanced_return_youtube_username_display_format_title">Display format</string>
+    <string name="revanced_return_youtube_username_display_format_summary">Select the username display format.</string>
+    <string name="revanced_return_youtube_username_display_format_username_only">Username</string>
+    <string name="revanced_return_youtube_username_display_format_username_handle">Username (@handle)</string>
+    <string name="revanced_return_youtube_username_display_format_handle_username">@handle (Username)</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_title">YouTube Data API key</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_summary">The developer key for using the YouTube Data API v3.</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_about_title">About YouTube Data API key</string>
diff --git a/src/main/resources/youtube/settings/host/values/arrays.xml b/src/main/resources/youtube/settings/host/values/arrays.xml
index b84d97b2ac..cb0427dd4a 100644
--- a/src/main/resources/youtube/settings/host/values/arrays.xml
+++ b/src/main/resources/youtube/settings/host/values/arrays.xml
@@ -161,6 +161,16 @@
         <item>PHONE</item>
         <item>TABLET</item>
     </string-array>
+    <string-array name="revanced_return_youtube_username_display_format_entries">
+        <item>@string/revanced_return_youtube_username_display_format_username_only</item>
+        <item>@string/revanced_return_youtube_username_display_format_username_handle</item>
+        <item>@string/revanced_return_youtube_username_display_format_handle_username</item>
+    </string-array>
+    <string-array name="revanced_return_youtube_username_display_format_entry_values">
+        <item>USERNAME_ONLY</item>
+        <item>USERNAME_HANDLE</item>
+        <item>HANDLE_USERNAME</item>
+    </string-array>
     <string-array name="revanced_shorts_double_tap_to_like_animation_entries">
         <item>@string/revanced_shorts_double_tap_to_like_animation_entry_1</item>
         <item>@string/revanced_shorts_double_tap_to_like_animation_entry_2</item>
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 3f07e9a345..a556bccf4f 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -1489,6 +1489,10 @@ Limitation: Dislikes may not appear if the user is not logged in or in incognito
     <string name="revanced_return_youtube_username_enabled_title">Enable Return YouTube Username</string>
     <string name="revanced_return_youtube_username_enabled_summary_on">Username is used.</string>
     <string name="revanced_return_youtube_username_enabled_summary_off">Handle is used.</string>
+    <string name="revanced_return_youtube_username_display_format_title">Display format</string>
+    <string name="revanced_return_youtube_username_display_format_username_only">Username</string>
+    <string name="revanced_return_youtube_username_display_format_username_handle">Username (@handle)</string>
+    <string name="revanced_return_youtube_username_display_format_handle_username">@handle (Username)</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_title">YouTube Data API key</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_summary">The developer key for using the YouTube Data API v3.</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_about_title">About YouTube Data API key</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index d971fb4875..7066e075cb 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -279,8 +279,8 @@
 
         <!-- SETTINGS: SPOOF_APP_VERSION
         <SwitchPreference android:title="@string/revanced_spoof_app_version_title" android:key="revanced_spoof_app_version" android:summaryOn="@string/revanced_spoof_app_version_summary_on" android:summaryOff="@string/revanced_spoof_app_version_summary_off" />
-        <ListPreference android:title="@string/revanced_spoof_app_version_target_entry_title" android:key="revanced_spoof_app_version_target" android:entries="@array/revanced_spoof_app_version_target_entries" android:entryValues="@array/revanced_spoof_app_version_target_entry_values" />
-        <app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference android:hint="18.17.43" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
+        <app.revanced.integrations.shared.settings.preference.WideListPreference android:title="@string/revanced_spoof_app_version_target_entry_title" android:key="revanced_spoof_app_version_target" android:entries="@array/revanced_spoof_app_version_target_entries" android:entryValues="@array/revanced_spoof_app_version_target_entry_values" />
+        <app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
 
     <!-- PREFERENCE_SCREEN: GENERAL
     </PreferenceScreen>PREFERENCE_SCREEN: GENERAL -->
@@ -667,6 +667,7 @@
     <!-- PREFERENCE_SCREEN: RETURN_YOUTUBE_USERNAME
     <PreferenceScreen android:title="@string/revanced_preference_screen_return_youtube_username_title" android:key="revanced_preference_screen_return_youtube_username" >
         <SwitchPreference android:title="@string/revanced_return_youtube_username_enabled_title" android:key="revanced_return_youtube_username_enabled" android:summaryOn="@string/revanced_return_youtube_username_enabled_summary_on" android:summaryOff="@string/revanced_return_youtube_username_enabled_summary_off" />
+        <app.revanced.integrations.shared.settings.preference.WideListPreference android:entries="@array/revanced_return_youtube_username_display_format_entries" android:title="@string/revanced_return_youtube_username_display_format_title" android:key="revanced_return_youtube_username_display_format" android:entryValues="@array/revanced_return_youtube_username_display_format_entry_values" android:dependency="revanced_return_youtube_username_enabled" />
         <app.revanced.integrations.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_return_youtube_username_youtube_data_api_v3_developer_key_title" android:key="revanced_return_youtube_username_youtube_data_api_v3_developer_key" android:summary="@string/revanced_return_youtube_username_youtube_data_api_v3_developer_key_summary" android:dependency="revanced_return_youtube_username_enabled" />
         <app.revanced.integrations.youtube.settings.preference.AboutYouTubeDataAPIPreference android:title="@string/revanced_return_youtube_username_youtube_data_api_v3_about_title" android:summary="@string/revanced_return_youtube_username_youtube_data_api_v3_about_summary" />
     </PreferenceScreen>PREFERENCE_SCREEN: RETURN_YOUTUBE_USERNAME -->