diff --git a/frontend/src/components/Layouts/DesktopLayout.vue b/frontend/src/components/Layouts/DesktopLayout.vue
index 7c863e47..f244b6ff 100644
--- a/frontend/src/components/Layouts/DesktopLayout.vue
+++ b/frontend/src/components/Layouts/DesktopLayout.vue
@@ -3,7 +3,7 @@
     <div class="h-full border-r bg-surface-menu-bar">
       <AppSidebar />
     </div>
-    <div class="flex-1 flex flex-col h-full overflow-auto">
+    <div class="flex-1 flex flex-col h-full overflow-auto bg-surface-white">
       <AppHeader />
       <slot />
     </div>
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 2384a6d1..d3686311 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -79,11 +79,6 @@ let dropdownOptions = ref([
       {
         component: markRaw(Apps),
       },
-      {
-        icon: computed(() => (theme.value === 'dark' ? 'sun' : 'moon')),
-        label: computed(() => __('Toggle theme')),
-        onClick: toggleTheme,
-      },
       {
         icon: 'life-buoy',
         label: computed(() => __('Support')),
@@ -100,6 +95,11 @@ let dropdownOptions = ref([
     group: 'Others',
     hideLabel: true,
     items: [
+      {
+        icon: computed(() => (theme.value === 'dark' ? 'moon' : 'sun')),
+        label: computed(() => __('Toggle theme')),
+        onClick: toggleTheme,
+      },
       {
         icon: 'credit-card',
         label: computed(() => __('Billing')),