diff --git a/Mail/Components/AttachmentView.swift b/Mail/Components/AttachmentView.swift
new file mode 100644
index 000000000..88bfde8a9
--- /dev/null
+++ b/Mail/Components/AttachmentView.swift
@@ -0,0 +1,71 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2022 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import MailCore
+import MailResources
+import SwiftUI
+
+struct AttachmentView<Content: View>: View {
+    let attachment: Attachment
+    let subtitle: String
+    @ViewBuilder let accessory: () -> Content?
+
+    init(attachment: Attachment, subtitle: String, accessory: @escaping () -> Content? = { EmptyView() }) {
+        self.attachment = attachment
+        self.subtitle = subtitle
+        self.accessory = accessory
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            HStack {
+                attachment.icon.swiftUIImage
+                    .resizable()
+                    .frame(width: 24, height: 24)
+
+                HStack(spacing: 8) {
+                    VStack(alignment: .leading, spacing: 0) {
+                        Text(attachment.name)
+                            .textStyle(.bodySmall)
+                            .lineLimit(1)
+                            .truncationMode(.middle)
+
+                        Text(subtitle)
+                            .textStyle(.labelSecondary)
+                    }
+
+                    accessory()
+                }
+            }
+            .padding(.horizontal, 8)
+            .padding(.vertical, 4)
+        }
+        .background(
+            RoundedRectangle(cornerRadius: 6)
+                .stroke(MailResourcesAsset.elementsColor.swiftUIColor, lineWidth: 1)
+        )
+        .cornerRadius(6)
+        .frame(maxWidth: 200)
+    }
+}
+
+struct AttachmentView_Previews: PreviewProvider {
+    static var previews: some View {
+        AttachmentView(attachment: PreviewHelper.sampleAttachment, subtitle: "24ko")
+    }
+}
diff --git a/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift b/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift
index c4e378cff..8efcf8ec1 100644
--- a/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift	
+++ b/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift	
@@ -21,60 +21,39 @@ import MailResources
 import SwiftUI
 
 struct AttachmentUploadCell: View {
-    let attachment: Attachment
     @ObservedObject var uploadTask: AttachmentUploadTask
+
+    let attachment: Attachment
     let attachmentRemoved: ((Attachment) -> Void)?
 
     var body: some View {
-        VStack(spacing: 0) {
-            HStack {
-                attachment.icon.swiftUIImage
-
-                VStack(alignment: .leading, spacing: 0) {
-                    Text(attachment.name)
-                        .textStyle(.bodySmall)
-                        .lineLimit(1)
-                        .truncationMode(.middle)
-                    if let error = uploadTask.error {
-                        Text(error.localizedDescription)
-                            .textStyle(.labelSecondary)
-                    } else {
-                        Text(attachment.size, format: .defaultByteCount)
-                            .textStyle(.labelSecondary)
-                            .opacity(attachment.size == 0 ? 0 : 1)
-                    }
+        AttachmentView(
+            attachment: attachment,
+            subtitle: uploadTask.error != nil ? uploadTask.error!.localizedDescription : attachment.size
+                .formatted(.defaultByteCount)
+        ) {
+            Button {
+                if let attachmentRemoved {
+                    attachmentRemoved(attachment)
                 }
-
-                Button {
-                    if let attachmentRemoved {
-                        attachmentRemoved(attachment)
-                    }
-                } label: {
-                    MailResourcesAsset.closeSmall.swiftUIImage
-                        .resizable()
-                        .foregroundColor(MailResourcesAsset.textSecondaryColor)
-                        .frame(width: 16, height: 16)
-                }
-                .buttonStyle(.borderless)
-                .padding(.leading, 8)
+            } label: {
+                MailResourcesAsset.closeSmall.swiftUIImage
+                    .resizable()
+                    .foregroundColor(MailResourcesAsset.textSecondaryColor)
+                    .frame(width: 12, height: 12)
             }
-            .padding(6)
+            .buttonStyle(.borderless)
+        }
+        .overlay(alignment: .bottom) {
             IndeterminateProgressView(indeterminate: uploadTask.progress == 0, progress: uploadTask.progress)
                 .opacity(uploadTask.progress == 1 ? 0 : 1)
         }
-        .background(
-            RoundedRectangle(cornerRadius: 6)
-                .stroke(MailResourcesAsset.elementsColor.swiftUIColor, lineWidth: 1)
-        )
-        .cornerRadius(6)
-        .frame(maxWidth: 200)
-        .padding(.top, 16)
     }
 }
 
 struct AttachmentUploadCell_Previews: PreviewProvider {
     static var previews: some View {
-        AttachmentUploadCell(attachment: PreviewHelper.sampleAttachment, uploadTask: AttachmentUploadTask()) { _ in
+        AttachmentUploadCell(uploadTask: AttachmentUploadTask(), attachment: PreviewHelper.sampleAttachment) { _ in
             /* Preview */
         }
     }
diff --git a/Mail/Views/New Message/Attachments/AttachmentsHeaderView.swift b/Mail/Views/New Message/Attachments/AttachmentsHeaderView.swift
index f0e99cecc..a06299715 100644
--- a/Mail/Views/New Message/Attachments/AttachmentsHeaderView.swift	
+++ b/Mail/Views/New Message/Attachments/AttachmentsHeaderView.swift	
@@ -30,10 +30,10 @@ struct AttachmentsHeaderView: View {
                 ScrollView(.horizontal, showsIndicators: false) {
                     HStack(spacing: 8) {
                         ForEach(attachmentsManager.attachments) { attachment in
-                            AttachmentUploadCell(attachment: attachment,
-                                                 uploadTask: attachmentsManager
-                                                     .attachmentUploadTaskOrFinishedTask(for: attachment
-                                                         .uuid)) { attachmentRemoved in
+                            AttachmentUploadCell(
+                                uploadTask: attachmentsManager.attachmentUploadTaskOrFinishedTask(for: attachment.uuid),
+                                attachment: attachment
+                            ) { attachmentRemoved in
                                 attachmentsManager.removeAttachment(attachmentRemoved)
                             }
                         }
@@ -41,6 +41,7 @@ struct AttachmentsHeaderView: View {
                     .padding(.vertical, 1)
                     .padding(.horizontal, 16)
                 }
+                .padding(.top, 16)
             }
         }
         .customAlert(item: $attachmentsManager.globalError) { error in
diff --git a/Mail/Views/Thread/AttachmentCell.swift b/Mail/Views/Thread/AttachmentCell.swift
index d707030fe..cdd83703e 100644
--- a/Mail/Views/Thread/AttachmentCell.swift
+++ b/Mail/Views/Thread/AttachmentCell.swift
@@ -24,28 +24,7 @@ struct AttachmentCell: View {
     let attachment: Attachment
 
     var body: some View {
-        VStack(spacing: 0) {
-            HStack {
-                attachment.icon.swiftUIImage
-
-                VStack(alignment: .leading, spacing: 0) {
-                    Text(attachment.name)
-                        .textStyle(.bodySmall)
-                        .lineLimit(1)
-                        .truncationMode(.middle)
-                    Text(attachment.size, format: .defaultByteCount)
-                        .textStyle(.labelSecondary)
-                        .opacity(attachment.size == 0 ? 0 : 1)
-                }
-            }
-            .padding(4)
-        }
-        .background(
-            RoundedRectangle(cornerRadius: 6)
-                .stroke(MailResourcesAsset.elementsColor.swiftUIColor, lineWidth: 1)
-        )
-        .cornerRadius(6)
-        .frame(maxWidth: 200)
+        AttachmentView(attachment: attachment, subtitle: attachment.size.formatted(.defaultByteCount))
     }
 }
 
diff --git a/MailCore/Models/Attachment.swift b/MailCore/Models/Attachment.swift
index 8197fc2a4..7b36cfc0e 100644
--- a/MailCore/Models/Attachment.swift
+++ b/MailCore/Models/Attachment.swift
@@ -53,24 +53,35 @@ public class Attachment: /* Hashable, */ EmbeddedObject, Codable, Identifiable {
 
     public var icon: MailResourcesImages {
         guard let uti else { return MailResourcesAsset.unknownFile }
-        if uti.conforms(to: .audio) {
-            return MailResourcesAsset.audioFile
-        } else if uti.conforms(to: .archive) {
-            return MailResourcesAsset.zipFile
+
+        if uti.conforms(to: .pdf) {
+            return MailResourcesAsset.pdfFile
+        } else if uti.conforms(to: .calendarEvent) || uti.conforms(to: .ics) {
+            return MailResourcesAsset.icsFile
+        } else if uti.conforms(to: .vCard) {
+            return MailResourcesAsset.vcardFile
         } else if uti.conforms(to: .image) {
-            return MailResourcesAsset.imageFileLandscape
-        } else if uti.conforms(to: .pdf) {
-            return MailResourcesAsset.officeFileAdobe
-        } else if uti.conforms(to: .plainText) {
-            return MailResourcesAsset.commonFileText
-        } else if uti.conforms(to: .presentation) {
-            return MailResourcesAsset.officeFileGraph
-        } else if uti.conforms(to: .spreadsheet) {
-            return MailResourcesAsset.officeFileSheet
+            return MailResourcesAsset.imageFile
+        } else if uti.conforms(to: .audio) {
+            return MailResourcesAsset.audioFile
         } else if uti.conforms(to: .movie) {
-            return MailResourcesAsset.videoFilePlay
+            return MailResourcesAsset.videoFile
+        } else if uti.conforms(to: .spreadsheet) {
+            return MailResourcesAsset.gridFile
+        } else if uti.conforms(to: .presentation) {
+            return MailResourcesAsset.pointFile
+        } else if uti.conforms(to: .sourceCode) || uti.conforms(to: .html) || uti.conforms(to: .json) || uti.conforms(to: .xml) {
+            return MailResourcesAsset.codeFile
+        } else if uti.conforms(to: .text) || uti.conforms(to: .pages) || uti.conforms(to: .onlyOffice)
+            || uti.conforms(to: .wordDoc) || uti.conforms(to: .wordDocm) || uti.conforms(to: .wordDocx) {
+            return MailResourcesAsset.docFile
+        } else if uti.conforms(to: .archive) {
+            return MailResourcesAsset.archiveFile
+        } else if uti.conforms(to: .font) {
+            return MailResourcesAsset.fontFile
+        } else {
+            return MailResourcesAsset.unknownFile
         }
-        return MailResourcesAsset.unknownFile
     }
 
     private enum CodingKeys: String, CodingKey {
diff --git a/MailCore/Utils/UTType+Extension.swift b/MailCore/Utils/UTType+Extension.swift
new file mode 100644
index 000000000..053cf956e
--- /dev/null
+++ b/MailCore/Utils/UTType+Extension.swift
@@ -0,0 +1,30 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2022 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Foundation
+import UniformTypeIdentifiers
+
+public extension UTType {
+    static let pages = UTType("com.apple.iwork.pages.sffpages")!
+    static let wordDoc = UTType("com.microsoft.word.doc")!
+    static let wordDocm = UTType(mimeType: "application/vnd.ms-word")!
+    static let wordDocx = UTType("org.openxmlformats.wordprocessingml.document")!
+    static let onlyOffice = UTType("org.oasis-open.opendocument.text")!
+
+    static let ics = UTType(mimeType: "application/ics")!
+}
diff --git a/MailResources/Assets.xcassets/Files/archive-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/archive-file.imageset/Contents.json
new file mode 100644
index 000000000..3d7c3f707
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/archive-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "archive-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "archive-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-dark.svg b/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-dark.svg
new file mode 100644
index 000000000..7edcf817f
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-dark.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H11.072L11.485 4.049C11.555 4.611 11.381 5.177 11.008 5.603C10.635 6.028 10.098 6.272 9.533 6.274H9.47C8.904 6.273 8.366 6.028 7.994 5.604C7.621 5.177 7.447 4.611 7.517 4.049L7.818 1H3.5ZM8.51 4.16C8.475 4.449 8.561 4.733 8.746 4.945C8.929 5.154 9.193 5.274 9.471 5.274H9.532C9.809 5.273 10.073 5.153 10.256 4.944C10.441 4.733 10.527 4.452 10.493 4.173L10.063 1H8.823L8.51 4.16Z" fill="#A5B7C0"/>
+<path d="M9.505 8.75C9.91921 8.75 10.255 8.41421 10.255 8C10.255 7.58579 9.91921 7.25 9.505 7.25C9.09079 7.25 8.755 7.58579 8.755 8C8.755 8.41421 9.09079 8.75 9.505 8.75Z" fill="#A5B7C0"/>
+<path d="M9.505 11.25C9.91921 11.25 10.255 10.9142 10.255 10.5C10.255 10.0858 9.91921 9.75 9.505 9.75C9.09079 9.75 8.755 10.0858 8.755 10.5C8.755 10.9142 9.09079 11.25 9.505 11.25Z" fill="#A5B7C0"/>
+<path d="M9.505 13.75C9.91921 13.75 10.255 13.4142 10.255 13C10.255 12.5858 9.91921 12.25 9.505 12.25C9.09079 12.25 8.755 12.5858 8.755 13C8.755 13.4142 9.09079 13.75 9.505 13.75Z" fill="#A5B7C0"/>
+<path d="M9.495 16.25C9.081 16.25 8.745 15.914 8.745 15.5C8.745 15.086 9.081 14.75 9.495 14.75C9.908 14.75 10.244 15.085 10.245 15.496C10.245 15.914 9.909 16.25 9.495 16.25Z" fill="#A5B7C0"/>
+<path d="M9.495 18.771C9.081 18.771 8.745 18.435 8.745 18.021C8.745 17.607 9.081 17.271 9.495 17.271C9.908 17.271 10.244 17.606 10.245 18.017C10.245 18.435 9.909 18.771 9.495 18.771Z" fill="#A5B7C0"/>
+<path d="M9.495 21.312C9.081 21.312 8.745 20.976 8.745 20.562C8.745 20.148 9.081 19.812 9.495 19.812C9.708 19.817 9.884 19.89 10.024 20.029C10.166 20.17 10.245 20.357 10.245 20.558C10.245 20.976 9.909 21.312 9.495 21.312Z" fill="#A5B7C0"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-light.svg b/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-light.svg
new file mode 100644
index 000000000..ed05e3487
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/archive-file.imageset/archive-file-light.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H11.072L11.485 4.049C11.555 4.611 11.381 5.177 11.008 5.603C10.635 6.028 10.098 6.272 9.533 6.274H9.47C8.904 6.273 8.366 6.028 7.994 5.604C7.621 5.177 7.447 4.611 7.517 4.049L7.818 1H3.5ZM8.51 4.16C8.475 4.449 8.561 4.733 8.746 4.945C8.929 5.154 9.193 5.274 9.471 5.274H9.532C9.809 5.273 10.073 5.153 10.256 4.944C10.441 4.733 10.527 4.452 10.493 4.173L10.063 1H8.823L8.51 4.16Z" fill="#607D8B"/>
+<path d="M9.505 8.75C9.91921 8.75 10.255 8.41421 10.255 8C10.255 7.58579 9.91921 7.25 9.505 7.25C9.09079 7.25 8.755 7.58579 8.755 8C8.755 8.41421 9.09079 8.75 9.505 8.75Z" fill="#607D8B"/>
+<path d="M9.505 11.25C9.91921 11.25 10.255 10.9142 10.255 10.5C10.255 10.0858 9.91921 9.75 9.505 9.75C9.09079 9.75 8.755 10.0858 8.755 10.5C8.755 10.9142 9.09079 11.25 9.505 11.25Z" fill="#607D8B"/>
+<path d="M9.505 13.75C9.91921 13.75 10.255 13.4142 10.255 13C10.255 12.5858 9.91921 12.25 9.505 12.25C9.09079 12.25 8.755 12.5858 8.755 13C8.755 13.4142 9.09079 13.75 9.505 13.75Z" fill="#607D8B"/>
+<path d="M9.495 16.25C9.081 16.25 8.745 15.914 8.745 15.5C8.745 15.086 9.081 14.75 9.495 14.75C9.908 14.75 10.244 15.085 10.245 15.496C10.245 15.914 9.909 16.25 9.495 16.25Z" fill="#607D8B"/>
+<path d="M9.495 18.771C9.081 18.771 8.745 18.435 8.745 18.021C8.745 17.607 9.081 17.271 9.495 17.271C9.908 17.271 10.244 17.606 10.245 18.017C10.245 18.435 9.909 18.771 9.495 18.771Z" fill="#607D8B"/>
+<path d="M9.495 21.312C9.081 21.312 8.745 20.976 8.745 20.562C8.745 20.148 9.081 19.812 9.495 19.812C9.708 19.817 9.884 19.89 10.024 20.029C10.166 20.17 10.245 20.357 10.245 20.558C10.245 20.976 9.909 21.312 9.495 21.312Z" fill="#607D8B"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/audio-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/audio-file.imageset/Contents.json
index 670fc420b..bba53518d 100644
--- a/MailResources/Assets.xcassets/Files/audio-file.imageset/Contents.json
+++ b/MailResources/Assets.xcassets/Files/audio-file.imageset/Contents.json
@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "audio-file.svg",
+      "filename" : "audio-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "audio-file-dark.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-dark.svg b/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-dark.svg
new file mode 100644
index 000000000..319bf14f9
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#86DEEA"/>
+<path d="M8 18C6.897 18 6 17.103 6 16C6 14.897 6.897 14 8 14C8.357 14 8.699 14.093 9 14.268V10.254C9 9.588 9.448 8.995 10.088 8.812L15.088 7.383C15.223 7.344 15.363 7.325 15.502 7.325C15.754 7.325 16.005 7.39 16.228 7.514C16.578 7.708 16.832 8.028 16.942 8.413C16.98 8.547 17 8.686 17 8.826V15C17 16.103 16.103 17 15 17C13.897 17 13 16.103 13 15C13 13.897 13.897 13 15 13C15.357 13 15.699 13.093 16 13.268V8.826C16 8.779 15.993 8.732 15.981 8.687C15.92 8.474 15.722 8.325 15.5 8.325C15.454 8.325 15.408 8.331 15.363 8.344L10.363 9.773C10.149 9.835 10 10.032 10 10.254V16C10 17.103 9.103 18 8 18ZM8 15C7.449 15 7 15.448 7 16C7 16.552 7.449 17 8 17C8.551 17 9 16.552 9 16C9 15.448 8.551 15 8 15ZM15 14C14.448 14 14 14.448 14 15C14 15.552 14.448 16 15 16C15.552 16 16 15.552 16 15C16 14.448 15.552 14 15 14Z" fill="#86DEEA"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-light.svg b/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-light.svg
new file mode 100644
index 000000000..4aa70f34c
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#00BCD4"/>
+<path d="M8 18C6.897 18 6 17.103 6 16C6 14.897 6.897 14 8 14C8.357 14 8.699 14.093 9 14.268V10.254C9 9.588 9.448 8.995 10.088 8.812L15.088 7.383C15.223 7.344 15.363 7.325 15.502 7.325C15.754 7.325 16.005 7.39 16.228 7.514C16.578 7.708 16.832 8.028 16.942 8.413C16.98 8.547 17 8.686 17 8.826V15C17 16.103 16.103 17 15 17C13.897 17 13 16.103 13 15C13 13.897 13.897 13 15 13C15.357 13 15.699 13.093 16 13.268V8.826C16 8.779 15.993 8.732 15.981 8.687C15.92 8.474 15.722 8.325 15.5 8.325C15.454 8.325 15.408 8.331 15.363 8.344L10.363 9.773C10.149 9.835 10 10.032 10 10.254V16C10 17.103 9.103 18 8 18ZM8 15C7.449 15 7 15.448 7 16C7 16.552 7.449 17 8 17C8.551 17 9 16.552 9 16C9 15.448 8.551 15 8 15ZM15 14C14.448 14 14 14.448 14 15C14 15.552 14.448 16 15 16C15.552 16 16 15.552 16 15C16 14.448 15.552 14 15 14Z" fill="#00BCD4"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file.svg b/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file.svg
deleted file mode 100644
index bbc361a85..000000000
--- a/MailResources/Assets.xcassets/Files/audio-file.imageset/audio-file.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#02A9F4"/>
-<path d="M8 18.0002C6.897 18.0002 6 17.1032 6 16.0002C6 14.8972 6.897 14.0002 8 14.0002C8.357 14.0002 8.699 14.0932 9 14.2682V10.2542C9 9.5882 9.448 8.9952 10.088 8.8122L15.088 7.3832C15.223 7.3442 15.363 7.3252 15.502 7.3252C15.754 7.3252 16.005 7.3902 16.228 7.5142C16.578 7.7082 16.832 8.0282 16.942 8.4132C16.98 8.5472 17 8.6862 17 8.8262V15.0002C17 16.1032 16.103 17.0002 15 17.0002C13.897 17.0002 13 16.1032 13 15.0002C13 13.8972 13.897 13.0002 15 13.0002C15.357 13.0002 15.699 13.0932 16 13.2682V8.8262C16 8.7792 15.993 8.7322 15.981 8.6872C15.92 8.4742 15.722 8.3252 15.5 8.3252C15.454 8.3252 15.408 8.3312 15.363 8.3442L10.363 9.7732C10.149 9.8352 10 10.0322 10 10.2542V16.0002C10 17.1032 9.103 18.0002 8 18.0002ZM8 15.0002C7.449 15.0002 7 15.4482 7 16.0002C7 16.5522 7.449 17.0002 8 17.0002C8.551 17.0002 9 16.5522 9 16.0002C9 15.4482 8.551 15.0002 8 15.0002ZM15 14.0002C14.448 14.0002 14 14.4482 14 15.0002C14 15.5522 14.448 16.0002 15 16.0002C15.552 16.0002 16 15.5522 16 15.0002C16 14.4482 15.552 14.0002 15 14.0002Z" fill="#02A9F4"/>
-</svg>
diff --git a/MailResources/Assets.xcassets/Files/code-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/code-file.imageset/Contents.json
new file mode 100644
index 000000000..472929922
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/code-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "code-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "code-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-dark.svg b/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-dark.svg
new file mode 100644
index 000000000..794a4af24
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-dark.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.193 0.003 17.58 0.167 17.857 0.45L21.56 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.154C17.051 1.056 16.922 1.001 16.789 1H3.5Z" fill="#956DDD"/>
+<path d="M10 16.504C9.866 16.504 9.741 16.452 9.646 16.358L6.146 12.858C6.052 12.763 6 12.637 6 12.504C6 12.371 6.052 12.245 6.146 12.15L9.646 8.65C9.741 8.556 9.866 8.504 10 8.504C10.134 8.504 10.259 8.556 10.354 8.65C10.449 8.744 10.5 8.87 10.5 9.004C10.5 9.138 10.448 9.263 10.354 9.358L7.208 12.504L10.354 15.65C10.448 15.744 10.5 15.87 10.5 16.004C10.5 16.138 10.448 16.263 10.354 16.358C10.26 16.453 10.134 16.504 10 16.504Z" fill="#956DDD"/>
+<path d="M14 16.504C13.866 16.504 13.741 16.452 13.646 16.358C13.551 16.264 13.5 16.138 13.5 16.004C13.5 15.87 13.552 15.745 13.646 15.65L16.792 12.504L13.646 9.358C13.552 9.263 13.5 9.138 13.5 9.004C13.5 8.87 13.552 8.745 13.646 8.65C13.74 8.555 13.866 8.504 14 8.504C14.134 8.504 14.259 8.556 14.354 8.65L17.854 12.15C17.948 12.245 18 12.37 18 12.504C18 12.638 17.948 12.763 17.854 12.858L14.354 16.358C14.259 16.452 14.134 16.504 14 16.504Z" fill="#956DDD"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-light.svg b/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-light.svg
new file mode 100644
index 000000000..da0043d01
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/code-file.imageset/code-file-light.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.193 0.003 17.58 0.167 17.857 0.45L21.56 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.154C17.051 1.056 16.922 1.001 16.789 1H3.5Z" fill="#673AB7"/>
+<path d="M10 16.504C9.866 16.504 9.741 16.452 9.646 16.358L6.146 12.858C6.052 12.763 6 12.637 6 12.504C6 12.371 6.052 12.245 6.146 12.15L9.646 8.65C9.741 8.556 9.866 8.504 10 8.504C10.134 8.504 10.259 8.556 10.354 8.65C10.449 8.744 10.5 8.87 10.5 9.004C10.5 9.138 10.448 9.263 10.354 9.358L7.208 12.504L10.354 15.65C10.448 15.744 10.5 15.87 10.5 16.004C10.5 16.138 10.448 16.263 10.354 16.358C10.26 16.453 10.134 16.504 10 16.504Z" fill="#673AB7"/>
+<path d="M14 16.504C13.866 16.504 13.741 16.452 13.646 16.358C13.551 16.264 13.5 16.138 13.5 16.004C13.5 15.87 13.552 15.745 13.646 15.65L16.792 12.504L13.646 9.358C13.552 9.263 13.5 9.138 13.5 9.004C13.5 8.87 13.552 8.745 13.646 8.65C13.74 8.555 13.866 8.504 14 8.504C14.134 8.504 14.259 8.556 14.354 8.65L17.854 12.15C17.948 12.245 18 12.37 18 12.504C18 12.638 17.948 12.763 17.854 12.858L14.354 16.358C14.259 16.452 14.134 16.504 14 16.504Z" fill="#673AB7"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/common-file-text.imageset/Contents.json b/MailResources/Assets.xcassets/Files/common-file-text.imageset/Contents.json
deleted file mode 100644
index 585455ede..000000000
--- a/MailResources/Assets.xcassets/Files/common-file-text.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "common-file-text.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/doc-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/doc-file.imageset/Contents.json
new file mode 100644
index 000000000..413a6309f
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/doc-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "doc-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "doc-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/common-file-text.imageset/common-file-text.svg b/MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-dark.svg
similarity index 82%
rename from MailResources/Assets.xcassets/Files/common-file-text.imageset/common-file-text.svg
rename to MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-dark.svg
index d2a9d73a0..fd4bd85a8 100644
--- a/MailResources/Assets.xcassets/Files/common-file-text.imageset/common-file-text.svg
+++ b/MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-dark.svg
@@ -1,8 +1,8 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#4051B5"/>
-<path d="M6 7.5C5.724 7.5 5.5 7.276 5.5 7C5.5 6.724 5.724 6.5 6 6.5H13C13.276 6.5 13.5 6.724 13.5 7C13.5 7.276 13.276 7.5 13 7.5H6Z" fill="#4051B5"/>
-<path d="M6 10.5C5.724 10.5 5.5 10.276 5.5 10C5.5 9.724 5.724 9.5 6 9.5H18C18.276 9.5 18.5 9.724 18.5 10C18.5 10.276 18.276 10.5 18 10.5H6Z" fill="#4051B5"/>
-<path d="M6 13.5C5.724 13.5 5.5 13.276 5.5 13C5.5 12.724 5.724 12.5 6 12.5H18C18.276 12.5 18.5 12.724 18.5 13C18.5 13.276 18.276 13.5 18 13.5H6Z" fill="#4051B5"/>
-<path d="M6 16.5C5.724 16.5 5.5 16.276 5.5 16C5.5 15.724 5.724 15.5 6 15.5H18C18.276 15.5 18.5 15.724 18.5 16C18.5 16.276 18.276 16.5 18 16.5H6Z" fill="#4051B5"/>
-<path d="M6 19.5C5.724 19.5 5.5 19.276 5.5 19C5.5 18.724 5.724 18.5 6 18.5H18C18.276 18.5 18.5 18.724 18.5 19C18.5 19.276 18.276 19.5 18 19.5H6Z" fill="#4051B5"/>
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#81C4F8"/>
+<path d="M6 7.5C5.724 7.5 5.5 7.276 5.5 7C5.5 6.724 5.724 6.5 6 6.5H13C13.276 6.5 13.5 6.724 13.5 7C13.5 7.276 13.276 7.5 13 7.5H6Z" fill="#81C4F8"/>
+<path d="M6 10.5C5.724 10.5 5.5 10.276 5.5 10C5.5 9.724 5.724 9.5 6 9.5H18C18.276 9.5 18.5 9.724 18.5 10C18.5 10.276 18.276 10.5 18 10.5H6Z" fill="#81C4F8"/>
+<path d="M6 13.5C5.724 13.5 5.5 13.276 5.5 13C5.5 12.724 5.724 12.5 6 12.5H18C18.276 12.5 18.5 12.724 18.5 13C18.5 13.276 18.276 13.5 18 13.5H6Z" fill="#81C4F8"/>
+<path d="M6 16.5C5.724 16.5 5.5 16.276 5.5 16C5.5 15.724 5.724 15.5 6 15.5H18C18.276 15.5 18.5 15.724 18.5 16C18.5 16.276 18.276 16.5 18 16.5H6Z" fill="#81C4F8"/>
+<path d="M6 19.5C5.724 19.5 5.5 19.276 5.5 19C5.5 18.724 5.724 18.5 6 18.5H18C18.276 18.5 18.5 18.724 18.5 19C18.5 19.276 18.276 19.5 18 19.5H6Z" fill="#81C4F8"/>
 </svg>
diff --git a/MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-light.svg b/MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-light.svg
new file mode 100644
index 000000000..2fef4c50b
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/doc-file.imageset/doc-file-light.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#2196F3"/>
+<path d="M6 7.5C5.724 7.5 5.5 7.276 5.5 7C5.5 6.724 5.724 6.5 6 6.5H13C13.276 6.5 13.5 6.724 13.5 7C13.5 7.276 13.276 7.5 13 7.5H6Z" fill="#2196F3"/>
+<path d="M6 10.5C5.724 10.5 5.5 10.276 5.5 10C5.5 9.724 5.724 9.5 6 9.5H18C18.276 9.5 18.5 9.724 18.5 10C18.5 10.276 18.276 10.5 18 10.5H6Z" fill="#2196F3"/>
+<path d="M6 13.5C5.724 13.5 5.5 13.276 5.5 13C5.5 12.724 5.724 12.5 6 12.5H18C18.276 12.5 18.5 12.724 18.5 13C18.5 13.276 18.276 13.5 18 13.5H6Z" fill="#2196F3"/>
+<path d="M6 16.5C5.724 16.5 5.5 16.276 5.5 16C5.5 15.724 5.724 15.5 6 15.5H18C18.276 15.5 18.5 15.724 18.5 16C18.5 16.276 18.276 16.5 18 16.5H6Z" fill="#2196F3"/>
+<path d="M6 19.5C5.724 19.5 5.5 19.276 5.5 19C5.5 18.724 5.724 18.5 6 18.5H18C18.276 18.5 18.5 18.724 18.5 19C18.5 19.276 18.276 19.5 18 19.5H6Z" fill="#2196F3"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/font-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/font-file.imageset/Contents.json
new file mode 100644
index 000000000..9a8902685
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/font-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "font-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "font-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-dark.svg b/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-dark.svg
new file mode 100644
index 000000000..05b3f0761
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#CD68DE"/>
+<path d="M9.5 20C9.224 20 9 19.776 9 19.5C9 19.224 9.224 19 9.5 19H11V10H8V11.5C8 11.776 7.776 12 7.5 12C7.224 12 7 11.776 7 11.5V10C7 9.449 7.449 9 8 9H15C15.552 9 16 9.449 16 10V11.5C16 11.776 15.776 12 15.5 12C15.224 12 15 11.776 15 11.5V10H12V19H13.5C13.776 19 14 19.224 14 19.5C14 19.776 13.776 20 13.5 20H9.5Z" fill="#CD68DE"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-light.svg b/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-light.svg
new file mode 100644
index 000000000..6f7bb4848
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/font-file.imageset/font-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#9C26B0"/>
+<path d="M9.5 20C9.224 20 9 19.776 9 19.5C9 19.224 9.224 19 9.5 19H11V10H8V11.5C8 11.776 7.776 12 7.5 12C7.224 12 7 11.776 7 11.5V10C7 9.449 7.449 9 8 9H15C15.552 9 16 9.449 16 10V11.5C16 11.776 15.776 12 15.5 12C15.224 12 15 11.776 15 11.5V10H12V19H13.5C13.776 19 14 19.224 14 19.5C14 19.776 13.776 20 13.5 20H9.5Z" fill="#9C26B0"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/grid-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/grid-file.imageset/Contents.json
new file mode 100644
index 000000000..22b865ad3
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/grid-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "grid-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "grid-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-dark.svg b/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-dark.svg
new file mode 100644
index 000000000..9688049cf
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#90D093"/>
+<path d="M6.5 19.999C5.673 19.999 5 19.438 5 18.749V8.249C5 7.56 5.673 6.999 6.5 6.999H17.5C18.327 6.999 19 7.56 19 8.249V18.749C19 19.438 18.327 19.999 17.5 19.999H6.5ZM17.5 18.999C17.79 18.999 18 18.85 18 18.749V16.999H10V18.999H17.5ZM6 18.749C6 18.85 6.21 18.999 6.5 18.999H9V16.999H6V18.749ZM18 15.999V13.999H10V15.999H18ZM9 15.999V13.999H6V15.999H9ZM18 12.999V10.999H10V12.999H18ZM9 12.999V10.999H6V12.999H9ZM18 9.999V8.249C18 8.148 17.79 7.999 17.5 7.999H10V9.999H18ZM9 9.999V7.999H6.5C6.21 7.999 6 8.148 6 8.249V9.999H9Z" fill="#90D093"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-light.svg b/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-light.svg
new file mode 100644
index 000000000..d42a9fd72
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/grid-file.imageset/grid-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#4BAF50"/>
+<path d="M6.5 19.999C5.673 19.999 5 19.438 5 18.749V8.249C5 7.56 5.673 6.999 6.5 6.999H17.5C18.327 6.999 19 7.56 19 8.249V18.749C19 19.438 18.327 19.999 17.5 19.999H6.5ZM17.5 18.999C17.79 18.999 18 18.85 18 18.749V16.999H10V18.999H17.5ZM6 18.749C6 18.85 6.21 18.999 6.5 18.999H9V16.999H6V18.749ZM18 15.999V13.999H10V15.999H18ZM9 15.999V13.999H6V15.999H9ZM18 12.999V10.999H10V12.999H18ZM9 12.999V10.999H6V12.999H9ZM18 9.999V8.249C18 8.148 17.79 7.999 17.5 7.999H10V9.999H18ZM9 9.999V7.999H6.5C6.21 7.999 6 8.148 6 8.249V9.999H9Z" fill="#4BAF50"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/ics-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/ics-file.imageset/Contents.json
new file mode 100644
index 000000000..58a0f0d3f
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/ics-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "ics-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ics-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-dark.svg b/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-dark.svg
new file mode 100644
index 000000000..ee4e67421
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-dark.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2272_14297)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.0022 2.41667C7.0022 2.18655 6.81565 2 6.58553 2C6.35541 2 6.16886 2.18655 6.16886 2.41667V3.66667H3.2522C2.56184 3.66667 2.0022 4.22631 2.0022 4.91667V20.75C2.0022 21.4404 2.56184 22 3.2522 22H20.7522C21.4426 22 22.0022 21.4404 22.0022 20.75V4.91667C22.0022 4.22631 21.4426 3.66667 20.7522 3.66667H17.8355V2.41667C17.8355 2.18655 17.649 2 17.4189 2C17.1887 2 17.0022 2.18655 17.0022 2.41667V3.66667H7.0022V2.41667ZM21.1689 7.83333V4.91667C21.1689 4.68655 20.9823 4.5 20.7522 4.5H17.8355V6.58333C17.8355 6.81345 17.649 7 17.4189 7C17.1887 7 17.0022 6.81345 17.0022 6.58333V4.5H7.0022V6.58333C7.0022 6.81345 6.81565 7 6.58553 7C6.35541 7 6.16886 6.81345 6.16886 6.58333V4.5H3.2522C3.02208 4.5 2.83553 4.68655 2.83553 4.91667V7.83333H21.1689ZM2.83553 8.66667H21.1689V20.75C21.1689 20.9801 20.9823 21.1667 20.7522 21.1667H3.2522C3.02208 21.1667 2.83553 20.9801 2.83553 20.75V8.66667Z" fill="#A2E9F6"/>
+</g>
+<defs>
+<clipPath id="clip0_2272_14297">
+<rect width="20" height="20" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-light.svg b/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-light.svg
new file mode 100644
index 000000000..545591ec6
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/ics-file.imageset/ics-file-light.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2272_13849)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.0022 2.41667C7.0022 2.18655 6.81565 2 6.58553 2C6.35541 2 6.16886 2.18655 6.16886 2.41667V3.66667H3.2522C2.56184 3.66667 2.0022 4.22631 2.0022 4.91667V20.75C2.0022 21.4404 2.56184 22 3.2522 22H20.7522C21.4426 22 22.0022 21.4404 22.0022 20.75V4.91667C22.0022 4.22631 21.4426 3.66667 20.7522 3.66667H17.8355V2.41667C17.8355 2.18655 17.649 2 17.4189 2C17.1887 2 17.0022 2.18655 17.0022 2.41667V3.66667H7.0022V2.41667ZM21.1689 7.83333V4.91667C21.1689 4.68655 20.9823 4.5 20.7522 4.5H17.8355V6.58333C17.8355 6.81345 17.649 7 17.4189 7C17.1887 7 17.0022 6.81345 17.0022 6.58333V4.5H7.0022V6.58333C7.0022 6.81345 6.81565 7 6.58553 7C6.35541 7 6.16886 6.81345 6.16886 6.58333V4.5H3.2522C3.02208 4.5 2.83553 4.68655 2.83553 4.91667V7.83333H21.1689ZM2.83553 8.66667H21.1689V20.75C21.1689 20.9801 20.9823 21.1667 20.7522 21.1667H3.2522C3.02208 21.1667 2.83553 20.9801 2.83553 20.75V8.66667Z" fill="#36D0EB"/>
+</g>
+<defs>
+<clipPath id="clip0_2272_13849">
+<rect width="20" height="20" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/Contents.json b/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/Contents.json
deleted file mode 100644
index c40ff16c1..000000000
--- a/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "image-file-landscape.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/image-file-landscape.svg b/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/image-file-landscape.svg
deleted file mode 100644
index db552e837..000000000
--- a/MailResources/Assets.xcassets/Files/image-file-landscape.imageset/image-file-landscape.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 12C7.121 12 6 10.879 6 9.5C6 8.121 7.121 7 8.5 7C9.879 7 11 8.121 11 9.5C11 10.879 9.879 12 8.5 12ZM8.5 8C7.673 8 7 8.673 7 9.5C7 10.327 7.673 11 8.5 11C9.327 11 10 10.327 10 9.5C10 8.673 9.327 8 8.5 8Z" fill="#00BCD4"/>
-<path d="M5.49966 19.9998C5.31766 19.9998 5.15067 19.9008 5.06267 19.7418C4.97467 19.5838 4.97967 19.3888 5.07567 19.2348L8.08966 14.4128C8.16966 14.2858 8.27866 14.1758 8.40766 14.0948C8.56766 13.9948 8.75066 13.9428 8.93766 13.9428C9.01266 13.9428 9.08867 13.9518 9.16266 13.9688C9.42367 14.0288 9.64466 14.1868 9.78666 14.4128L10.4377 15.4558L12.6527 11.9128C12.7327 11.7848 12.8427 11.6738 12.9707 11.5948C13.1297 11.4958 13.3127 11.4438 13.4987 11.4438C13.8467 11.4438 14.1637 11.6198 14.3477 11.9138L18.9237 19.2358C19.0197 19.3898 19.0257 19.5838 18.9377 19.7428C18.8487 19.9008 18.6817 19.9998 18.4997 19.9998H5.49966ZM17.5977 18.9998L13.4997 12.4428L10.8607 16.6648C10.7687 16.8118 10.6097 16.8998 10.4367 16.8998C10.2627 16.8998 10.1047 16.8118 10.0127 16.6648L8.93766 14.9438L6.40166 18.9998H17.5977Z" fill="#00BCD4"/>
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#00BCD4"/>
-</svg>
diff --git a/MailResources/Assets.xcassets/Files/image-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/image-file.imageset/Contents.json
new file mode 100644
index 000000000..1060613c6
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/image-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "image-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "image-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-dark.svg b/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-dark.svg
new file mode 100644
index 000000000..21579790d
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-dark.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 12C7.121 12 6 10.879 6 9.5C6 8.121 7.121 7 8.5 7C9.879 7 11 8.121 11 9.5C11 10.879 9.879 12 8.5 12ZM8.5 8C7.673 8 7 8.673 7 9.5C7 10.327 7.673 11 8.5 11C9.327 11 10 10.327 10 9.5C10 8.673 9.327 8 8.5 8Z" fill="#86DEEA"/>
+<path d="M5.5 20C5.318 20 5.151 19.901 5.063 19.742C4.975 19.584 4.98 19.389 5.076 19.235L8.09 14.413C8.17 14.286 8.279 14.176 8.408 14.095C8.568 13.995 8.751 13.943 8.938 13.943C9.013 13.943 9.089 13.952 9.163 13.969C9.424 14.029 9.645 14.187 9.787 14.413L10.438 15.456L12.653 11.913C12.733 11.785 12.843 11.674 12.971 11.595C13.13 11.496 13.313 11.444 13.499 11.444C13.847 11.444 14.164 11.62 14.348 11.914L18.924 19.236C19.02 19.39 19.026 19.584 18.938 19.743C18.849 19.901 18.682 20 18.5 20H5.5ZM17.598 19L13.5 12.443L10.861 16.665C10.769 16.812 10.61 16.9 10.437 16.9C10.263 16.9 10.105 16.812 10.013 16.665L8.938 14.944L6.402 19H17.598Z" fill="#86DEEA"/>
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#86DEEA"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-light.svg b/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-light.svg
new file mode 100644
index 000000000..d5c01f042
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/image-file.imageset/image-file-light.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 12C7.121 12 6 10.879 6 9.5C6 8.121 7.121 7 8.5 7C9.879 7 11 8.121 11 9.5C11 10.879 9.879 12 8.5 12ZM8.5 8C7.673 8 7 8.673 7 9.5C7 10.327 7.673 11 8.5 11C9.327 11 10 10.327 10 9.5C10 8.673 9.327 8 8.5 8Z" fill="#00BCD4"/>
+<path d="M5.5 20C5.318 20 5.151 19.901 5.063 19.742C4.975 19.584 4.98 19.389 5.076 19.235L8.09 14.413C8.17 14.286 8.279 14.176 8.408 14.095C8.568 13.995 8.751 13.943 8.938 13.943C9.013 13.943 9.089 13.952 9.163 13.969C9.424 14.029 9.645 14.187 9.787 14.413L10.438 15.456L12.653 11.913C12.733 11.785 12.843 11.674 12.971 11.595C13.13 11.496 13.313 11.444 13.499 11.444C13.847 11.444 14.164 11.62 14.348 11.914L18.924 19.236C19.02 19.39 19.026 19.584 18.938 19.743C18.849 19.901 18.682 20 18.5 20H5.5ZM17.598 19L13.5 12.443L10.861 16.665C10.769 16.812 10.61 16.9 10.437 16.9C10.263 16.9 10.105 16.812 10.013 16.665L8.938 14.944L6.402 19H17.598Z" fill="#00BCD4"/>
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#00BCD4"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/Contents.json b/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/Contents.json
deleted file mode 100644
index 195fbcbc5..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "office-file-adobe.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/office-file-adobe.svg b/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/office-file-adobe.svg
deleted file mode 100644
index 456cf6672..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-adobe.imageset/office-file-adobe.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#FF540B"/>
-<path d="M6.14786 20.3508C6.07586 20.3508 6.00387 20.3458 5.93087 20.3368C5.33287 20.2628 4.81086 19.8778 4.60086 19.3558C4.38986 18.8318 4.50287 18.2608 4.91887 17.7488C5.96687 16.5128 7.17587 15.4438 8.51887 14.5648C8.66187 13.6768 8.71987 12.7178 8.69387 11.7128C8.68487 11.3608 8.66387 10.9978 8.63287 10.6318C7.57087 9.59381 6.66087 8.41981 5.92787 7.13981C5.56486 6.53881 5.56087 5.86681 5.91887 5.30081C6.22487 4.81981 6.75987 4.50781 7.28187 4.50781C7.32787 4.50781 7.37487 4.50981 7.42087 4.51481C7.93287 4.56881 8.34386 4.91481 8.54686 5.46281C9.03187 6.77681 9.42186 8.52781 9.59386 10.1658C10.5959 11.0988 11.7179 11.8918 12.9329 12.5248C14.4599 12.0768 16.0509 11.8488 17.6629 11.8488H17.7739C18.4779 11.8748 19.0389 12.2188 19.3209 12.7908C19.5929 13.3428 19.5489 14.0338 19.2099 14.5108C18.9369 14.8958 18.5139 15.1078 18.0179 15.1078C17.9459 15.1078 17.8729 15.1028 17.7989 15.0938C16.0799 14.8688 14.4129 14.3658 12.8409 13.5968C11.6449 13.9808 10.4979 14.5098 9.42787 15.1688C9.09887 16.8578 8.46786 18.3498 7.55287 19.6058C7.20387 20.0868 6.70486 20.3508 6.14786 20.3508ZM8.19587 16.0148C7.27787 16.7098 6.43687 17.5048 5.68887 18.3878C5.56887 18.5358 5.44086 18.7628 5.52886 18.9838C5.60386 19.1708 5.81486 19.3158 6.05486 19.3458C6.08086 19.3488 6.11187 19.3518 6.14487 19.3518C6.38287 19.3518 6.58486 19.2408 6.74486 19.0208C7.38187 18.1448 7.86887 17.1358 8.19587 16.0148ZM14.3859 13.1888C15.5269 13.6388 16.7149 13.9458 17.9249 14.1048C17.9559 14.1088 17.9879 14.1108 18.0199 14.1108C18.1869 14.1108 18.3099 14.0528 18.3939 13.9348C18.5239 13.7518 18.5359 13.4638 18.4239 13.2348C18.2749 12.9328 17.9759 12.8588 17.7509 12.8498H17.6589C16.5519 12.8498 15.4549 12.9638 14.3859 13.1888ZM9.69387 11.6868C9.71387 12.4538 9.68687 13.1978 9.61387 13.9068C10.2719 13.5448 10.9549 13.2278 11.6559 12.9578C10.9679 12.5468 10.3099 12.0858 9.68986 11.5778C9.69186 11.6138 9.69287 11.6498 9.69387 11.6868ZM7.28087 5.50781C7.09887 5.50781 6.88586 5.64281 6.76386 5.83581C6.65686 6.00481 6.57487 6.27881 6.78787 6.62981C7.25787 7.45081 7.80187 8.22281 8.41487 8.93781C8.22087 7.80581 7.93687 6.69881 7.60887 5.80981C7.53987 5.62381 7.44186 5.52281 7.31587 5.50981C7.30487 5.50881 7.29287 5.50781 7.28087 5.50781Z" fill="#FF540B"/>
-</svg>
diff --git a/MailResources/Assets.xcassets/Files/office-file-graph.imageset/Contents.json b/MailResources/Assets.xcassets/Files/office-file-graph.imageset/Contents.json
deleted file mode 100644
index dc0bb784e..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-graph.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "office-file-graph.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/office-file-graph.imageset/office-file-graph.svg b/MailResources/Assets.xcassets/Files/office-file-graph.imageset/office-file-graph.svg
deleted file mode 100644
index 7b2d630e6..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-graph.imageset/office-file-graph.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#9F9F9F"/>
-<path d="M12 18.499C8.692 18.499 6 15.807 6 12.499C6 9.19102 8.692 6.49902 12 6.49902C13.202 6.49902 14.363 6.85502 15.357 7.52902C15.37 7.53502 15.382 7.54202 15.392 7.54902C15.402 7.55602 15.413 7.56602 15.424 7.57602C17.032 8.69102 18 10.534 18 12.499C18 14.264 17.226 15.93 15.874 17.076C15.865 17.086 15.855 17.097 15.846 17.104C15.835 17.114 15.823 17.122 15.812 17.129C14.746 18.011 13.39 18.499 12 18.499ZM7.032 12.999C7.284 15.543 9.418 17.499 12 17.499C13.005 17.499 13.968 17.2 14.8 16.633L11.766 12.999H7.032ZM15.567 15.991C16.481 15.058 17 13.799 17 12.499C17 11.015 16.354 9.63902 15.218 8.68302L12.626 12.469L15.567 15.991ZM11.736 11.999L14.393 8.11702C13.657 7.71202 12.835 7.49902 12 7.49902C9.418 7.49902 7.284 9.45502 7.032 11.999H11.736Z" fill="#9F9F9F"/>
-</svg>
diff --git a/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/Contents.json b/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/Contents.json
deleted file mode 100644
index 9e3f333d4..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "office-file-sheet.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/office-file-sheet.svg b/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/office-file-sheet.svg
deleted file mode 100644
index 951a61bb7..000000000
--- a/MailResources/Assets.xcassets/Files/office-file-sheet.imageset/office-file-sheet.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#4BAF50"/>
-<path d="M6.5 19.999C5.673 19.999 5 19.438 5 18.749V8.24902C5 7.56002 5.673 6.99902 6.5 6.99902H17.5C18.327 6.99902 19 7.56002 19 8.24902V18.749C19 19.438 18.327 19.999 17.5 19.999H6.5ZM17.5 18.999C17.79 18.999 18 18.85 18 18.749V16.999H10V18.999H17.5ZM6 18.749C6 18.85 6.21 18.999 6.5 18.999H9V16.999H6V18.749ZM18 15.999V13.999H10V15.999H18ZM9 15.999V13.999H6V15.999H9ZM18 12.999V10.999H10V12.999H18ZM9 12.999V10.999H6V12.999H9ZM18 9.99902V8.24902C18 8.14802 17.79 7.99902 17.5 7.99902H10V9.99902H18ZM9 9.99902V7.99902H6.5C6.21 7.99902 6 8.14802 6 8.24902V9.99902H9Z" fill="#4BAF50"/>
-</svg>
diff --git a/MailResources/Assets.xcassets/Files/pdf-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/pdf-file.imageset/Contents.json
new file mode 100644
index 000000000..7d0d258db
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/pdf-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "pdf-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "pdf-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-dark.svg b/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-dark.svg
new file mode 100644
index 000000000..1e5710a45
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#FD9459"/>
+<path d="M6.148 20.351C6.076 20.351 6.004 20.346 5.931 20.337C5.333 20.263 4.811 19.878 4.601 19.356C4.39 18.832 4.503 18.261 4.919 17.749C5.967 16.513 7.176 15.444 8.519 14.565C8.662 13.677 8.72 12.718 8.694 11.713C8.685 11.361 8.664 10.998 8.633 10.632C7.571 9.594 6.661 8.42 5.928 7.14C5.565 6.539 5.561 5.867 5.919 5.301C6.225 4.82 6.76 4.508 7.282 4.508C7.328 4.508 7.375 4.51 7.421 4.515C7.933 4.569 8.344 4.915 8.547 5.463C9.032 6.777 9.422 8.528 9.594 10.166C10.596 11.099 11.718 11.892 12.933 12.525C14.46 12.077 16.051 11.849 17.663 11.849H17.774C18.478 11.875 19.039 12.219 19.321 12.791C19.593 13.343 19.549 14.034 19.21 14.511C18.937 14.896 18.514 15.108 18.018 15.108C17.946 15.108 17.873 15.103 17.799 15.094C16.08 14.869 14.413 14.366 12.841 13.597C11.645 13.981 10.498 14.51 9.428 15.169C9.099 16.858 8.468 18.35 7.553 19.606C7.204 20.087 6.705 20.351 6.148 20.351ZM8.196 16.015C7.278 16.71 6.437 17.505 5.689 18.388C5.569 18.536 5.441 18.763 5.529 18.984C5.604 19.171 5.815 19.316 6.055 19.346C6.081 19.349 6.112 19.352 6.145 19.352C6.383 19.352 6.585 19.241 6.745 19.021C7.382 18.145 7.869 17.136 8.196 16.015ZM14.386 13.189C15.527 13.639 16.715 13.946 17.925 14.105C17.956 14.109 17.988 14.111 18.02 14.111C18.187 14.111 18.31 14.053 18.394 13.935C18.524 13.752 18.536 13.464 18.424 13.235C18.275 12.933 17.976 12.859 17.751 12.85H17.659C16.552 12.85 15.455 12.964 14.386 13.189ZM9.694 11.687C9.714 12.454 9.687 13.198 9.614 13.907C10.272 13.545 10.955 13.228 11.656 12.958C10.968 12.547 10.31 12.086 9.69 11.578C9.692 11.614 9.693 11.65 9.694 11.687ZM7.281 5.508C7.099 5.508 6.886 5.643 6.764 5.836C6.657 6.005 6.575 6.279 6.788 6.63C7.258 7.451 7.802 8.223 8.415 8.938C8.221 7.806 7.937 6.699 7.609 5.81C7.54 5.624 7.442 5.523 7.316 5.51C7.305 5.509 7.293 5.508 7.281 5.508Z" fill="#FD9459"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-light.svg b/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-light.svg
new file mode 100644
index 000000000..c8de375aa
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/pdf-file.imageset/pdf-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#EF5803"/>
+<path d="M6.148 20.351C6.076 20.351 6.004 20.346 5.931 20.337C5.333 20.263 4.811 19.878 4.601 19.356C4.39 18.832 4.503 18.261 4.919 17.749C5.967 16.513 7.176 15.444 8.519 14.565C8.662 13.677 8.72 12.718 8.694 11.713C8.685 11.361 8.664 10.998 8.633 10.632C7.571 9.594 6.661 8.42 5.928 7.14C5.565 6.539 5.561 5.867 5.919 5.301C6.225 4.82 6.76 4.508 7.282 4.508C7.328 4.508 7.375 4.51 7.421 4.515C7.933 4.569 8.344 4.915 8.547 5.463C9.032 6.777 9.422 8.528 9.594 10.166C10.596 11.099 11.718 11.892 12.933 12.525C14.46 12.077 16.051 11.849 17.663 11.849H17.774C18.478 11.875 19.039 12.219 19.321 12.791C19.593 13.343 19.549 14.034 19.21 14.511C18.937 14.896 18.514 15.108 18.018 15.108C17.946 15.108 17.873 15.103 17.799 15.094C16.08 14.869 14.413 14.366 12.841 13.597C11.645 13.981 10.498 14.51 9.428 15.169C9.099 16.858 8.468 18.35 7.553 19.606C7.204 20.087 6.705 20.351 6.148 20.351ZM8.196 16.015C7.278 16.71 6.437 17.505 5.689 18.388C5.569 18.536 5.441 18.763 5.529 18.984C5.604 19.171 5.815 19.316 6.055 19.346C6.081 19.349 6.112 19.352 6.145 19.352C6.383 19.352 6.585 19.241 6.745 19.021C7.382 18.145 7.869 17.136 8.196 16.015ZM14.386 13.189C15.527 13.639 16.715 13.946 17.925 14.105C17.956 14.109 17.988 14.111 18.02 14.111C18.187 14.111 18.31 14.053 18.394 13.935C18.524 13.752 18.536 13.464 18.424 13.235C18.275 12.933 17.976 12.859 17.751 12.85H17.659C16.552 12.85 15.455 12.964 14.386 13.189ZM9.694 11.687C9.714 12.454 9.687 13.198 9.614 13.907C10.272 13.545 10.955 13.228 11.656 12.958C10.968 12.547 10.31 12.086 9.69 11.578C9.692 11.614 9.693 11.65 9.694 11.687ZM7.281 5.508C7.099 5.508 6.886 5.643 6.764 5.836C6.657 6.005 6.575 6.279 6.788 6.63C7.258 7.451 7.802 8.223 8.415 8.938C8.221 7.806 7.937 6.699 7.609 5.81C7.54 5.624 7.442 5.523 7.316 5.51C7.305 5.509 7.293 5.508 7.281 5.508Z" fill="#EF5803"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/point-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/point-file.imageset/Contents.json
new file mode 100644
index 000000000..0cfff6530
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/point-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "point-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "point-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-dark.svg b/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-dark.svg
new file mode 100644
index 000000000..904584d83
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#FFC166"/>
+<path d="M12 18.499C8.692 18.499 6 15.807 6 12.499C6 9.191 8.692 6.499 12 6.499C13.202 6.499 14.363 6.855 15.357 7.529C15.37 7.535 15.382 7.542 15.392 7.549C15.402 7.556 15.413 7.566 15.424 7.576C17.032 8.691 18 10.534 18 12.499C18 14.264 17.226 15.93 15.874 17.076C15.865 17.086 15.855 17.097 15.846 17.104C15.835 17.114 15.823 17.122 15.812 17.129C14.746 18.011 13.39 18.499 12 18.499ZM7.032 12.999C7.284 15.543 9.418 17.499 12 17.499C13.005 17.499 13.968 17.2 14.8 16.633L11.766 12.999H7.032ZM15.567 15.991C16.481 15.058 17 13.799 17 12.499C17 11.015 16.354 9.639 15.218 8.683L12.626 12.469L15.567 15.991ZM11.736 11.999L14.393 8.117C13.657 7.712 12.835 7.499 12 7.499C9.418 7.499 7.284 9.455 7.032 11.999H11.736Z" fill="#FFC166"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-light.svg b/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-light.svg
new file mode 100644
index 000000000..c0c875120
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/point-file.imageset/point-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.214 0.012 17.578 0.163 17.853 0.437L21.561 4.147C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.144C17.052 1.051 16.93 1.001 16.792 1H3.5Z" fill="#FF9802"/>
+<path d="M12 18.499C8.692 18.499 6 15.807 6 12.499C6 9.191 8.692 6.499 12 6.499C13.202 6.499 14.363 6.855 15.357 7.529C15.37 7.535 15.382 7.542 15.392 7.549C15.402 7.556 15.413 7.566 15.424 7.576C17.032 8.691 18 10.534 18 12.499C18 14.264 17.226 15.93 15.874 17.076C15.865 17.086 15.855 17.097 15.846 17.104C15.835 17.114 15.823 17.122 15.812 17.129C14.746 18.011 13.39 18.499 12 18.499ZM7.032 12.999C7.284 15.543 9.418 17.499 12 17.499C13.005 17.499 13.968 17.2 14.8 16.633L11.766 12.999H7.032ZM15.567 15.991C16.481 15.058 17 13.799 17 12.499C17 11.015 16.354 9.639 15.218 8.683L12.626 12.469L15.567 15.991ZM11.736 11.999L14.393 8.117C13.657 7.712 12.835 7.499 12 7.499C9.418 7.499 7.284 9.455 7.032 11.999H11.736Z" fill="#FF9802"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/unknown-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/unknown-file.imageset/Contents.json
index bc3df475b..010610427 100644
--- a/MailResources/Assets.xcassets/Files/unknown-file.imageset/Contents.json
+++ b/MailResources/Assets.xcassets/Files/unknown-file.imageset/Contents.json
@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "unknown-file.svg",
+      "filename" : "unknown-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "unknown-file-dark.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file.svg b/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-dark.svg
similarity index 86%
rename from MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file.svg
rename to MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-dark.svg
index ac4908969..f76bac150 100644
--- a/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file.svg
+++ b/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-dark.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#9F9F9F"/>
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#AFC2CF"/>
 </svg>
diff --git a/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-light.svg b/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-light.svg
new file mode 100644
index 000000000..3ee431472
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/unknown-file.imageset/unknown-file-light.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#85A2B6"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/vcard-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/vcard-file.imageset/Contents.json
new file mode 100644
index 000000000..1e3911cf3
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/vcard-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "vcard-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "vcard-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-dark.svg b/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-dark.svg
new file mode 100644
index 000000000..455bd2208
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-dark.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 24C3.621 24 2.5 22.878 2.5 21.5V2C2.5 0.897 3.397 0 4.5 0H20C20.276 0 20.5 0.224 20.5 0.5C20.5 0.776 20.276 1 20 1H4.5C3.949 1 3.5 1.449 3.5 2C3.5 2.551 3.949 3 4.5 3H20.5C21.052 3 21.5 3.449 21.5 4V23C21.5 23.552 21.052 24 20.5 24H5ZM3.5 21.5C3.5 22.327 4.173 23 5 23H20.5V4H4.5C4.143 4 3.801 3.907 3.5 3.733V21.5Z" fill="#C8AAEE"/>
+<path d="M7.5 20C7.224 20 7 19.776 7 19.5C7 16.467 9.467 14 12.5 14C15.533 14 18 16.467 18 19.5C18 19.776 17.776 20 17.5 20H7.5ZM16.972 19C16.722 16.737 14.806 15 12.5 15C10.193 15 8.277 16.737 8.027 19H16.972Z" fill="#C8AAEE"/>
+<path d="M12.5 13.5C10.57 13.5 9 11.93 9 10C9 8.07 10.57 6.5 12.5 6.5C14.43 6.5 16 8.07 16 10C16 11.93 14.43 13.5 12.5 13.5ZM12.5 7.5C11.121 7.5 10 8.621 10 10C10 11.379 11.121 12.5 12.5 12.5C13.878 12.5 15 11.379 15 10C15 8.621 13.878 7.5 12.5 7.5Z" fill="#C8AAEE"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-light.svg b/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-light.svg
new file mode 100644
index 000000000..8268f2067
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/vcard-file.imageset/vcard-file-light.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 24C3.621 24 2.5 22.878 2.5 21.5V2C2.5 0.897 3.397 0 4.5 0H20C20.276 0 20.5 0.224 20.5 0.5C20.5 0.776 20.276 1 20 1H4.5C3.949 1 3.5 1.449 3.5 2C3.5 2.551 3.949 3 4.5 3H20.5C21.052 3 21.5 3.449 21.5 4V23C21.5 23.552 21.052 24 20.5 24H5ZM3.5 21.5C3.5 22.327 4.173 23 5 23H20.5V4H4.5C4.143 4 3.801 3.907 3.5 3.733V21.5Z" fill="#9D66E1"/>
+<path d="M7.5 20C7.224 20 7 19.776 7 19.5C7 16.467 9.467 14 12.5 14C15.533 14 18 16.467 18 19.5C18 19.776 17.776 20 17.5 20H7.5ZM16.972 19C16.722 16.737 14.806 15 12.5 15C10.193 15 8.277 16.737 8.027 19H16.972Z" fill="#9D66E1"/>
+<path d="M12.5 13.5C10.57 13.5 9 11.93 9 10C9 8.07 10.57 6.5 12.5 6.5C14.43 6.5 16 8.07 16 10C16 11.93 14.43 13.5 12.5 13.5ZM12.5 7.5C11.121 7.5 10 8.621 10 10C10 11.379 11.121 12.5 12.5 12.5C13.878 12.5 15 11.379 15 10C15 8.621 13.878 7.5 12.5 7.5Z" fill="#9D66E1"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/video-file-play.imageset/Contents.json b/MailResources/Assets.xcassets/Files/video-file-play.imageset/Contents.json
deleted file mode 100644
index d17b3f1c5..000000000
--- a/MailResources/Assets.xcassets/Files/video-file-play.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "video-file-play.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/video-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/video-file.imageset/Contents.json
new file mode 100644
index 000000000..b4cf361f0
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/video-file.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "video-file-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "video-file-dark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/MailResources/Assets.xcassets/Files/video-file-play.imageset/video-file-play.svg b/MailResources/Assets.xcassets/Files/video-file.imageset/video-file-dark.svg
similarity index 90%
rename from MailResources/Assets.xcassets/Files/video-file-play.imageset/video-file-play.svg
rename to MailResources/Assets.xcassets/Files/video-file.imageset/video-file-dark.svg
index ac7864037..96f25805e 100644
--- a/MailResources/Assets.xcassets/Files/video-file-play.imageset/video-file-play.svg
+++ b/MailResources/Assets.xcassets/Files/video-file.imageset/video-file-dark.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#CDDC3A"/>
-<path d="M9.5 18C8.673 18 8 17.327 8 16.5V9C8 8.745 8.065 8.493 8.189 8.271C8.383 7.921 8.703 7.668 9.088 7.558C9.223 7.519 9.362 7.5 9.501 7.5C9.753 7.5 10.004 7.565 10.227 7.689L16.723 11.187C16.973 11.326 17.175 11.528 17.311 11.772C17.505 12.122 17.552 12.527 17.442 12.913C17.332 13.299 17.079 13.618 16.729 13.812L10.248 17.8C10.008 17.934 9.759 18 9.5 18ZM9.501 8.5C9.455 8.5 9.408 8.507 9.362 8.52C9.234 8.556 9.128 8.64 9.063 8.757C9.022 8.831 9 8.915 9 9V16.5C9 16.776 9.224 17 9.5 17C9.585 17 9.669 16.978 9.743 16.937L16.224 12.948C16.48 12.805 16.571 12.498 16.437 12.257C16.392 12.176 16.325 12.109 16.243 12.063L9.749 8.566C9.668 8.521 9.585 8.5 9.501 8.5Z" fill="#CDDC3A"/>
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#86DEEA"/>
+<path d="M9.5 18C8.673 18 8 17.327 8 16.5V9C8 8.745 8.065 8.493 8.189 8.271C8.383 7.921 8.703 7.668 9.088 7.558C9.223 7.519 9.362 7.5 9.501 7.5C9.753 7.5 10.004 7.565 10.227 7.689L16.723 11.187C16.973 11.326 17.175 11.528 17.311 11.772C17.505 12.122 17.552 12.527 17.442 12.913C17.332 13.299 17.079 13.618 16.729 13.812L10.248 17.8C10.008 17.934 9.759 18 9.5 18ZM9.501 8.5C9.455 8.5 9.408 8.507 9.362 8.52C9.234 8.556 9.128 8.64 9.063 8.757C9.022 8.831 9 8.915 9 9V16.5C9 16.776 9.224 17 9.5 17C9.585 17 9.669 16.978 9.743 16.937L16.224 12.948C16.48 12.805 16.571 12.498 16.437 12.257C16.392 12.176 16.325 12.109 16.243 12.063L9.749 8.566C9.668 8.521 9.585 8.5 9.501 8.5Z" fill="#86DEEA"/>
 </svg>
diff --git a/MailResources/Assets.xcassets/Files/video-file.imageset/video-file-light.svg b/MailResources/Assets.xcassets/Files/video-file.imageset/video-file-light.svg
new file mode 100644
index 000000000..727c0696d
--- /dev/null
+++ b/MailResources/Assets.xcassets/Files/video-file.imageset/video-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H3.5Z" fill="#00BCD4"/>
+<path d="M9.5 18C8.673 18 8 17.327 8 16.5V9C8 8.745 8.065 8.493 8.189 8.271C8.383 7.921 8.703 7.668 9.088 7.558C9.223 7.519 9.362 7.5 9.501 7.5C9.753 7.5 10.004 7.565 10.227 7.689L16.723 11.187C16.973 11.326 17.175 11.528 17.311 11.772C17.505 12.122 17.552 12.527 17.442 12.913C17.332 13.299 17.079 13.618 16.729 13.812L10.248 17.8C10.008 17.934 9.759 18 9.5 18ZM9.501 8.5C9.455 8.5 9.408 8.507 9.362 8.52C9.234 8.556 9.128 8.64 9.063 8.757C9.022 8.831 9 8.915 9 9V16.5C9 16.776 9.224 17 9.5 17C9.585 17 9.669 16.978 9.743 16.937L16.224 12.948C16.48 12.805 16.571 12.498 16.437 12.257C16.392 12.176 16.325 12.109 16.243 12.063L9.749 8.566C9.668 8.521 9.585 8.5 9.501 8.5Z" fill="#00BCD4"/>
+</svg>
diff --git a/MailResources/Assets.xcassets/Files/zip-file.imageset/Contents.json b/MailResources/Assets.xcassets/Files/zip-file.imageset/Contents.json
deleted file mode 100644
index c8b37b452..000000000
--- a/MailResources/Assets.xcassets/Files/zip-file.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "zip-file.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/MailResources/Assets.xcassets/Files/zip-file.imageset/zip-file.svg b/MailResources/Assets.xcassets/Files/zip-file.imageset/zip-file.svg
deleted file mode 100644
index 39fd72890..000000000
--- a/MailResources/Assets.xcassets/Files/zip-file.imageset/zip-file.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 24C2.673 24 2 23.327 2 22.5V1.5C2 0.673 2.673 0 3.5 0H16.793C17.194 0 17.57 0.156 17.854 0.439L21.561 4.146C21.844 4.43 22 4.807 22 5.207V22.5C22 23.327 21.327 24 20.5 24H3.5ZM3.5 1C3.224 1 3 1.224 3 1.5V22.5C3 22.776 3.224 23 3.5 23H20.5C20.776 23 21 22.776 21 22.5V5.207C21 5.074 20.948 4.948 20.854 4.853L17.147 1.146C17.053 1.053 16.925 1 16.793 1H11.072L11.485 4.049C11.555 4.611 11.381 5.177 11.008 5.603C10.635 6.028 10.098 6.272 9.533 6.274H9.47C8.904 6.273 8.366 6.028 7.994 5.604C7.621 5.177 7.447 4.611 7.517 4.049L7.818 1H3.5ZM8.51 4.16C8.475 4.449 8.561 4.733 8.746 4.945C8.929 5.154 9.193 5.274 9.471 5.274H9.532C9.809 5.273 10.073 5.153 10.256 4.944C10.441 4.733 10.527 4.452 10.493 4.173L10.063 1H8.823L8.51 4.16Z" fill="#607D8B"/>
-<path d="M9.50488 8.75C9.9191 8.75 10.2549 8.41421 10.2549 8C10.2549 7.58579 9.9191 7.25 9.50488 7.25C9.09067 7.25 8.75488 7.58579 8.75488 8C8.75488 8.41421 9.09067 8.75 9.50488 8.75Z" fill="#607D8B"/>
-<path d="M9.50488 11.25C9.9191 11.25 10.2549 10.9142 10.2549 10.5C10.2549 10.0858 9.9191 9.75 9.50488 9.75C9.09067 9.75 8.75488 10.0858 8.75488 10.5C8.75488 10.9142 9.09067 11.25 9.50488 11.25Z" fill="#607D8B"/>
-<path d="M9.50488 13.75C9.9191 13.75 10.2549 13.4142 10.2549 13C10.2549 12.5858 9.9191 12.25 9.50488 12.25C9.09067 12.25 8.75488 12.5858 8.75488 13C8.75488 13.4142 9.09067 13.75 9.50488 13.75Z" fill="#607D8B"/>
-<path d="M9.49512 16.25C9.08112 16.25 8.74512 15.914 8.74512 15.5C8.74512 15.086 9.08112 14.75 9.49512 14.75C9.90812 14.75 10.2441 15.085 10.2451 15.496C10.2451 15.914 9.90912 16.25 9.49512 16.25Z" fill="#607D8B"/>
-<path d="M9.49512 18.771C9.08112 18.771 8.74512 18.435 8.74512 18.021C8.74512 17.607 9.08112 17.271 9.49512 17.271C9.90812 17.271 10.2441 17.606 10.2451 18.017C10.2451 18.435 9.90912 18.771 9.49512 18.771Z" fill="#607D8B"/>
-<path d="M9.49512 21.312C9.08112 21.312 8.74512 20.976 8.74512 20.562C8.74512 20.148 9.08112 19.812 9.49512 19.812C9.70812 19.817 9.88412 19.89 10.0241 20.029C10.1661 20.17 10.2451 20.357 10.2451 20.558C10.2451 20.976 9.90912 21.312 9.49512 21.312Z" fill="#607D8B"/>
-</svg>