diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index 413112d9..5b8f58f7 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -405,7 +405,7 @@
                                                 :style="{ color: user.$userColour }"
                                                 v-text="user.displayName" />
                                             <span v-if="user.location === 'traveling'" class="extra">
-                                                <Loader2 class="is-loading" style="margin-right: 3px" />
+                                                <Spinner class="inline-block mr-1" />
                                                 <Timer :epoch="user.$travelingToTime" />
                                             </span>
                                             <span v-else class="extra">
@@ -1171,7 +1171,6 @@
         Copy,
         Download,
         Eye,
-        Loader2,
         MessageSquare,
         MoreHorizontal,
         Pencil,
diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue
index e000486d..8a3a2bdb 100644
--- a/src/components/dialogs/UserDialog/UserDialog.vue
+++ b/src/components/dialogs/UserDialog/UserDialog.vue
@@ -83,7 +83,7 @@
                                                 :style="{ color: user.$userColour }"
                                                 v-text="user.displayName"></span>
                                             <span v-if="user.location === 'traveling'" class="extra">
-                                                <Loader2 class="is-loading" style="margin-right: 3px" />
+                                                <Spinner class="inline-block mr-1" />
                                                 <Timer :epoch="user.$travelingToTime" />
                                             </span>
                                             <span v-else class="extra">
@@ -1287,7 +1287,6 @@
         Eye,
         Info,
         Languages,
-        Loader2,
         LogOut,
         MoreHorizontal,
         Pencil,
diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue
index de6ebcb4..af346a91 100644
--- a/src/components/dialogs/WorldDialog/WorldDialog.vue
+++ b/src/components/dialogs/WorldDialog/WorldDialog.vue
@@ -63,7 +63,7 @@
                                         variant="outline"
                                         style="margin-right: 5px; margin-top: 5px">
                                         <Monitor class="h-4 w-4 x-tag-platform-pc" />
-                                        ><span
+                                        <span
                                             v-if="worldDialog.bundleSizes['standalonewindows']"
                                             :class="['x-grey', 'x-tag-platform-pc', 'x-tag-border-left']">
                                             {{ worldDialog.bundleSizes['standalonewindows'].fileSize }}
@@ -77,7 +77,7 @@
                                         variant="outline"
                                         style="margin-right: 5px; margin-top: 5px">
                                         <Smartphone class="h-4 w-4 x-tag-platform-quest" />
-                                        ><span
+                                        <span
                                             v-if="worldDialog.bundleSizes['android']"
                                             :class="['x-grey', 'x-tag-platform-quest', 'x-tag-border-left']">
                                             {{ worldDialog.bundleSizes['android'].fileSize }}
@@ -91,7 +91,7 @@
                                         variant="outline"
                                         style="margin-right: 5px; margin-top: 5px">
                                         <Apple class="h-4 w-4 text-[#8e8e93]" />
-                                        ><span
+                                        <span
                                             v-if="worldDialog.bundleSizes['ios']"
                                             :class="[
                                                 'x-grey',
@@ -413,7 +413,7 @@
                                                     :style="{ color: user.$userColour }"
                                                     v-text="user.displayName" />
                                                 <span v-if="user.location === 'traveling'" class="extra">
-                                                    <Loader2 class="is-loading" style="margin-right: 3px" />
+                                                    <Spinner class="inline-block mr-1" />
                                                     <Timer :epoch="user.$travelingToTime" />
                                                 </span>
                                                 <span v-else class="extra">
@@ -722,11 +722,9 @@
         Ellipsis,
         Eye,
         Flag,
-        History,
         Home,
         Image,
         LineChart,
-        Loader2,
         MessageSquare,
         Monitor,
         Pencil,
@@ -743,6 +741,7 @@
     import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
+    import { Spinner } from '@/components/ui/spinner';
     import { TabsUnderline } from '@/components/ui/tabs';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
