diff --git a/front/src/ui/components/Sidebar.vue b/front/src/ui/components/Sidebar.vue
index b923dc302..6e507cbaf 100644
--- a/front/src/ui/components/Sidebar.vue
+++ b/front/src/ui/components/Sidebar.vue
@@ -25,28 +25,24 @@ const uploads = useUploadsStore()
   <aside>
     <div class="sticky-content">
       <nav class="quick-actions">
-        <RouterLink to="/">
+        <Link to="/">
           <img
             src="../../assets/logo/logo.svg"
             alt="Logo"
             class="logo"
           >
-        </RouterLink>
+        </Link>
 
-        <Button
+        <Link to="todo:settings"
           icon="bi:wrench"
           color="secondary"
-          variant="ghost"
-        />
-        <!-- TODO: Replace button with link because navigate is not working on new Button -->
-        <RouterLink to="/upload" custom v-slot="{ navigate, isExactActive }">
-          <button
+          variant="ghost">
+        </Link>
+
+        <Link to="/upload"
             icon="bi:upload"
             color="secondary"
-            variant="ghost"
-            :class="[{ active: isExactActive }, 'icon-only']"
-            @click="navigate"
-          >
+            variant="ghost">
             <Transition>
               <div
                 v-if="uploads.currentIndex < uploads.queue.length"
@@ -59,19 +55,17 @@ const uploads = useUploadsStore()
                 />
               </div>
             </Transition>
-          </button>
-        </RouterLink>
+        </Link>
 
-        <Button
+        <Link to="TODO/inbox"
           icon="bi:inbox"
           color="secondary"
           variant="ghost"
         />
-
-        <a
-          href=""
-          class="avatar"
-          @click.prevent
+        <Link to="TODO/inbox"
+          icon="bi:inbox"
+          color="secondary"
+          variant="ghost"
         >
           <img
             v-if="store.state.auth.authenticated && store.state.auth.profile?.avatar?.urls.medium_square_crop"
@@ -86,7 +80,7 @@ const uploads = useUploadsStore()
             v-else
             class="cog icon"
           />
-        </a>
+        </Link>
       </nav>
 
       <div class="search">