diff --git a/include/wx/msw/csquery.bmp b/include/wx/msw/csquery.bmp
index 7a63555268..4e7bcdc30b 100644
Binary files a/include/wx/msw/csquery.bmp and b/include/wx/msw/csquery.bmp differ
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 719576135a..4f45dc975b 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -59,6 +59,7 @@ public:
 
 protected:
 
+    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
     wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 421e47578b..48e10b9d71 100644
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -344,4 +344,16 @@ WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
+WXHBRUSH wxScrollBar::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
+{
+    HDC hdc = (HDC)pDC;
+    if ( m_hasFgCol )
+    {
+        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    }
+
+    WXHBRUSH hbr = 0;
+    return hbr;
+}
+
 #endif // wxUSE_SCROLLBAR