diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index f7722b1be7..b3c37bbadf 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -77,18 +77,21 @@
   }
   html[data-darkmode='1'] sl-menu-item::part(prefix),
   html[data-darkmode='1'] et2-select-country::part(prefix),
-  html[data-darkmode='1'] et2-email-tag::part(prefix),
   html[data-darkmode='1'] et2-button::part(prefix),
   html[data-darkmode='1'] *::part(image),
   html[data-darkmode='1'] img,
   html[data-darkmode='1'] #blueimp-gallery:not(:fullscreen),
   html[data-darkmode='1'] #blueimp-gallery ol,
+  html[data-darkmode='1'] et2-select-email::part(icon),
+  html[data-darkmode='1'] et2-calendar-owner::part(icon),
+  html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon,
   html[data-darkmode='1'] .fw_avatar_stat,
   html[data-darkmode='1'] et2-tag::part(icon),
+  html[data-darkmode='1'] et2-email-tag::part(icon),
   html[data-darkmode='1'] et2-avatar-group,
   html[data-darkmode='1'] .blueimp-gallery .slide {
     filter: invert(1) hue-rotate(180deg) !important;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 5cb30e44db..59d17997cf 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -57,18 +57,21 @@
   }
   html[data-darkmode='1'] sl-menu-item::part(prefix),
   html[data-darkmode='1'] et2-select-country::part(prefix),
-  html[data-darkmode='1'] et2-email-tag::part(prefix),
   html[data-darkmode='1'] et2-button::part(prefix),
   html[data-darkmode='1'] *::part(image),
   html[data-darkmode='1'] img,
   html[data-darkmode='1'] #blueimp-gallery:not(:fullscreen),
   html[data-darkmode='1'] #blueimp-gallery ol,
+  html[data-darkmode='1'] et2-select-email::part(icon),
+  html[data-darkmode='1'] et2-calendar-owner::part(icon),
+  html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon,
   html[data-darkmode='1'] .fw_avatar_stat,
   html[data-darkmode='1'] et2-tag::part(icon),
+  html[data-darkmode='1'] et2-email-tag::part(icon),
   html[data-darkmode='1'] et2-avatar-group,
   html[data-darkmode='1'] .blueimp-gallery .slide {
     filter: invert(1) hue-rotate(180deg) !important;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 3f448187ad..74dc5bb9a7 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -67,18 +67,21 @@
   }
   html[data-darkmode='1'] sl-menu-item::part(prefix),
   html[data-darkmode='1'] et2-select-country::part(prefix),
-  html[data-darkmode='1'] et2-email-tag::part(prefix),
   html[data-darkmode='1'] et2-button::part(prefix),
   html[data-darkmode='1'] *::part(image),
   html[data-darkmode='1'] img,
   html[data-darkmode='1'] #blueimp-gallery:not(:fullscreen),
   html[data-darkmode='1'] #blueimp-gallery ol,
+  html[data-darkmode='1'] et2-select-email::part(icon),
+  html[data-darkmode='1'] et2-calendar-owner::part(icon),
+  html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon,
   html[data-darkmode='1'] .fw_avatar_stat,
   html[data-darkmode='1'] et2-tag::part(icon),
+  html[data-darkmode='1'] et2-email-tag::part(icon),
   html[data-darkmode='1'] et2-avatar-group,
   html[data-darkmode='1'] .blueimp-gallery .slide {
     filter: invert(1) hue-rotate(180deg) !important;
diff --git a/pixelegg/less/darkmode.less b/pixelegg/less/darkmode.less
index c053343f7b..ee623bf637 100644
--- a/pixelegg/less/darkmode.less
+++ b/pixelegg/less/darkmode.less
@@ -31,9 +31,10 @@
 	filter: invert(1) hue-rotate(180deg) brightness(1);
 
 	sl-menu-item::part(prefix), et2-select-country::part(prefix),
-	et2-email-tag::part(prefix), et2-button::part(prefix), *::part(image), img, #blueimp-gallery:not(:fullscreen), #blueimp-gallery ol,
+	et2-button::part(prefix), *::part(image), img, #blueimp-gallery:not(:fullscreen), #blueimp-gallery ol,
+	  et2-select-email::part(icon), et2-calendar-owner::part(icon),	sl-menu-item [slot="prefix"],
 	iframe,
-	video, #loginMainDiv, .et2_taglist_tags_icon, .fw_avatar_stat, et2-tag::part(icon), et2-avatar-group,
+	video, #loginMainDiv, .et2_taglist_tags_icon, .fw_avatar_stat, et2-tag::part(icon), et2-email-tag::part(icon), et2-avatar-group,
 	.blueimp-gallery .slide {
 	  filter: invert(1) hue-rotate(180deg) !important;
 	}
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index ff87801cf5..0a57ccd3e8 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -42,18 +42,21 @@
   }
   html[data-darkmode='1'] sl-menu-item::part(prefix),
   html[data-darkmode='1'] et2-select-country::part(prefix),
-  html[data-darkmode='1'] et2-email-tag::part(prefix),
   html[data-darkmode='1'] et2-button::part(prefix),
   html[data-darkmode='1'] *::part(image),
   html[data-darkmode='1'] img,
   html[data-darkmode='1'] #blueimp-gallery:not(:fullscreen),
   html[data-darkmode='1'] #blueimp-gallery ol,
+  html[data-darkmode='1'] et2-select-email::part(icon),
+  html[data-darkmode='1'] et2-calendar-owner::part(icon),
+  html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon,
   html[data-darkmode='1'] .fw_avatar_stat,
   html[data-darkmode='1'] et2-tag::part(icon),
+  html[data-darkmode='1'] et2-email-tag::part(icon),
   html[data-darkmode='1'] et2-avatar-group,
   html[data-darkmode='1'] .blueimp-gallery .slide {
     filter: invert(1) hue-rotate(180deg) !important;