GTK+-3.20 Most themes: fix remaining wrong syntax for 3.20

19 files changed, 107 insertions, 177 deletions

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 24787c64..26b6bf12 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -1950,9 +1950,9 @@ toolbar .raised.linked:nth-child(last) button:checked:hover {
 toolbar.inline-toolbar button,

 toolbar.inline-toolbar button:checked,

 toolbar.inline-toolbar button:disabled,

-toolbar.inline-toolbar GtkToolButton > button,

-toolbar.inline-toolbar GtkToolButton > button:checked,

-toolbar.inline-toolbar GtkToolButton > button:disabled {

+toolbar.inline-toolbar toolbutton > button,

+toolbar.inline-toolbar toolbutton > button:checked,

+toolbar.inline-toolbar toolbutton > button:disabled {

     /* outer */

     border-width: 0px;

     border-right-width: 0px;

@@ -1970,7 +1970,7 @@ toolbar.inline-toolbar button:hover:active,
 toolbar.inline-toolbar button:checked,

 toolbar.inline-toolbar button:checked:hover,

 toolbar.inline-toolbar button:checked:hover:active,

-toolbar.inline-toolbar GtkToolButton > button:checked {

+toolbar.inline-toolbar toolbutton > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -1980,7 +1980,7 @@ toolbar.inline-toolbar GtkToolButton > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled,

-toolbar.inline-toolbar GtkToolButton > button:disabled {

+toolbar.inline-toolbar toolbutton > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

@@ -1988,9 +1988,9 @@ toolbar.inline-toolbar GtkToolButton > button:disabled {
 toolbar.inline-toolbar button:first-child,

 toolbar.inline-toolbar button:checked:first-child,

 toolbar.inline-toolbar button:disabled:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button,

-toolbar.inline-toolbar GtkToolButton:first-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

+toolbar.inline-toolbar toolbutton:first-child > button,

+toolbar.inline-toolbar toolbutton:first-child > button:checked,

+toolbar.inline-toolbar toolbutton:first-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2003,7 +2003,7 @@ toolbar.inline-toolbar button:hover:active:first-child,
 toolbar.inline-toolbar button:checked:first-child,

 toolbar.inline-toolbar button:checked:hover:first-child,

 toolbar.inline-toolbar button:checked:hover:active:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button:checked {

+toolbar.inline-toolbar toolbutton:first-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  1px  0px alpha(#000, 0.03),

@@ -2012,7 +2012,7 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

+toolbar.inline-toolbar toolbutton:first-child > button:disabled {

     box-shadow: none;

 }

 

@@ -2020,9 +2020,9 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {
 toolbar.inline-toolbar button:last-child,

 toolbar.inline-toolbar button:checked:last-child,

 toolbar.inline-toolbar button:disabled:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button,

-toolbar.inline-toolbar GtkToolButton:last-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

+toolbar.inline-toolbar toolbutton:last-child > button,

+toolbar.inline-toolbar toolbutton:last-child > button:checked,

+toolbar.inline-toolbar toolbutton:last-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2037,7 +2037,7 @@ toolbar.inline-toolbar button:hover:active:last-child,
 toolbar.inline-toolbar button:checked:last-child,

 toolbar.inline-toolbar button:checked:hover:last-child,

 toolbar.inline-toolbar button:checked:hover:active:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button:checked {

+toolbar.inline-toolbar toolbutton:last-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -2048,7 +2048,7 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

+toolbar.inline-toolbar toolbutton:last-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10),

                 inset -1px  0px shade(@button_border, 1.10);

 }

@@ -2057,9 +2057,9 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {
 toolbar.inline-toolbar button:only-child,

 toolbar.inline-toolbar button:checked:only-child,

 toolbar.inline-toolbar button:disabled:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button,

-toolbar.inline-toolbar GtkToolButton:only-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

+toolbar.inline-toolbar toolbutton:only-child > button,

+toolbar.inline-toolbar toolbutton:only-child > button:checked,

+toolbar.inline-toolbar toolbutton:only-child > button:disabled {

     border-radius: 0px;

     border-width: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2072,7 +2072,7 @@ toolbar.inline-toolbar button:hover:active:only-child,
 toolbar.inline-toolbar button:checked:only-child,

 toolbar.inline-toolbar button:checked:hover:only-child,

 toolbar.inline-toolbar button:checked:hover:active:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button:checked {

+toolbar.inline-toolbar toolbutton:only-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset -1px  0px alpha(#000, 0.03),

@@ -2081,7 +2081,7 @@ toolbar.inline-toolbar GtkToolButton:only-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

+toolbar.inline-toolbar toolbutton:only-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

@@ -2528,7 +2528,6 @@ toolbar combobox button.combo:hover arrow {
  * Toolbars *

  ************/

 

-GtkHandleBox,

 toolbar  {

     padding: 2px 4px;

     background-color: @toolbar_gradient_base;

@@ -3318,29 +3317,25 @@ spinbutton.vertical > entry:focus {
 }

 

 /* volume button */

-GtkGrid button,

-GtkGrid button.flat {

+button.scale.flat {

     transition: all 400ms ease-out;

 }

 

-GtkGrid button,

-GtkGrid button.flat,

-GtkGrid button:hover,

-GtkGrid button:disabled,

-GtkGrid button.flat:hover,

-GtkGrid button.flat:disabled {

+button.scale.flat,

+button.scale.flat:hover,

+button.scale.flat:disabled {

     padding: 5px 4px;

     border-radius: 6px;

     border-color: transparent;

     background-color: transparent;

 }

 

-GtkFlowBox .grid-child {

+flowbox flowboxchild {

     padding: 3px;

     border-radius: 3px;

 }

 

-GtkFlowBox .grid-child:selected {

+flowbox flowboxchild:selected {

     outline-offset: -2px;

 }

 

@@ -4977,7 +4972,7 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical {
     background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

 }

 

-GtkOverlay.osd {

+overlay.osd {

     background-color: transparent;

 }

 

@@ -5068,7 +5063,7 @@ button.osd:hover,
 .osd button:checked:hover:active,

 .osd button:hover:active,

 .osd button:focus:hover:active,

-.osd button.menu-button:checked,

+.osd button.popup:checked,

 button.osd:checked,

 button.osd:checked:hover,

 button.osd:checked:hover:active,

@@ -5083,7 +5078,7 @@ button.osd.menu-button:checked {
     text-shadow: none;

 }

 

-.osd button.menu-button:checked {

+.osd button.popup:checked {

     background-color: transparent;

     border-color: @osd_button_border;

 }

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 9720a4c1..b9c4a099 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -943,14 +943,6 @@ vte-terminal {
     padding: 2px 5px;
 }
 
-/* FIXME , does not work anymore since GtkArrow is widget *//*
-#pluma-status-combo-button.flat.toggle box.horizontal widget {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    min-height: 16px
-    min-width: 16px;
-}
-*/
-
 /* Printpreview */
 .pluma-print-preview toolbar.horizontal {
    background-image: -gtk-gradient (linear,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index d58850ca..4a405c4f 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -4282,7 +4282,7 @@ calendar.header .path-bar button.titlebutton {
 	padding-left: 0;
 }
 
-.path-bar button GtkImage,
+.path-bar button image,
 .path-bar headerbar button.titlebutton image,
 headerbar .path-bar button.titlebutton image,
 .path-bar .titlebar button.titlebutton image,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index d875b53a..561531e6 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -554,11 +554,6 @@ window.background.mate-terminal > box.vertical > notebook > header.top tab:check
     padding: 0px;
 }
 
-.pluma-window statusbar.horizontal frame button.flat.toggle GtkArrow {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    -GtkArrow-arrow-scaling: 1.0; /* deprecated, but ignored */
-}
-
 /* Printpreview */
 .pluma-print-preview toolbar.horizontal {
     background-image: linear-gradient(to bottom,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls.css b/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
index 1dc6f45a..a3687b77 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
@@ -152,15 +152,15 @@ headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 
 /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
 /*
-headerbar .button.menu-button.titlebutton {
+headerbar .button.popup.titlebutton {
 	background-image: url('window-controls/menu.png');
 }
 
-headerbar .button.menu-button.titlebutton:hover {
+headerbar .button.popup.titlebutton:hover {
 	background-image: url('window-controls/menu_prelight.png');
 }
 
-headerbar .button.menu-button.titlebutton:active {
+headerbar .button.popup.titlebutton:active {
 	background-image: url('window-controls/menu.png');
 }
 */
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
index 8df79b5a..366da8db 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
@@ -1267,8 +1267,8 @@ headerbar {
   headerbar .subtitle {
     font-size: 80%;
     padding: 0 12px; }
-  .titlebar > GtkBox > separator.vertical,
-  headerbar > GtkBox > separator.vertical {
+  .titlebar > box > separator.vertical,
+  headerbar > box > separator.vertical {
     border-width: 0 1px;
     border-color: #fff;
     border-style: solid; }
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
index 0b01e6d7..64898aac 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
@@ -218,11 +218,6 @@ PanelApplet.wnck-applet .wnck-pager:hover {
 }
 
 
-/* no background for icon-padding area */
-GtkTrayIcon.background {
-    background-color: transparent;
-}
-
 na-tray-applet {
     -NaTrayApplet-icon-padding: 4;
     -NaTrayApplet-icon-size: 16;
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/other-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/other-applications.css
index 4ef6a353..deb4d514 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/other-applications.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/other-applications.css
@@ -2,9 +2,9 @@
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:hover,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:hover:active {
 	padding: 0px 4px;
 }
 
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 e368a3ff..08d7cd6b 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -1953,9 +1953,9 @@ toolbar .raised.linked:nth-child(last) button:checked:hover {
 toolbar.inline-toolbar button,

 toolbar.inline-toolbar button:checked,

 toolbar.inline-toolbar button:disabled,

-toolbar.inline-toolbar GtkToolButton > button,

-toolbar.inline-toolbar GtkToolButton > button:checked,

-toolbar.inline-toolbar GtkToolButton > button:disabled {

+toolbar.inline-toolbar toolbutton > button,

+toolbar.inline-toolbar toolbutton > button:checked,

+toolbar.inline-toolbar toolbutton > button:disabled {

     /* outer */

     border-width: 0px;

     border-right-width: 0px;

@@ -1973,7 +1973,7 @@ toolbar.inline-toolbar button:hover:active,
 toolbar.inline-toolbar button:checked,

 toolbar.inline-toolbar button:checked:hover,

 toolbar.inline-toolbar button:checked:hover:active,

-toolbar.inline-toolbar GtkToolButton > button:checked {

+toolbar.inline-toolbar toolbutton > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -1983,7 +1983,7 @@ toolbar.inline-toolbar GtkToolButton > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled,

-toolbar.inline-toolbar GtkToolButton > button:disabled {

+toolbar.inline-toolbar toolbutton > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

@@ -1991,9 +1991,9 @@ toolbar.inline-toolbar GtkToolButton > button:disabled {
 toolbar.inline-toolbar button:first-child,

 toolbar.inline-toolbar button:checked:first-child,

 toolbar.inline-toolbar button:disabled:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button,

-toolbar.inline-toolbar GtkToolButton:first-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

+toolbar.inline-toolbar toolbutton:first-child > button,

+toolbar.inline-toolbar toolbutton:first-child > button:checked,

+toolbar.inline-toolbar toolbutton:first-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2006,7 +2006,7 @@ toolbar.inline-toolbar button:hover:active:first-child,
 toolbar.inline-toolbar button:checked:first-child,

 toolbar.inline-toolbar button:checked:hover:first-child,

 toolbar.inline-toolbar button:checked:hover:active:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button:checked {

+toolbar.inline-toolbar toolbutton:first-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  1px  0px alpha(#000, 0.03),

@@ -2015,7 +2015,7 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:first-child,

-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

+toolbar.inline-toolbar toolbutton:first-child > button:disabled {

     box-shadow: none;

 }

 

@@ -2023,9 +2023,9 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {
 toolbar.inline-toolbar button:last-child,

 toolbar.inline-toolbar button:checked:last-child,

 toolbar.inline-toolbar button:disabled:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button,

-toolbar.inline-toolbar GtkToolButton:last-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

+toolbar.inline-toolbar toolbutton:last-child > button,

+toolbar.inline-toolbar toolbutton:last-child > button:checked,

+toolbar.inline-toolbar toolbutton:last-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2040,7 +2040,7 @@ toolbar.inline-toolbar button:hover:active:last-child,
 toolbar.inline-toolbar button:checked:last-child,

 toolbar.inline-toolbar button:checked:hover:last-child,

 toolbar.inline-toolbar button:checked:hover:active:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button:checked {

+toolbar.inline-toolbar toolbutton:last-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -2051,7 +2051,7 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:last-child,

-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

+toolbar.inline-toolbar toolbutton:last-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10),

                 inset -1px  0px shade(@button_border, 1.10);

 }

@@ -2060,9 +2060,9 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {
 toolbar.inline-toolbar button:only-child,

 toolbar.inline-toolbar button:checked:only-child,

 toolbar.inline-toolbar button:disabled:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button,

-toolbar.inline-toolbar GtkToolButton:only-child > button:checked,

-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

+toolbar.inline-toolbar toolbutton:only-child > button,

+toolbar.inline-toolbar toolbutton:only-child > button:checked,

+toolbar.inline-toolbar toolbutton:only-child > button:disabled {

     border-radius: 0px;

     border-width: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -2075,7 +2075,7 @@ toolbar.inline-toolbar button:hover:active:only-child,
 toolbar.inline-toolbar button:checked:only-child,

 toolbar.inline-toolbar button:checked:hover:only-child,

 toolbar.inline-toolbar button:checked:hover:active:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button:checked {

+toolbar.inline-toolbar toolbutton:only-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset -1px  0px alpha(#000, 0.03),

@@ -2084,7 +2084,7 @@ toolbar.inline-toolbar GtkToolButton:only-child > button:checked {
 }

 

 toolbar.inline-toolbar button:disabled:only-child,

-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

+toolbar.inline-toolbar toolbutton:only-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

@@ -2529,7 +2529,6 @@ toolbar combobox button.combo:hover arrow {
  * Toolbars *

  ************/

 

-GtkHandleBox,

 toolbar  {

     padding: 2px 4px;

     background-color: @toolbar_gradient_base;

@@ -3320,29 +3319,25 @@ spinbutton.vertical > entry:focus {
 }

 

 /* volume button */

-GtkGrid button,

-GtkGrid button.flat {

+button.scale.flat {

     transition: all 400ms ease-out;

 }

 

-GtkGrid button,

-GtkGrid button.flat,

-GtkGrid button:hover,

-GtkGrid button:disabled,

-GtkGrid button.flat:hover,

-GtkGrid button.flat:disabled {

+button.scale.flat,

+button.scale.flat:hover,

+button.scale.flat:disabled {

     padding: 5px 4px;

     border-radius: 6px;

     border-color: transparent;

     background-color: transparent;

 }

 

-GtkFlowBox .grid-child {

+flowbox flowboxchild {

     padding: 3px;

     border-radius: 3px;

 }

 

-GtkFlowBox .grid-child:selected {

+flowbox flowboxchild:selected {

     outline-offset: -2px;

 }

 

@@ -4979,7 +4974,7 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical {
     background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

 }

 

-GtkOverlay.osd {

+overlay.osd {

     background-color: transparent;

 }

 

@@ -5070,7 +5065,7 @@ button.osd:hover,
 .osd button:checked:hover:active,

 .osd button:hover:active,

 .osd button:focus:hover:active,

-.osd button.menu-button:checked,

+.osd button.popup:checked,

 button.osd:checked,

 button.osd:checked:hover,

 button.osd:checked:hover:active,

@@ -5085,7 +5080,7 @@ button.osd.menu-button:checked {
     text-shadow: none;

 }

 

-.osd button.menu-button:checked {

+.osd button.popup:checked {

     background-color: transparent;

     border-color: @osd_button_border;

 }

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 01b05f43..b777e676 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -943,14 +943,6 @@ vte-terminal {
     padding: 2px 5px;
 }
 
-/* FIXME , does not work anymore since GtkArrow is widget *//*
-#pluma-status-combo-button.flat.toggle box.horizontal widget {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    min-height: 16px
-    min-width: 16px;
-}
-*/
-
 /* Printpreview */
 .pluma-print-preview toolbar.horizontal {
    background-image: -gtk-gradient (linear,
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 30c7dc7a..4ff02591 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -2638,8 +2638,7 @@ toolbar.primary-toolbar combobox button.combo:disabled {
                                       @button_hover_gradient_color_b);
 }
 
-toolbar GtkSeparatorToolItem {
-/*    -GtkWidget-separator-width: 1;*/
+toolbar separator {
     border-style: solid;
     border-width: 1px;
     border-color: shade(@theme_bg_color, 0.85);
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
index e94f0fb4..c334d782 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/window-controls.css
@@ -140,15 +140,15 @@ headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 
 /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
 /*
-headerbar .button.menu-button.titlebutton {
+headerbar .button.popup.titlebutton {
     background-image: url('window-controls/menu.png');
 }
 
-headerbar .button.menu-button.titlebutton:hover {
+headerbar .button.popup.titlebutton:hover {
     background-image: url('window-controls/menu_prelight.png');
 }
 
-headerbar .button.menu-button.titlebutton:active {
+headerbar .button.popup.titlebutton:active {
     background-image: url('window-controls/menu.png');
 }
 */
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 41f96636..4c9d2c20 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -1571,19 +1571,13 @@ toolbar.inline-toolbar.vertical toolbutton > button,
 
 .linked.vertical button:first-child,
 toolbar.inline-toolbar.vertical button:first-child,
-toolbar.inline-toolbar.vertical toolbutton > button:first-child,
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
+toolbar.inline-toolbar.vertical toolbutton > button:first-child {
 	box-shadow: inset 0 -1px @inset_dark_color;
 }
 
 .linked.vertical button:last-child,
 toolbar.inline-toolbar.vertical button:last-child,
-toolbar.inline-toolbar.vertical toolbutton > button:last-child,
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
+toolbar.inline-toolbar.vertical toolbutton > button:last-child {
 	box-shadow: inset 0 -1px @inset_light_color;
 }
 
@@ -1591,20 +1585,13 @@ toolbar.inline-toolbar.vertical toolbutton > button:last-child,
 toolbar.inline-toolbar.vertical button:checked,
 toolbar.inline-toolbar.vertical toolbutton > button:checked,
 .linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
+.linked.vertical .button:checked {
 	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
 }
 
 .linked.vertical button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical toolbutton > button:disabled,
-.linked.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled {
+toolbar.inline-toolbar.vertical toolbutton > button:disabled {
 	box-shadow: inset 0 -1px @inset_dark_color;
 }
 
@@ -1613,13 +1600,7 @@ toolbar.inline-toolbar.vertical toolbutton > button:disabled,
 toolbar.inline-toolbar.vertical button:disabled:last-child,
 toolbar.inline-toolbar.vertical button:only-child,
 toolbar.inline-toolbar.vertical toolbutton > button:disabled:last-child,
-toolbar.inline-toolbar.vertical toolbutton > button:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:disabled:last-child,
-.inline-toolbar.toolbar.vertical .button:disabled:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:disabled,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
+toolbar.inline-toolbar.vertical toolbutton > button:only-child {
 	box-shadow: none;
 }
 
@@ -1627,12 +1608,7 @@ toolbar.inline-toolbar.vertical toolbutton > button:only-child,
 .linked button.popup:checked,
 toolbar .raised.linked button.popup:checked,
 toolbar.inline-toolbar button.popup:checked,
-toolbar.inline-toolbar toolbutton > button.popup:checked,
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
+toolbar.inline-toolbar toolbutton > button.popup:checked {
 	box-shadow: none;
 }
 
@@ -4299,7 +4275,7 @@ calendar.header .path-bar button.titlebutton {
 	padding-left: 0;
 }
 
-.path-bar button GtkImage,
+.path-bar button image,
 .path-bar headerbar button.titlebutton image,
 headerbar .path-bar button.titlebutton image,
 .path-bar .titlebar button.titlebutton image,
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 7ea51bfc..704eb806 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -546,11 +546,6 @@ window.background.mate-terminal > box.vertical > notebook > header.top tab:check
     padding: 0px;
 }
 
-.pluma-window statusbar.horizontal frame button.flat.toggle GtkArrow {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    -GtkArrow-arrow-scaling: 1.0; /* deprecated, but ignored */
-}
-
 /* Printpreview */
 .pluma-print-preview toolbar.horizontal {
     background-image: linear-gradient(to bottom,
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls.css b/desktop-themes/Menta/gtk-3.0/window-controls.css
index 1dc6f45a..a3687b77 100644
--- a/desktop-themes/Menta/gtk-3.0/window-controls.css
+++ b/desktop-themes/Menta/gtk-3.0/window-controls.css
@@ -152,15 +152,15 @@ headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 
 /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
 /*
-headerbar .button.menu-button.titlebutton {
+headerbar .button.popup.titlebutton {
 	background-image: url('window-controls/menu.png');
 }
 
-headerbar .button.menu-button.titlebutton:hover {
+headerbar .button.popup.titlebutton:hover {
 	background-image: url('window-controls/menu_prelight.png');
 }
 
-headerbar .button.menu-button.titlebutton:active {
+headerbar .button.popup.titlebutton:active {
 	background-image: url('window-controls/menu.png');
 }
 */
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 0fbf51ab..5683fd43 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -14,8 +14,6 @@
     outline-width: 0px; /* disable ugly focus-line */
     -gtk-outline-radius: 2px;
     -gtk-icon-style: regular; /* disable symbolic icons */
-    -GtkWindow-resize-grip-width: 11;
-    -GtkWindow-resize-grip-height: 11;
 }
 
 /***************
@@ -55,8 +53,8 @@ label,
 label:disabled,
 box,
 box:disabled,
-GtkGrid,
-GtkGrid:disabled {
+grid,
+grid:disabled {
     background-color: transparent;
 }
 
@@ -544,8 +542,8 @@ colorchooser #add-color-button:selected:hover {
     color: @color_active_badge_dark_color;
 }
 
-GtkColorEditor colorswatch.color-light:hover,
-GtkColorEditor colorswatch.color-dark:hover {
+colorswatch.color-light:hover,
+colorswatch.color-dark:hover {
     background-image: none;
 }
 
@@ -2942,7 +2940,7 @@ button.osd:checked:hover,
 button.osd:focus:hover:active,
 .osd button:checked,
 .osd button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
+.osd button.popup:checked {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_active_a,
                                       @osd_button_bg_active_b 20%,
@@ -2957,7 +2955,7 @@ button.osd:focus:hover:active,
     border-right-width: 1px;
 }
 
-.osd GtkMenuButton.menu-button:checked {
+.osd button.popup:checked {
     background-color: transparent;
     border-color: @osd_button_border;
     color: @osd_button_fg_active;
@@ -3047,10 +3045,10 @@ toolbar.osd button:hover:only-child,
 toolbar.osd button:checked:only-child,
 toolbar.osd button:hover:active:only-child,
 toolbar.osd button:focus:hover:active:only-child,
-toolbar.osd GtkToolButton button,
-toolbar.osd GtkToolButton:only-child button,
-toolbar.osd GtkToolButton:last-child button,
-toolbar.osd GtkToolButton:first-child button {
+toolbar.osd toolbutton button,
+toolbar.osd toolbutton:only-child button,
+toolbar.osd toolbutton:last-child button,
+toolbar.osd toolbutton:first-child button {
     border-width: 1px;
     border-radius: 3px;
     border-style: solid;
diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
index 31c6ee3d..27031f63 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/other-applications.css
@@ -11,9 +11,9 @@
 
 /* rhythmbox */
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:checked,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:checked,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:hover {
     padding: 0px 6px;
 }
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 290ce1ae..868942f6 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -14,8 +14,6 @@
     outline-width: 0px; /* disable ugly focus-line */
     -gtk-outline-radius: 2px;
     -gtk-icon-style: regular; /* disable symbolic icons */
-    -GtkWindow-resize-grip-width: 11;
-    -GtkWindow-resize-grip-height: 11;
 }
 
 /***************
@@ -55,8 +53,8 @@ label,
 label:disabled,
 box,
 box:disabled,
-GtkGrid,
-GtkGrid:disabled {
+grid,
+grid:disabled {
     background-color: transparent;
 }
 
@@ -544,8 +542,8 @@ colorchooser #add-color-button:selected:hover {
     color: @color_active_badge_dark_color;
 }
 
-GtkColorEditor colorswatch.color-light:hover,
-GtkColorEditor colorswatch.color-dark:hover {
+colorswatch.color-light:hover,
+colorswatch.color-dark:hover {
     background-image: none;
 }
 
@@ -2944,7 +2942,7 @@ button.osd:checked:hover,
 button.osd:focus:hover:active,
 .osd button:checked,
 .osd button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
+.osd button.popup:checked {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_active_a,
                                       @osd_button_bg_active_b 20%,
@@ -2959,7 +2957,7 @@ button.osd:focus:hover:active,
     border-right-width: 1px;
 }
 
-.osd GtkMenuButton.menu-button:checked {
+.osd button.popup:checked {
     background-color: transparent;
     border-color: @osd_button_border;
     color: @osd_button_fg_active;
@@ -3049,10 +3047,10 @@ toolbar.osd button:hover:only-child,
 toolbar.osd button:checked:only-child,
 toolbar.osd button:hover:active:only-child,
 toolbar.osd button:focus:hover:active:only-child,
-toolbar.osd GtkToolButton button,
-toolbar.osd GtkToolButton:only-child button,
-toolbar.osd GtkToolButton:last-child button,
-toolbar.osd GtkToolButton:first-child button {
+toolbar.osd toolbutton button,
+toolbar.osd toolbutton:only-child button,
+toolbar.osd toolbutton:last-child button,
+toolbar.osd toolbutton:first-child button {
     border-width: 1px;
     border-radius: 3px;
     border-style: solid;
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
index 31c6ee3d..27031f63 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/other-applications.css
@@ -11,9 +11,9 @@
 
 /* rhythmbox */
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:checked,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:checked,
+.primary-toolbar.toolbar.horizontal RBHeader.horizontal button.scale.flat:hover {
     padding: 0px 6px;
 }