diff --git a/src/localization/en.json b/src/localization/en.json
index c7393c60..9e41b2fc 100644
--- a/src/localization/en.json
+++ b/src/localization/en.json
@@ -788,7 +788,7 @@
                 },
                 "favorites": {
                     "header": "Favorite Groups Filter",
-                    "header_tooltip": "Choose which favorite groups are treated as VIP for filtering in Feed, Game Log, Notifications, and VR Overlay",
+                    "header_tooltip": "When the favorites filter is enabled on Feed, Game Log, Notifications Page, or VR Overlay, only entries from the selected groups will be shown",
                     "group_placeholder": "Select Groups"
                 },
                 "logging": {
@@ -813,7 +813,8 @@
                     "auto_invite_request_accept": "Auto Accept Invite Requests",
                     "auto_invite_request_accept_tooltip": "Automatically accept invite requests from favorite friends",
                     "auto_invite_request_accept_favs": "All Favorites",
-                    "auto_invite_request_accept_selected_favs": "VRCX Favorites",
+                    "auto_invite_request_accept_favs_hint": "Includes local friend favorite groups",
+                    "auto_invite_request_accept_selected_favs": "Custom Favorite Groups",
                     "change_status_description": "Override Status Description",
                     "status_description_placeholder": "Status description (max 32 characters)",
                     "auto_change_status_groups": "Only count friends from",
@@ -971,7 +972,7 @@
                     "header": "Notifications",
                     "layout": "Notification View",
                     "layout_notification_center": "Notification Center",
-                    "layout_table": "Notifications Tab",
+                    "layout_table": "Notifications Page",
                     "notification_filter": "Notification Filters",
                     "test_notification": "Send Test Notification",
                     "test_message": "Test notification.",
diff --git a/src/stores/notification/index.js b/src/stores/notification/index.js
index a736624e..a092edc8 100644
--- a/src/stores/notification/index.js
+++ b/src/stores/notification/index.js
@@ -304,7 +304,8 @@ export const useNotificationStore = defineStore('Notification', () => {
             generalSettingsStore.autoAcceptInviteRequests === 'All Favorites' &&
             !favoriteStore.state.favoriteFriends_.some(
                 (x) => x.id === ref.senderUserId
-            )
+            ) &&
+            !favoriteStore.isInAnyLocalFriendGroup(ref.senderUserId)
         ) {
             return;
         }
@@ -321,8 +322,8 @@ export const useNotificationStore = defineStore('Notification', () => {
                     if (groupKey.startsWith('local:')) {
                         const localGroup = groupKey.slice(6);
                         const localFavs =
-                            favoriteStore.localFriendFavorites.get(localGroup);
-                        if (localFavs && localFavs.has(ref.senderUserId)) {
+                            favoriteStore.localFriendFavorites[localGroup];
+                        if (localFavs && localFavs.includes(ref.senderUserId)) {
                             found = true;
                             break;
                         }
diff --git a/src/views/Settings/components/Tabs/SocialTab.vue b/src/views/Settings/components/Tabs/SocialTab.vue
index 66c31cc5..cd9b69d2 100644
--- a/src/views/Settings/components/Tabs/SocialTab.vue
+++ b/src/views/Settings/components/Tabs/SocialTab.vue
@@ -27,49 +27,44 @@
             </SettingsItem>
         </SettingsGroup>
 
-        <SettingsGroup>
-            <template #description>
-                <div class="flex items-center gap-1.5">
-                    <span class="text-base font-semibold text-foreground">{{ t('view.settings.general.favorites.header') }}</span>
-                    <TooltipWrapper side="top" :content="t('view.settings.general.favorites.header_tooltip')">
-                        <Info class="size-3 text-muted-foreground cursor-help" />
-                    </TooltipWrapper>
-                </div>
-            </template>
-
-            <Select
-                :model-value="localFavoriteFriendsGroups"
-                multiple
-                @update:modelValue="setLocalFavoriteFriendsGroups">
-                <SelectTrigger>
-                    <SelectValue :placeholder="t('view.settings.general.favorites.group_placeholder')" />
-                </SelectTrigger>
-                <SelectContent>
-                    <SelectGroup>
-                        <SelectItem v-for="group in favoriteFriendGroups" :key="group.key" :value="group.key">
-                            {{ group.displayName }}
-                        </SelectItem>
-                    </SelectGroup>
-                    <template v-if="localFriendFavoriteGroups.length">
-                        <SelectSeparator />
+        <SettingsGroup :title="t('view.settings.social.favorites.header')">
+            <SettingsItem
+                :label="t('view.settings.general.favorites.header')"
+                :description="t('view.settings.general.favorites.header_tooltip')">
+                <Select
+                    :model-value="localFavoriteFriendsGroups"
+                    multiple
+                    @update:modelValue="setLocalFavoriteFriendsGroups">
+                    <SelectTrigger class="w-48">
+                        <SelectValue :placeholder="t('view.settings.general.favorites.group_placeholder')" />
+                    </SelectTrigger>
+                    <SelectContent>
                         <SelectGroup>
-                            <SelectItem
-                                v-for="group in localFriendFavoriteGroups"
-                                :key="'local:' + group"
-                                :value="'local:' + group">
-                                {{ group }}
+                            <SelectItem v-for="group in favoriteFriendGroups" :key="group.key" :value="group.key">
+                                {{ group.displayName }}
                             </SelectItem>
                         </SelectGroup>
-                    </template>
-                </SelectContent>
-            </Select>
+                        <template v-if="localFriendFavoriteGroups.length">
+                            <SelectSeparator />
+                            <SelectGroup>
+                                <SelectItem
+                                    v-for="group in localFriendFavoriteGroups"
+                                    :key="'local:' + group"
+                                    :value="'local:' + group">
+                                    {{ group }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </template>
+                    </SelectContent>
+                </Select>
+            </SettingsItem>
         </SettingsGroup>
     </div>
 </template>
 
 <script setup>
     import { Switch } from '@/components/ui/switch';
-    import { Info } from 'lucide-vue-next';
+
     import {
         NumberField,
         NumberFieldContent,
@@ -93,7 +88,7 @@
 
     import SettingsGroup from '../SettingsGroup.vue';
     import SettingsItem from '../SettingsItem.vue';
-    import { TooltipWrapper } from '@/components/ui/tooltip';
+
 
     const { t } = useI18n();
 
diff --git a/src/views/Tools/dialogs/AutoChangeStatusDialog.vue b/src/views/Tools/dialogs/AutoChangeStatusDialog.vue
index 3b579b07..2f3061ef 100644
--- a/src/views/Tools/dialogs/AutoChangeStatusDialog.vue
+++ b/src/views/Tools/dialogs/AutoChangeStatusDialog.vue
@@ -192,18 +192,22 @@
                     @change="handleAutoAcceptInviteSwitch" />
 
                 <Field>
-                    <FieldLabel>{{ t('view.settings.general.automation.auto_invite_request_accept') }}</FieldLabel>
                     <FieldContent>
                         <RadioGroup
                             :model-value="autoAcceptInviteMode"
                             :disabled="autoAcceptInviteRequests === 'Off'"
                             class="gap-2 flex"
                             @update:modelValue="handleAutoAcceptInviteModeChange">
-                            <div class="flex items-center space-x-2">
-                                <RadioGroupItem id="autoAcceptInvite-all" value="All Favorites" />
-                                <label for="autoAcceptInvite-all">
-                                    {{ t('view.settings.general.automation.auto_invite_request_accept_favs') }}
-                                </label>
+                            <div>
+                                <div class="flex items-center space-x-2">
+                                    <RadioGroupItem id="autoAcceptInvite-all" value="All Favorites" />
+                                    <label for="autoAcceptInvite-all">
+                                        {{ t('view.settings.general.automation.auto_invite_request_accept_favs') }}
+                                    </label>
+                                </div>
+                                <p class="text-xs text-muted-foreground ml-6">
+                                    {{ t('view.settings.general.automation.auto_invite_request_accept_favs_hint') }}
+                                </p>
                             </div>
                             <div class="flex items-center space-x-2">
                                 <RadioGroupItem id="autoAcceptInvite-selected" value="Selected Favorites" />