diff --git a/src/app/[locale]/dashboard/[subdomain]/layout-component.tsx b/src/app/[locale]/dashboard/[subdomain]/layout-component.tsx
index 2abd1c95..efb23999 100644
--- a/src/app/[locale]/dashboard/[subdomain]/layout-component.tsx
+++ b/src/app/[locale]/dashboard/[subdomain]/layout-component.tsx
@@ -1,7 +1,6 @@
 "use client"
 
 import { useTranslations } from "next-intl"
-import Link from "next/link"
 import {
   useParams,
   usePathname,
@@ -243,7 +242,10 @@ export default function DashboardLayout({
               drawerWidget={(close: any) => (
                 <>
                   <div className="flex-1 min-h-0 flex flex-col h-full">
-                    <div className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center">
+                    <UniLink
+                      href="/"
+                      className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center"
+                    >
                       <div className="inline-block size-9 mr-3">
                         <Logo
                           type="lottie"
@@ -252,8 +254,8 @@ export default function DashboardLayout({
                           autoplay={false}
                         />
                       </div>
-                      <Link href="/">xLog</Link>
-                    </div>
+                      xLog
+                    </UniLink>
                     <div className="px-3 space-y-[2px] text-zinc-500 flex-1 min-h-0 overflow-y-auto">
                       {links.map((link) => {
                         const active =
@@ -320,7 +322,10 @@ export default function DashboardLayout({
                 className={`w-sidebar transition-[width] fixed h-full flex flex-col`}
               >
                 <div className="flex-1 min-h-0 flex flex-col">
-                  <div className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center">
+                  <UniLink
+                    href="/"
+                    className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center"
+                  >
                     <div className="inline-block size-9 mr-3">
                       <Logo
                         type="lottie"
@@ -329,8 +334,8 @@ export default function DashboardLayout({
                         autoplay={false}
                       />
                     </div>
-                    <Link href="/">xLog</Link>
-                  </div>
+                    xLog
+                  </UniLink>
                   {account?.character?.handle &&
                     subdomain &&
                     account?.character?.handle !== subdomain && (
diff --git a/src/components/dashboard/DashboardTopbar.tsx b/src/components/dashboard/DashboardTopbar.tsx
index f84d9f62..3c016b7a 100644
--- a/src/components/dashboard/DashboardTopbar.tsx
+++ b/src/components/dashboard/DashboardTopbar.tsx
@@ -3,6 +3,8 @@ import { Fragment } from "react"
 import { Popover, Transition } from "@headlessui/react"
 import { Bars3Icon } from "@heroicons/react/24/outline"
 
+import { UniLink } from "~/components/ui/UniLink"
+
 import { Logo } from "../common/Logo"
 
 export const DashboardTopbar = ({
@@ -31,7 +33,7 @@ export const DashboardTopbar = ({
               <Popover.Overlay className="fixed inset-0 bg-black opacity-10" />
             </Transition>
             <Popover.Button className="group inline-flex items-center rounded-md text-base font-medium hover:text-opacity-100 focus:outline-none focus-visible:ring-2 focus-visible:ring-white/75">
-              <Bars3Icon className="h-6 w-6" />
+              <Bars3Icon className="size-6" />
             </Popover.Button>
             <Transition
               as={Fragment}
@@ -52,12 +54,15 @@ export const DashboardTopbar = ({
         )}
       </Popover>
 
-      <div className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center">
-        <div className="inline-block w-9 h-9 mr-3">
+      <UniLink
+        href="/"
+        className="mb-2 px-5 pt-3 pb-2 text-2xl font-extrabold flex items-center"
+      >
+        <div className="inline-block size-9 mr-3">
           <Logo type="lottie" width={36} height={36} autoplay={false} />
         </div>
         xLog
-      </div>
+      </UniLink>
       <div className="flex-1"></div>
       {userWidget}
     </div>