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 9dd3bd4b..e3f53227 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -2592,7 +2592,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;
@@ -2605,8 +2610,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 {
@@ -2624,7 +2631,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 e612fc7e..7e705047 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -5772,7 +5772,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;
@@ -5783,9 +5788,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 {
@@ -5807,7 +5814,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 7b066149..69b26b4b 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -670,6 +670,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 5dce746f..a64790b4 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -4742,7 +4742,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;
@@ -4750,8 +4755,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 {
@@ -4773,7 +4780,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 f72da84e..9034df6f 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
@@ -2595,7 +2595,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;
@@ -2603,7 +2608,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 {
@@ -2611,10 +2615,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 {
@@ -2631,7 +2635,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 ef3b6142..93482149 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
@@ -2517,7 +2517,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;
@@ -2527,15 +2532,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);
 }
@@ -2550,7 +2557,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 908b772e..3627fd91 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -1920,6 +1920,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),
@@ -5756,7 +5757,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;
@@ -5766,10 +5772,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 {
@@ -5791,7 +5799,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 {
@@ -6227,6 +6235,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 119257d1..0be65f68 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -683,6 +683,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 1d4384af..c3377c89 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -2770,7 +2770,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;
@@ -2783,8 +2788,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 {
@@ -2802,7 +2809,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 5300763d..3a9d1f35 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -266,6 +266,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 c270bdb6..02977cb6 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -4743,7 +4743,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;
@@ -4751,8 +4756,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 {
@@ -4774,7 +4781,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 59514664..03bc3cfa 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -2621,7 +2621,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;
@@ -2629,8 +2634,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 {
@@ -2652,7 +2659,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 ce01001d..c4e76595 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -2625,7 +2625,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;
@@ -2633,8 +2638,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 {
@@ -2656,7 +2663,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 3604efa7..403c175a 100644
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
@@ -2621,7 +2621,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;
@@ -2629,8 +2634,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 {
@@ -2652,7 +2659,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);