diff --git a/app/globals.css b/app/globals.css
index c19fec0d..4386b06e 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -23,6 +23,13 @@
   --font-size-base: 16px;
   --list-item-height: 48px;
   --transition-duration: 0.2s;
+
+  /* Density spacing variables (defaults = regular) */
+  --density-item-py: 12px;
+  --density-item-gap: 12px;
+  --density-header-py: 12px;
+  --density-card-p: 16px;
+  --density-sidebar-py: 4px;
 }
 
 .dark {
diff --git a/components/calendar/calendar-agenda-view.tsx b/components/calendar/calendar-agenda-view.tsx
index e8b3f6ee..74f5801d 100644
--- a/components/calendar/calendar-agenda-view.tsx
+++ b/components/calendar/calendar-agenda-view.tsx
@@ -146,7 +146,8 @@ export function CalendarAgendaView({
                   onClick={(e) => onSelectEvent(ev, e.currentTarget.getBoundingClientRect())}
                   onMouseEnter={(e) => onHoverEvent?.(ev, e.currentTarget.getBoundingClientRect())}
                   onMouseLeave={() => onHoverLeave?.()}
-                  className="w-full flex items-start gap-3 px-4 py-3 hover:bg-muted/50 transition-colors text-left"
+                  className="w-full flex items-start px-4 hover:bg-muted/50 transition-colors text-left"
+                  style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}
                 >
                   <div className="flex flex-col items-center pt-0.5 min-w-[60px]">
                     {ev.showWithoutTime ? (
diff --git a/components/contacts/contact-group-list.tsx b/components/contacts/contact-group-list.tsx
index 7714cdc1..0c3127b1 100644
--- a/components/contacts/contact-group-list.tsx
+++ b/components/contacts/contact-group-list.tsx
@@ -69,10 +69,11 @@ export function ContactGroupList({
                   key={group.id}
                   onClick={() => onSelectGroup(group.id)}
                   className={cn(
-                    "w-full flex items-center gap-3 px-4 py-3 text-left transition-colors",
+                    "w-full flex items-center px-4 text-left transition-colors",
                     "hover:bg-muted",
                     group.id === selectedGroupId && "bg-accent text-accent-foreground"
                   )}
+                  style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}
                 >
                   <div className="w-9 h-9 rounded-full bg-primary/10 flex items-center justify-center flex-shrink-0">
                     <Users className="w-4 h-4 text-primary" />
diff --git a/components/contacts/contact-list-item.tsx b/components/contacts/contact-list-item.tsx
index 9e95d609..e87ce17a 100644
--- a/components/contacts/contact-list-item.tsx
+++ b/components/contacts/contact-list-item.tsx
@@ -22,10 +22,11 @@ export function ContactListItem({ contact, isSelected, onClick }: ContactListIte
     <button
       onClick={onClick}
       className={cn(
-        "w-full flex items-center gap-3 px-4 py-3 text-left transition-colors",
+        "w-full flex items-center px-4 text-left transition-colors",
         "hover:bg-muted",
         isSelected && "bg-accent text-accent-foreground"
       )}
+      style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}
     >
       <Avatar name={name} email={email} size="sm" />
       <div className="flex-1 min-w-0">
diff --git a/components/contacts/contact-list.tsx b/components/contacts/contact-list.tsx
index 4da12842..e7d09d82 100644
--- a/components/contacts/contact-list.tsx
+++ b/components/contacts/contact-list.tsx
@@ -204,7 +204,8 @@ export function ContactList({
                     e.stopPropagation();
                     onToggleSelection(contact.id);
                   }}
-                  className="pl-4 pr-1 py-3 flex-shrink-0"
+                  className="pl-4 pr-1 flex-shrink-0"
+                  style={{ paddingBlock: 'var(--density-item-py)' }}
                 >
                   <div className={cn(
                     "w-4 h-4 rounded border flex items-center justify-center transition-colors",
diff --git a/components/email/email-list-item.tsx b/components/email/email-list-item.tsx
index 7806fef4..eadf3f2a 100644
--- a/components/email/email-list-item.tsx
+++ b/components/email/email-list-item.tsx
@@ -87,7 +87,7 @@ export function EmailListItem({ email, selected, onClick, onContextMenu }: Email
       onContextMenu={handleContextMenu}
       style={{ minHeight: 'var(--list-item-height)' }}
     >
-      <div className="flex items-start gap-3 px-4 py-3">
+      <div className="flex items-start px-4" style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}>
         {/* Checkbox - only visible when in selection mode */}
         {selectedEmailIds.size > 0 && (
           <button
diff --git a/components/email/email-list.tsx b/components/email/email-list.tsx
index 3cd4e086..da02da1a 100644
--- a/components/email/email-list.tsx
+++ b/components/email/email-list.tsx
@@ -96,13 +96,13 @@ export function EmailList({
 
   const [isProcessing, setIsProcessing] = useState(false);
   const parentRef = useRef<HTMLDivElement>(null);
-  const listDensity = useSettingsStore((state) => state.listDensity);
+  const density = useSettingsStore((state) => state.density);
   const showPreview = useSettingsStore((state) => state.showPreview);
 
   const estimateSize = useCallback(() => {
-    const base = { compact: 72, regular: 88, comfortable: 104 }[listDensity];
-    return showPreview ? base + 40 : base;
-  }, [listDensity, showPreview]);
+    const base = { compact: 60, regular: 84, comfortable: 104 }[density];
+    return showPreview ? base + 36 : base;
+  }, [density, showPreview]);
 
   const virtualizer = useVirtualizer({
     count: threadGroups.length,
@@ -217,7 +217,7 @@ export function EmailList({
   useEffect(() => {
     virtualizer.measure();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [listDensity, showPreview]);
+  }, [density, showPreview]);
 
   return (
     <div className={cn("flex flex-col min-h-0", className)}>
diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index c3334949..f4d8987b 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -1309,7 +1309,7 @@ export function EmailViewer({
         "bg-background border-b border-border",
         toolbarPosition === 'below-subject' && "max-lg:sticky max-lg:top-0 max-lg:z-10"
       )}>
-        <div className="px-4 lg:px-6 py-3 lg:py-4">
+        <div className="px-4 lg:px-6" style={{ paddingBlock: 'var(--density-header-py)' }}>
           <div className="flex items-start justify-between gap-2 lg:gap-4">
             {/* Back button (for below-subject mode on tablet) */}
             {toolbarPosition === 'below-subject' && isTablet && !tabletListVisible && onBack && (
@@ -1644,8 +1644,8 @@ export function EmailViewer({
       )}
 
       {/* === SENDER INFO (Desktop) === */}
-      <div className="hidden lg:block bg-background border-b border-border px-6 py-4">
-          <div className="flex items-start gap-4">
+      <div className="hidden lg:block bg-background border-b border-border px-6" style={{ paddingBlock: 'var(--density-header-py)' }}>
+          <div className="flex items-start" style={{ gap: 'var(--density-item-gap)' }}>
             <button
               onClick={() => sender?.email && handleViewContactSidebar(null, sender.email)}
               className="cursor-pointer group flex-shrink-0"
@@ -2175,8 +2175,8 @@ export function EmailViewer({
       {/* Email Content Area */}
       <div className="flex-1 overflow-auto bg-muted/30">
         {/* Mobile/Tablet Sender Info - scrolls with content */}
-        <div className="lg:hidden bg-background border-b border-border px-4 py-3">
-          <div className="flex items-start gap-3">
+        <div className="lg:hidden bg-background border-b border-border px-4" style={{ paddingBlock: 'var(--density-header-py)' }}>
+          <div className="flex items-start" style={{ gap: 'var(--density-item-gap)' }}>
             <button
               onClick={() => sender?.email && handleViewContactSidebar(null, sender.email)}
               className="cursor-pointer group flex-shrink-0"
diff --git a/components/email/thread-conversation-view.tsx b/components/email/thread-conversation-view.tsx
index 980d500c..3ea1867b 100644
--- a/components/email/thread-conversation-view.tsx
+++ b/components/email/thread-conversation-view.tsx
@@ -139,7 +139,7 @@ export function ThreadConversationView({
   return (
     <div className="flex flex-col h-full bg-background">
       {/* Header */}
-      <div className="flex items-center gap-3 px-4 py-3 border-b border-border bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 sticky top-0 z-10">
+      <div className="flex items-center px-4 border-b border-border bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 sticky top-0 z-10" style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-header-py)' }}>
         <button
           onClick={onBack}
           className="p-2 -ml-2 rounded-full hover:bg-muted transition-colors"
@@ -158,7 +158,7 @@ export function ThreadConversationView({
 
       {/* Email Cards */}
       <div className="flex-1 overflow-y-auto">
-        <div className="p-4 space-y-3">
+        <div className="space-y-3" style={{ padding: 'var(--density-card-p)' }}>
           {emails.map((email, index) => {
             const senderEmail = email.from?.[0]?.email?.toLowerCase();
             const senderIsTrusted = senderEmail ? isSenderTrusted(senderEmail) : false;
@@ -423,9 +423,10 @@ function EmailCard({
       <button
         onClick={onToggleExpanded}
         className={cn(
-          "w-full flex items-start gap-3 p-4 text-left transition-colors",
+          "w-full flex items-start text-left transition-colors",
           !isExpanded && "hover:bg-muted/50"
         )}
+        style={{ gap: 'var(--density-item-gap)', padding: 'var(--density-card-p)' }}
       >
         <Avatar
           name={sender?.name}
@@ -503,7 +504,7 @@ function EmailCard({
           )}
 
           {/* Email Body */}
-          <div className="px-4 py-4">
+          <div style={{ padding: 'var(--density-card-p)' }}>
             <div
               className={cn(
                 "prose prose-sm max-w-none dark:prose-invert",
diff --git a/components/email/thread-email-item.tsx b/components/email/thread-email-item.tsx
index f97af01d..cce9e20e 100644
--- a/components/email/thread-email-item.tsx
+++ b/components/email/thread-email-item.tsx
@@ -61,7 +61,7 @@ export function ThreadEmailItem({
       {...dragHandlers}
       className={cn(
         "relative cursor-pointer transition-all duration-150",
-        "pl-12 pr-4 py-2.5",
+        "pl-12 pr-4",
         "border-l-2 border-l-transparent",
         selected
           ? "bg-blue-200 dark:bg-blue-900/50 border-l-primary"
@@ -73,6 +73,7 @@ export function ThreadEmailItem({
       )}
       onClick={handleClick}
       onContextMenu={handleContextMenu}
+      style={{ paddingBlock: 'var(--density-item-py)' }}
     >
       <div className="flex items-start gap-3">
         {/* Checkbox - only visible when in selection mode */}
diff --git a/components/email/thread-list-item.tsx b/components/email/thread-list-item.tsx
index 334f420d..707ece1e 100644
--- a/components/email/thread-list-item.tsx
+++ b/components/email/thread-list-item.tsx
@@ -101,7 +101,7 @@ const SingleEmailItem = React.forwardRef<HTMLDivElement, SingleEmailItemProps>(
         onContextMenu={handleContextMenu}
         style={{ minHeight: 'var(--list-item-height)' }}
       >
-        <div className="flex items-start gap-3 px-3 py-3">
+        <div className="flex items-start px-3" style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}>
           {/* Checkbox - only visible when in selection mode */}
           {selectedEmailIds.size > 0 && (
             <button
@@ -324,7 +324,7 @@ export const ThreadListItem = React.forwardRef<HTMLDivElement, ThreadListItemPro
           onContextMenu={handleContextMenu}
           style={{ minHeight: 'var(--list-item-height)' }}
         >
-          <div className="flex items-start gap-3 px-3 py-3">
+          <div className="flex items-start px-3" style={{ gap: 'var(--density-item-gap)', paddingBlock: 'var(--density-item-py)' }}>
             {/* Checkbox for thread selection - only visible when in selection mode */}
             {selectedEmailIds.size > 0 && (
               <button
diff --git a/components/layout/navigation-rail.tsx b/components/layout/navigation-rail.tsx
index 8cbce4e4..1d6f45b7 100644
--- a/components/layout/navigation-rail.tsx
+++ b/components/layout/navigation-rail.tsx
@@ -229,7 +229,7 @@ export function NavigationRail({
                 "relative flex items-center gap-2.5 rounded-md transition-colors duration-150",
                 collapsed
                   ? "justify-center w-10 h-10"
-                  : "px-2.5 py-1.5 text-sm",
+                  : "px-2.5 text-sm",
                 "max-lg:min-h-[44px]",
                 isActive
                   ? "bg-primary/10 text-primary font-medium"
@@ -237,6 +237,7 @@ export function NavigationRail({
               )}
               aria-current={isActive ? "page" : undefined}
               title={collapsed ? t(item.labelKey) : undefined}
+              style={collapsed ? undefined : { paddingBlock: 'var(--density-sidebar-py)' }}
             >
               <Icon className={cn("w-[18px] h-[18px] flex-shrink-0", isActive && "text-primary")} />
               {!collapsed && <span className="truncate">{t(item.labelKey)}</span>}
diff --git a/components/layout/sidebar.tsx b/components/layout/sidebar.tsx
index 9c4859fc..31d2916d 100644
--- a/components/layout/sidebar.tsx
+++ b/components/layout/sidebar.tsx
@@ -125,8 +125,9 @@ function MailboxTreeItem({
     <>
       <div
         {...(globalDragging ? dropHandlers : {})}
+        style={{ paddingBlock: 'var(--density-sidebar-py)' }}
         className={cn(
-          "group w-full flex items-center py-1 lg:py-1 max-lg:py-3 max-lg:min-h-[44px] text-sm transition-all duration-200",
+          "group w-full flex items-center max-lg:min-h-[44px] text-sm transition-all duration-200",
           isCollapsed ? "justify-center px-1" : "px-2",
           isVirtualNode
             ? "text-muted-foreground"
@@ -163,13 +164,14 @@ function MailboxTreeItem({
           onClick={() => !isVirtualNode && onMailboxSelect?.(node.id)}
           disabled={isVirtualNode}
           className={cn(
-            "flex items-center py-1 lg:py-1 max-lg:py-2 px-1 rounded",
+            "flex items-center px-1 rounded",
             "transition-colors duration-150",
             isCollapsed ? "justify-center" : "flex-1 text-left",
             isVirtualNode && "cursor-default select-none"
           )}
-          style={isCollapsed ? undefined : {
-            paddingLeft: hasChildren ? '4px' : `${indentPixels + 24}px`
+          style={{
+            paddingBlock: 'var(--density-sidebar-py)',
+            ...(isCollapsed ? {} : { paddingLeft: hasChildren ? '4px' : `${indentPixels + 24}px` })
           }}
           title={isCollapsed ? node.name : undefined}
         >
@@ -258,8 +260,9 @@ function TagItem({
   return (
     <div
       {...(globalDragging ? dropHandlers : {})}
+      style={{ paddingBlock: 'var(--density-sidebar-py)' }}
       className={cn(
-        "group w-full flex items-center py-1 lg:py-1 max-lg:py-3 max-lg:min-h-[44px] text-sm transition-all duration-200",
+        "group w-full flex items-center max-lg:min-h-[44px] text-sm transition-all duration-200",
         isCollapsed ? "justify-center px-1" : "px-2",
         isSelected
           ? "bg-accent text-accent-foreground"
@@ -270,10 +273,10 @@ function TagItem({
       <button
         onClick={() => onTagSelect?.(isSelected ? null : kw.id)}
         className={cn(
-          "flex items-center py-1 lg:py-1 max-lg:py-2 px-1 rounded transition-colors duration-150",
+          "flex items-center px-1 rounded transition-colors duration-150",
           isCollapsed ? "justify-center" : "flex-1 text-left"
         )}
-        style={isCollapsed ? undefined : { paddingLeft: '40px' }}
+        style={{ paddingBlock: 'var(--density-sidebar-py)', ...(isCollapsed ? {} : { paddingLeft: '40px' }) }}
         title={isCollapsed ? kw.label : undefined}
       >
         <span className={cn("w-3 h-3 rounded-full flex-shrink-0", palette?.dot || "bg-gray-400", !isCollapsed && "mr-2")} />
@@ -489,8 +492,9 @@ export function Sidebar({
         {emailKeywords.length > 0 && (
           <>
             <div
+              style={{ paddingBlock: 'var(--density-sidebar-py)' }}
               className={cn(
-                "group w-full flex items-center py-1 lg:py-1 max-lg:py-3 max-lg:min-h-[44px] text-sm transition-all duration-200 font-medium",
+                "group w-full flex items-center max-lg:min-h-[44px] text-sm transition-all duration-200 font-medium",
                 isCollapsed ? "justify-center px-1" : "px-2",
                 "text-foreground hover:bg-muted"
               )}
@@ -528,11 +532,11 @@ export function Sidebar({
                   });
                 }}
                 className={cn(
-                  "flex items-center py-1 lg:py-1 max-lg:py-2 px-1 rounded",
+                  "flex items-center px-1 rounded",
                   "transition-colors duration-150",
                   isCollapsed ? "justify-center" : "flex-1 text-left"
                 )}
-                style={isCollapsed ? undefined : { paddingLeft: '4px' }}
+                style={{ paddingBlock: 'var(--density-sidebar-py)', ...(isCollapsed ? {} : { paddingLeft: '4px' }) }}
                 title={isCollapsed ? t("tags") : undefined}
               >
                 <Tag className={cn(
diff --git a/components/settings/appearance-settings.tsx b/components/settings/appearance-settings.tsx
index 7363e9f6..4da68987 100644
--- a/components/settings/appearance-settings.tsx
+++ b/components/settings/appearance-settings.tsx
@@ -9,7 +9,7 @@ import { SettingsSection, SettingItem, RadioGroup, ToggleSwitch } from './settin
 export function AppearanceSettings() {
   const t = useTranslations('settings.appearance');
   const { theme, setTheme } = useThemeStore();
-  const { fontSize, listDensity, animationsEnabled, toolbarPosition, updateSetting } = useSettingsStore();
+  const { fontSize, density, animationsEnabled, toolbarPosition, updateSetting } = useSettingsStore();
 
   return (
     <SettingsSection title={t('title')} description={t('description')}>
@@ -44,12 +44,12 @@ export function AppearanceSettings() {
         />
       </SettingItem>
 
-      {/* List Density */}
+      {/* Density */}
       <SettingItem label={t('list_density.label')} description={t('list_density.description')}>
         <RadioGroup
-          value={listDensity}
+          value={density}
           onChange={(value) =>
-            updateSetting('listDensity', value as 'compact' | 'regular' | 'comfortable')
+            updateSetting('density', value as 'compact' | 'regular' | 'comfortable')
           }
           options={[
             { value: 'compact', label: t('list_density.compact') },
diff --git a/locales/de/common.json b/locales/de/common.json
index b00d3070..44c03db4 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -510,8 +510,8 @@
         "large": "Groß"
       },
       "list_density": {
-        "label": "Listendichte",
-        "description": "Abstand in E-Mail-Listen steuern",
+        "label": "Dichte",
+        "description": "Abstände in der Benutzeroberfläche steuern",
         "compact": "Kompakt",
         "regular": "Normal",
         "comfortable": "Komfortabel"
diff --git a/locales/en/common.json b/locales/en/common.json
index 94f1537d..0dd03897 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -510,8 +510,8 @@
         "large": "Large"
       },
       "list_density": {
-        "label": "List Density",
-        "description": "Control spacing in email lists",
+        "label": "Density",
+        "description": "Control spacing and padding across the UI",
         "compact": "Compact",
         "regular": "Regular",
         "comfortable": "Comfortable"
diff --git a/locales/es/common.json b/locales/es/common.json
index 80f62888..192ff548 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -510,8 +510,8 @@
         "large": "Grande"
       },
       "list_density": {
-        "label": "Densidad de Lista",
-        "description": "Controle el espaciado en las listas de correo",
+        "label": "Densidad",
+        "description": "Controle el espaciado en toda la interfaz",
         "compact": "Compacto",
         "regular": "Regular",
         "comfortable": "Cómodo"
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 6003549c..c0806d7b 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -510,8 +510,8 @@
         "large": "Grande"
       },
       "list_density": {
-        "label": "Densité de la liste",
-        "description": "Contrôlez l'espacement dans les listes d'emails",
+        "label": "Densité",
+        "description": "Contrôlez l'espacement dans toute l'interface",
         "compact": "Compacte",
         "regular": "Normale",
         "comfortable": "Confortable"
diff --git a/locales/it/common.json b/locales/it/common.json
index 6d495da1..6b0a85de 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -510,8 +510,8 @@
         "large": "Grande"
       },
       "list_density": {
-        "label": "Densità elenco",
-        "description": "Controlla la spaziatura negli elenchi email",
+        "label": "Densità",
+        "description": "Controlla la spaziatura in tutta l'interfaccia",
         "compact": "Compatto",
         "regular": "Normale",
         "comfortable": "Comodo"
diff --git a/locales/ja/common.json b/locales/ja/common.json
index b23ca401..a989e717 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -510,8 +510,8 @@
         "large": "大"
       },
       "list_density": {
-        "label": "リストの密度",
-        "description": "メールリストの間隔を調整",
+        "label": "密度",
+        "description": "UI全体の間隔を調整",
         "compact": "コンパクト",
         "regular": "標準",
         "comfortable": "ゆったり"
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 5299d6b0..9aac4f48 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -510,8 +510,8 @@
         "large": "Groot"
       },
       "list_density": {
-        "label": "Lijstdichtheid",
-        "description": "Regeleer de ruimte in e-maillijsten",
+        "label": "Dichtheid",
+        "description": "Regeleer de ruimte in de gehele interface",
         "compact": "Compact",
         "regular": "Normaal",
         "comfortable": "Comfortabel"
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 0dfb2835..ee55b304 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -510,8 +510,8 @@
         "large": "Grande"
       },
       "list_density": {
-        "label": "Densidade da Lista",
-        "description": "Controle o espaçamento nas listas de e-mail",
+        "label": "Densidade",
+        "description": "Controle o espaçamento em toda a interface",
         "compact": "Compacto",
         "regular": "Regular",
         "comfortable": "Confortável"
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 5cd35029..f858163a 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -19,7 +19,9 @@ let isLoadingFromServer = false;
 const SYNC_DEBOUNCE_MS = 2000;
 
 export type FontSize = 'small' | 'medium' | 'large';
-export type ListDensity = 'compact' | 'regular' | 'comfortable';
+export type Density = 'compact' | 'regular' | 'comfortable';
+/** @deprecated Use Density instead */
+export type ListDensity = Density;
 export type DeleteAction = 'trash' | 'permanent';
 export type ReplyMode = 'reply' | 'replyAll';
 export type DateFormat = 'regional' | 'iso' | 'custom';
@@ -64,7 +66,7 @@ export const DEFAULT_KEYWORDS: KeywordDefinition[] = [
 interface SettingsState {
   // Appearance
   fontSize: FontSize;
-  listDensity: ListDensity;
+  density: Density;
   animationsEnabled: boolean;
 
   // Language & Region
@@ -141,7 +143,7 @@ interface SettingsState {
 const DEFAULT_SETTINGS = {
   // Appearance
   fontSize: 'medium' as FontSize,
-  listDensity: 'regular' as ListDensity,
+  density: 'regular' as Density,
   animationsEnabled: true,
 
   // Language & Region
@@ -199,9 +201,9 @@ export const useSettingsStore = create<SettingsState>()(
           applyFontSize(value as FontSize);
         }
 
-        // Apply list density to document root
-        if (key === 'listDensity') {
-          applyListDensity(value as ListDensity);
+        // Apply density to document root
+        if (key === 'density') {
+          applyDensity(value as Density);
         }
 
         // Apply animations to document root
@@ -213,7 +215,7 @@ export const useSettingsStore = create<SettingsState>()(
       resetToDefaults: () => {
         set(DEFAULT_SETTINGS);
         applyFontSize(DEFAULT_SETTINGS.fontSize);
-        applyListDensity(DEFAULT_SETTINGS.listDensity);
+        applyDensity(DEFAULT_SETTINGS.density);
         applyAnimations(DEFAULT_SETTINGS.animationsEnabled);
       },
 
@@ -221,7 +223,7 @@ export const useSettingsStore = create<SettingsState>()(
         const state = get();
         const settings = {
           fontSize: state.fontSize,
-          listDensity: state.listDensity,
+          density: state.density,
           animationsEnabled: state.animationsEnabled,
           dateFormat: state.dateFormat,
           timeFormat: state.timeFormat,
@@ -269,7 +271,7 @@ export const useSettingsStore = create<SettingsState>()(
 
           // Apply visual settings
           applyFontSize(get().fontSize);
-          applyListDensity(get().listDensity);
+          applyDensity(get().density);
           applyAnimations(get().animationsEnabled);
 
           // Apply cross-store settings
@@ -395,7 +397,24 @@ export const useSettingsStore = create<SettingsState>()(
     }),
     {
       name: 'settings-storage',
-      version: 1,
+      version: 2,
+      migrate: (persisted, version) => {
+        const state = persisted as Record<string, unknown>;
+        if (version < 2 && state.listDensity) {
+          state.density = state.listDensity;
+          delete state.listDensity;
+        }
+        return state as unknown as SettingsState;
+      },
+      onRehydrateStorage: () => {
+        return (state) => {
+          if (state) {
+            applyFontSize(state.fontSize);
+            applyDensity(state.density);
+            applyAnimations(state.animationsEnabled);
+          }
+        };
+      },
     }
   )
 );
@@ -413,16 +432,42 @@ function applyFontSize(size: FontSize) {
   root.style.setProperty('--font-size-base', sizeMap[size]);
 }
 
-function applyListDensity(density: ListDensity) {
+function applyDensity(density: Density) {
   if (typeof document === 'undefined') return;
 
   const root = document.documentElement;
-  const densityMap = {
-    compact: '32px',
-    regular: '48px',
-    comfortable: '64px',
+
+  const densityValues = {
+    compact: {
+      '--list-item-height': 'auto',
+      '--density-item-py': '4px',
+      '--density-item-gap': '8px',
+      '--density-header-py': '6px',
+      '--density-card-p': '10px',
+      '--density-sidebar-py': '1px',
+    },
+    regular: {
+      '--list-item-height': '48px',
+      '--density-item-py': '12px',
+      '--density-item-gap': '12px',
+      '--density-header-py': '12px',
+      '--density-card-p': '16px',
+      '--density-sidebar-py': '4px',
+    },
+    comfortable: {
+      '--list-item-height': '64px',
+      '--density-item-py': '16px',
+      '--density-item-gap': '16px',
+      '--density-header-py': '16px',
+      '--density-card-p': '20px',
+      '--density-sidebar-py': '6px',
+    },
   };
-  root.style.setProperty('--list-item-height', densityMap[density]);
+
+  const values = densityValues[density];
+  for (const [prop, val] of Object.entries(values)) {
+    root.style.setProperty(prop, val);
+  }
 }
 
 function applyAnimations(enabled: boolean) {
@@ -440,7 +485,7 @@ function applyAnimations(enabled: boolean) {
 if (typeof window !== 'undefined') {
   const store = useSettingsStore.getState();
   applyFontSize(store.fontSize);
-  applyListDensity(store.listDensity);
+  applyDensity(store.density);
   applyAnimations(store.animationsEnabled);
 
   // Shared sync function used by all store subscribers