diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index 4094b1c..e7e32d9 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -171,6 +171,16 @@ menuitem[type="radio"][disabled="true"] .menu-iconic-icon {
 .identity-popup-permission-remove-button .button-icon {
 	list-style-image: url("../icons/window-close-symbolic.svg") !important;
 }
+@media (prefers-color-scheme: light) {
+	.notificationbox-stack notification[type="critical"] .close-icon:not(.tab-close-button):not(:hover) {
+		fill: #fff !important;
+	}
+}
+@media (prefers-color-scheme: dark) {
+	.notificationbox-stack notification[type="warning"] .close-icon:not(.tab-close-button):not(:hover) image {
+		fill: rgb(46, 52, 54) !important;
+	}
+}
 
 /* Window buttons */
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
diff --git a/theme/parts/toolbox.css b/theme/parts/toolbox.css
index 338356d..e74a0d1 100644
--- a/theme/parts/toolbox.css
+++ b/theme/parts/toolbox.css
@@ -97,17 +97,6 @@ findbar:-moz-window-inactive description,
   background: #d70022 !important;
 }
 
-@media (prefers-color-scheme: light) {
-	.notificationbox-stack notification[type="critical"] .close-icon:not(.tab-close-button):not(:hover) image {
-		filter: invert(100%) brightness(200%);
-	}
-}
-@media (prefers-color-scheme: dark) {
-	.notificationbox-stack notification[type="warning"] .close-icon:not(.tab-close-button):not(:hover) image {
-		filter: none !important;
-	}
-}
-
 .notificationbox-stack[notificationside="top"] notification {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }