diff --git a/include/wx/msw/taskbarbutton.h b/include/wx/msw/taskbarbutton.h
index b5dd6e7833..15a5a58aa8 100644
--- a/include/wx/msw/taskbarbutton.h
+++ b/include/wx/msw/taskbarbutton.h
@@ -26,7 +26,8 @@ public:
     virtual void Hide() wxOVERRIDE;
     virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE;
     virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE;
-    virtual void SetOverlayIcon(const wxIcon& icon) wxOVERRIDE;
+    virtual void SetOverlayIcon(const wxIcon& icon,
+        const wxString& description = wxString()) wxOVERRIDE;
     virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE;
     virtual bool AddThumbBarButton(wxThumbBarButton *button) wxOVERRIDE;
     virtual void ShowThumbnailToolbar() wxOVERRIDE;
diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h
index 41a386b7f5..9cb76d2580 100644
--- a/include/wx/taskbarbutton.h
+++ b/include/wx/taskbarbutton.h
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_ADV wxThumbBarButton {
 public:
     wxThumbBarButton(int id,
                      const wxIcon& icon,
-                     const wxString& tooltip = wxEmptyString);
+                     const wxString& tooltip = wxString());
 
     virtual ~wxThumbBarButton() {}
 
@@ -59,7 +59,8 @@ public:
     virtual void Hide() = 0;
     virtual void SetThumbnailTooltip(const wxString& tooltip) = 0;
     virtual void SetProgressState(wxTaskBarButtonState state) = 0;
-    virtual void SetOverlayIcon(const wxIcon& icon) = 0;
+    virtual void SetOverlayIcon(const wxIcon& icon,
+                                const wxString& description = wxString()) = 0;
     virtual void SetThumbnailClip(const wxRect& rect) = 0;
 
     /**
diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index 1ed30f59e4..d61ac2958d 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -96,9 +96,12 @@ void wxTaskBarButtonImpl::SetProgressState(wxTaskBarButtonState state)
     m_taskbarList->SetProgressState(m_hwnd, static_cast<TBPFLAG>(state));
 }
 
-void wxTaskBarButtonImpl::SetOverlayIcon(const wxIcon& icon)
+void wxTaskBarButtonImpl::SetOverlayIcon(const wxIcon& icon,
+                                         const wxString& description)
 {
-    m_taskbarList->SetOverlayIcon(m_hwnd, GetHiconOf(icon), NULL);
+    m_taskbarList->SetOverlayIcon(m_hwnd,
+                                  GetHiconOf(icon),
+                                  description.wc_str());
 }
 
 void wxTaskBarButtonImpl::SetThumbnailClip(const wxRect& rect)