diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
index 6cff3f350..b2f3cd73a 100644
--- a/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
+++ b/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
@@ -98,7 +98,7 @@ struct FolderCellContent: View {
             Text(folder.formattedUnreadCount)
                 .textStyle(.bodySmallMediumAccent)
         }
-        .padding(.vertical, Constants.menuDrawerVerticalPadding)
+        .padding(.vertical, 14)
         .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
         .padding(.leading, Constants.menuDrawerSubFolderPadding * CGFloat(level))
         .background(SelectionBackground(
diff --git a/Mail/Views/Menu Drawer/Folders/RoleFoldersListView.swift b/Mail/Views/Menu Drawer/Folders/RoleFoldersListView.swift
index c77d4b8d2..01bbb07a0 100644
--- a/Mail/Views/Menu Drawer/Folders/RoleFoldersListView.swift	
+++ b/Mail/Views/Menu Drawer/Folders/RoleFoldersListView.swift	
@@ -30,13 +30,9 @@ struct RoleFoldersListView: View {
         VStack(spacing: 0) {
             ForEach(folders) { folder in
                 FolderCell(folder: folder, isCompact: isCompact)
-
-                if folder.content.role == .inbox {
-                    IKDivider(withPadding: true)
-                        .padding(.vertical, Constants.menuDrawerVerticalPadding)
-                }
             }
         }
-        .padding(.vertical, Constants.menuDrawerVerticalPadding)
+        .padding(.top, 4)
+        .padding(.bottom, 12)
     }
 }
diff --git a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift
index 94a65fd22..76ae2c908 100644
--- a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift	
+++ b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift	
@@ -72,6 +72,6 @@ struct UserFoldersListView: View {
             }
         }
         .padding(.top, 16)
-        .padding(.bottom, 24)
+        .padding(.bottom, 12)
     }
 }
diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift
index a5283b2d9..23b9028d2 100644
--- a/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift	
+++ b/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift	
@@ -37,6 +37,7 @@ struct MenuDrawerItemCell: View {
                     .textStyle(.bodyMedium)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.vertical, 14)
         }
     }
 }
diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift
index 8d0820cc6..5653c5791 100644
--- a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift	
+++ b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift	
@@ -36,7 +36,7 @@ struct MenuDrawerItemsListView: View {
     @State private var isExpanded = true
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 16) {
+        VStack(alignment: .leading, spacing: 0) {
             if let title = title {
                 Button {
                     withAnimation {
@@ -50,6 +50,7 @@ struct MenuDrawerItemsListView: View {
                         Spacer()
                     }
                 }
+                .padding(.vertical, 16)
 
                 if isExpanded {
                     ForEach(content) { item in
@@ -62,8 +63,7 @@ struct MenuDrawerItemsListView: View {
                 }
             }
         }
-        .padding(.top, 16)
-        .padding(.bottom, 24)
+        .padding(.bottom, 16)
         .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
     }
 }
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
index e3904d35a..f518048db 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
@@ -36,7 +36,7 @@ struct MailboxesManagementButtonView: View {
 
     var body: some View {
         Button(action: handleAction) {
-            HStack(spacing: 24) {
+            HStack(spacing: 16) {
                 Image(resource: icon)
                     .resizable()
                     .scaledToFit()
@@ -52,9 +52,8 @@ struct MailboxesManagementButtonView: View {
                 }
             }
         }
-        .padding(.vertical, 8)
-        .padding(.leading, 19)
-        .padding(.trailing, Constants.menuDrawerHorizontalPadding)
+        .padding(.vertical, 10)
+        .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
     }
 }
 
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
index 59f5c4bf1..32cd6b142 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
@@ -51,7 +51,7 @@ struct MailboxesManagementView: View {
                         .foregroundColor(.accentColor)
                         .padding(.trailing, 16)
                     Text(mailboxManager.mailbox.email)
-                        .textStyle(.bodyMediumAccent)
+                        .textStyle(navigationDrawerState.showMailboxes ? .bodyMediumAccent : .bodyMedium)
                         .lineLimit(1)
                     Spacer()
                     if !otherMailboxes.isEmpty {
@@ -61,12 +61,11 @@ struct MailboxesManagementView: View {
                 .environment(\.isEnabled, true)
                 .padding(.vertical, Constants.menuDrawerVerticalPadding)
                 .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
-                .background(SelectionBackground(isSelected: true, offsetX: 8, leadingPadding: 0, verticalPadding: 0))
             }
             .disabled(otherMailboxes.isEmpty)
 
             if navigationDrawerState.showMailboxes {
-                VStack(alignment: .leading, spacing: 4) {
+                VStack(alignment: .leading) {
                     ForEach(otherMailboxes) { mailbox in
                         MailboxCell(mailbox: mailbox)
                     }
@@ -75,6 +74,9 @@ struct MailboxesManagementView: View {
                     try? await updateAccount()
                 }
             }
+
+            IKDivider(withPadding: true)
+                .padding(.top, 8)
         }
         .padding(.top, 16)
         .task {