Index: dll/win32/uxtheme/nonclient.c
===================================================================
--- dll/win32/uxtheme/nonclient.c	(revision 68007)
+++ dll/win32/uxtheme/nonclient.c	(working copy)
@@ -262,7 +262,7 @@
     rcPart.right = prcCurrent->right;
     rcPart.bottom = rcPart.top + ButtonHeight ;
     rcPart.left = rcPart.right - ButtonWidth ;
-    prcCurrent->right -= ButtonWidth + BUTTON_GAP_SIZE;
+    prcCurrent->right -= ButtonWidth;
 
     DrawThemeBackground(pcontext->theme, pcontext->hDC, iPartId, iStateId, &rcPart, NULL);
 }
@@ -292,8 +292,8 @@
     rcCurrent.bottom = pcontext->CaptionHeight;
     
     /* Add a padding around the objects of the caption */
-    InflateRect(&rcCurrent, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, 
-                            -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE);
+    InflateRect(&rcCurrent, -(int)pcontext->wi.cyWindowBorders, 
+                            -(int)pcontext->wi.cyWindowBorders);
 
     /* Draw the buttons */
     ThemeDrawCaptionButton(pcontext, &rcCurrent, CLOSEBUTTON, 
@@ -335,8 +335,8 @@
     DrawThemeBackground(pcontext->theme, pcontext->hDC,iPart,iState,&rcPart,NULL);
 
     /* Add a padding around the objects of the caption */
-    InflateRect(&rcPart, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, 
-                         -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE);
+    InflateRect(&rcPart, -(int)pcontext->wi.cyWindowBorders, 
+                         -(int)pcontext->wi.cyWindowBorders);
 
     /* Draw the caption buttons */
     if (pcontext->wi.dwStyle & WS_SYSMENU)
@@ -949,7 +949,7 @@
                 ButtonWidth = GetSystemMetrics(SM_CXSIZE);
 
             ButtonWidth -= 4;
-            ButtonWidth+= BUTTON_GAP_SIZE;
+            //ButtonWidth+= BUTTON_GAP_SIZE;
 
             if (wi.dwStyle & WS_SYSMENU)
             {