Index: class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs	(revision 104790)
+++ class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs	(working copy)
@@ -538,7 +538,7 @@
 
 		public virtual int ToolWindowCaptionHeight {
 			get {
-				return 16;
+				return XplatUI.ToolWindowCaptionHeight;
 			}
 		}
 
Index: class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs	(revision 104790)
+++ class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs	(working copy)
@@ -412,6 +412,11 @@
 			}
 		}
 
+		public static int ToolWindowCaptionHeight {
+			get {
+				return driver.ToolWindowCaptionHeight;
+			}
+		}
 		#endregion	// Public Static Properties
 
 		#region Events
Index: class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs	(revision 104790)
+++ class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs	(working copy)
@@ -242,6 +242,12 @@
 		internal abstract Rectangle WorkingArea { get; }
 		internal abstract bool ThemesEnabled { get; }
 
+		public virtual int ToolWindowCaptionHeight {
+			get {
+				return 16;
+			}
+		}
+
 		#endregion	// XplatUI Driver Properties
 
 		internal abstract event EventHandler Idle;
Index: class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs	(revision 104790)
+++ class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs	(working copy)
@@ -1506,8 +1506,12 @@
 				return XplatUIWin32.themes_enabled;
 			}
 		}
- 
 
+		public override int ToolWindowCaptionHeight {
+			get {
+				return Win32GetSystemMetrics (SystemMetrics.SM_CYSMCAPTION);
+			}
+		}
 		#endregion	// Static Properties
 
 		#region Singleton Specific Code