diff --git a/Mail/Views/Switch User/AccountActionsView.swift b/Mail/Views/Switch User/AccountActionsView.swift
index 1c7efbf41..b17cb8ba8 100644
--- a/Mail/Views/Switch User/AccountActionsView.swift	
+++ b/Mail/Views/Switch User/AccountActionsView.swift	
@@ -37,7 +37,7 @@ struct AccountActionsView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
+        VStack(spacing: 0) {
             ForEach(actions) { action in
                 Button {
                     handleAction(action)
diff --git a/Mail/Views/Switch User/AccountCellView.swift b/Mail/Views/Switch User/AccountCellView.swift
index c2f9dd7e6..11b97a668 100644
--- a/Mail/Views/Switch User/AccountCellView.swift	
+++ b/Mail/Views/Switch User/AccountCellView.swift	
@@ -75,6 +75,7 @@ struct AccountHeaderCell: View {
     var body: some View {
         HStack {
             AvatarView(mailboxManager: mailboxManager, contactConfiguration: .user(user: account.user), size: 40)
+
             VStack(alignment: .leading, spacing: 0) {
                 Text(account.user.displayName)
                     .textStyle(.bodyMedium)
@@ -87,7 +88,8 @@ struct AccountHeaderCell: View {
             switch type {
             case .switchAccount:
                 if isSelected {
-                    IKIcon(MailResourcesAsset.check)
+                    MailResourcesAsset.check.swiftUIImage
+                        .iconSize(.medium)
                         .foregroundStyle(.tint)
                 }
             case .selectComposeMailbox:
diff --git a/Mail/Views/Switch User/AccountListView.swift b/Mail/Views/Switch User/AccountListView.swift
index 80dd8fde2..29b67c946 100644
--- a/Mail/Views/Switch User/AccountListView.swift	
+++ b/Mail/Views/Switch User/AccountListView.swift	
@@ -77,19 +77,28 @@ struct AccountListView: View {
 
     var body: some View {
         ScrollView {
-            Text(MailResourcesStrings.Localizable.titleMyAccount(viewModel.accounts.count))
-                .textStyle(.bodyMedium)
-
-            VStack(spacing: IKPadding.small) {
-                ForEach(Array(viewModel.accounts.keys)) { account in
-                    AccountCellView(selectedUserId: $viewModel.selectedUserId, mailboxManager: mailboxManager, account: account)
+            VStack(spacing: 0) {
+                Text(MailResourcesStrings.Localizable.titleMyAccount(viewModel.accounts.count))
+                    .textStyle(.bodyMedium)
+                    .padding(.bottom, value: .medium)
+
+                VStack(spacing: IKPadding.extraSmall) {
+                    ForEach(Array(viewModel.accounts.keys)) { account in
+                        AccountCellView(
+                            selectedUserId: $viewModel.selectedUserId,
+                            mailboxManager: mailboxManager,
+                            account: account
+                        )
+                        .padding(.horizontal, value: .medium)
+                    }
                 }
-            }
-            .padding(.horizontal, value: .medium)
 
-            IKDivider()
+                IKDivider()
+                    .padding(.vertical, value: .small)
 
-            AccountActionsView()
+                AccountActionsView()
+                    .padding(.horizontal, value: .small)
+            }
         }
         .fullScreenCover(isPresented: $isShowingNewAccountView, onDismiss: {
             orientationManager.setOrientationLock(.all)