diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 3e80416d..2fa002fc 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -12,7 +12,6 @@ const { notifications } = useNotifications()
     <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" xl:hidden :command="command" />
 
     <div shrink hidden sm:block mt-4 />
-    <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
     <NavSideItem :text="$t('nav.notifications')" to="/notifications" icon="i-ri:notification-4-line" user-only :command="command">
       <template #icon>
         <div flex relative>
@@ -34,6 +33,6 @@ const { notifications } = useNotifications()
     <NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" :command="command" />
 
     <div shrink hidden sm:block mt-4 />
-    <NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" />
+    <NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" class="-mb-2" />
   </nav>
 </template>
diff --git a/components/nav/NavTitle.vue b/components/nav/NavTitle.vue
index d9bb616d..4e89b1e5 100644
--- a/components/nav/NavTitle.vue
+++ b/components/nav/NavTitle.vue
@@ -20,11 +20,33 @@ const { env } = useBuildInfo()
     </NuxtLink>
     <div hidden xl:flex items-center me-8 mt-2>
       <NuxtLink
+        key="back"
         :aria-label="$t('nav.back')"
-        @click="$router.go(-1)"
+        opacity-50 @click="$router.back()"
       >
         <div i-ri:arrow-left-line class="rtl-flip" btn-text />
       </NuxtLink>
+
+      <NuxtLink
+        key="home"
+        :aria-label="$t('nav.home')"
+        to="/home"
+        outline-none
+      >
+        <div i-ri:home-5-line btn-text />
+      </NuxtLink>
     </div>
   </div>
 </template>
+
+<style scoped>
+.v-enter-active,
+.v-leave-active {
+  transition: opacity 0.5s ease;
+}
+
+.v-enter-from,
+.v-leave-to {
+  opacity: 0;
+}
+</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index bff152d8..46198b3c 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -25,7 +25,7 @@ const showUserPicker = logicAnd(
                 <div hidden xl:block>
                   <UserSignInEntry v-if="!currentUser" />
                 </div>
-                <div v-if="currentUser" p6 pb8 w-full>
+                <div v-if="currentUser" p6 w-full>
                   <div hidden xl-block>
                     <UserPicker v-if="showUserPicker" />
                     <div v-else flex="~" items-center justify-between>