diff --git a/mail/components/unifiedToolbar/content/unifiedToolbarTemplates.inc.xhtml b/mail/components/unifiedToolbar/content/unifiedToolbarTemplates.inc.xhtml
index bc14efd6ed..7390625401 100644
--- a/mail/components/unifiedToolbar/content/unifiedToolbarTemplates.inc.xhtml
+++ b/mail/components/unifiedToolbar/content/unifiedToolbarTemplates.inc.xhtml
@@ -84,7 +84,7 @@
 <html:template id="unifiedToolbarTabTemplate"
                xmlns="http://www.w3.org/1999/xhtml">
   <button role="tab">
-    <img alt="" src="" />
+    <img alt="" src="" part="icon" />
     <slot></slot>
   </button>
 </html:template>
diff --git a/mail/themes/shared/mail/unifiedToolbar.css b/mail/themes/shared/mail/unifiedToolbar.css
index 675a364133..4c00d354cd 100644
--- a/mail/themes/shared/mail/unifiedToolbar.css
+++ b/mail/themes/shared/mail/unifiedToolbar.css
@@ -95,3 +95,33 @@ unified-toolbar-customization {
 unified-toolbar-customization-pane {
   flex-grow: 1;
 }
+
+unified-toolbar-tab::part(icon) {
+  -moz-context-properties: fill, stroke;
+  fill: color-mix(in srgb, currentColor 20%, transparent);
+  stroke: currentColor;
+}
+
+#unified-toolbar-customization-tab-mail::part(icon) {
+  content: var(--icon-mail);
+}
+
+#unified-toolbar-customization-tab-calendar::part(icon) {
+  content: var(--icon-calendar);
+}
+
+#unified-toolbar-customization-tab-tasks::part(icon) {
+  content: var(--icon-tasks);
+}
+
+#unified-toolbar-customization-tab-addressbook::part(icon) {
+  content: var(--icon-address-book);
+}
+
+#unified-toolbar-customization-tab-chat::part(icon) {
+  content: var(--icon-chat);
+}
+
+#unified-toolbar-customization-tab-settings::part(icon) {
+  content: var(--icon-settings);
+}
diff --git a/mail/themes/shared/mail/unifiedToolbarTab.css b/mail/themes/shared/mail/unifiedToolbarTab.css
index d0911dae78..1a4944b8a2 100644
--- a/mail/themes/shared/mail/unifiedToolbarTab.css
+++ b/mail/themes/shared/mail/unifiedToolbarTab.css
@@ -11,7 +11,9 @@ button {
   appearance: none;
   border: none;
   background: none;
-  display: block;
+  display: flex;
+  align-content: center;
+  gap: 6px;
 }
 
 button[aria-selected="true"] {