diff --git a/themes/Default/common.css b/themes/Default/common.css
index 1939241c98..216ac845ad 100644
--- a/themes/Default/common.css
+++ b/themes/Default/common.css
@@ -122,7 +122,7 @@ combobox button {
   background-color: @widget-bg-color;
 }
 
-combobox arrow {
+combobox arrow, combobox button * {
   -gtk-icon-shadow: none;
 }
 
@@ -417,6 +417,7 @@ spinbutton
 /* Styling for the +/- buttons */
 spinbutton button.up, spinbutton button.down {
   background-color: @bg-color;
+  -gtk-icon-shadow: none;
 }
 
 GimpSpinScale entry progress {