diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index ef8c9f7bc5..375f03bb1c 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -157,4 +157,4 @@ plot_zin_bmp            BITMAP  "wx/msw/plot_zin.bmp"
 plot_zot_bmp            BITMAP  "wx/msw/plot_zot.bmp"
 
 // For wxContextHelpButton
-csquery_bmp             BITMAP "wx/msw/csquery.bmp"
+csquery                 BITMAP "wx/msw/csquery.bmp"
diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 37a3ade54c..cc59931d9c 100644
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -212,18 +212,14 @@ BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
     EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp)
 END_EVENT_TABLE()
 
-wxContextHelpButton::wxContextHelpButton(wxWindow* parent, wxWindowID id,
-        const wxPoint& pos, const wxSize& size,
-        long style):
-   wxBitmapButton(parent, id, wxNullBitmap, pos, size, style)
+wxContextHelpButton::wxContextHelpButton(wxWindow* parent,
+                                         wxWindowID id,
+                                         const wxPoint& pos,
+                                         const wxSize& size,
+                                         long style)
+                   : wxBitmapButton(parent, id, wxBITMAP(csquery),
+                                    pos, size, style)
 {
-#ifdef __WXMSW__
-    wxBitmap bitmap(wxT("csquery_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
-#else
-    wxBitmap bitmap(csquery_xpm);
-#endif
-
-    SetBitmapLabel(bitmap);
 }
 
 void wxContextHelpButton::OnContextHelp(wxCommandEvent& event)