Index: class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs	(revision 104925)
+++ class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs	(working copy)
@@ -420,9 +420,6 @@
 
 		public bool IconRectangleContains (int x, int y)
 		{
-			if (form.Icon == null)
-				return false;
-
 			int bw = ThemeEngine.Current.ManagedWindowBorderWidth (this);
 			Rectangle icon = new Rectangle (bw + 3, bw + 2, IconWidth, IconWidth);
 			return icon.Contains (x, y);
Index: class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(revision 104925)
+++ class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(working copy)
@@ -6082,9 +6082,9 @@
 			if (wm.HasBorders) {
 				bool draw_icon = false;
 #if NET_2_0
-				draw_icon = !wm.IsToolWindow && form.Icon != null && form.ShowIcon;
+				draw_icon = !wm.IsToolWindow && form.ShowIcon;
 #else
-				draw_icon = !wm.IsToolWindow && form.Icon != null;
+				draw_icon = !wm.IsToolWindow;
 #endif
 				if (draw_icon) {
 					Rectangle icon = new Rectangle (bdwidth + 3,