diff --git a/src/stores/instance.js b/src/stores/instance.js
index a9ada757..f1195498 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -968,6 +968,7 @@ export const useInstanceStore = defineStore('Instance', () => {
             imageUrl: group?.iconUrl,
             message: `Instance ready to join ${location}`,
             location: instanceId,
+            senderUserId: L.groupId,
             groupName,
             worldName
         };
diff --git a/src/views/Favorites/components/FavoritesAvatarItem.vue b/src/views/Favorites/components/FavoritesAvatarItem.vue
index 1109f060..4ac186aa 100644
--- a/src/views/Favorites/components/FavoritesAvatarItem.vue
+++ b/src/views/Favorites/components/FavoritesAvatarItem.vue
@@ -23,7 +23,7 @@
                             </TooltipWrapper>
                         </span>
                     </div>
-                    <span class="text-xs text-gray-600">{{ localFavFakeRef.authorName }}</span>
+                    <span class="text-xs text-muted-foreground">{{ localFavFakeRef.authorName }}</span>
                 </div>
             </div>
             <div class="favorites-search-card__actions">
diff --git a/src/views/Favorites/components/FavoritesFriendItem.vue b/src/views/Favorites/components/FavoritesFriendItem.vue
index 1595b396..24e88167 100644
--- a/src/views/Favorites/components/FavoritesFriendItem.vue
+++ b/src/views/Favorites/components/FavoritesFriendItem.vue
@@ -15,7 +15,7 @@
                             :traveling="favorite.ref.travelingToLocation"
                             :link="false" />
                     </div>
-                    <span v-else class="text-xs text-gray-600">{{ favorite.ref.statusDescription }}</span>
+                    <span v-else class="text-xs text-muted-foreground">{{ favorite.ref.statusDescription }}</span>
                 </div>
             </div>
             <div class="favorites-search-card__actions">
diff --git a/src/views/Favorites/components/FavoritesWorldItem.vue b/src/views/Favorites/components/FavoritesWorldItem.vue
index 82850560..840556d8 100644
--- a/src/views/Favorites/components/FavoritesWorldItem.vue
+++ b/src/views/Favorites/components/FavoritesWorldItem.vue
@@ -29,7 +29,7 @@
                                 class="h-4 w-4" />
                         </span>
                     </div>
-                    <span class="text-xs text-gray-600">
+                    <span class="text-xs text-muted-foreground">
                         {{ props.favorite.ref.authorName }}
                         <template v-if="props.favorite.ref.occupants"> ({{ props.favorite.ref.occupants }}) </template>
                     </span>
diff --git a/src/views/Settings/components/SimpleSwitch.vue b/src/views/Settings/components/SimpleSwitch.vue
index 73231695..9047acfe 100644
--- a/src/views/Settings/components/SimpleSwitch.vue
+++ b/src/views/Settings/components/SimpleSwitch.vue
@@ -3,7 +3,7 @@
         <div class="name" :style="{ width: longLabel ? '300px' : undefined }">
             {{ label }}
             <TooltipWrapper v-if="tooltip" side="top" :content="tooltip">
-                <Info size="small" class="tooltip" />
+                <Info class="tooltip" />
             </TooltipWrapper>
         </div>
 
diff --git a/src/views/Settings/components/Tabs/AppearanceTab.vue b/src/views/Settings/components/Tabs/AppearanceTab.vue
index df423dde..2f4e1120 100644
--- a/src/views/Settings/components/Tabs/AppearanceTab.vue
+++ b/src/views/Settings/components/Tabs/AppearanceTab.vue
@@ -362,53 +362,53 @@
                 @change="updateTrustColor('', '', true)"></simple-switch>
             <div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-untrusted">Visitor</span>
                     <PresetColorPicker
                         :model-value="trustColor.untrusted"
                         :presets="['#CCCCCC']"
                         @change="updateTrustColor('untrusted', $event)" />
-                    <span class="text-[18px] align-top x-tag-untrusted">Visitor</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-basic">New User</span>
                     <PresetColorPicker
                         :model-value="trustColor.basic"
                         :presets="['#1778ff']"
                         @change="updateTrustColor('basic', $event)" />
-                    <span class="text-[18px] align-top x-tag-basic">New User</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-known">User</span>
                     <PresetColorPicker
                         :model-value="trustColor.known"
                         :presets="['#2bcf5c']"
                         @change="updateTrustColor('known', $event)" />
-                    <span class="text-[18px] align-top x-tag-known">User</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-trusted">Known User</span>
                     <PresetColorPicker
                         :model-value="trustColor.trusted"
                         :presets="['#ff7b42']"
                         @change="updateTrustColor('trusted', $event)" />
-                    <span class="text-[18px] align-top x-tag-trusted">Known User</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-veteran">Trusted User</span>
                     <PresetColorPicker
                         :model-value="trustColor.veteran"
                         :presets="['#b18fff', '#8143e6', '#ff69b4', '#b52626', '#ffd000', '#abcdef']"
                         @change="updateTrustColor('veteran', $event)" />
-                    <span class="text-[18px] align-top x-tag-veteran">Trusted User</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-vip">VRChat Team</span>
                     <PresetColorPicker
                         :model-value="trustColor.vip"
                         :presets="['#ff2626']"
                         @change="updateTrustColor('vip', $event)" />
-                    <span class="text-[18px] align-top x-tag-vip">VRChat Team</span>
                 </div>
                 <div>
+                    <span class="text-[18px] align-top x-tag-troll">Nuisance</span>
                     <PresetColorPicker
                         :model-value="trustColor.troll"
                         :presets="['#782f2f']"
                         @change="updateTrustColor('troll', $event)" />
-                    <span class="text-[18px] align-top x-tag-troll">Nuisance</span>
                 </div>
             </div>
         </div>
diff --git a/src/views/Settings/components/Tabs/GeneralTab.vue b/src/views/Settings/components/Tabs/GeneralTab.vue
index c2bdef3c..fda89489 100644
--- a/src/views/Settings/components/Tabs/GeneralTab.vue
+++ b/src/views/Settings/components/Tabs/GeneralTab.vue
@@ -244,7 +244,7 @@
                         side="top"
                         style="margin-left: 5px"
                         :content="t('view.settings.general.automation.auto_invite_request_accept_tooltip')">
-                        <Info />
+                        <Info class="inline-block" />
                     </TooltipWrapper>
                 </span>
                 <br />
diff --git a/src/views/Settings/components/Tabs/PicturesTab.vue b/src/views/Settings/components/Tabs/PicturesTab.vue
index 8316e46d..8282b1a4 100644
--- a/src/views/Settings/components/Tabs/PicturesTab.vue
+++ b/src/views/Settings/components/Tabs/PicturesTab.vue
@@ -67,7 +67,7 @@
         <TooltipWrapper
             side="top"
             :content="t('view.settings.advanced.advanced.save_instance_prints_to_file.header_tooltip')">
-            <Info />
+            <Info class="inline-block" />
         </TooltipWrapper>
         <simple-switch
             :label="t('view.settings.advanced.advanced.save_instance_prints_to_file.description')"
@@ -93,7 +93,7 @@
         <TooltipWrapper
             side="top"
             :content="t('view.settings.advanced.advanced.save_instance_prints_to_file.header_tooltip')">
-            <Info />
+            <Info class="inline-block" />
         </TooltipWrapper>
         <simple-switch
             :label="t('view.settings.advanced.advanced.save_instance_emoji_to_file.description')"
diff --git a/src/views/Settings/dialogs/FeedFiltersDialog.vue b/src/views/Settings/dialogs/FeedFiltersDialog.vue
index 39e66828..8d803bd4 100644
--- a/src/views/Settings/dialogs/FeedFiltersDialog.vue
+++ b/src/views/Settings/dialogs/FeedFiltersDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <Dialog :open="!!feedFiltersDialogMode" @update:open="(open) => !open && handleDialogClose()">
-        <DialogContent>
+        <DialogContent class="sm:max-w-140">
             <DialogHeader>
                 <DialogTitle>{{ dialogTitle }}</DialogTitle>
             </DialogHeader>
@@ -13,8 +13,8 @@
                             side="top"
                             style="margin-left: 5px"
                             :content="setting.tooltip">
-                            <AlertTriangle v-if="setting.tooltipWarning" />
-                            <Info v-else />
+                            <AlertTriangle class="inline-block" v-if="setting.tooltipWarning" />
+                            <Info class="inline-block" v-else />
                         </TooltipWrapper>
                     </span>
 
diff --git a/src/views/Sidebar/components/FriendItem.vue b/src/views/Sidebar/components/FriendItem.vue
index 2a2ce071..459a6d7c 100644
--- a/src/views/Sidebar/components/FriendItem.vue
+++ b/src/views/Sidebar/components/FriendItem.vue
@@ -23,7 +23,7 @@
                     </div>
                     <template v-else-if="isGroupByInstance">
                         <div class="flex items-center">
-                            <Loader2 v-if="isFriendTraveling" class="is-loading" style="margin-right: 3px" />
+                            <Spinner v-if="isFriendTraveling" class="mr-1" />
                             <Timer
                                 class="text-xs"
                                 :epoch="epoch"
@@ -65,8 +65,9 @@
 </template>
 
 <script setup>
-    import { Loader2, Trash2 } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
+    import { Spinner } from '@/components/ui/spinner';
+    import { Trash2 } from 'lucide-vue-next';
     import { computed } from 'vue';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
diff --git a/src/views/Sidebar/components/GroupsSidebar.vue b/src/views/Sidebar/components/GroupsSidebar.vue
index c10626f0..ea8b70ae 100644
--- a/src/views/Sidebar/components/GroupsSidebar.vue
+++ b/src/views/Sidebar/components/GroupsSidebar.vue
@@ -5,7 +5,7 @@
                 <div @click="toggleGroupSidebarCollapse(getGroupId(group))" style="display: flex; align-items: center">
                     <ChevronDown
                         class="rotation-transition"
-                        :class="{ 'is-rotated': !groupInstancesCfg[getGroupId(group)]?.isCollapsed }" />
+                        :class="{ 'is-rotated': groupInstancesCfg[getGroupId(group)]?.isCollapsed }" />
                     <span style="margin-left: 5px">{{ group[0].group.name }} – {{ group.length }}</span>
                 </div>
             </div>
diff --git a/src/views/Tools/dialogs/GroupCalendarDialog.vue b/src/views/Tools/dialogs/GroupCalendarDialog.vue
index 2b01851e..8d4ae132 100644
--- a/src/views/Tools/dialogs/GroupCalendarDialog.vue
+++ b/src/views/Tools/dialogs/GroupCalendarDialog.vue
@@ -62,9 +62,9 @@
                         <div v-if="filteredGroupEvents.length" class="groups-container">
                             <div v-for="group in filteredGroupEvents" :key="group.groupId" class="group-row">
                                 <div class="group-header" @click="toggleGroup(group.groupId)">
-                                    <ArrowRight
+                                    <ChevronDown
                                         class="rotation-transition"
-                                        :class="{ rotate: !groupCollapsed[group.groupId] }" />
+                                        :class="{ 'is-rotated': groupCollapsed[group.groupId] }" />
                                     {{ group.groupName }}
                                 </div>
                                 <div class="events-row" v-show="!groupCollapsed[group.groupId]">
@@ -97,8 +97,8 @@
 <script setup>
     import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
     import { computed, onMounted, ref, watch } from 'vue';
-    import { ArrowRight } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
+    import { ChevronDown } from 'lucide-vue-next';
     import { InputGroupSearch } from '@/components/ui/input-group';
     import { useI18n } from 'vue-i18n';
 
@@ -332,11 +332,9 @@
     // Use a stable key for calendar maps (independent of locale/appearance date formatting).
     const formatDateKey = (date) => dayjs(date).format('YYYY-MM-DD');
 
-    function getGroupNameFromCache(groupId) {
+    async function getGroupNameFromCache(groupId) {
         if (!groupNamesCache.has(groupId)) {
-            getGroupName(groupId).then((name) => {
-                groupNamesCache.set(groupId, name);
-            });
+            groupNamesCache.set(groupId, await getGroupName(groupId));
         }
     }
 
@@ -351,13 +349,13 @@
                     offset: 0,
                     date: dayjs(selectedDay.value).format('YYYY-MM-DDTHH:mm:ss[Z]') // this need to be local time because UTC time may cause month shift
                 },
-                handle(args) {
-                    args.results.forEach((event) => {
+                async handle(args) {
+                    for (const event of args.results) {
                         event.title = replaceBioSymbols(event.title);
                         event.description = replaceBioSymbols(event.description);
                         applyGroupEvent(event);
-                        getGroupNameFromCache(event.ownerId);
-                    });
+                        await getGroupNameFromCache(event.ownerId);
+                    }
                     calendar.value.push(...args.results);
                 }
             });
