diff -ur src/xfce_theme_draw.c src/xfce_theme_draw.c
--- src/xfce_theme_draw.c	2011-01-16 16:40:26.000000000 +0100
+++ src/xfce_theme_draw.c	2011-02-25 01:24:59.412000004 +0100
@@ -181,11 +181,16 @@
     /* Spin buttons are a special case */
     if (widget && GTK_IS_SPIN_BUTTON (widget))
     {
-        if (DETAIL("spinbutton_up") || DETAIL("spinbutton_down"))
+        if (DETAIL("spinbutton"))
+        {
+            draw_flat = TRUE;
+        }
+        else if (DETAIL("spinbutton_up") || DETAIL("spinbutton_down"))
         {
             if ((state_type != GTK_STATE_PRELIGHT) && (state_type != GTK_STATE_ACTIVE))
             {
-                draw_flat = TRUE;
+                /* Do nothing */
+                return;
             }
         }
     }
@@ -665,7 +670,7 @@
         case GTK_SHADOW_OUT:
             if (XFCE_RC_STYLE(style->rc_style)->smooth_edge)
             {
-                if ((DETAIL("spinbutton_up") || DETAIL("spinbutton_up") || DETAIL("spinbutton_down")) && (state_type != GTK_STATE_PRELIGHT))
+                if ((DETAIL("spinbutton_up") || DETAIL("spinbutton_down")) && (state_type != GTK_STATE_PRELIGHT))
                 {
                     /* Do nothing */
                 }
@@ -810,10 +815,6 @@
                 if ((DETAIL("spinbutton_up") || DETAIL("spinbutton_down")) && (state_type != GTK_STATE_PRELIGHT))
                 {
                     /* Do nothing */
-                }
-                if ((DETAIL("spinbutton_up") || DETAIL("spinbutton_down")) && (state_type != GTK_STATE_PRELIGHT))
-                {
-                    /* Do nothing */
                 }
                 else if (DETAIL("menubar"))
                 {