diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
index 7ac81ddf1..5f1e279f9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
@@ -14,10 +14,10 @@ import app.revanced.patches.youtube.shorts.components.fingerprints.ShortsInfoPan
 import app.revanced.patches.youtube.shorts.components.fingerprints.ShortsPaidPromotionFingerprint
 import app.revanced.patches.youtube.shorts.components.fingerprints.ShortsPivotFingerprint
 import app.revanced.patches.youtube.shorts.components.fingerprints.ShortsPivotLegacyFingerprint
-import app.revanced.patches.youtube.utils.browseid.BrowseIdHookPatch
 import app.revanced.patches.youtube.utils.integrations.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.integrations.Constants.COMPONENTS_PATH
 import app.revanced.patches.youtube.utils.integrations.Constants.SHORTS_CLASS_DESCRIPTOR
+import app.revanced.patches.youtube.utils.navigation.NavigationBarHookPatch
 import app.revanced.patches.youtube.utils.playertype.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.ReelDynRemix
@@ -44,8 +44,8 @@ object ShortsComponentPatch : BaseBytecodePatch(
     name = "Hide shorts components",
     description = "Adds options to hide components related to YouTube Shorts.",
     dependencies = setOf(
-        BrowseIdHookPatch::class,
         LithoFilterPatch::class,
+        NavigationBarHookPatch::class,
         PlayerTypeHookPatch::class,
         SettingsPatch::class,
         SharedResourceIdPatch::class,
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 0dac74a17..0f6a9cfe2 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -151,9 +151,9 @@ Tap here to learn more about DeArrow."</string>
     <string name="revanced_hide_category_bar_in_related_videos_title">Hide in related videos</string>
     <string name="revanced_hide_category_bar_in_related_videos_summary_on">Hidden in related videos.</string>
     <string name="revanced_hide_category_bar_in_related_videos_summary_off">Shown in related videos.</string>
-    <string name="revanced_hide_category_bar_in_search_title">Hide in search</string>
-    <string name="revanced_hide_category_bar_in_search_summary_on">Hidden in search.</string>
-    <string name="revanced_hide_category_bar_in_search_summary_off">Shown in search.</string>
+    <string name="revanced_hide_category_bar_in_search_title">Hide in search results</string>
+    <string name="revanced_hide_category_bar_in_search_summary_on">Hidden in search results.</string>
+    <string name="revanced_hide_category_bar_in_search_summary_off">Shown in search results.</string>
 
     <!-- PreferenceScreen: Feed, PreferenceCategory: Feed, PreferenceScreen: Channel profile -->
     <string name="revanced_preference_screen_channel_profile_title">Channel profile</string>
@@ -598,7 +598,7 @@ Instead, use the 'Settings → Autoplay → Autoplay next video' setting."</stri
     <string name="revanced_show_video_title_section_title">Show video title section</string>
     <string name="revanced_show_video_title_section_summary">"Shows the video title section in full screen.
 
-Known issue: Video title disappears when clicked."</string>
+Limitation: Video title disappears when clicked."</string>
     <string name="revanced_hide_autoplay_preview_summary_on">Autoplay preview container is hidden.</string>
     <string name="revanced_hide_autoplay_preview_summary_off">Autoplay preview container is shown.</string>
     <string name="revanced_hide_autoplay_preview_title">Hide autoplay preview container</string>
@@ -865,10 +865,20 @@ Please download %s from the website."</string>
     <string name="revanced_hide_shorts_shelf_title">Hide shorts shelf</string>
     <string name="revanced_hide_shorts_shelf_summary">"Hides Shorts shelves.
 
-Known issue: Official headers in search results will be hidden."</string>
-    <string name="revanced_hide_shorts_shelf_exception_history_title">Show in watch history</string>
-    <string name="revanced_hide_shorts_shelf_exception_history_summary_on">Shorts shelves in watch history is shown.</string>
-    <string name="revanced_hide_shorts_shelf_exception_history_summary_off">Shorts shelves in watch history is hidden.</string>
+Limitation: Official headers in search results will be hidden."</string>
+
+    <string name="revanced_hide_shorts_shelf_home_related_videos_title">Hide in home feed and related videos</string>
+    <string name="revanced_hide_shorts_shelf_home_related_videos_summary_on">Hidden in home feed and related videos.</string>
+    <string name="revanced_hide_shorts_shelf_home_related_videos_summary_off">Shown in home feed and related videos.</string>
+    <string name="revanced_hide_shorts_shelf_subscriptions_title">Hide in subscriptions feed</string>
+    <string name="revanced_hide_shorts_shelf_subscriptions_summary_on">Hidden in subscriptions feed.</string>
+    <string name="revanced_hide_shorts_shelf_subscriptions_summary_off">Shown in subscriptions feed.</string>
+    <string name="revanced_hide_shorts_shelf_search_title">Hide in search results</string>
+    <string name="revanced_hide_shorts_shelf_search_summary_on">Hidden in search results.</string>
+    <string name="revanced_hide_shorts_shelf_search_summary_off">Shown in search results.</string>
+    <string name="revanced_hide_shorts_shelf_history_title">Hide in watch history</string>
+    <string name="revanced_hide_shorts_shelf_history_summary_on">Hidden in watch history.</string>
+    <string name="revanced_hide_shorts_shelf_history_summary_off">Shown in watch history.</string>
 
 
     <!-- PreferenceScreen: Swipe controls -->
@@ -1226,7 +1236,7 @@ Known issue: Official headers in search results will be hidden."</string>
     <string name="revanced_spoof_player_parameter_title">Spoof player parameter</string>
     <string name="revanced_spoof_player_parameter_summary">"Spoofs player parameters to prevent playback issues.
 
-Known issues:
+Limitations:
 • Enhanced bitrate is not available.
 • No seekbar thumbnails for paid videos.
 • Offline downloads may not work.
@@ -1234,10 +1244,10 @@ Known issues:
     <string name="revanced_spoof_player_parameter_in_feed_title">Spoof player parameter in feed</string>
     <string name="revanced_spoof_player_parameter_in_feed_summary_on">"Player parameter spoofed for feed videos.
 
-Known issue: Automatically played feed videos will show up in your watch history."</string>
+Limitation: Automatically played feed videos will show up in your watch history."</string>
     <string name="revanced_spoof_player_parameter_in_feed_summary_off">"Player parameter not spoofed for feed videos.
 
-Known issue: Feed videos will play for less than 1 minute before encountering playback issues."</string>
+Limitation: Feed videos will play for less than 1 minute before encountering playback issues."</string>
 
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Import / Export settings -->
     <string name="revanced_preference_screen_import_export_title">Import / Export settings</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index c1d292695..5e27d5a09 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -375,7 +375,10 @@
         <!-- SETTINGS: HIDE_SHORTS_COMPONENTS
         <PreferenceScreen android:title="@string/revanced_preference_screen_shorts_shelf_title" android:key="revanced_preference_screen_shorts_shelf" android:summary="@string/revanced_preference_screen_shorts_shelf_summary">
             <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_title" android:key="revanced_hide_shorts_shelf" android:defaultValue="true" android:summary="@string/revanced_hide_shorts_shelf_summary" />
-            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_exception_history_title" android:key="revanced_hide_shorts_shelf_exception_history" android:defaultValue="false" android:summaryOn="@string/revanced_hide_shorts_shelf_exception_history_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_exception_history_summary_off" android:dependency="revanced_hide_shorts_shelf" />
+            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_home_related_videos_title" android:key="revanced_hide_shorts_shelf_home_related_videos" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_home_related_videos_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_home_related_videos_summary_off" android:dependency="revanced_hide_shorts_shelf" />
+            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_subscriptions_title" android:key="revanced_hide_shorts_shelf_subscriptions" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_subscriptions_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_subscriptions_summary_off" android:dependency="revanced_hide_shorts_shelf" />
+            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_search_title" android:key="revanced_hide_shorts_shelf_search" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_search_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_search_summary_off" android:dependency="revanced_hide_shorts_shelf" />
+            <SwitchPreference android:title="@string/revanced_hide_shorts_shelf_history_title" android:key="revanced_hide_shorts_shelf_history" android:defaultValue="true" android:summaryOn="@string/revanced_hide_shorts_shelf_history_summary_on" android:summaryOff="@string/revanced_hide_shorts_shelf_history_summary_off" android:dependency="revanced_hide_shorts_shelf" />
         </PreferenceScreen>SETTINGS: HIDE_SHORTS_COMPONENTS -->
 
         <!-- SETTINGS: CHANGE_SHORTS_REPEAT_STATE