diff --git a/Zukitre/gtk-3.0/_common.scss b/Zukitre/gtk-3.0/_common.scss
index e88251b..0e8d1b3 100644
--- a/Zukitre/gtk-3.0/_common.scss
+++ b/Zukitre/gtk-3.0/_common.scss
@@ -1247,11 +1247,10 @@ toolbar {
   &.vertical separator { margin: 6px 1px 7px 0; }
 
   &:not(.inline-toolbar):not(.osd) {
-    switch,
-    scale,
-    entry,
-    spinbutton,
-    button {
+    // workaround: add margins to the children of tool items to simulate
+    // spacing, ignore the overflow button (.toggle) and the overflow menu
+    // (.popup)
+    > *:not(.toggle):not(.popup) > * {
       margin-right: 1px;
       margin-bottom: 1px;
     }
@@ -1269,7 +1268,7 @@ toolbar {
   border-radius: 0  0 1px 1px;
 }
 
-searchbar,
+searchbar > revealer > box,
 .location-bar {
   @extend %toolbar;
 
@@ -1279,6 +1278,12 @@ searchbar,
   padding: 3px;
 }
 
+searchbar > revealer > box {
+  // workaround: undo the GtkContainer:border-width and use CSS padding instead
+  margin: -6px;
+  padding: 6px;
+}
+
 %darkbar {
   border-style: solid;
   border-color: $borders_color;
diff --git a/Zukitre/gtk-3.0/gtk-contained-dark.css b/Zukitre/gtk-3.0/gtk-contained-dark.css
index 7881876..c155f93 100644
--- a/Zukitre/gtk-3.0/gtk-contained-dark.css
+++ b/Zukitre/gtk-3.0/gtk-contained-dark.css
@@ -481,7 +481,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #1d2529; box-shadow: inset 0 2px rgba(8, 10, 11, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #1d2529; box-shadow: inset 0 2px rgba(8, 10, 11, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -495,13 +495,15 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
 
 toolbar.vertical separator { margin: 6px 1px 7px 0; }
 
-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
+toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 1px 1px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #080a0b; background-color: #1e262a; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
+
+.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #080a0b; background-color: #1e262a; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 4px; min-height: 38px; border-width: 0 0 1px; border-style: solid; border-color: #080a0b; background-color: #273238; box-shadow: inset 0 1px rgba(222, 226, 229, 0), inset 0 -1px rgba(222, 226, 229, 0); }
diff --git a/Zukitre/gtk-3.0/gtk-contained.css b/Zukitre/gtk-3.0/gtk-contained.css
index 321edae..506fc5a 100644
--- a/Zukitre/gtk-3.0/gtk-contained.css
+++ b/Zukitre/gtk-3.0/gtk-contained.css
@@ -489,7 +489,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #c9c9c9; box-shadow: inset 0 2px rgba(176, 176, 176, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-color: #c9c9c9; box-shadow: inset 0 2px rgba(176, 176, 176, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -503,13 +503,15 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
 
 toolbar.vertical separator { margin: 6px 1px 7px 0; }
 
-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
+toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 1px 1px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #b0b0b0; background-color: #cbcbcb; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
+
+.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #b0b0b0; background-color: #cbcbcb; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 4px; min-height: 38px; border-width: 0 0 1px; border-style: solid; border-color: #b0b0b0; background-color: #d6d6d6; box-shadow: inset 0 1px rgba(255, 255, 255, 0.6), inset 0 -1px rgba(255, 255, 255, 0.3); }
diff --git a/Zukitwo/gtk-3.0/_common.scss b/Zukitwo/gtk-3.0/_common.scss
index 38b42d8..7d2e8a2 100644
--- a/Zukitwo/gtk-3.0/_common.scss
+++ b/Zukitwo/gtk-3.0/_common.scss
@@ -1249,11 +1249,10 @@ toolbar {
   &.vertical separator { margin: 6px 1px 7px 0; }
 
   &:not(.inline-toolbar):not(.osd) {
-    switch,
-    scale,
-    entry,
-    spinbutton,
-    button {
+    // workaround: add margins to the children of tool items to simulate
+    // spacing, ignore the overflow button (.toggle) and the overflow menu
+    // (.popup)
+    > *:not(.toggle):not(.popup) > * {
       margin-right: 1px;
       margin-bottom: 1px;
     }
@@ -1271,7 +1270,7 @@ toolbar {
   border-radius: 0  0 1px 1px;
 }
 
-searchbar,
+searchbar > revealer > box,
 .location-bar {
   @extend %toolbar;
 
@@ -1281,6 +1280,12 @@ searchbar,
   padding: 3px;
 }
 
+searchbar > revealer > box {
+  // workaround: undo the GtkContainer:border-width and use CSS padding instead
+  margin: -6px;
+  padding: 6px;
+}
+
 %darkbar {
   border-style: solid;
   border-color: $borders_color;
diff --git a/Zukitwo/gtk-3.0/gtk-contained-dark.css b/Zukitwo/gtk-3.0/gtk-contained-dark.css
index 713436c..5f0bb7b 100644
--- a/Zukitwo/gtk-3.0/gtk-contained-dark.css
+++ b/Zukitwo/gtk-3.0/gtk-contained-dark.css
@@ -481,7 +481,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-image: linear-gradient(to bottom, #1e2226, #2b3137); box-shadow: inset 0 1px rgba(9, 11, 12, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-image: linear-gradient(to bottom, #1e2226, #2b3137); box-shadow: inset 0 1px rgba(9, 11, 12, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -495,13 +495,15 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
 
 toolbar.vertical separator { margin: 6px 1px 7px 0; }
 
-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
+toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 1px 1px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #090b0c; background-color: #21262a; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
+
+.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #090b0c; background-color: #21262a; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 4px; min-height: 38px; border-width: 0 0 1px; border-style: solid; border-color: #090b0c; background-image: linear-gradient(to bottom, #384048, #2b3137); box-shadow: inset 0 1px rgba(238, 238, 238, 0), inset 0 -1px rgba(238, 238, 238, 0); }
diff --git a/Zukitwo/gtk-3.0/gtk-contained.css b/Zukitwo/gtk-3.0/gtk-contained.css
index ee9d50b..dfab122 100644
--- a/Zukitwo/gtk-3.0/gtk-contained.css
+++ b/Zukitwo/gtk-3.0/gtk-contained.css
@@ -489,7 +489,7 @@ combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-heig
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
-toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-image: linear-gradient(to bottom, #c7c7c7, #d6d6d6); box-shadow: inset 0 1px rgba(176, 176, 176, 0.35); }
+toolbar, .inline-toolbar, searchbar > revealer > box, .location-bar { -GtkWidget-window-dragging: true; padding: 4px; background-image: linear-gradient(to bottom, #c7c7c7, #d6d6d6); box-shadow: inset 0 1px rgba(176, 176, 176, 0.35); }
 
 toolbar { padding: 4px 3px 3px 4px; }
 
@@ -503,13 +503,15 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; }
 
 toolbar.vertical separator { margin: 6px 1px 7px 0; }
 
-toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; }
+toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; }
 
 .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0  0 1px 1px; }
 
-searchbar, .location-bar { border-width: 0 0 1px; padding: 3px; }
+searchbar > revealer > box, .location-bar { border-width: 0 0 1px; padding: 3px; }
 
-.inline-toolbar, searchbar, .location-bar { border-style: solid; border-color: #b0b0b0; background-color: #cbcbcb; }
+searchbar > revealer > box { margin: -6px; padding: 6px; }
+
+.inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; border-color: #b0b0b0; background-color: #cbcbcb; }
 
 /*************** Header bars * */
 .titlebar:not(headerbar), headerbar { padding: 0 4px; min-height: 38px; border-width: 0 0 1px; border-style: solid; border-color: #b0b0b0; background-image: linear-gradient(to bottom, #e5e5e5, #d6d6d6); box-shadow: inset 0 1px rgba(255, 255, 255, 0.6), inset 0 -1px rgba(255, 255, 255, 0.3); }