diff --git a/apps/mail/components/create/create-email.tsx b/apps/mail/components/create/create-email.tsx
index f1fb949e66..7c01e0df91 100644
--- a/apps/mail/components/create/create-email.tsx
+++ b/apps/mail/components/create/create-email.tsx
@@ -209,7 +209,7 @@ export function CreateEmail({
         <div className="flex min-h-screen flex-col items-center justify-center gap-1">
           <div className="flex w-[750px] justify-start">
             <DialogClose asChild className="flex">
-              <button className="dark:bg-panelDark flex items-center gap-1 rounded-lg bg-[#F0F0F0] px-2 py-1.5">
+              <button className="dark:bg-panelDark flex items-center gap-1 rounded-lg bg-[#F0F0F0] px-2 py-1.5 cursor-pointer">
                 <X className="fill-muted-foreground mt-0.5 h-3.5 w-3.5 dark:fill-[#929292]" />
                 <span className="text-muted-foreground text-sm font-medium dark:text-white">
                   esc
diff --git a/apps/mail/components/mail/mail-list.tsx b/apps/mail/components/mail/mail-list.tsx
index 4cbe8df3a5..33bc349560 100644
--- a/apps/mail/components/mail/mail-list.tsx
+++ b/apps/mail/components/mail/mail-list.tsx
@@ -968,7 +968,7 @@ export const MailList = memo(
                     <p className="text-lg">It's empty here</p>
                     <p className="text-md text-muted-foreground dark:text-white/50">
                       Search for another email or{' '}
-                      <button className="underline" onClick={clearFilters}>
+                      <button type="button" className="underline cursor-pointer" onClick={clearFilters}>
                         clear filters
                       </button>
                     </p>
diff --git a/apps/mail/components/mail/render-labels.tsx b/apps/mail/components/mail/render-labels.tsx
index 55c58ea68a..c6b6248648 100644
--- a/apps/mail/components/mail/render-labels.tsx
+++ b/apps/mail/components/mail/render-labels.tsx
@@ -51,7 +51,7 @@ export const RenderLabels = ({ count = 1, labels }: { count?: number; labels: La
       {hiddenLabels.length > 0 && (
         <Tooltip>
           <TooltipTrigger asChild>
-            <button className="text-foreground dark:bg-subtleBlack bg-subtleWhite inline-block overflow-hidden truncate rounded px-1.5 py-0.5 text-xs font-medium">
++            <button type="button" className="text-foreground dark:bg-subtleBlack bg-subtleWhite inline-block overflow-hidden truncate rounded px-1.5 py-0.5 text-xs font-medium cursor-pointer">
               +{hiddenLabels.length}
             </button>
           </TooltipTrigger>
diff --git a/apps/mail/components/mail/thread-display.tsx b/apps/mail/components/mail/thread-display.tsx
index f60637db36..4442fbd167 100644
--- a/apps/mail/components/mail/thread-display.tsx
+++ b/apps/mail/components/mail/thread-display.tsx
@@ -873,7 +873,7 @@ export function ThreadDisplay() {
 
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild>
-                    <button className="inline-flex h-7 w-7 items-center justify-center gap-1 overflow-hidden rounded-lg bg-white focus:outline-none focus:ring-0 dark:bg-[#313131]">
+                    <button type="button" aria-label="Thread actions" aria-haspopup="menu" className="inline-flex h-7 w-7 items-center justify-center gap-1 overflow-hidden rounded-lg bg-white cursor-pointer focus:outline-hidden focus:ring-0 dark:bg-[#313131]">
                       <ThreeDots className="fill-iconLight dark:fill-iconDark" />
                     </button>
                   </DropdownMenuTrigger>
diff --git a/apps/mail/components/ui/app-sidebar.tsx b/apps/mail/components/ui/app-sidebar.tsx
index c655386edc..af9d4cc043 100644
--- a/apps/mail/components/ui/app-sidebar.tsx
+++ b/apps/mail/components/ui/app-sidebar.tsx
@@ -200,7 +200,7 @@ function ComposeButton() {
       <DialogDescription></DialogDescription>
 
       <DialogTrigger asChild>
-        <button className="relative mb-1.5 inline-flex h-8 w-full items-center justify-center gap-1 self-stretch overflow-hidden rounded-lg border border-gray-200 bg-[#006FFE] text-black dark:border-none dark:text-white">
+        <button type="button" className="relative mb-1.5 inline-flex h-8 w-full items-center justify-center gap-1 self-stretch overflow-hidden rounded-lg border border-gray-200 bg-[#006FFE] text-black dark:border-none dark:text-white cursor-pointer">
           {state === 'collapsed' && !isMobile ? (
             <PencilCompose className="mt-0.5 fill-white text-black" />
           ) : (
diff --git a/apps/mail/components/ui/button.tsx b/apps/mail/components/ui/button.tsx
index 853286cecc..47159b456e 100644
--- a/apps/mail/components/ui/button.tsx
+++ b/apps/mail/components/ui/button.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
 import { cn } from '@/lib/utils';
 
 const buttonVariants = cva(
-  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 aria-busy:cursor-progress cursor-pointer',
+  'inline-flex items-center justify-center cursor-pointer gap-2 whitespace-nowrap rounded-lg text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 aria-busy:cursor-progress',
   {
     variants: {
       variant: {
diff --git a/apps/mail/components/ui/sidebar.tsx b/apps/mail/components/ui/sidebar.tsx
index 2d4e56aeae..643cf875da 100644
--- a/apps/mail/components/ui/sidebar.tsx
+++ b/apps/mail/components/ui/sidebar.tsx
@@ -365,7 +365,7 @@ const SidebarMenuItem = React.forwardRef<HTMLLIElement, React.ComponentProps<'li
 SidebarMenuItem.displayName = 'SidebarMenuItem';
 
 const sidebarMenuButtonVariants = cva(
-  'peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-lg p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',
+  'peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-lg p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 cursor-pointer',
   {
     variants: {
       variant: {
diff --git a/apps/mail/components/voice-button.tsx b/apps/mail/components/voice-button.tsx
index f559c29f47..3ba6ec47d2 100644
--- a/apps/mail/components/voice-button.tsx
+++ b/apps/mail/components/voice-button.tsx
@@ -29,7 +29,7 @@ export function VoiceButton() {
   if (!isConnected) {
     return (
       <motion.div initial={{ scale: 0 }} animate={{ scale: 1 }} exit={{ scale: 0 }}>
-        <button type="button" onClick={handleStartConversation}>
+        <button type="button" onClick={handleStartConversation} className="cursor-pointer">
           <div className="dark:bg[#141414] flex h-7 items-center justify-center rounded-sm bg-[#262626] px-2">
             <Mic className="h-4 w-4 text-white dark:text-[#929292]" />
           </div>
@@ -40,7 +40,7 @@ export function VoiceButton() {
 
   return (
     isConnected && (
-      <button type="button" onClick={endConversation}>
+      <button type="button" onClick={endConversation} className="cursor-pointer">
         <div className="dark:bg[#141414] flex h-7 items-center justify-center rounded-sm bg-[#262626] px-2">
           {isInitializing && (
             <div className="flex items-center justify-center gap-2">
diff --git a/package.json b/package.json
index aed3fcade2..4a1e1115d3 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,9 @@
     "typescript": "catalog:"
   },
   "dependencies": {
-    "zod-to-json-schema": "3.24.6",
-    "zod": "4.1.1"
+    "drizzle-kit": "catalog:",
+    "react-router": "^7.6.3",
+    "zod": "4.1.1",
+    "zod-to-json-schema": "3.24.6"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d3fae52307..c9de70c003 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ catalogs:
       specifier: ^1.3.4
       version: 1.3.7
     drizzle-kit:
-      specifier: ^0.31.1
+      specifier: 0.31.4
       version: 0.31.4
     drizzle-orm:
       specifier: ^0.43.1
@@ -55,6 +55,12 @@ importers:
 
   .:
     dependencies:
+      drizzle-kit:
+        specifier: 'catalog:'
+        version: 0.31.4
+      react-router:
+        specifier: ^7.6.3
+        version: 7.6.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       zod:
         specifier: 4.1.1
         version: 4.1.1
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0ec4f9c7ca..cb26deec73 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,20 +4,20 @@ packages:
   - scripts/*
 
 catalog:
-  zod: ^3.25.42
-  better-auth: ^1.3.4
-  autumn-js: ^0.0.48
-  superjson: ^2.2.2
-  '@trpc/server': ^11.1.4
   '@trpc/client': ^11.1.4
+  '@trpc/server': ^11.1.4
   '@trpc/tanstack-react-query': ^11.1.4
-  wrangler: ^4.32.0
-  typescript: ^5.8.3
-  drizzle-orm: ^0.43.1
-  drizzle-kit: ^0.31.1
   '@types/node': ^22.15.21
+  autumn-js: ^0.0.48
+  better-auth: ^1.3.4
+  drizzle-kit: 0.31.4
+  drizzle-orm: ^0.43.1
   react: ^19.1.0
   react-dom: ^19.1.0
+  superjson: ^2.2.2
+  typescript: ^5.8.3
+  wrangler: ^4.32.0
+  zod: ^3.25.42
 
 onlyBuiltDependencies:
   - '@sentry/cli'