diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 2c88e00..80c07d5 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -841,15 +841,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index e4077f5..b27a886 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -840,15 +840,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 575a787..88b4031 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -841,15 +841,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 5a62280..21e91da 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -840,15 +840,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 060ad71..a6242a2 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -840,15 +840,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index b50c13c..93c0d50 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -840,15 +840,15 @@ toolbar, .inline-toolbar {
       border-width: 0 1px 0 0; }
     toolbar.osd.right, .osd.right.inline-toolbar {
       border-width: 0 0 0 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) switch, .inline-toolbar:not(.inline-toolbar):not(.osd) switch,
-  toolbar:not(.inline-toolbar):not(.osd) scale, .inline-toolbar:not(.inline-toolbar):not(.osd) scale,
-  toolbar:not(.inline-toolbar):not(.osd) entry, .inline-toolbar:not(.inline-toolbar):not(.osd) entry,
-  toolbar:not(.inline-toolbar):not(.osd) spinbutton, .inline-toolbar:not(.inline-toolbar):not(.osd) spinbutton,
-  toolbar:not(.inline-toolbar):not(.osd) button, .inline-toolbar:not(.inline-toolbar):not(.osd) button {
+  toolbar:not(.inline-toolbar) switch, .inline-toolbar:not(.inline-toolbar) switch,
+  toolbar:not(.inline-toolbar) scale, .inline-toolbar:not(.inline-toolbar) scale,
+  toolbar:not(.inline-toolbar) entry, .inline-toolbar:not(.inline-toolbar) entry,
+  toolbar:not(.inline-toolbar) spinbutton, .inline-toolbar:not(.inline-toolbar) spinbutton,
+  toolbar:not(.inline-toolbar) button, .inline-toolbar:not(.inline-toolbar) button {
     margin-right: 1px;
     margin-bottom: 1px; }
-  toolbar:not(.inline-toolbar):not(.osd) .linked > button, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > button,
-  toolbar:not(.inline-toolbar):not(.osd) .linked > entry, .inline-toolbar:not(.inline-toolbar):not(.osd) .linked > entry {
+  toolbar:not(.inline-toolbar) .linked > button, .inline-toolbar:not(.inline-toolbar) .linked > button,
+  toolbar:not(.inline-toolbar) .linked > entry, .inline-toolbar:not(.inline-toolbar) .linked > entry {
     margin-right: 0; }
 
 .primary-toolbar {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index bb8f166..1dbef2a 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -883,7 +883,7 @@ toolbar {
     &.right { border-width: 0 0 0 1px; }
   }
 
-  &:not(.inline-toolbar):not(.osd) {
+  &:not(.inline-toolbar) {
     switch,
     scale,
     entry,