diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index a7d7e69df7..c1e96c37c4 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -2272,9 +2272,13 @@ properties:
 @beginTable
 @hdr3col{property, type, description}
 @row3col{bitmap, @ref overview_xrcformat_type_bitmap,
-    Tool's bitmap (default: empty).}
+    Tool's bitmap (default: empty). Mutually exclusive with @c bitmaps.}
 @row3col{bitmap2, @ref overview_xrcformat_type_bitmap,
     Bitmap for disabled tool (default: derived from @c bitmap).}
+@row3col{bitmaps, @ref overview_xrcformat_type_bitmaps,
+    Tool's BitmapBundle. Mutually exclusive with @c bitmap.}
+@row3col{bitmaps2, @ref overview_xrcformat_type_bitmaps,
+    BitmapBundle for disabled tool (default: derived from @c bitmaps).}
 @row3col{label, @ref overview_xrcformat_type_text,
     Label to display on the tool (default: no label).}
 @row3col{radio, @ref overview_xrcformat_type_bool,
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index d5d6ae15ee..8a61d8f746 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -1650,8 +1650,16 @@ wxToolBar_tool =
     element object {
         attribute class { "tool" } &
         stdObjectNodeAttributes &
-        [xrc:p="important"] element bitmap {_, t_bitmap }* &
-        [xrc:p="o"] element bitmap2  {_, t_bitmap }* &
+        (
+            (
+                [xrc:p="important"] element bitmap {_, t_bitmap }* &
+                [xrc:p="o"] element bitmap2  {_, t_bitmap }*
+            ) |
+            (
+                [xrc:p="important"] element bitmaps {_, t_bitmaps }* &
+                [xrc:p="o"] element bitmaps2  {_, t_bitmaps }*
+            )
+        ) &
         [xrc:p="o"] element label    {_, t_text }* &
         [xrc:p="o"] element tooltip  {_, t_text }* &
         [xrc:p="o"] element longhelp {_, t_text }* &
diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 8348c55433..26e7265021 100644
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -126,8 +126,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                        (
                           GetID(),
                           GetText(wxT("label")),
-                          GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_toolSize),
-                          GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_toolSize),
+                          GetBitmapOrBitmaps(wxT("bitmap"), wxT("bitmaps"), wxART_TOOLBAR, m_toolSize),
+                          GetBitmapOrBitmaps(wxT("bitmap2"), wxT("bitmaps2"), wxART_TOOLBAR, m_toolSize),
                           kind,
                           GetText(wxT("tooltip")),
                           GetText(wxT("longhelp"))