diff --git a/docs/changes.txt b/docs/changes.txt
index 6d21154315..1f1d4ba26e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -98,7 +98,8 @@ All:
 All (GUI):
 
 - Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer).
-- Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example Polish Pro input.
+- Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example
+  Polish Pro input.
 - Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after
   single-cell paragraphs.
 
@@ -110,6 +111,7 @@ All (Unix):
 wxMSW:
 
 - Restored generation of events for accelerators when there is no menu bar.
+- Fixed wxArtProvider::GetSizeHint() to return 16x16 for wxART_FRAME_ICON.
 
 wxGTK:
 
diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index dd5cdb4bd5..6d0a4e88d9 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -30,6 +30,10 @@
     #include "wx/module.h"
 #endif
 
+#ifdef __WXMSW__
+    #include "wx/msw/wrapwin.h"
+#endif
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -272,7 +276,14 @@ wxArtProvider::~wxArtProvider()
     else if (client == wxART_MENU)
         return wxSize(16, 15);
     else if (client == wxART_FRAME_ICON)
-        return wxSize(16, 15);
+    {
+#ifdef __WXMSW__
+        return wxSize(::GetSystemMetrics(SM_CXSMICON),
+                      ::GetSystemMetrics(SM_CYSMICON));
+#else
+        return wxSize(16, 16);
+#endif // __WXMSW__/!__WXMSW__
+    }
     else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX)
         return wxSize(32, 32);
     else if (client == wxART_HELP_BROWSER)