diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue
index 16aa2fd2..ab84768a 100644
--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -31,6 +31,9 @@
                     </template>
                 </el-menu-item>
             </el-menu>
+            <el-tooltip :content="t('prompt.direct_access_omni.header')" placement="right"
+                ><div class="bottom-button" @click="directAccessPaste"><i class="ri-compass-3-line"></i></div
+            ></el-tooltip>
         </div>
 
         <div class="nav-menu-container-bottom">
@@ -38,24 +41,86 @@
                 ><div class="bottom-button" id="feedback" @click="!sentryErrorReporting && setSentryErrorReporting()">
                     <i class="ri-feedback-line"></i></div
             ></el-tooltip>
-            <el-tooltip :content="t('prompt.direct_access_omni.header')" placement="right"
-                ><div class="bottom-button" @click="directAccessPaste"><i class="ri-compass-3-line"></i></div
-            ></el-tooltip>
-            <el-tooltip :content="t('nav_tooltip.settings')" placement="right"
-                ><div class="bottom-button" @click="router.push({ name: 'settings' })">
-                    <i class="ri-settings-3-line"></i></div
-            ></el-tooltip>
+
+            <el-popover
+                v-model:visible="settingsMenuVisible"
+                placement="right"
+                trigger="click"
+                popper-style="padding:4px;border-radius:8px;"
+                :offset="4"
+                :show-arrow="false"
+                :width="200">
+                <div class="nav-menu-settings">
+                    <div class="nav-menu-settings__header">
+                        <img class="nav-menu-settings__logo" :src="vrcxLogo" alt="VRCX" @click="openGithub" />
+                        <div class="nav-menu-settings__meta">
+                            <span class="nav-menu-settings__title" @click="openGithub">VRCX💚</span>
+                            <span class="nav-menu-settings__version">{{ version }}</span>
+                        </div>
+                    </div>
+                    <button type="button" class="nav-menu-settings__item" @click="handleSettingsClick">
+                        <span>{{ t('nav_tooltip.settings') }}</span>
+                    </button>
+                    <el-popover
+                        v-model:visible="themeMenuVisible"
+                        placement="right-start"
+                        trigger="hover"
+                        popper-style="padding:4px;border-radius:8px;"
+                        :offset="4"
+                        :show-arrow="false"
+                        :width="200">
+                        <div class="nav-menu-theme">
+                            <button
+                                v-for="theme in themes"
+                                :key="theme"
+                                type="button"
+                                class="nav-menu-theme__item"
+                                :class="{ 'is-active': themeMode === theme }"
+                                @click="handleThemeSelect(theme)">
+                                <span class="nav-menu-theme__label">{{ themeDisplayName(theme) }}</span>
+                                <span v-if="themeMode === theme" class="nav-menu-theme__check">✔</span>
+                            </button>
+                        </div>
+                        <template #reference>
+                            <button type="button" class="nav-menu-settings__item" @click.prevent>
+                                <span>Theme</span>
+                                <span class="nav-menu-settings__arrow">›</span>
+                            </button>
+                        </template>
+                    </el-popover>
+                    <button
+                        type="button"
+                        class="nav-menu-settings__item nav-menu-settings__item--danger"
+                        @click="handleLogoutClick">
+                        <span>{{ t('dialog.user.actions.logout') }}</span>
+                    </button>
+                </div>
+                <template #reference>
+                    <div class="bottom-button">
+                        <i class="ri-settings-3-line"></i>
+                    </div>
+                </template>
+            </el-popover>
         </div>
     </div>
 </template>
 
 <script setup>
-    import { onMounted } from 'vue';
+    import { computed, onMounted, ref, watch } from 'vue';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
     import { useRouter } from 'vue-router';
 
-    import { useAdvancedSettingsStore, useSearchStore, useUiStore, useVRCXUpdaterStore } from '../stores';
+    import {
+        useAdvancedSettingsStore,
+        useAppearanceSettingsStore,
+        useAuthStore,
+        useSearchStore,
+        useUiStore,
+        useVRCXUpdaterStore
+    } from '../stores';
+    import { THEME_CONFIG } from '../shared/constants';
+    import { openExternalLink } from '../shared/utils';
 
     import * as Sentry from '@sentry/vue';
 
@@ -64,7 +129,7 @@
 
     const navItems = [
         { index: 'feed', icon: 'ri-rss-line', tooltip: 'nav_tooltip.feed' },
-        { index: 'friend-location', icon: 'ri-group-line', tooltip: 'nav_tooltip.friend_location' },
+        { index: 'friend-location', icon: 'ri-map-pin-user-line', tooltip: 'nav_tooltip.friend_location' },
         { index: 'game-log', icon: 'ri-history-line', tooltip: 'nav_tooltip.game_log' },
         { index: 'player-list', icon: 'ri-group-3-line', tooltip: 'nav_tooltip.player_list' },
         { index: 'search', icon: 'ri-search-line', tooltip: 'nav_tooltip.search' },
@@ -78,7 +143,7 @@
     ];
 
     const VRCXUpdaterStore = useVRCXUpdaterStore();
-    const { pendingVRCXUpdate, pendingVRCXInstall, updateInProgress, updateProgress, branch } =
+    const { pendingVRCXUpdate, pendingVRCXInstall, updateInProgress, updateProgress, branch, appVersion } =
         storeToRefs(VRCXUpdaterStore);
     const { showVRCXUpdateDialog, updateProgressText } = VRCXUpdaterStore;
     const uiStore = useUiStore();
@@ -86,6 +151,46 @@
     const { directAccessPaste } = useSearchStore();
     const { sentryErrorReporting } = storeToRefs(useAdvancedSettingsStore());
     const { setSentryErrorReporting } = useAdvancedSettingsStore();
+    const { logout } = useAuthStore();
+    const appearanceSettingsStore = useAppearanceSettingsStore();
+    const { themeMode } = storeToRefs(appearanceSettingsStore);
+
+    const settingsMenuVisible = ref(false);
+    const themeMenuVisible = ref(false);
+
+    const version = computed(() => appVersion.value?.split('VRCX ')?.[1] || '-');
+    const vrcxLogo = new URL('../../images/VRCX.png', import.meta.url).href;
+
+    const themes = computed(() => Object.keys(THEME_CONFIG));
+
+    const themeDisplayName = (key) => THEME_CONFIG[key]?.name ?? key;
+
+    const handleSettingsClick = () => {
+        themeMenuVisible.value = false;
+        settingsMenuVisible.value = false;
+        router.push({ name: 'settings' });
+    };
+
+    const handleLogoutClick = () => {
+        settingsMenuVisible.value = false;
+        logout();
+    };
+
+    const handleThemeSelect = (theme) => {
+        themeMenuVisible.value = false;
+        settingsMenuVisible.value = false;
+        appearanceSettingsStore.saveThemeMode(theme);
+    };
+
+    const openGithub = () => {
+        openExternalLink('https://github.com/vrcx-team/VRCX');
+    };
+
+    watch(settingsMenuVisible, (visible) => {
+        if (!visible) {
+            themeMenuVisible.value = false;
+        }
+    });
 
     onMounted(() => {
         if (!sentryErrorReporting.value) return;
@@ -125,10 +230,10 @@
             justify-content: center;
             text-align: center;
             vertical-align: middle;
+            cursor: pointer;
         }
         .bottom-button:hover {
             background-color: var(--el-menu-hover-bg-color);
-            cursor: pointer;
             transition:
                 border-color var(--el-transition-duration),
                 background-color var(--el-transition-duration),
@@ -139,4 +244,96 @@
             flex-direction: column;
         }
     }
+
+    .nav-menu-settings {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+        .nav-menu-settings__header {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+            padding: 8px 8px 10px;
+            border-bottom: 1px solid var(--el-border-color-light);
+            margin-bottom: 4px;
+            .nav-menu-settings__logo {
+                width: 24px;
+                height: 24px;
+                object-fit: contain;
+                cursor: pointer;
+            }
+
+            .nav-menu-settings__meta {
+                display: flex;
+                flex-direction: column;
+                gap: 2px;
+                color: var(--el-text-color-secondary);
+                font-size: 12px;
+                line-height: 1.2;
+            }
+            .nav-menu-settings__title {
+                font-weight: 600;
+                color: var(--el-text-color-regular);
+                cursor: pointer;
+            }
+
+            .nav-menu-settings__version {
+                font-size: 11px;
+            }
+        }
+        .nav-menu-settings__item {
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            padding: 8px 12px;
+            width: 100%;
+            border: none;
+            background: transparent;
+            color: var(--el-text-color-primary);
+            font-size: 14px;
+            border-radius: 4px;
+            transition: background-color var(--el-transition-duration);
+            cursor: pointer;
+            .nav-menu-settings__arrow {
+                margin-left: auto;
+                color: var(--el-text-color-secondary);
+                font-size: 12px;
+            }
+        }
+        .nav-menu-settings__item:hover {
+            background-color: var(--el-menu-hover-bg-color);
+        }
+
+        .nav-menu-settings__item--danger {
+            color: var(--el-color-danger);
+        }
+    }
+
+    .nav-menu-theme {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+        .nav-menu-theme__item {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 6px 10px;
+            border: none;
+            background: transparent;
+            color: var(--el-text-color-primary);
+            font-size: 13px;
+            border-radius: 6px;
+            transition: background-color var(--el-transition-duration);
+            cursor: pointer;
+            .nav-menu-theme__check {
+                font-size: 12px;
+                color: var(--el-color-primary);
+                margin-left: 10px;
+            }
+        }
+        .nav-menu-theme__item:hover,
+        .nav-menu-theme__item.is-active {
+            background-color: var(--el-menu-hover-bg-color);
+        }
+    }
 </style>