diff --git a/components/layout/LayoutHeader.vue b/components/layout/LayoutHeader.vue
index 47b9d9fb3c41941269086570b308619c7d1d90e4..ae5df3fd575c40fbb8db084133181d72a924c227 100644
--- a/components/layout/LayoutHeader.vue
+++ b/components/layout/LayoutHeader.vue
@@ -9,6 +9,8 @@
       <div class="flex justify-end items-center relative">
         <LayoutHeaderMenu />
 
+        <AppDarkMode />
+
         <LayoutHeaderMenuAvatar />
       </div>
     </nav>
diff --git a/components/layout/LayoutHeaderMenuAvatar.vue b/components/layout/LayoutHeaderMenuAvatar.vue
index bbe04d210346c5073d7be21c09b155ef820a0ff5..88afd31251616311543f37075d0e1b2875a71be3 100644
--- a/components/layout/LayoutHeaderMenuAvatar.vue
+++ b/components/layout/LayoutHeaderMenuAvatar.vue
@@ -8,34 +8,17 @@
         'absolute right-0 rounded-md shadow-lg bg-white dark:bg-gray-600 border-gray-100 dark:border-gray-500 border transform translate-y-1',
     }"
   >
-    <div
-      slot="trigger"
-      slot-scope="{
-        mousedownHandler,
-        focusHandler,
-        blurHandler,
-        keydownHandler,
-        isShown,
-      }"
-      class="inline-flex items-center relative px-2 dark:border-gray-500 border-2 rounded-full hover:shadow-lg focus:outline-none focus:ring-2 transition-shadow"
-      :class="{ 'shadow-lg': isShown }"
-    >
-      <AppDarkMode />
-
+    <div slot="trigger" class="flex items-center ml-5">
       <button
         type="button"
         aria-label="User menu"
         aria-haspopup="true"
-        @mousedown="mousedownHandler"
-        @focus="focusHandler"
-        @blur="blurHandler"
-        @keydown="keydownHandler"
+        class="h-8 w-8 focus:ring-2 focus:outline-none rounded-full"
       >
-        <div class="flex items-center h-10 w-10 pl-3">
-          <img v-if="user" :src="user.avatar_url" class="rounded-full" />
-          <fa v-else icon="user-circle" class="text-3xl" />
-        </div>
+        <img v-if="user" :src="user.avatar_url" class="rounded-full" />
+        <fa v-else icon="user-circle" class="text-3xl" />
       </button>
+      <fa icon="caret-down" class="pl-1.5" />
     </div>
 
     <div class="my-1" style="min-width: 15rem">
diff --git a/nuxt.config.js b/nuxt.config.js
index c50f381e65484261e28aec6660e783bc54686e03..c373c59324eae9999c6f9d12e9f8c07f09704961 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -89,6 +89,7 @@ export default {
             'faExpandArrowsAlt',
             'faFont',
             'faWheelchair',
+            'faCaretDown',
           ],
           brands: [
             'faCreativeCommonsNcEu',