@@ -377,11 +375,11 @@
                     offset: 0,
                     date: dayjs(selectedDay.value).format('YYYY-MM-DDTHH:mm:ss[Z]')
                 },
-                handle(args) {
-                    args.results.forEach((event) => {
+                async handle(args) {
+                    for (const event of args.results) {
                         applyGroupEvent(event);
-                        getGroupNameFromCache(event.ownerId);
-                    });
+                        await getGroupNameFromCache(event.ownerId);
+                    }
                     followingCalendar.value.push(...args.results);
                 }
             });
@@ -401,11 +399,11 @@
                     offset: 0,
                     date: dayjs(selectedDay.value).format('YYYY-MM-DDTHH:mm:ss[Z]')
                 },
-                handle(args) {
-                    args.results.forEach((event) => {
+                async handle(args) {
+                    for (const event of args.results) {
                         applyGroupEvent(event);
-                        getGroupNameFromCache(event.ownerId);
-                    });
+                        await getGroupNameFromCache(event.ownerId);
+                    }
                     featuredCalendar.value.push(...args.results);
                 }
             });
@@ -622,8 +620,8 @@
         }
     }
 
-    .rotate {
-        transform: rotate(90deg);
+    .is-rotated {
+        transform: rotate(-90deg);
     }
 
     .rotation-transition {