diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index db317ab..43969fb 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -426,6 +426,8 @@ treeview spinbutton:not(.vertical) entry { min-height: 0; }
 /************** ComboBoxes * */
 combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; }
 
+combobox button { min-height: 1.6em; min-width: 1.6em; padding: 2px; }
+
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
@@ -534,8 +536,6 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; box-shadow: none; }
 
-.titlebar:not(headerbar) separator { background-color: #252525; }
-
 window.devel headerbar.titlebar:not(.selection-mode) { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(102, 153, 0, 0.1)), linear-gradient(to top, #2d2c2c 3px, #323131); }
 
 window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#3f3e3e); /* background-color would flash */ }
@@ -953,7 +953,7 @@ levelbar > trough:disabled, progressbar trough:disabled, scale fill:disabled, sc
 
 progressbar progress, scale highlight { border: none; border-radius: 0px; background-color: #669900; }
 
-progressbar progress:disabled, scale highlight:disabled { background-color: #53463e; }
+progressbar progress:disabled, scale highlight:disabled { background-color: #635349; }
 
 scale { min-height: 10px; min-width: 10px; padding: 12px; }
 
@@ -1098,7 +1098,13 @@ separator { border-width: 2px; border-style: solid; background-color: #3f3e3e; b
 
 statusbar separator, .osd separator, osd separator { background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; }
 
-headerbar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+.titlebar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+
+button separator { background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
+
+:disabled separator { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; }
+
+button:checked separator { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
 
 /********* Lists * */
 list { color: #EDF0F5; background-color: #323232; border-color: #252525; }
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 4280755..14516b2 100644
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -467,6 +467,8 @@ dropdown > button > box { border-spacing: 6px; }
 
 dropdown > button > box > stack > row.activatable, dropdown > button > box > stack > row.activatable:hover { background: none; box-shadow: none; border-style: none; border-width: 0; }
 
+dropdown button, combobox button { min-height: 1.6em; min-width: 1.6em; padding: 2px; }
+
 dropdown arrow, combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; }
 
 dropdown > popover.menu > contents modelbutton, combobox > popover.menu > contents modelbutton { padding-left: 9px; padding-right: 9px; }
@@ -654,8 +656,6 @@ headerbar switch { margin-top: 10px; margin-bottom: 10px; }
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; }
 
-.titlebar:not(headerbar) separator { background-color: #252525; }
-
 window.devel headerbar.titlebar { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(102, 153, 0, 0.1)), linear-gradient(to top, #2d2c2c 3px, #323131); }
 
 window.devel headerbar.titlebar:backdrop { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#3f3e3e); /* background-color would flash */ }
@@ -1065,7 +1065,7 @@ levelbar > trough:disabled, progressbar > trough:disabled, scale > trough > fill
 
 progressbar > trough > progress, scale > trough > highlight { border: none; border-radius: 0px; background-color: #669900; }
 
-progressbar > trough > progress:disabled, scale > trough > highlight:disabled { background-color: #53463e; }
+progressbar > trough > progress:disabled, scale > trough > highlight:disabled { background-color: #635349; }
 
 scale { min-height: 10px; min-width: 10px; padding: 12px; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
 
@@ -1238,7 +1238,13 @@ separator { border-width: 2px; border-style: solid; background-color: #3f3e3e; b
 
 statusbar separator, .osd separator, osd separator { background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; }
 
-headerbar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+.titlebar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+
+button separator { background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
+
+:disabled separator { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; }
+
+button:checked separator { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
 
 /********* Lists * */
 listview, list { color: #EDF0F5; background-color: #323232; border-color: #252525; border-radius: 0; box-shadow: none; }
diff --git a/kde_plasma_qt/Kvantum/Simplewaita/Simplewaita.kvconfig b/kde_plasma_qt/Kvantum/Simplewaita/Simplewaita.kvconfig
index db391ad..47f9ca3 100644
--- a/kde_plasma_qt/Kvantum/Simplewaita/Simplewaita.kvconfig
+++ b/kde_plasma_qt/Kvantum/Simplewaita/Simplewaita.kvconfig
@@ -385,6 +385,7 @@ frame=true
 inherits=PanelButtonCommand
 frame.element=tooltip
 interior.element=tooltip
+text.normal.color=white
 frame.top=2
 frame.bottom=2
 frame.left=2
diff --git a/source/gtk3/_common.scss b/source/gtk3/_common.scss
index 94282fb..da6bb53 100644
--- a/source/gtk3/_common.scss
+++ b/source/gtk3/_common.scss
@@ -1283,6 +1283,11 @@ combobox {
       &:dir(rtl) { @extend %linked_left; }
     }
   }
+  button {
+    min-height: $_entry_height;
+    min-width: $_entry_height;
+    padding: 2px;
+  }
 
   &:drop(active) { // FIXME: untested
     box-shadow: none;
@@ -1681,7 +1686,7 @@ headerbar { // headerbar border rounding; could perfectly be removed, since all
     box-shadow: none;
   }
 
-  separator { background-color: $borders_color; }  // FIXME: use darker border?
+  //separator { background-color: $borders_color; }  // FIXME: use darker border?
 
   @extend %titlebar;
 }
@@ -2571,7 +2576,7 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
   //margin: 1px;
 
   &:disabled {
-    background-color: mix($insensitive_bg_color, $insensitive_fg_color, 80%);
+    background-color: mix($insensitive_bg_color, $insensitive_fg_color, 50%);
     //border-color: transparent;
   }
 
@@ -3006,7 +3011,10 @@ separator {
   min-width: 0px;
   min-height: 0px;
   statusbar &, .osd &, osd & {@include relief($hint_bg);}
-  headerbar:not(:backdrop) & {@include relief($titlebar_active_bg);}
+  .titlebar:not(:backdrop) & {@include relief($titlebar_active_bg);}
+  button & {@include relief($button_bg);}
+  :disabled & {@include relief($insensitive_bg_color);}
+  button:checked & {@include relief($button_checked_bg);}
 }
 
 
diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css
index db317ab..43969fb 100644
--- a/source/gtk3/gtk-new.css
+++ b/source/gtk3/gtk-new.css
@@ -426,6 +426,8 @@ treeview spinbutton:not(.vertical) entry { min-height: 0; }
 /************** ComboBoxes * */
 combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; }
 
+combobox button { min-height: 1.6em; min-width: 1.6em; padding: 2px; }
+
 combobox:drop(active) { box-shadow: none; }
 
 /************ Toolbars * */
@@ -534,8 +536,6 @@ window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerb
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; box-shadow: none; }
 
-.titlebar:not(headerbar) separator { background-color: #252525; }
-
 window.devel headerbar.titlebar:not(.selection-mode) { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(102, 153, 0, 0.1)), linear-gradient(to top, #2d2c2c 3px, #323131); }
 
 window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#3f3e3e); /* background-color would flash */ }
@@ -953,7 +953,7 @@ levelbar > trough:disabled, progressbar trough:disabled, scale fill:disabled, sc
 
 progressbar progress, scale highlight { border: none; border-radius: 0px; background-color: #669900; }
 
-progressbar progress:disabled, scale highlight:disabled { background-color: #53463e; }
+progressbar progress:disabled, scale highlight:disabled { background-color: #635349; }
 
 scale { min-height: 10px; min-width: 10px; padding: 12px; }
 
@@ -1098,7 +1098,13 @@ separator { border-width: 2px; border-style: solid; background-color: #3f3e3e; b
 
 statusbar separator, .osd separator, osd separator { background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; }
 
-headerbar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+.titlebar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+
+button separator { background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
+
+:disabled separator { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; }
+
+button:checked separator { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
 
 /********* Lists * */
 list { color: #EDF0F5; background-color: #323232; border-color: #252525; }
diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss
index 9727ea1..2f9c019 100644
--- a/source/gtk4/_common.scss
+++ b/source/gtk4/_common.scss
@@ -1159,6 +1159,11 @@ dropdown > button > box {
 
 dropdown,
 combobox {
+  button {
+    min-height: $_entry_height;
+    min-width: $_entry_height;
+    padding: 2px;
+  }
   arrow {
     -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
     min-height: 16px;
@@ -1513,7 +1518,7 @@ headerbar {
     border-color: transparent;
   }
 
-  separator { background-color: $borders_color; }  // FIXME: use darker border?
+  //separator { background-color: $borders_color; }  // FIXME: use darker border?
 
   @extend %titlebar;
 }
@@ -2297,7 +2302,7 @@ treeview.view radio:selected { &:selected, &:focus, & { @extend %radio; }} // Th
   //margin: 1px;
 
   &:disabled {
-    background-color: mix($insensitive_bg_color, $insensitive_fg_color, 80%);
+    background-color: mix($insensitive_bg_color, $insensitive_fg_color, 50%);
     //border-color: transparent;
   }
 
@@ -2739,7 +2744,10 @@ separator {
   min-width: 0px;
   min-height: 0px;
   statusbar &, .osd &, osd & {@include relief($hint_bg);}
-  headerbar:not(:backdrop) & {@include relief($titlebar_active_bg);}
+  .titlebar:not(:backdrop) & {@include relief($titlebar_active_bg);}
+  button & {@include relief($button_bg);}
+  :disabled & {@include relief($insensitive_bg_color);}
+  button:checked & {@include relief($button_checked_bg);}
 }
 
 
diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css
index 4280755..14516b2 100644
--- a/source/gtk4/gtk-new.css
+++ b/source/gtk4/gtk-new.css
@@ -467,6 +467,8 @@ dropdown > button > box { border-spacing: 6px; }
 
 dropdown > button > box > stack > row.activatable, dropdown > button > box > stack > row.activatable:hover { background: none; box-shadow: none; border-style: none; border-width: 0; }
 
+dropdown button, combobox button { min-height: 1.6em; min-width: 1.6em; padding: 2px; }
+
 dropdown arrow, combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); min-height: 16px; min-width: 16px; }
 
 dropdown > popover.menu > contents modelbutton, combobox > popover.menu > contents modelbutton { padding-left: 9px; padding-right: 9px; }
@@ -654,8 +656,6 @@ headerbar switch { margin-top: 10px; margin-bottom: 10px; }
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; }
 
-.titlebar:not(headerbar) separator { background-color: #252525; }
-
 window.devel headerbar.titlebar { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(102, 153, 0, 0.1)), linear-gradient(to top, #2d2c2c 3px, #323131); }
 
 window.devel headerbar.titlebar:backdrop { background: #3f3e3e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#3f3e3e); /* background-color would flash */ }
@@ -1065,7 +1065,7 @@ levelbar > trough:disabled, progressbar > trough:disabled, scale > trough > fill
 
 progressbar > trough > progress, scale > trough > highlight { border: none; border-radius: 0px; background-color: #669900; }
 
-progressbar > trough > progress:disabled, scale > trough > highlight:disabled { background-color: #53463e; }
+progressbar > trough > progress:disabled, scale > trough > highlight:disabled { background-color: #635349; }
 
 scale { min-height: 10px; min-width: 10px; padding: 12px; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; }
 
@@ -1238,7 +1238,13 @@ separator { border-width: 2px; border-style: solid; background-color: #3f3e3e; b
 
 statusbar separator, .osd separator, osd separator { background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; }
 
-headerbar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+.titlebar:not(:backdrop) separator { background-color: #507800; border-left-color: #79983c; border-top-color: #79983c; border-right-color: #314a00; border-bottom-color: #314a00; }
+
+button separator { background-color: #4e584d; border-left-color: #878e87; border-top-color: #878e87; border-right-color: #343a33; border-bottom-color: #343a33; }
+
+:disabled separator { background-color: #493e37; border-left-color: #776e69; border-top-color: #776e69; border-right-color: #2e2722; border-bottom-color: #2e2722; }
+
+button:checked separator { background-color: #669900; border-left-color: #94b84d; border-top-color: #94b84d; border-right-color: #426300; border-bottom-color: #426300; }
 
 /********* Lists * */
 listview, list { color: #EDF0F5; background-color: #323232; border-color: #252525; border-radius: 0; box-shadow: none; }