diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index c489d4c068..b6addcc4cf 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -146,6 +146,9 @@ public:
         { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
 
     // attributes
+    wxBitmapBundle GetNormalBitmapBundle() const { return m_bmpNormal; }
+    wxBitmapBundle GetDisabledBitmapBundle() const { return m_bmpDisabled; }
+
     wxBitmap GetNormalBitmap(const wxSize& size = wxDefaultSize) const
         { return m_bmpNormal.GetBitmap(size); }
     wxBitmap GetDisabledBitmap(const wxSize& size = wxDefaultSize) const
diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index 35474cf509..19cf6a4506 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -112,6 +112,26 @@ public:
     bool IsToggled() const;
     bool CanBeToggled() const;
 
+    /**
+        Return the bundle containing normal tool bitmaps.
+
+        This bundle may be invalid if the tool doesn't show a bitmap.
+
+        @since 3.1.6
+     */
+    wxBitmapBundle GetNormalBitmapBundle() const;
+
+    /**
+        Return the bundle containing disabled tool bitmaps.
+
+        This bundle may be invalid if the tool doesn't show a bitmap or doesn't
+        have a specific disabled bitmap creates one automatically from the
+        normal bitmap.
+
+        @since 3.1.6
+     */
+    wxBitmapBundle GetDisabledBitmapBundle() const;
+
     wxBitmap GetNormalBitmap() const;
     wxBitmap GetDisabledBitmap() const;