diff --git a/src/app.js b/src/app.js
index b50dad38..734dfef0 100644
--- a/src/app.js
+++ b/src/app.js
@@ -23276,7 +23276,8 @@ console.log(`isLinux: ${LINUX}`);
     $app.computed.friendsInSameInstance = function () {
         const friendsList = {};
 
-        this.friends.forEach((friend) => {
+        const allFriends = [...this.vipFriends, ...this.onlineFriends];
+        allFriends.forEach((friend) => {
             if (!friend.ref?.$location.isRealInstance) return;
 
             const key = friend.ref.$location.tag;
diff --git a/src/app.scss b/src/app.scss
index 5fe2d1f6..7f35bd4c 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -519,7 +519,8 @@ img.friends-list-avatar {
     color: #303133;
 }
 
-.x-friend-item > .detail > .extra {
+.x-friend-item > .detail > .extra,
+.extra {
     font-weight: normal;
     color: #606266;
 }
diff --git a/src/mixins/friendsListSidebar.pug b/src/mixins/friendsListSidebar.pug
index 02291a53..49757537 100644
--- a/src/mixins/friendsListSidebar.pug
+++ b/src/mixins/friendsListSidebar.pug
@@ -95,13 +95,13 @@ mixin friendsListSidebar
                     //- Group By Instance
                     template(v-if='isSidebarGroupByInstance && friendsInSameInstance.length')
                         .x-friend-group.x-link(@click='toggleSwitchGroupByInstanceCollapsed')
-                            i.el-icon-arrow-right(:class='{ rotate: isSidebarGroupByInstanceCollapsed }')
+                            i.el-icon-arrow-right(:class='{ rotate: !isSidebarGroupByInstanceCollapsed }')
                             span(style='margin-left: 5px') {{ $t('side_panel.same_instance') }} ― {{ friendsInSameInstance.length }}
                         div(v-show='!isSidebarGroupByInstanceCollapsed')
                             div(v-for='friendArr in friendsInSameInstance' :key='friendArr[0].ref?.$location.tag')
                                 div(style='margin-bottom: 3px')
-                                    location.extra(:location='getFriendsLocations(friendArr)' style='color: #c7c7c7')
-                                    span(style='margin-left: 5px') {{ `(${friendArr.length})` }}
+                                    location.extra(:location='getFriendsLocations(friendArr)')
+                                    span.extra(style='margin-left: 5px') {{ `(${friendArr.length})` }}
                                 div
                                     .x-friend-item(
                                         v-if='friendArr && friendArr.length'
@@ -113,11 +113,11 @@ mixin friendsListSidebar
                                             .avatar(:class='userStatusClass(friend.ref, friend.pendingOffline)')
                                                 img(v-lazy='userImage(friend.ref)')
                                             .detail
-                                                div(style='display: flex; align-items: center')
-                                                    span.name(
+                                                span.name(style='display: flex; align-items: center')
+                                                    span(
                                                         v-if='!hideNicknames && friend.$nickName'
                                                         :style='{ color: friend.ref.$userColour }') {{ friend.ref.displayName }} ({{ friend.$nickName }})
-                                                    span.name(
+                                                    span(
                                                         v-else
                                                         v-text='friend.ref.displayName'
                                                         :style='{ color: friend.ref.$userColour }')
@@ -129,7 +129,7 @@ mixin friendsListSidebar
                                                     i.el-icon.el-icon-loading(
                                                         v-if='friend.ref.travelingToLocation'
                                                         style='display: inline-block; margin-right: 5px')
-                                                    timer(:epoch='friend.ref?.$location_at' style='color: #c7c7c7')
+                                                    timer.extra(:epoch='friend.ref?.$location_at')
                                         template(v-else)
                                             span(v-text='friend.name || friend.id')
                                             el-button(
diff --git a/src/theme.dark.scss b/src/theme.dark.scss
index 795655bf..63917bfd 100644
--- a/src/theme.dark.scss
+++ b/src/theme.dark.scss
@@ -397,7 +397,8 @@ button {
     color: #fff;
 }
 
-.x-friend-item > .detail > .extra {
+.x-friend-item > .detail > .extra,
+.extra {
     color: #c7c7c7;
 }