diff --git a/PInvoke/User32/WinUser.Icon.cs b/PInvoke/User32/WinUser.Icon.cs
index b36263c0..59f153b6 100644
--- a/PInvoke/User32/WinUser.Icon.cs
+++ b/PInvoke/User32/WinUser.Icon.cs
@@ -8,6 +8,36 @@ namespace Vanara.PInvoke
 {
 	public static partial class User32
 	{
+		/// <summary>Default application icon.</summary>
+		public static readonly ResourceId IDI_APPLICATION = Macros.MAKEINTRESOURCE(32512);
+
+		/// <summary>Hand-shaped icon. Same as IDI_ERROR.</summary>
+		public static readonly ResourceId IDI_HAND        = Macros.MAKEINTRESOURCE(32513);
+
+		/// <summary>Question mark icon.</summary>
+		public static readonly ResourceId IDI_QUESTION    = Macros.MAKEINTRESOURCE(32514);
+
+		/// <summary>Exclamation point icon. Same as IDI_WARNING.</summary>
+		public static readonly ResourceId IDI_EXCLAMATION = Macros.MAKEINTRESOURCE(32515);
+
+		/// <summary>Asterisk icon. Same as IDI_INFORMATION.</summary>
+		public static readonly ResourceId IDI_ASTERISK    = Macros.MAKEINTRESOURCE(32516);
+
+		/// <summary>Default application icon. Windows 2000: Windows logo icon.</summary>
+		public static readonly ResourceId IDI_WINLOGO     = Macros.MAKEINTRESOURCE(32517);
+
+		/// <summary>Security Shield icon.</summary>
+		public static readonly ResourceId IDI_SHIELD      = Macros.MAKEINTRESOURCE(32518);
+
+		/// <summary>Exclamation point icon.</summary>
+		public static readonly ResourceId IDI_WARNING = IDI_EXCLAMATION;
+
+		/// <summary>Hand-shaped icon.</summary>
+		public static readonly ResourceId IDI_ERROR = IDI_HAND;
+
+		/// <summary>Asterisk icon.</summary>
+		public static readonly ResourceId IDI_INFORMATION = IDI_ASTERISK;
+
 		/// <summary>Flags used by <see cref="DrawIconEx"/>.</summary>
 		[PInvokeData("winuser.h", MSDNShortId = "drawiconex")]
 		[Flags]
@@ -1328,41 +1358,6 @@ namespace Vanara.PInvoke
 			public string szResName;
 		}
 
-		/// <summary>Predefined icon values.</summary>
-		[PInvokeData("winuser.h")]
-		public static class IDI
-		{
-			/// <summary>Default application icon.</summary>
-			public static readonly ResourceId IDI_APPLICATION = Macros.MAKEINTRESOURCE(32512);
-
-			/// <summary>Hand-shaped icon. Same as IDI_ERROR.</summary>
-			public static readonly ResourceId IDI_HAND        = Macros.MAKEINTRESOURCE(32513);
-
-			/// <summary>Question mark icon.</summary>
-			public static readonly ResourceId IDI_QUESTION    = Macros.MAKEINTRESOURCE(32514);
-
-			/// <summary>Exclamation point icon. Same as IDI_WARNING.</summary>
-			public static readonly ResourceId IDI_EXCLAMATION = Macros.MAKEINTRESOURCE(32515);
-
-			/// <summary>Asterisk icon. Same as IDI_INFORMATION.</summary>
-			public static readonly ResourceId IDI_ASTERISK    = Macros.MAKEINTRESOURCE(32516);
-
-			/// <summary>Default application icon. Windows 2000: Windows logo icon.</summary>
-			public static readonly ResourceId IDI_WINLOGO     = Macros.MAKEINTRESOURCE(32517);
-
-			/// <summary>Security Shield icon.</summary>
-			public static readonly ResourceId IDI_SHIELD      = Macros.MAKEINTRESOURCE(32518);
-
-			/// <summary>Exclamation point icon.</summary>
-			public static readonly ResourceId IDI_WARNING = IDI_EXCLAMATION;
-
-			/// <summary>Hand-shaped icon.</summary>
-			public static readonly ResourceId IDI_ERROR = IDI_HAND;
-
-			/// <summary>Asterisk icon.</summary>
-			public static readonly ResourceId IDI_INFORMATION = IDI_ASTERISK;
-		}
-
 		/// <summary>Provides a <see cref="SafeHandle"/> to a Windows that disposes a created HICON instance at disposal using DestroyIcon.</summary>
 		public class SafeHICON : SafeHANDLE, IUserHandle
 		{
diff --git a/PInvoke/User32/WinUser.Static.cs b/PInvoke/User32/WinUser.Static.cs
index 36132b7a..d78a51cc 100644
--- a/PInvoke/User32/WinUser.Static.cs
+++ b/PInvoke/User32/WinUser.Static.cs
@@ -389,10 +389,10 @@ namespace Vanara.PInvoke
 			/// </summary>
 			SS_LEFTNOWORDWRAP = 0x0000000C,
 
-			/// <summary>Prevents interpretation of any ampersand (&) characters in the control's text as accelerator prefix characters.
+			/// <summary>Prevents interpretation of any ampersand (&amp;) characters in the control's text as accelerator prefix characters.
 			/// These are displayed with the ampersand removed and the next character in the string underlined. This static control style
 			/// may be included with any of the defined static controls. You can combine SS_NOPREFIX with other styles. This can be useful
-			/// when filenames or other strings that may contain an ampersand (&) must be displayed in a static control in a dialog box.</summary>
+			/// when filenames or other strings that may contain an ampersand (&amp;) must be displayed in a static control in a dialog box.</summary>
 			SS_NOPREFIX = 0x00000080,
 
 			/// <summary>