Index: class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(revision 105391)
+++ class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(working copy)
@@ -6138,10 +6138,20 @@
 					tbheight + bdwidth - 1, form.Width - bdwidth - 1,
 					tbheight + bdwidth - 1);
 
-			if (!wm.IsToolWindow) {
-				tb.X += 18; // Room for the icon and the buttons
-				tb.Width = (form.Width - 62) - tb.X;
+			if (wm.ShowIcon) {
+				Rectangle icon = ManagedWindowGetTitleBarIconArea (wm);
+				if (icon.IntersectsWith (clip))
+					dc.DrawIcon (form.Icon, icon);
+				const int SpacingBetweenIconAndCaption = 2;
+				tb.Width -= icon.Right + SpacingBetweenIconAndCaption - tb.X ;
+				tb.X = icon.Right + SpacingBetweenIconAndCaption;
 			}
+			
+			foreach (TitleButton button in wm.TitleButtons.AllButtons) {
+				tb.Width -= Math.Max (0, tb.Right - DrawTitleButton (dc, button, clip));
+			}
+			const int SpacingBetweenCaptionAndLeftMostButton = 3;
+			tb.Width -= SpacingBetweenCaptionAndLeftMostButton;
 
 			string window_caption = form.Text;
 			window_caption = window_caption.Replace (Environment.NewLine, string.Empty);
@@ -6157,16 +6167,6 @@
 						ThemeEngine.Current.ResPool.GetSolidBrush (Color.White),
 						tb, format);
 			}
-
-			if (wm.ShowIcon) {
-				Rectangle icon = ManagedWindowGetTitleBarIconArea (wm);
-				if (icon.IntersectsWith (clip))
-					dc.DrawIcon (form.Icon, icon);
-			}
-			
-			foreach (TitleButton button in wm.TitleButtons.AllButtons) {
-				DrawTitleButton (dc, button, clip);
-			}
 		}
 
 		public override Size ManagedWindowButtonSize (InternalWindowManager wm)
@@ -6185,19 +6185,19 @@
 					height - 5);
 		}
 
-		private void DrawTitleButton (Graphics dc, TitleButton button, Rectangle clip)
+		private int DrawTitleButton (Graphics dc, TitleButton button, Rectangle clip)
 		{
 			if (!button.Visible) {
-				return;
+				return int.MaxValue;
 			}
 			
-			if (!button.Rectangle.IntersectsWith (clip))
-				return;
+			if (button.Rectangle.IntersectsWith (clip)) {
+				dc.FillRectangle (SystemBrushes.Control, button.Rectangle);
 
-			dc.FillRectangle (SystemBrushes.Control, button.Rectangle);
-
-			ControlPaint.DrawCaptionButton (dc, button.Rectangle,
-					button.Caption, button.State);
+				ControlPaint.DrawCaptionButton (dc, button.Rectangle,
+						button.Caption, button.State);
+			}
+			return button.Rectangle.Left;
 		}
 
 		public override Rectangle ManagedWindowGetTitleBarIconArea (InternalWindowManager wm)