diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 8e84fb0e19..93b811e75f 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -49,12 +49,17 @@
 @media all {
   html[data-darkmode='1'] {
     background: #000;
+    position: fixed;
     filter: invert(1) hue-rotate(180deg);
   }
   html[data-darkmode='1'] img,
   html[data-darkmode='1'] #blueimp-gallery {
     filter: invert(1) hue-rotate(180deg) !important;
   }
+  html[data-darkmode='1'] div.dhtmlxMenu_egw_SubLevelArea_Polygon,
+  html[data-darkmode='1'] .egw_tooltip {
+    box-shadow: 0px 0px 2px 2px #666666;
+  }
 }
 @media all {
   /**
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 26883d818a..55352d5446 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -17,10 +17,12 @@
 
 	html[data-darkmode='1'] {
 		background: #000;
+		position: fixed; // ATM Firefox doesn't like filter:invert on none fixed html
 		filter: invert(1) hue-rotate(180deg);
 		img, #blueimp-gallery {
 			filter: invert(1) hue-rotate(180deg) !important;
 		}
+		div.dhtmlxMenu_egw_SubLevelArea_Polygon,.egw_tooltip {box-shadow: 0px 0px 2px 2px #666666;}
 	}
 }