diff --git a/Mail/Components/ChevronIcon.swift b/Mail/Components/ChevronIcon.swift
index ded7d788c2..8e43506c66 100644
--- a/Mail/Components/ChevronIcon.swift
+++ b/Mail/Components/ChevronIcon.swift
@@ -38,14 +38,13 @@ struct ChevronIcon: View {
     }
 
     let style: Style
+    var color = MailResourcesAsset.textSecondaryColor
 
     var body: some View {
         MailResourcesAsset.arrowDown.swiftUIImage
             .resizable()
             .frame(width: 12, height: 12)
-            .foregroundColor(MailResourcesAsset.textSecondaryColor)
-            .padding(.vertical, 2)
-            .padding(.horizontal, 1.5)
+            .foregroundColor(color)
             .rotationEffect(style.rotationAngle)
     }
 }
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
index 1a9c32bd3c..e7db4c8119 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
@@ -67,10 +67,7 @@ struct MailboxesManagementButtonView: View {
                 } else {
                     switch style {
                     case .blockedPassword:
-                        MailResourcesAsset.arrowRight.swiftUIImage
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                            .foregroundColor(MailResourcesAsset.textPrimaryColor.swiftUIColor)
+                        ChevronIcon(style: .right, color: MailResourcesAsset.textPrimaryColor)
                     case .menuDrawer:
                         if let detailNumber {
                             Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
diff --git a/Mail/Views/Search/SearchFilterFolderCell.swift b/Mail/Views/Search/SearchFilterFolderCell.swift
index 3c9478474d..af942e44d9 100644
--- a/Mail/Views/Search/SearchFilterFolderCell.swift
+++ b/Mail/Views/Search/SearchFilterFolderCell.swift
@@ -77,9 +77,7 @@ struct SearchFilterFolderCell: View {
                 }
                 Text(selectedFolderName)
                     .font(MailTextStyle.bodyMedium.font)
-                MailResourcesAsset.arrowDown.swiftUIImage
-                    .resizable()
-                    .frame(width: 12, height: 12)
+                ChevronIcon(style: .down)
             }
         }
         .filterCellStyle(isSelected: isSelected)
diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json
deleted file mode 100644
index dbdae09ae3..0000000000
--- a/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "chevron-right.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg b/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg
deleted file mode 100644
index 36ee01977d..0000000000
--- a/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3533_1961)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.21231 0.227136C3.50108 -0.0698232 3.97591 -0.0764616 4.27286 0.212308L9.41702 5.2146C9.41714 5.21473 9.41689 5.21448 9.41702 5.2146C9.52097 5.31565 9.605 5.43713 9.66249 5.57196C9.72007 5.707 9.74999 5.85252 9.74999 6C9.74999 6.14748 9.72007 6.293 9.66249 6.42804C9.605 6.56288 9.52135 6.68398 9.4174 6.78503C9.41727 6.78515 9.41753 6.7849 9.4174 6.78503L4.27286 11.7877C3.97591 12.0765 3.50108 12.0698 3.21231 11.7729C2.92354 11.4759 2.93018 11.0011 3.22714 10.7123L8.07308 6L3.22714 1.28769C2.93018 0.998922 2.92354 0.524095 3.21231 0.227136Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_3533_1961">
-<rect width="12" height="12" fill="white"/>
-</clipPath>
-</defs>
-</svg>