diff --git a/include/wx/msw/error.ico b/include/wx/msw/error.ico
new file mode 100644
index 0000000000..c540fbb22d
Binary files /dev/null and b/include/wx/msw/error.ico differ
diff --git a/include/wx/msw/info.ico b/include/wx/msw/info.ico
new file mode 100644
index 0000000000..71324fa96a
Binary files /dev/null and b/include/wx/msw/info.ico differ
diff --git a/include/wx/msw/question.ico b/include/wx/msw/question.ico
new file mode 100644
index 0000000000..de35b24017
Binary files /dev/null and b/include/wx/msw/question.ico differ
diff --git a/include/wx/msw/warning.ico b/include/wx/msw/warning.ico
new file mode 100644
index 0000000000..d1b6481021
Binary files /dev/null and b/include/wx/msw/warning.ico differ
diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index d064760b5f..253038559a 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -25,14 +25,14 @@
 // LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF
 // DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
 // THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Version: $Id$
 /////////////////////////////////////////////////////////////////////////////
-//
-//
 
 #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
-#include <wx/msw/gnuwin32/winresrc.h>
+	#include <wx/msw/gnuwin32/winresrc.h>
 #else
-#include <windows.h>
+	#include <windows.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -109,6 +109,12 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
+// Standard icons
+wxICON_QUESTION		ICON "wx/msw/question.ico"
+wxICON_WARNING		ICON "wx/msw/warning.ico"
+wxICON_ERROR		ICON "wx/msw/error.ico"
+wxICON_INFO		ICON "wx/msw/info.ico"
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps