diff --git a/apps/mail/app/(routes)/mail/layout.tsx b/apps/mail/app/(routes)/mail/layout.tsx
index 10d8b89a9..6b24544ac 100644
--- a/apps/mail/app/(routes)/mail/layout.tsx
+++ b/apps/mail/app/(routes)/mail/layout.tsx
@@ -7,7 +7,7 @@ export default function MailLayout({ children }: { children: React.ReactNode })
     <HotkeyProviderWrapper>
       <AppSidebar />
       <GlobalHotkeys />
-      <div className="w-full bg-white md:py-3 md:pr-2 dark:bg-black">{children}</div>
+      <div className="w-full bg-white dark:bg-black">{children}</div>
     </HotkeyProviderWrapper>
   );
 }
diff --git a/apps/mail/components/create/create-email.tsx b/apps/mail/components/create/create-email.tsx
index 3922522ac..8a9e6ef83 100644
--- a/apps/mail/components/create/create-email.tsx
+++ b/apps/mail/components/create/create-email.tsx
@@ -470,7 +470,7 @@ export function CreateEmail({
 
   return (
     <div
-      className="bg-offsetLight dark:bg-offsetDark relative flex h-[100.3%] flex-col overflow-hidden shadow-inner md:rounded-2xl md:border md:shadow-sm"
+      className="bg-offsetLight dark:bg-offsetDark relative flex h-[calc(98vh+10px)] mt-1 flex-col overflow-hidden shadow-inner md:rounded-2xl md:border md:shadow-sm"
       onDragOver={handleDragOver}
       onDragLeave={handleDragLeave}
       onDrop={handleDrop}
diff --git a/apps/mail/components/icons/animated/archive.tsx b/apps/mail/components/icons/animated/archive.tsx
index ed414a9f4..f112a65a7 100644
--- a/apps/mail/components/icons/animated/archive.tsx
+++ b/apps/mail/components/icons/animated/archive.tsx
@@ -94,7 +94,6 @@ const ArchiveIcon = forwardRef<ArchiveIconHandle, HTMLAttributes<HTMLDivElement>
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
-          className="relative bottom-0.5"
         >
           <motion.rect
             width="20"
diff --git a/apps/mail/components/icons/animated/trash.tsx b/apps/mail/components/icons/animated/trash.tsx
index bfe82a598..808407c7b 100644
--- a/apps/mail/components/icons/animated/trash.tsx
+++ b/apps/mail/components/icons/animated/trash.tsx
@@ -74,7 +74,6 @@ const DeleteIcon = forwardRef<DeleteIconHandle, HTMLAttributes<HTMLDivElement>>(
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
-          className="relative bottom-0.5"
         >
           <motion.g variants={lidVariants} animate={controls} transition={springTransition}>
             <path d="M3 6h18" />
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index 7ab7dc58b..be093fd71 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -297,7 +297,7 @@ export function MailLayout() {
 
   return (
     <TooltipProvider delayDuration={0}>
-      <div className="rounded-inherit flex p-0 ">
+      <div className="rounded-inherit flex p-0 mt-1">
         <ResizablePanelGroup
           direction="horizontal"
           autoSaveId="mail-panel-layout"
@@ -308,7 +308,7 @@ export function MailLayout() {
             defaultSize={isMobile ? 100 : 30}
             minSize={isMobile ? 100 : 30}
           >
-            <div className="bg-offsetLight dark:bg-offsetDark flex-1 flex-col overflow-y-auto shadow-inner md:flex md:rounded-2xl md:border md:shadow-sm h-[calc(98vh)]">
+            <div className="bg-offsetLight dark:bg-offsetDark flex-1 flex-col overflow-y-auto shadow-inner md:flex md:rounded-2xl md:border md:shadow-sm h-[calc(98vh+10px)]">
               <div
                 className={cn(
                   'sticky top-0 z-10 flex items-center justify-between gap-1.5 border-b p-2 transition-colors md:min-h-14',
diff --git a/apps/mail/components/ui/ai-sidebar.tsx b/apps/mail/components/ui/ai-sidebar.tsx
index 6a245b09f..fe97fc2ef 100644
--- a/apps/mail/components/ui/ai-sidebar.tsx
+++ b/apps/mail/components/ui/ai-sidebar.tsx
@@ -88,9 +88,9 @@ export function AISidebar({ children, className }: AISidebarProps & { children:
             <ResizableHandle className='opacity-0 w-0.5' />
             <ResizablePanel defaultSize={25} minSize={20} maxSize={25}>
               <div className={cn(
-                'h-[calc(100vh-5px)]',
+                'h-[calc(98vh+15px)]',
                 'flex flex-col',
-                'mr-3',
+                'mr-1 ml-0.5',
                 className
               )}>
                 <div className="flex h-full flex-col">
diff --git a/apps/mail/components/ui/settings-content.tsx b/apps/mail/components/ui/settings-content.tsx
index 5b166f3ff..1dcd96bda 100644
--- a/apps/mail/components/ui/settings-content.tsx
+++ b/apps/mail/components/ui/settings-content.tsx
@@ -8,8 +8,8 @@ export function SettingsLayoutContent({ children }: { children: React.ReactNode
   return (
     <div className="flex h-full w-full">
       <AppSidebar className="hidden lg:flex" />
-      <div className="w-full flex-1 bg-white md:py-3 md:pr-2 dark:bg-black">
-        <div className="md:shadow-s bg-offsetLight dark:bg-offsetDark flex h-full flex-col overflow-y-auto shadow-inner md:rounded-2xl md:border">
+      <div className="w-full flex-1 bg-white dark:bg-black">
+        <div className="md:shadow-s bg-offsetLight dark:bg-offsetDark flex h-[calc(98vh+10px)] mt-1 flex-col overflow-y-auto shadow-inner md:rounded-2xl md:border">
           <div className="sticky top-0 z-10 flex items-center justify-between gap-1.5 border-b p-2">
             <SidebarToggle className="h-fit px-2" />
           </div>
diff --git a/apps/mail/config/navigation.ts b/apps/mail/config/navigation.ts
index f9f210740..5d1822d30 100644
--- a/apps/mail/config/navigation.ts
+++ b/apps/mail/config/navigation.ts
@@ -162,12 +162,6 @@ export const navigationConfig: Record<string, NavConfig> = {
             url: '/settings/appearance',
             icon: SparklesIcon,
           },
-          {
-            title: 'navigation.settings.signatures',
-            url: '/settings/signatures',
-            icon: MessageSquareIcon,
-            disabled: true,
-          },
           {
             title: 'navigation.settings.shortcuts',
             url: '/settings/shortcuts',