22 files changed, 171 insertions, 40 deletions
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index a686d838..26ba7864 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -2512,7 +2512,12 @@ GtkPopover .separator {
 	color: #747473;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-radius: 7px 7px 0px 0px;
     border-width: 0px;
     box-shadow: 0 0 0 2px @wm_csd_border_color, 0 2px 8px 3px @wm_shadow;
@@ -2525,8 +2530,10 @@ GtkPopover .separator {
     background-color: @theme_bg_color;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-    box-shadow: 0 0 0 2px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 2px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.ssd {
@@ -2544,7 +2551,7 @@ GtkPopover .separator {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index 75d71215..fdfa78a7 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -301,6 +301,11 @@ CajaQueryEditor .toolbar .entry:focus {
     text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* first make all transparent */
 WnckSelector.menubar,
 PanelMenuBar.menubar,
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index d2bc1a81..82ed58e0 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -5664,7 +5664,12 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-color: darker(@theme_bg_dark_color);
     border-radius: 7px 7px 0 0;
     border-width: 1px;
@@ -5675,9 +5680,11 @@ GtkModelButton.button:selected,
     margin: 10px;
 }
  
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
     background-color: @theme_bg_dark_color;
-    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -5699,7 +5706,7 @@ GtkModelButton.button:selected,
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @theme_shadow_color;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index fcebad28..73660bfe 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -660,6 +660,11 @@ FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
     text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* first make all transparent */
 WnckSelector.menubar,
 PanelMenuBar.menubar,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 5f86a156..49e5d718 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -4671,7 +4671,12 @@ GtkModelButton.button.flat:selected {
     icon-shadow: none;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-radius: 6px 6px 0px 0px;
     border-width: 0px;
     box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
@@ -4679,8 +4684,10 @@ GtkModelButton.button.flat:selected {
     margin: 10px;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -4702,7 +4709,7 @@ GtkModelButton.button.flat:selected {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 4973dc8b..a54a4463 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -351,6 +351,11 @@ CajaQueryEditor .button {
     text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* first make all transparent */
 WnckSelector.menubar,
 MatePanelApplet GtkToggleButton.button {
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
index 81c7cff3..ffb8aa74 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
@@ -2561,7 +2561,12 @@ GtkPopover .separator {
     color: @theme_selected_fg_color;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd  .window-frame {
     border-color: darker(@theme_bg_color);
     border-radius: 7px 7px 0 0;
     border-width: 1px;
@@ -2569,7 +2574,6 @@ GtkPopover .separator {
     box-shadow: 0 2px 8px 3px alpha(black, 0.7);
     /* this is used for the resize cursor area */
     margin: 10px;
-    padding: 6px 6px 5px 6px;
 }
 
 .window-frame.tiled {
@@ -2577,10 +2581,10 @@ GtkPopover .separator {
 	background-color: @theme_bg_color;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-    box-shadow: 0 0 0 @wm_shadow;
-    box-shadow: 0 2px 5px 1px alpha(black, 0.7);
-    padding: 6px 6px 5px 6px;
+/*    box-shadow: 0 2px 5px 1px alpha(black, 0.7);*/
+    box-shadow: none;
 }
 
 .window-frame.ssd {
@@ -2597,7 +2601,7 @@ GtkPopover .separator {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
index 2815894e..8e17adcc 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css
@@ -73,6 +73,11 @@ MatePanelApplet {
     text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 MatePanelApplet {
     border-width: 0;
 }
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
index 5d896a66..d8be9b97 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
@@ -2484,7 +2484,12 @@ GtkPopover .separator {
 }
 
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-color: darker(@theme_bg_color);
     border-radius: 7px 7px 0 0;
     border-width: 1px;
@@ -2494,15 +2499,17 @@ GtkPopover .separator {
     margin: 10px;
 }
 
-.window-frame:backdrop {
-    box-shadow: 0 2px 5px 1px alpha(white, 0.7);
-}
-
 .window-frame.tiled {
 	border-radius: 0;
 	background-color: @theme_bg_color;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.window-frame:backdrop {
+/*    box-shadow: 0 2px 5px 1px alpha(white, 0.7);*/
+    box-shadow: none;
+}
+
 .window-frame.ssd {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
 }
@@ -2517,7 +2524,7 @@ GtkPopover .separator {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
index db002789..e67e010b 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
@@ -27,6 +27,11 @@ MatePanelApplet {
     background-image: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 MatePanelApplet {
     border-width: 0;
 }
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index 7deba0af..6476f32a 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -1902,6 +1902,7 @@ GtkColorButton.button {
 .inline-toolbar.toolbar GtkToolButton:first-child > .button:active,
 .inline-toolbar.toolbar .button:checked:first-child,
 .inline-toolbar.toolbar GtkToolButton:first-child > .button:checked {
+
     background-color: transparent;
     box-shadow: inset  0px  1px alpha(#000, 0.05),
                 inset  1px  0px alpha(#000, 0.03),
@@ -5654,7 +5655,12 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-color: darker(@theme_bg_dark_color);
     border-radius: 7px 7px 0 0;
     border-width: 1px;
@@ -5664,10 +5670,12 @@ GtkModelButton.button:selected,
     /* this is used for the resize cursor area */
     margin: 10px;
 }
- 
+
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
     background-color: @theme_bg_dark_color;
-    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -5689,7 +5697,7 @@ GtkModelButton.button:selected,
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @theme_shadow_color;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
@@ -6125,6 +6133,7 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal {
 
 .floating-bar {
     background-image: linear-gradient(to bottom, 
+
                                       @theme_bg_color 20%, 
                                       shade(@theme_bg_color, 0.95));
     background-color: @theme_bg_color;
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
index acf53336..2396a376 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -673,6 +673,11 @@ MatePanelApplet GtkToggleButton.button {
     box-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* dictionary applet */
 GdictApplet .entry {
     /* normal panel */
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 65de03ec..12dfeee0 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -2702,7 +2702,12 @@ GtkPopover .separator {
 	color: #747473;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-radius: 7px 7px 0px 0px;
     border-width: 0px;
     box-shadow: 0 0 0 2px @wm_csd_border_color, 0 2px 8px 3px @wm_shadow;
@@ -2715,8 +2720,10 @@ GtkPopover .separator {
     background-color: @theme_bg_color;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-    box-shadow: 0 0 0 2px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 2px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.ssd {
@@ -2734,7 +2741,7 @@ GtkPopover .separator {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index c842b119..7b0f212b 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -265,6 +265,11 @@ MatePanelApplet GtkToggleButton.button {
     box-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 MatePanelApplet {
     border-width: 0;
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index eeda6513..c6844e8d 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -4673,7 +4673,12 @@ GtkModelButton.button.flat:selected {
     icon-shadow: none;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
     border-radius: 6px 6px 0px 0px;
     border-width: 0px;
     box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
@@ -4681,8 +4686,10 @@ GtkModelButton.button.flat:selected {
     margin: 10px;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
+/*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -4704,7 +4711,7 @@ GtkModelButton.button.flat:selected {
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index cef0c576..d4dc3042 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -360,6 +360,11 @@ MatePanelApplet GtkToggleButton.button {
     background-image: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* dictionary applet */
 GdictApplet .entry {
     /* normal panel */
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 4347f05b..49945669 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -2535,7 +2535,12 @@ GtkInfoBar:last-child,
 	border-image: none;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
 	border-width: 0px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
@@ -2543,8 +2548,10 @@ GtkInfoBar:last-child,
 	margin: 10px;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px
+/*	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -2566,7 +2573,7 @@ GtkInfoBar:last-child,
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
index f85f3483..35ffcdd6 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
@@ -81,6 +81,11 @@ MatePanelApplet {
 	text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
 	background-image: none;
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 038d96aa..2ca085a7 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -2539,7 +2539,12 @@ GtkInfoBar:last-child,
 	border-image: none;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
 	border-width: 0px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
@@ -2547,8 +2552,10 @@ GtkInfoBar:last-child,
 	margin: 10px;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px
+/*	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -2570,7 +2577,7 @@ GtkInfoBar:last-child,
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 410e6704..075a0ca4 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -94,6 +94,11 @@ MatePanelApplet {
 	text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
 	background-image: none;
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
index 2a6f79c7..f8dc07a6 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -2535,7 +2535,12 @@ GtkInfoBar:last-child,
 	border-image: none;
 }
 
-.window-frame {
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.background .window-frame  {
+    box-shadow: none;
+}
+
+.background.csd .window-frame {
 	border-width: 0px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
@@ -2543,8 +2548,10 @@ GtkInfoBar:last-child,
 	margin: 10px;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
 .window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px
+/*	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
+    box-shadow: none;
 }
 
 .window-frame.tiled {
@@ -2566,7 +2573,7 @@ GtkInfoBar:last-child,
 
 .window-frame.csd.popup {
     border-radius: 0;
-    box-shadow: 0 1px 5px @wm_shadow;
+    box-shadow: none;
 }
 
 .window-frame.csd.tooltip {
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
index 1e1eda4c..ded06133 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
@@ -81,6 +81,11 @@ MatePanelApplet {
 	text-shadow: none;
 }
 
+/* workaround to avoid unwanted black frames if switching compositor on/off */
+.mate-panel-menu-bar .window-frame.csd.popup {
+    box-shadow: none;
+}
+
 /* set selected menubar button */
 PanelMenuBar.menubar .menuitem:hover {
 	background-color: shade(@theme_selected_bg_color, 1.1);