diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index a5608b2664..41454ed5ff 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -155,7 +155,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
 	$(CXX) -o $@ $(TOOLBAR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 	$(__toolbar___os2_emxbindcmd)
 
-@COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(srcdir)/bitmaps/new.png $(srcdir)/bitmaps/open.png $(srcdir)/bitmaps/save.png $(srcdir)/bitmaps/copy.png $(srcdir)/bitmaps/cut.png $(srcdir)/bitmaps/paste.png $(srcdir)/bitmaps/print.png $(srcdir)/bitmaps/help.png
 @COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents
 @COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents/Resources
@@ -179,6 +179,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(srcdir)/bitmaps/new.png $(srcdir)/bitmaps/open.png $(srcdir)/bitmaps/save.png $(srcdir)/bitmaps/copy.png $(srcdir)/bitmaps/cut.png $(srcdir)/bitmaps/paste.png $(srcdir)/bitmaps/print.png $(srcdir)/bitmaps/help.png toolbar.app/Contents/Resources
 
 @COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)
 
diff --git a/samples/toolbar/bitmaps/README.md b/samples/toolbar/bitmaps/README.md
new file mode 100644
index 0000000000..e64df36c69
--- /dev/null
+++ b/samples/toolbar/bitmaps/README.md
@@ -0,0 +1,10 @@
+PNG icons in this directory are public domain were taken from Tango Desktop
+Project[1] and are in public domain.
+
+[1]: http://tango.freedesktop.org/Tango_Desktop_Project
+
+The `foo_png.c` files were generated by running
+
+    $ ../../../misc/scripts/png2c.py foo.png > foo_png.c
+
+for each icon.
diff --git a/samples/toolbar/bitmaps/copy.bmp b/samples/toolbar/bitmaps/copy.bmp
deleted file mode 100644
index a21608fc23..0000000000
Binary files a/samples/toolbar/bitmaps/copy.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/copy.png b/samples/toolbar/bitmaps/copy.png
new file mode 100644
index 0000000000..8dd48c4949
Binary files /dev/null and b/samples/toolbar/bitmaps/copy.png differ
diff --git a/samples/toolbar/bitmaps/copy.xpm b/samples/toolbar/bitmaps/copy.xpm
deleted file mode 100644
index 15eb885af9..0000000000
--- a/samples/toolbar/bitmaps/copy.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static const char *const copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"+ c #769CDA",
-": c #DCE6F6",
-"X c #3365B7",
-"* c #FFFFFF",
-"o c #9AB6E4",
-"< c #EAF0FA",
-"# c #B1C7EB",
-". c #6992D7",
-"3 c #F7F9FD",
-", c #F0F5FC",
-"$ c #A8C0E8",
-"  c None",
-"- c #FDFEFF",
-"& c #C4D5F0",
-"1 c #E2EAF8",
-"O c #89A9DF",
-"= c #D2DFF4",
-"4 c #FAFCFE",
-"2 c #F5F8FD",
-"; c #DFE8F7",
-"% c #B8CCEC",
-"> c #E5EDF9",
-"@ c #648FD6",
-/* pixels */
-" .....XX        ",
-" .oO+@X#X       ",
-" .$oO+X##X      ",
-" .%$o........   ",
-" .&%$.*=&#o.-.  ",
-" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
-" .....**-432,>. ",
-"     .***-432,. ",
-"     .......... "
-};
diff --git a/samples/toolbar/bitmaps/copy_png.c b/samples/toolbar/bitmaps/copy_png.c
new file mode 100644
index 0000000000..657a2ad8ff
--- /dev/null
+++ b/samples/toolbar/bitmaps/copy_png.c
@@ -0,0 +1,65 @@
+/* copy.png - 498 bytes */
+static const unsigned char copy_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
+  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
+  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
+  0x07, 0xd5, 0x0a, 0x1a, 0x14, 0x08, 0x2f, 0x83,
+  0x14, 0x34, 0x9b, 0x00, 0x00, 0x01, 0x7f, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0x4b,
+  0x4b, 0x02, 0x51, 0x18, 0x86, 0xdf, 0x23, 0x33,
+  0x63, 0xda, 0x80, 0xfd, 0x0a, 0xcf, 0x08, 0xdd,
+  0x16, 0xfd, 0x8f, 0x08, 0x5a, 0xb6, 0x88, 0xa0,
+  0x75, 0x17, 0xf0, 0x42, 0xb6, 0xb0, 0x45, 0x91,
+  0x76, 0xdb, 0x44, 0x44, 0x44, 0x1b, 0xb1, 0x36,
+  0x05, 0xfe, 0x04, 0x31, 0xb3, 0x36, 0x81, 0x65,
+  0x30, 0xa3, 0xbf, 0xa0, 0x9a, 0x30, 0x05, 0x37,
+  0xcd, 0xed, 0xb4, 0x69, 0x74, 0x46, 0x47, 0xb1,
+  0x6f, 0xf5, 0x9d, 0xc3, 0x79, 0x1f, 0xde, 0xf7,
+  0xe3, 0x3b, 0xe4, 0xe8, 0x24, 0x33, 0xaf, 0xeb,
+  0xfa, 0x2c, 0x46, 0x28, 0xc1, 0xcf, 0xbd, 0x6d,
+  0xae, 0xc5, 0xef, 0x9c, 0x77, 0x9c, 0x61, 0x18,
+  0xd3, 0xf1, 0xe8, 0xd6, 0x28, 0x7a, 0xa4, 0x0f,
+  0xf6, 0x26, 0x01, 0xb8, 0x01, 0x76, 0xd3, 0x6a,
+  0x35, 0xc1, 0x18, 0xeb, 0x13, 0x11, 0x42, 0x00,
+  0x00, 0xa1, 0xd0, 0x84, 0x27, 0x94, 0x73, 0x1e,
+  0x6a, 0xb5, 0x1a, 0x5e, 0xab, 0x95, 0x85, 0xc6,
+  0x77, 0x63, 0x66, 0x90, 0x8b, 0xfd, 0xcc, 0x6e,
+  0xca, 0xee, 0x79, 0x9e, 0xbf, 0x75, 0x01, 0x24,
+  0x49, 0x42, 0xb1, 0x54, 0x98, 0xfa, 0x47, 0xa4,
+  0x45, 0x17, 0x40, 0x51, 0x94, 0x4e, 0x8c, 0x56,
+  0xab, 0x39, 0x54, 0x6c, 0x47, 0x72, 0x01, 0x28,
+  0xa5, 0x28, 0x96, 0x0a, 0x9d, 0xb3, 0x2c, 0xcb,
+  0x9e, 0xe2, 0x48, 0x24, 0xd2, 0x3f, 0x03, 0xc6,
+  0x18, 0x64, 0x59, 0x76, 0x0d, 0xd2, 0xf9, 0x70,
+  0x50, 0xb9, 0x00, 0x94, 0x52, 0x94, 0xca, 0xc5,
+  0xa1, 0x0e, 0x7a, 0xa1, 0x9c, 0x2d, 0xb6, 0x2c,
+  0x06, 0x45, 0x19, 0xcd, 0x41, 0x30, 0x38, 0x8e,
+  0x76, 0xbb, 0xdd, 0x05, 0xe8, 0xba, 0x0e, 0xc6,
+  0x18, 0xc2, 0x61, 0x8a, 0xf2, 0x53, 0x69, 0xa8,
+  0x03, 0x4a, 0x25, 0x98, 0xa6, 0x81, 0xca, 0x4b,
+  0xa5, 0x0b, 0xd0, 0xb4, 0x1f, 0x04, 0x02, 0x63,
+  0xb0, 0x2c, 0x36, 0xd4, 0xee, 0xe5, 0xd5, 0x05,
+  0x1e, 0x1e, 0xef, 0xdd, 0x11, 0x04, 0x9e, 0xaf,
+  0x9e, 0x9d, 0x9f, 0xba, 0x16, 0x87, 0x31, 0xcb,
+  0xd3, 0xb6, 0x28, 0x8a, 0x58, 0x59, 0x5e, 0x85,
+  0x65, 0x99, 0x50, 0xbf, 0x54, 0xe4, 0xae, 0xb3,
+  0xe0, 0x36, 0xd6, 0xa3, 0x79, 0x00, 0x79, 0xc7,
+  0x72, 0x6c, 0x1b, 0x86, 0xe1, 0xeb, 0x15, 0x3b,
+  0x4b, 0x55, 0x55, 0xe4, 0x6e, 0xb2, 0x00, 0xf0,
+  0xec, 0xf3, 0x1a, 0x92, 0xa6, 0xe9, 0xf0, 0xfb,
+  0xfd, 0x10, 0x04, 0x01, 0xa2, 0x28, 0x82, 0x10,
+  0x82, 0x7a, 0xbd, 0x0e, 0x80, 0xe0, 0xe3, 0xf3,
+  0xdd, 0x16, 0xa7, 0x12, 0xb1, 0xe4, 0x1c, 0xe9,
+  0x15, 0x1f, 0x1e, 0xa7, 0xb3, 0xa6, 0x69, 0x2e,
+  0x79, 0x7d, 0xac, 0xbf, 0x2a, 0x00, 0x28, 0x24,
+  0x62, 0xc9, 0x1d, 0x00, 0xf8, 0x05, 0x42, 0x59,
+  0xa6, 0x03, 0x15, 0x88, 0xf7, 0xd8, 0x00, 0x00,
+  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+  0x60, 0x82};
diff --git a/samples/toolbar/bitmaps/cut.bmp b/samples/toolbar/bitmaps/cut.bmp
deleted file mode 100644
index d41668ab3f..0000000000
Binary files a/samples/toolbar/bitmaps/cut.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/cut.png b/samples/toolbar/bitmaps/cut.png
new file mode 100644
index 0000000000..dc9eb9a7ad
Binary files /dev/null and b/samples/toolbar/bitmaps/cut.png differ
diff --git a/samples/toolbar/bitmaps/cut.xpm b/samples/toolbar/bitmaps/cut.xpm
deleted file mode 100644
index e638157f59..0000000000
--- a/samples/toolbar/bitmaps/cut.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static const char *const cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
-"  c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
-/* pixels */
-"   .X     .o    ",
-"   O.+   @.     ",
-"    O.   ..     ",
-"    O#$ %.&     ",
-"     O.*..      ",
-"     #%#..      ",
-"     O=-..      ",
-"     #%#;.      ",
-"     OO:=O      ",
-"  >,,<, ,<,,1   ",
-" ><23<1 1<32<1  ",
-" ,2 4<   <5 2,  ",
-" <, ,2   2, ,<  ",
-" 23,<5   5<,32  ",
-" 6225     522>  "
-};
diff --git a/samples/toolbar/bitmaps/cut_png.c b/samples/toolbar/bitmaps/cut_png.c
new file mode 100644
index 0000000000..0ac463dc38
--- /dev/null
+++ b/samples/toolbar/bitmaps/cut_png.c
@@ -0,0 +1,103 @@
+/* cut.png - 807 bytes */
+static const unsigned char cut_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
+  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
+  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
+  0x07, 0xd5, 0x0a, 0x1c, 0x16, 0x1d, 0x31, 0x68,
+  0x41, 0x64, 0x5e, 0x00, 0x00, 0x02, 0xb4, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0xcb, 0x85, 0x93, 0x5d,
+  0x48, 0x93, 0x51, 0x18, 0xc7, 0x9f, 0x73, 0xde,
+  0x77, 0xaf, 0xaf, 0xdb, 0xd4, 0x7d, 0xa5, 0xdb,
+  0x6c, 0xf8, 0x15, 0x68, 0x78, 0xd1, 0x55, 0x10,
+  0x74, 0x61, 0x94, 0x49, 0x57, 0x45, 0xde, 0x64,
+  0x22, 0x11, 0x68, 0x69, 0x96, 0x58, 0xa8, 0x69,
+  0x81, 0x90, 0x04, 0x95, 0xa5, 0x7d, 0x81, 0x88,
+  0x10, 0x94, 0x18, 0xe8, 0x10, 0xf4, 0x4a, 0x90,
+  0x24, 0xba, 0x0c, 0x02, 0xb5, 0x30, 0x6d, 0x33,
+  0x36, 0xf2, 0x63, 0xef, 0x36, 0x75, 0x9b, 0xee,
+  0x75, 0x5f, 0xef, 0x76, 0xce, 0xdb, 0x4d, 0xce,
+  0x61, 0x5a, 0xe7, 0xee, 0xfc, 0xff, 0x0f, 0x3f,
+  0xfe, 0xcf, 0xf3, 0x9c, 0x83, 0x20, 0xe5, 0x3c,
+  0xeb, 0x7d, 0x72, 0x0e, 0x00, 0xde, 0xf3, 0x3c,
+  0xef, 0x6d, 0xba, 0x79, 0xbb, 0x74, 0x8f, 0xd7,
+  0xcf, 0xb2, 0xec, 0xa5, 0x3b, 0xcd, 0xad, 0xba,
+  0x54, 0x1d, 0xa7, 0x5e, 0x18, 0x86, 0x19, 0xbb,
+  0xd5, 0xd8, 0xac, 0x8d, 0x46, 0xa3, 0xcb, 0x7d,
+  0xfd, 0xaf, 0x3b, 0x53, 0x3d, 0x05, 0xab, 0xb8,
+  0x70, 0xe6, 0x74, 0xb9, 0xe6, 0xc5, 0xab, 0x9e,
+  0x4f, 0x07, 0x02, 0x08, 0x21, 0xfc, 0x4f, 0x87,
+  0x1d, 0xd7, 0xd5, 0xd6, 0x57, 0x10, 0x42, 0x8e,
+  0xed, 0xe8, 0x4f, 0x7b, 0x1e, 0x97, 0x99, 0x73,
+  0xcd, 0xa6, 0xed, 0x90, 0x88, 0x28, 0xa5, 0x27,
+  0x0e, 0x04, 0x60, 0x8c, 0x43, 0x4b, 0x4b, 0xbf,
+  0x80, 0x4f, 0x4b, 0x43, 0xb1, 0x58, 0xac, 0x74,
+  0x27, 0x05, 0xcb, 0xb2, 0x53, 0x85, 0x85, 0x85,
+  0xe0, 0x71, 0x7b, 0x28, 0xa5, 0xd4, 0xf1, 0xaf,
+  0x04, 0x15, 0x36, 0x9b, 0x0d, 0x56, 0x5d, 0x2b,
+  0xa8, 0xae, 0xb6, 0xbe, 0x38, 0x91, 0x48, 0x9c,
+  0xea, 0x79, 0xde, 0x3d, 0x50, 0x52, 0x52, 0xa2,
+  0x40, 0x80, 0xc1, 0xe1, 0x74, 0x00, 0x00, 0x58,
+  0x0f, 0x04, 0xdc, 0x6d, 0xbd, 0xf7, 0x19, 0x63,
+  0xbc, 0xbc, 0xb8, 0x68, 0x07, 0x3e, 0x8d, 0x47,
+  0x92, 0x24, 0x1d, 0xd7, 0xeb, 0xf4, 0xd7, 0x64,
+  0x0a, 0xb0, 0xbe, 0xb1, 0x46, 0x01, 0x60, 0xa2,
+  0xad, 0xa5, 0xe3, 0xe1, 0x81, 0x00, 0x00, 0x00,
+  0x4a, 0x69, 0xe5, 0xc2, 0x8f, 0x05, 0x79, 0x6d,
+  0xcd, 0x03, 0x8d, 0x37, 0x9a, 0x54, 0xf1, 0x44,
+  0x1c, 0x89, 0x62, 0x10, 0xe6, 0xe6, 0xe6, 0x24,
+  0x00, 0xe8, 0xda, 0x5b, 0xff, 0x17, 0xa0, 0xad,
+  0xa5, 0x63, 0x1a, 0x63, 0x3c, 0x64, 0x5f, 0xb4,
+  0xd1, 0x60, 0x70, 0x0b, 0x6b, 0x34, 0x1a, 0x10,
+  0xdc, 0x82, 0x2c, 0xcb, 0xf2, 0xbb, 0xb6, 0x96,
+  0x8e, 0xe9, 0xff, 0x02, 0xfe, 0xa4, 0x98, 0x9a,
+  0x9d, 0x99, 0xc6, 0x4e, 0xa7, 0x03, 0xd2, 0x39,
+  0x1e, 0x32, 0xdf, 0x0e, 0x46, 0x10, 0x42, 0x6f,
+  0xf6, 0xab, 0x45, 0x7b, 0x85, 0x31, 0xa3, 0xb1,
+  0x97, 0x50, 0x7a, 0x3d, 0xbe, 0xb9, 0xa9, 0x26,
+  0xe5, 0x65, 0x32, 0x33, 0xf9, 0x11, 0x15, 0x18,
+  0x73, 0x40, 0x20, 0x74, 0x0b, 0x21, 0x34, 0x50,
+  0xe9, 0xf1, 0xb4, 0xef, 0x0b, 0x18, 0x33, 0x99,
+  0x3a, 0xe3, 0x7e, 0xff, 0x83, 0xa3, 0x26, 0x13,
+  0x24, 0x28, 0x45, 0xde, 0xad, 0x4d, 0xd9, 0x17,
+  0xde, 0x1e, 0x66, 0x65, 0x54, 0x55, 0x90, 0x9d,
+  0xc3, 0xf0, 0x1c, 0x47, 0x25, 0x59, 0x06, 0xe7,
+  0xfa, 0x3a, 0x28, 0xb2, 0xb2, 0xae, 0x56, 0xba,
+  0xdd, 0x43, 0xc9, 0x16, 0xc6, 0xcd, 0xe6, 0x1a,
+  0xc9, 0xe7, 0xeb, 0x2a, 0x36, 0x1a, 0xe9, 0xc2,
+  0xca, 0xca, 0x54, 0x30, 0x12, 0x96, 0x02, 0x41,
+  0x11, 0xd7, 0xc4, 0x69, 0x4d, 0x94, 0x23, 0x3a,
+  0x96, 0xc1, 0x34, 0x10, 0x12, 0x13, 0x8e, 0xd5,
+  0xd5, 0x0f, 0x47, 0xf4, 0x7a, 0x12, 0xf3, 0xf9,
+  0x06, 0xc7, 0xcd, 0xe6, 0xdd, 0x97, 0x3a, 0x6a,
+  0x30, 0x08, 0xf3, 0x45, 0x45, 0x64, 0x84, 0x61,
+  0xee, 0x03, 0x00, 0xcc, 0x58, 0x2c, 0x21, 0xab,
+  0x52, 0x99, 0xd8, 0xf1, 0x47, 0x18, 0x86, 0x7c,
+  0xc9, 0x35, 0x07, 0x01, 0x00, 0x86, 0x31, 0x6e,
+  0xff, 0x96, 0x9f, 0x4f, 0x46, 0x0d, 0x06, 0x61,
+  0x77, 0x88, 0xb1, 0x98, 0x5e, 0x92, 0x24, 0x52,
+  0x45, 0xc8, 0xa3, 0x09, 0x95, 0xea, 0xa5, 0x82,
+  0x65, 0x79, 0x84, 0xb1, 0x3d, 0x39, 0x69, 0x8e,
+  0x9b, 0x51, 0xf3, 0xe9, 0xaa, 0xc9, 0x8c, 0x8c,
+  0xbe, 0xcb, 0x94, 0x76, 0x83, 0x2c, 0x53, 0x20,
+  0xc4, 0xb0, 0x0b, 0xe0, 0x38, 0x41, 0xad, 0x54,
+  0x32, 0x5f, 0xf3, 0xf2, 0x62, 0x26, 0x9d, 0xae,
+  0x69, 0x5e, 0x10, 0xbc, 0x8a, 0xcc, 0xcc, 0x2b,
+  0xc9, 0x8f, 0xa4, 0xd5, 0x36, 0x7c, 0x77, 0xb9,
+  0x36, 0x0e, 0x1f, 0x3a, 0xd4, 0x30, 0x6b, 0xb1,
+  0xc4, 0x08, 0xa5, 0x18, 0x30, 0x0e, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0xd5, 0x5a, 0xad, 0xcf, 0xe5,
+  0xf7, 0x9f, 0xf4, 0x4b, 0x12, 0x1b, 0x00, 0x90,
+  0x39, 0xb5, 0xfa, 0xec, 0x45, 0x41, 0x48, 0xee,
+  0xdc, 0x2a, 0x8a, 0xee, 0xea, 0xec, 0x6c, 0x8f,
+  0x37, 0x10, 0xc8, 0xf1, 0x87, 0xc3, 0x1a, 0x5f,
+  0x24, 0xe2, 0x53, 0xa8, 0x54, 0xe7, 0xad, 0xa2,
+  0xe8, 0xfe, 0x0d, 0xa0, 0xf3, 0x3a, 0x07, 0xdc,
+  0x34, 0xc1, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x49,
+  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
diff --git a/samples/toolbar/bitmaps/help.bmp b/samples/toolbar/bitmaps/help.bmp
deleted file mode 100644
index d5636e9aa2..0000000000
Binary files a/samples/toolbar/bitmaps/help.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/help.png b/samples/toolbar/bitmaps/help.png
new file mode 100644
index 0000000000..f25fc3fbf1
Binary files /dev/null and b/samples/toolbar/bitmaps/help.png differ
diff --git a/samples/toolbar/bitmaps/help.xpm b/samples/toolbar/bitmaps/help.xpm
deleted file mode 100644
index eebb5b518d..0000000000
--- a/samples/toolbar/bitmaps/help.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static const char *const help_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 50 1",
-"j c #4E7FD0",
-"8 c #EDF2FB",
-", c #7198D9",
-"e c #DCE6F6",
-"y c #FFFFFF",
-"5 c #95B2E3",
-"$ c #9AB6E4",
-"g c #EAF0FA",
-"1 c #2D59A3",
-"@ c #B1C7EB",
-"> c #6992D7",
-"a c #D9E4F5",
-"r c #356AC1",
-"6 c #9BB7E5",
-"= c #F7F9FD",
-"+ c #BED0EE",
-"z c #F0F5FC",
-"f c #ADC4E9",
-"# c #A8C0E8",
-"7 c #CBD9F1",
-"u c #366BC2",
-"  c None",
-"c c #FDFEFF",
-"w c #274D8D",
-"t c #C4D5F0",
-"% c #7CA0DC",
-"h c #E2EAF8",
-"p c #487BCE",
-"o c #4377CD",
-"4 c #2A549A",
-"< c #254A87",
-"O c #CCDAF2",
-"& c #89A9DF",
-"9 c #2B559B",
-"* c #D2DFF4",
-". c #3366BB",
-": c #2E5CA8",
-"x c #FAFCFE",
-"l c #F5F8FD",
-"2 c #799EDB",
-"d c #DFE8F7",
-"; c #A6BFE8",
-"3 c #638ED5",
-"- c #5282D0",
-"X c #2A5398",
-"0 c #B8CCEC",
-"s c #376EC9",
-"q c #2D5AA5",
-"i c #285092",
-"k c #8CACE0",
-/* pixels */
-"   .......Xo    ",
-"   .O+@#$%.&o   ",
-"   .*O+@#$.=&-  ",
-"  ;:::>#@#.==&: ",
-" ,<1234<>@....: ",
-"5<X67869<&0#$&. ",
-"q99wwe;9Xrt0#$. ",
-"<99X&yu99iOt0#. ",
-"<99wyp999<aOt0. ",
-"<99X<u99XsdaOt. ",
-",w9<y;99<fghaO. ",
-" j<X<XX<klzgha. ",
-"  5:::j7x=lzgh. ",
-"   .yyyccx=lzg. ",
-"   ............ "
-};
diff --git a/samples/toolbar/bitmaps/help_png.c b/samples/toolbar/bitmaps/help_png.c
new file mode 100644
index 0000000000..e0ba52ffbe
--- /dev/null
+++ b/samples/toolbar/bitmaps/help_png.c
@@ -0,0 +1,119 @@
+/* help.png - 932 bytes */
+static const unsigned char help_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
+  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
+  0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
+  0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
+  0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
+  0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
+  0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
+  0x03, 0x36, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
+  0x6d, 0x93, 0x5b, 0x6c, 0x54, 0x65, 0x14, 0x85,
+  0xbf, 0xf3, 0xff, 0xe7, 0x5a, 0x51, 0x1a, 0xc0,
+  0x86, 0x4e, 0xa1, 0xf4, 0x36, 0xed, 0x80, 0x4e,
+  0xa9, 0x53, 0x82, 0x05, 0x4d, 0x53, 0x2e, 0x46,
+  0x2d, 0xfa, 0xa2, 0xa2, 0x86, 0xc4, 0x84, 0x98,
+  0x18, 0x13, 0x2b, 0x06, 0x49, 0x4c, 0x27, 0x41,
+  0x8c, 0x69, 0xa2, 0xad, 0x17, 0x24, 0xf1, 0x41,
+  0x0d, 0x89, 0x11, 0xd2, 0xf8, 0xe0, 0x83, 0x09,
+  0xa0, 0x47, 0x23, 0x82, 0x8e, 0xd5, 0xa0, 0x05,
+  0x69, 0x19, 0x5a, 0xdb, 0x82, 0x63, 0xa7, 0x62,
+  0x9d, 0xa1, 0x2d, 0x50, 0x7b, 0x99, 0x69, 0xa7,
+  0x76, 0xce, 0xef, 0x43, 0x4b, 0x03, 0xc1, 0x9d,
+  0xec, 0x97, 0x9d, 0xbd, 0x57, 0xd6, 0x5e, 0x59,
+  0x4b, 0x53, 0x4a, 0x71, 0x63, 0x15, 0x6f, 0x6b,
+  0x09, 0x00, 0xcf, 0x00, 0x75, 0x40, 0x70, 0x7e,
+  0xdc, 0x05, 0x44, 0x80, 0xd6, 0xb8, 0x1b, 0xee,
+  0xbb, 0x71, 0x5f, 0xbb, 0x0e, 0x50, 0xbc, 0xad,
+  0x45, 0x00, 0x8d, 0x8b, 0x72, 0xcc, 0x57, 0x77,
+  0x3e, 0xba, 0xce, 0xbe, 0x27, 0xe0, 0x13, 0x95,
+  0xe5, 0xf9, 0x00, 0x9c, 0xbf, 0x98, 0xa4, 0xf3,
+  0x42, 0xc2, 0x3b, 0x74, 0xec, 0xd7, 0xcc, 0x64,
+  0x7a, 0xa6, 0x09, 0x78, 0x3b, 0xee, 0x86, 0xbd,
+  0x05, 0x80, 0xf9, 0xe3, 0xb6, 0xfb, 0xaa, 0x8a,
+  0x42, 0x2d, 0x2f, 0x3d, 0xec, 0x9c, 0x8a, 0x0e,
+  0x70, 0xa2, 0x3d, 0x46, 0x4f, 0xff, 0x30, 0x00,
+  0x6b, 0x4a, 0xf2, 0x78, 0xa0, 0xc6, 0xcf, 0xc6,
+  0xb5, 0xab, 0x08, 0xbf, 0xff, 0xf5, 0xd4, 0x4f,
+  0x9d, 0x03, 0x1d, 0x40, 0x6d, 0xdc, 0x0d, 0x7b,
+  0xfa, 0x3c, 0x93, 0xc6, 0x4d, 0xeb, 0x4a, 0x43,
+  0x6f, 0xee, 0x7a, 0xc8, 0xd9, 0xb3, 0xff, 0x4b,
+  0xae, 0x8d, 0xa5, 0xd9, 0xfb, 0xdc, 0x66, 0x2a,
+  0xfd, 0xf9, 0xa4, 0xa7, 0x66, 0xf8, 0xa1, 0x23,
+  0x4e, 0xab, 0xdb, 0xc9, 0xf1, 0x5f, 0x62, 0xbc,
+  0xbb, 0xe7, 0x11, 0xe7, 0x95, 0x03, 0x6e, 0xf5,
+  0x8f, 0x1d, 0xf1, 0x46, 0xa0, 0x99, 0xa2, 0xfa,
+  0xe6, 0x40, 0x70, 0xfb, 0x7b, 0xa9, 0xbf, 0x87,
+  0xc7, 0xd4, 0xd3, 0xe1, 0x4f, 0x55, 0x51, 0x7d,
+  0xb3, 0x7a, 0xb1, 0xe5, 0x88, 0xca, 0x66, 0x3d,
+  0xd5, 0xd3, 0x3f, 0xa4, 0x46, 0xc7, 0xd3, 0x4a,
+  0x29, 0xa5, 0x4e, 0x9e, 0x8e, 0xa9, 0x9a, 0x9d,
+  0x1f, 0xa9, 0x86, 0xb7, 0xbe, 0x50, 0x89, 0x91,
+  0x71, 0x15, 0xdc, 0xbe, 0x3f, 0x5d, 0x54, 0xdf,
+  0x1c, 0x90, 0xb9, 0xfe, 0xad, 0x2f, 0xbf, 0xf0,
+  0xe4, 0x86, 0x4d, 0xa3, 0xe3, 0x69, 0xed, 0xd0,
+  0xb1, 0xb3, 0x00, 0x18, 0x86, 0xce, 0x67, 0xc7,
+  0xcf, 0x73, 0xd8, 0x3d, 0x47, 0x7b, 0xf7, 0x5f,
+  0x3c, 0xbe, 0xe5, 0x6e, 0x56, 0x2e, 0xcf, 0xe5,
+  0xf3, 0xef, 0x7b, 0x19, 0x19, 0x4d, 0x51, 0xba,
+  0x62, 0x09, 0x25, 0x2b, 0x96, 0xca, 0x53, 0xd1,
+  0x3f, 0x27, 0x04, 0x50, 0x57, 0x55, 0xe1, 0xd3,
+  0x4e, 0xb4, 0xc7, 0x00, 0xb0, 0x4c, 0x9d, 0x4b,
+  0x97, 0xc7, 0x48, 0x5e, 0x4d, 0x61, 0x5b, 0x06,
+  0x55, 0x15, 0x3e, 0x00, 0xae, 0xfe, 0x93, 0xc6,
+  0x30, 0x74, 0x72, 0x1c, 0x8b, 0xce, 0xdf, 0x87,
+  0x08, 0xad, 0x2e, 0x10, 0x52, 0x88, 0x3a, 0x1d,
+  0x08, 0x06, 0xcb, 0x96, 0x13, 0xbd, 0x98, 0xc4,
+  0x30, 0x24, 0xa6, 0x69, 0x60, 0x59, 0x06, 0x96,
+  0x69, 0x10, 0x0a, 0x14, 0xb0, 0x7b, 0xc7, 0x46,
+  0x94, 0x52, 0x1c, 0x3c, 0xda, 0x81, 0x63, 0x5b,
+  0x08, 0xa1, 0x91, 0xb8, 0x32, 0xc9, 0xea, 0xe2,
+  0x3c, 0x3c, 0xa5, 0x82, 0xd7, 0x45, 0x44, 0x08,
+  0x0d, 0x43, 0xd7, 0x31, 0x8d, 0xb9, 0xb6, 0x4c,
+  0x83, 0xbd, 0xcf, 0xd6, 0x62, 0xea, 0x92, 0xc3,
+  0x5f, 0x45, 0xe9, 0xbb, 0x34, 0x4a, 0x8e, 0x63,
+  0x22, 0x84, 0xc0, 0xb1, 0x4c, 0x34, 0x34, 0x34,
+  0x40, 0x00, 0x5d, 0x5d, 0xb1, 0xcb, 0x84, 0x02,
+  0x05, 0x18, 0x86, 0x9c, 0x63, 0x61, 0xe8, 0x2c,
+  0xbe, 0xdd, 0x66, 0x20, 0x39, 0xc6, 0x99, 0xde,
+  0x04, 0x6d, 0xd1, 0x41, 0x1c, 0xdb, 0xc4, 0xb1,
+  0x2d, 0x72, 0x1c, 0x93, 0xf2, 0xc2, 0x65, 0xc4,
+  0x06, 0xaf, 0x21, 0xa4, 0xe8, 0x12, 0x40, 0xe4,
+  0xdc, 0x85, 0x84, 0xb7, 0x65, 0x7d, 0x19, 0xba,
+  0x2e, 0xd1, 0x75, 0x89, 0x61, 0xe8, 0x68, 0x42,
+  0xf0, 0x73, 0xf7, 0x20, 0xa7, 0x7b, 0x93, 0x48,
+  0x29, 0xb1, 0x6d, 0x63, 0x01, 0xa4, 0xd2, 0x9f,
+  0x47, 0xf7, 0x1f, 0x43, 0x5e, 0x36, 0xeb, 0x45,
+  0x04, 0xd0, 0xfa, 0xf1, 0x91, 0x33, 0x99, 0x0d,
+  0x6b, 0x57, 0xb1, 0xfe, 0xae, 0x95, 0xe8, 0x52,
+  0xa2, 0x4b, 0x41, 0xee, 0x22, 0x87, 0xdd, 0x4f,
+  0xdd, 0x4b, 0xc3, 0x63, 0xd5, 0xe4, 0x38, 0x26,
+  0x96, 0x65, 0x62, 0xdb, 0x26, 0x6b, 0x8a, 0xef,
+  0xa4, 0xcc, 0x97, 0xcb, 0x81, 0xd6, 0x48, 0x46,
+  0x29, 0xd5, 0x2a, 0xe2, 0x6e, 0xb8, 0x6f, 0x22,
+  0x95, 0x69, 0xda, 0xf7, 0xc1, 0x37, 0x53, 0xaf,
+  0x3f, 0xbf, 0x99, 0x50, 0xc0, 0x87, 0x94, 0x02,
+  0x29, 0xb5, 0x05, 0xbf, 0x1b, 0xf3, 0xba, 0x04,
+  0x0a, 0x97, 0xf0, 0x44, 0x6d, 0x29, 0xaf, 0x7d,
+  0xf8, 0xed, 0xf4, 0x44, 0x2a, 0xd3, 0x14, 0x77,
+  0xc3, 0x7d, 0x37, 0x59, 0x79, 0x6b, 0x8d, 0xbf,
+  0xfa, 0x8d, 0x86, 0x07, 0xed, 0x68, 0x6c, 0x98,
+  0x68, 0x6c, 0x98, 0xc4, 0x95, 0x49, 0x6c, 0x7b,
+  0xee, 0xe7, 0xca, 0xd2, 0x65, 0x94, 0xe4, 0x2f,
+  0xa6, 0xe9, 0xe0, 0xc9, 0x69, 0xb7, 0xad, 0xe7,
+  0xec, 0xcc, 0xbf, 0xb3, 0xb5, 0x71, 0x37, 0xec,
+  0xdd, 0x12, 0xa6, 0x3b, 0x6e, 0xb3, 0xf7, 0xed,
+  0xda, 0x71, 0xbf, 0x5d, 0x55, 0xe1, 0xd3, 0xca,
+  0x0b, 0x97, 0xa2, 0x69, 0x1a, 0xf1, 0xc4, 0x28,
+  0xbf, 0xf5, 0x8f, 0x78, 0xef, 0x7c, 0xf2, 0x5d,
+  0x66, 0x7c, 0x72, 0xba, 0x29, 0xeb, 0x79, 0x37,
+  0x87, 0xe9, 0xff, 0xe2, 0x2c, 0xa5, 0xa8, 0x53,
+  0x4a, 0x05, 0x01, 0xa4, 0x94, 0x5d, 0xb3, 0xb3,
+  0xd9, 0x88, 0x52, 0xea, 0x96, 0x38, 0xff, 0x07,
+  0x66, 0xf7, 0x4c, 0x94, 0xa2, 0xdb, 0x8a, 0x61,
+  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+  0xae, 0x42, 0x60, 0x82};
diff --git a/samples/toolbar/bitmaps/new.bmp b/samples/toolbar/bitmaps/new.bmp
deleted file mode 100644
index 0ca6689785..0000000000
Binary files a/samples/toolbar/bitmaps/new.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/new.png b/samples/toolbar/bitmaps/new.png
new file mode 100644
index 0000000000..4c3efdd6fa
Binary files /dev/null and b/samples/toolbar/bitmaps/new.png differ
diff --git a/samples/toolbar/bitmaps/new.xpm b/samples/toolbar/bitmaps/new.xpm
deleted file mode 100644
index 22d2e40421..0000000000
--- a/samples/toolbar/bitmaps/new.xpm
+++ /dev/null
@@ -1,53 +0,0 @@
-/* XPM */
-static const char *const new_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 31 1",
-". c #7198D9",
-"2 c #DCE6F6",
-", c #FFFFFF",
-"= c #9AB6E4",
-"6 c #EAF0FA",
-"w c #6992D7",
-"0 c #5886D2",
-"7 c #F7F9FD",
-"5 c #F0F5FC",
-"* c #A8C0E8",
-"  c None",
-"8 c #FDFEFF",
-"% c #C4D5F0",
-"3 c #E2EAF8",
-"+ c #4377CD",
-"O c #487BCE",
-"; c #6B94D7",
-"- c #89A9DF",
-": c #5584D1",
-"# c #3569BF",
-"@ c #3A70CA",
-"1 c #D2DFF4",
-"> c #3366BB",
-"$ c #2E5CA8",
-"9 c #FAFCFE",
-"4 c #F5F8FD",
-"q c #638ED5",
-"o c #5282D0",
-"& c #B8CCEC",
-"X c #376EC9",
-"< c #ACE95B",
-/* pixels */
-"   .XoO+@#$.     ",
-"   .%%&*=-O;:    ",
-"  >>>>%&*=O,=o   ",
-"  ><<>%%&*O,,=o  ",
-">>><<>>>%&OOo+@  ",
-"><<<<<<>1%&*=-@  ",
-"><<<<<<>21%&*=@  ",
-">>><<>>>321%&*+  ",
-"  ><<>456321%&O  ",
-"  >>>>7456321%o  ",
-"   .,8974563210  ",
-"   .,,897456320  ",
-"   .,,,8974563q  ",
-"   .,,,,897456w  ",
-"   .,,,,,89745w  ",
-"   ............  "
-};
diff --git a/samples/toolbar/bitmaps/new_png.c b/samples/toolbar/bitmaps/new_png.c
new file mode 100644
index 0000000000..202fa4f11a
--- /dev/null
+++ b/samples/toolbar/bitmaps/new_png.c
@@ -0,0 +1,62 @@
+/* new.png - 477 bytes */
+static const unsigned char new_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+  0x44, 0x00, 0xfc, 0x00, 0xe9, 0x00, 0x4f, 0x34,
+  0xd7, 0xb1, 0x0d, 0x00, 0x00, 0x00, 0x09, 0x70,
+  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
+  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
+  0x07, 0xd5, 0x02, 0x12, 0x0e, 0x26, 0x1c, 0xd3,
+  0xb6, 0x19, 0x29, 0x00, 0x00, 0x01, 0x6a, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x90, 0x4f,
+  0x4b, 0x5b, 0x51, 0x10, 0xc5, 0x7f, 0x73, 0xef,
+  0x8d, 0x56, 0x24, 0x7d, 0x25, 0x82, 0xd0, 0xca,
+  0x5b, 0x16, 0xdc, 0xd4, 0xee, 0x5c, 0x66, 0xa9,
+  0x1b, 0xf3, 0x0d, 0xb2, 0x71, 0x59, 0xbf, 0x45,
+  0xde, 0xb2, 0xdd, 0x77, 0x23, 0x04, 0xc4, 0x82,
+  0xdf, 0xc0, 0x4d, 0x37, 0xdd, 0x2a, 0x85, 0x52,
+  0x4a, 0xb2, 0x52, 0x4a, 0x49, 0x5a, 0x84, 0x10,
+  0xff, 0x45, 0x62, 0x9b, 0xde, 0x77, 0xc7, 0x85,
+  0x26, 0xc6, 0x18, 0x93, 0x54, 0x7a, 0x36, 0x33,
+  0x0c, 0x73, 0xe6, 0x9c, 0x33, 0x52, 0x2e, 0x97,
+  0xb7, 0x6b, 0xb5, 0x5a, 0x91, 0x11, 0x98, 0x9d,
+  0xfd, 0xcb, 0xdc, 0x5c, 0x9b, 0x67, 0xd1, 0x6f,
+  0xf2, 0xcb, 0x9f, 0xdf, 0xe5, 0xa2, 0x6f, 0x1f,
+  0xe1, 0xcf, 0xbe, 0x64, 0xc3, 0x19, 0xa5, 0x52,
+  0x49, 0xc7, 0xe1, 0xfc, 0x78, 0x53, 0x2f, 0x4f,
+  0xdf, 0x68, 0xe7, 0xbc, 0xa0, 0x97, 0x27, 0x2b,
+  0x9d, 0x8b, 0xc6, 0xe2, 0xae, 0xb6, 0xb2, 0xeb,
+  0xda, 0x32, 0x33, 0xae, 0xab, 0xd2, 0x6c, 0x36,
+  0x09, 0x21, 0x00, 0x20, 0x22, 0x3d, 0xf5, 0x8c,
+  0xd9, 0x63, 0xda, 0x7e, 0x21, 0xe3, 0xbe, 0x22,
+  0x66, 0x09, 0xeb, 0x4c, 0x26, 0xd8, 0xf6, 0x6a,
+  0xc7, 0xb7, 0x5b, 0x53, 0xce, 0x57, 0x7b, 0x07,
+  0x06, 0xc9, 0xdd, 0x6a, 0xe4, 0x08, 0x6b, 0xea,
+  0x88, 0x79, 0x85, 0xb8, 0x02, 0x60, 0x31, 0x2a,
+  0x46, 0xd3, 0x5f, 0x8b, 0xe0, 0x5e, 0xba, 0xfe,
+  0xac, 0x83, 0xe4, 0xeb, 0x5e, 0x6f, 0x3a, 0x0b,
+  0x4c, 0x81, 0x38, 0x10, 0x0b, 0x82, 0x00, 0x17,
+  0x6e, 0x34, 0x59, 0x08, 0x3a, 0x4f, 0xd0, 0xe7,
+  0xd8, 0x50, 0x45, 0xd3, 0x69, 0x40, 0xd0, 0xb4,
+  0xa2, 0xde, 0x9b, 0x7a, 0xc6, 0xa6, 0x15, 0xf7,
+  0xd0, 0xe7, 0xbb, 0x87, 0x02, 0xaf, 0xf1, 0xe1,
+  0x27, 0xe0, 0xb1, 0x5a, 0x01, 0x14, 0xef, 0x5f,
+  0xe8, 0xe9, 0x59, 0xeb, 0xd3, 0xcc, 0xfc, 0xf7,
+  0x83, 0x91, 0x11, 0x44, 0x04, 0xe5, 0x29, 0x1d,
+  0x5d, 0x43, 0x75, 0x81, 0x34, 0xfd, 0x01, 0x3c,
+  0x61, 0x6b, 0xe7, 0xd0, 0x6c, 0x6c, 0x6c, 0xbf,
+  0x05, 0x70, 0xa3, 0xc8, 0xb7, 0x35, 0x8b, 0xd7,
+  0x3c, 0x22, 0x42, 0x14, 0x45, 0x34, 0x1a, 0x49,
+  0x4f, 0xd4, 0x30, 0x21, 0xfa, 0x7f, 0xd3, 0x8f,
+  0x7b, 0x11, 0x86, 0x39, 0x78, 0x88, 0x7c, 0xc7,
+  0xc1, 0xb0, 0xa5, 0xc1, 0xd9, 0xb0, 0x1d, 0x33,
+  0xa9, 0xdd, 0xb1, 0x11, 0x72, 0xb9, 0x1c, 0x8f,
+  0x81, 0x8b, 0xe3, 0xf8, 0x43, 0x92, 0x24, 0xc5,
+  0x7f, 0x21, 0xc5, 0x71, 0xfc, 0x9e, 0xff, 0x85,
+  0x2b, 0xcc, 0x3d, 0x99, 0x60, 0x7b, 0xac, 0x14,
+  0xc9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+  0x44, 0xae, 0x42, 0x60, 0x82};
diff --git a/samples/toolbar/bitmaps/open.bmp b/samples/toolbar/bitmaps/open.bmp
deleted file mode 100644
index 35ad487487..0000000000
Binary files a/samples/toolbar/bitmaps/open.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/open.png b/samples/toolbar/bitmaps/open.png
new file mode 100644
index 0000000000..ab940462fd
Binary files /dev/null and b/samples/toolbar/bitmaps/open.png differ
diff --git a/samples/toolbar/bitmaps/open.xpm b/samples/toolbar/bitmaps/open.xpm
deleted file mode 100644
index 787164750e..0000000000
--- a/samples/toolbar/bitmaps/open.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static const char *const open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-", c #AAC1E8",
-"1 c #9AEA53",
-"q c #DCE6F6",
-". c #295193",
-"; c #A9D066",
-"r c #C6D6F0",
-"$ c #4A7CCE",
-"9 c #779DDB",
-"8 c #EAF0FA",
-"O c #6E96D8",
-"X c #214279",
-"e c #BED0EE",
-"6 c #85A7DF",
-"5 c #F0F5FC",
-"t c #ADC4E9",
-": c #3161B1",
-"  c None",
-"u c #274D8B",
-"& c #BFDC9B",
-"> c #9FB9E5",
-"y c #5584D1",
-"w c #3569BF",
-"% c #3A70CA",
-"+ c #305FAC",
-"3 c #5D89D3",
-"0 c #D2DFF4",
-"@ c #CAE2AA",
-"= c #B2D58C",
-"2 c #FAFCFE",
-"# c #638ED5",
-"* c #CEDCF2",
-"4 c #90AFE2",
-"< c #B3C8EB",
-"7 c #E5EDF9",
-"- c #A2BCE6",
-"o c #DFF0D0",
-/* pixels */
-"                ",
-"     ....       ",
-"XXXXX .oo.      ",
-"XOOOO+ .@o.     ",
-"XOOOO#$%.&*XXX  ",
-"XOOOOOOO.=*X-X  ",
-"XOXXXX...;*XXXX:",
-"XOX>,<.11111*X2:",
-"X3X4>,<.111*X5-:",
-"XX#64>,,.1*X78: ",
-"XXO964>,,.X0q7: ",
-"Xw3O964>,,er0t: ",
-"X%y3O964>,<er:  ",
-"uXXXXXXXXXXXX:  ",
-"                "
-};
diff --git a/samples/toolbar/bitmaps/open_png.c b/samples/toolbar/bitmaps/open_png.c
new file mode 100644
index 0000000000..0d4c0abe5d
--- /dev/null
+++ b/samples/toolbar/bitmaps/open_png.c
@@ -0,0 +1,87 @@
+/* open.png - 672 bytes */
+static const unsigned char open_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
+  0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
+  0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59,
+  0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d,
+  0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00,
+  0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
+  0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77,
+  0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
+  0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b,
+  0xee, 0x3c, 0x1a, 0x00, 0x00, 0x02, 0x1d, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0x8d, 0x8d, 0x93, 0xbf,
+  0x4b, 0x97, 0x51, 0x14, 0xc6, 0x3f, 0xe7, 0x7d,
+  0xaf, 0x6f, 0x49, 0xa0, 0x6b, 0x04, 0xe1, 0xd2,
+  0x52, 0xd0, 0x18, 0xa8, 0x4b, 0x3f, 0xa4, 0x25,
+  0x0d, 0x72, 0x6a, 0xd0, 0xa5, 0xc5, 0xc1, 0xa0,
+  0xe6, 0x86, 0xfe, 0x82, 0x86, 0x10, 0x37, 0x87,
+  0x8a, 0x06, 0xfb, 0x0f, 0x04, 0x23, 0x85, 0x08,
+  0x4d, 0x2b, 0x68, 0x68, 0x8a, 0x10, 0x21, 0xb5,
+  0x45, 0x42, 0x2d, 0xcd, 0xef, 0xf7, 0xde, 0x73,
+  0xcf, 0x69, 0xf8, 0xea, 0x9b, 0x96, 0x60, 0xcf,
+  0x70, 0xee, 0xb9, 0x97, 0x7b, 0x9f, 0xe7, 0x39,
+  0xe7, 0xde, 0x2b, 0x43, 0x43, 0x43, 0x1c, 0x44,
+  0xca, 0xcd, 0x86, 0x88, 0x94, 0xee, 0x2e, 0x22,
+  0x02, 0x40, 0x51, 0x14, 0x22, 0x22, 0xb4, 0xb5,
+  0xb5, 0x7d, 0xfe, 0xb5, 0xdd, 0xb8, 0x5c, 0x55,
+  0xd5, 0xfa, 0xfe, 0xfe, 0xd0, 0xd5, 0xd5, 0xf5,
+  0xd4, 0xdd, 0x6f, 0xee, 0x2f, 0x2c, 0x2d, 0x7f,
+  0x39, 0xf1, 0xec, 0xc9, 0x73, 0x8a, 0xa2, 0x40,
+  0x44, 0xd8, 0x27, 0x11, 0x11, 0x26, 0x5f, 0x4c,
+  0x9e, 0x9f, 0x9e, 0x9e, 0xfa, 0x80, 0x73, 0x11,
+  0xf8, 0x01, 0x10, 0xcc, 0x6c, 0x70, 0x70, 0x70,
+  0xb0, 0xd3, 0xcc, 0xc8, 0x39, 0x33, 0x36, 0xfe,
+  0x98, 0x95, 0x95, 0x15, 0x9a, 0xcd, 0x26, 0x00,
+  0xee, 0x4e, 0xce, 0x19, 0x33, 0x63, 0x78, 0x68,
+  0x98, 0xad, 0xcd, 0xcd, 0xb3, 0x0b, 0xef, 0x17,
+  0xe6, 0xe3, 0x6e, 0xba, 0x54, 0x55, 0xd5, 0x6e,
+  0x48, 0x29, 0xb9, 0xaa, 0xb2, 0xbe, 0xbe, 0x8e,
+  0xaa, 0xee, 0x5b, 0x66, 0xf1, 0xdd, 0xe2, 0xa1,
+  0xd2, 0x7a, 0xba, 0xbb, 0x01, 0x18, 0x1d, 0xbd,
+  0x2b, 0xe5, 0x44, 0xb8, 0x30, 0x37, 0xff, 0x66,
+  0x0c, 0x63, 0x64, 0x8f, 0x20, 0xa1, 0xaa, 0x98,
+  0x19, 0x22, 0x42, 0x55, 0x55, 0xf4, 0x5d, 0xeb,
+  0xc3, 0xdd, 0x6b, 0x17, 0x65, 0x59, 0xd6, 0x22,
+  0xbd, 0x3d, 0xbd, 0xf2, 0x76, 0x61, 0xee, 0xb6,
+  0x19, 0x23, 0x41, 0x55, 0x4d, 0x35, 0x93, 0x73,
+  0xae, 0x1d, 0x84, 0x10, 0x98, 0x99, 0x7d, 0x45,
+  0xce, 0xb9, 0x76, 0x70, 0xf5, 0xca, 0x35, 0x62,
+  0x8c, 0xad, 0x89, 0x80, 0x99, 0x15, 0x50, 0x10,
+  0x52, 0x4a, 0x1e, 0x63, 0xac, 0x09, 0xf6, 0xba,
+  0x4d, 0xff, 0x8d, 0x81, 0x5a, 0xfd, 0xef, 0xb1,
+  0xfd, 0x64, 0x3b, 0x38, 0x06, 0x10, 0x62, 0x8c,
+  0xa6, 0xaa, 0x4c, 0xcc, 0x3b, 0x0d, 0x0d, 0xd0,
+  0x79, 0x8b, 0x81, 0x87, 0x2f, 0x71, 0x6b, 0x89,
+  0xf9, 0x81, 0xd8, 0x22, 0xd8, 0x4b, 0xda, 0xfb,
+  0x3b, 0xca, 0xa2, 0x58, 0x0d, 0xaa, 0x4a, 0x4a,
+  0x89, 0x9d, 0x08, 0x8f, 0xee, 0x5f, 0xe7, 0x28,
+  0x48, 0x1d, 0xfe, 0x20, 0xaa, 0xf1, 0x60, 0x7c,
+  0xe6, 0x4c, 0x48, 0x29, 0x59, 0x4a, 0x09, 0x70,
+  0x4a, 0x81, 0x8f, 0xcb, 0x5b, 0x47, 0x92, 0x1c,
+  0x44, 0x59, 0x0a, 0xe7, 0x4e, 0x9f, 0x02, 0x71,
+  0x0f, 0x29, 0x25, 0x53, 0x4d, 0x08, 0x50, 0x88,
+  0x50, 0x85, 0xe2, 0x58, 0x82, 0x6c, 0x8e, 0x1b,
+  0x08, 0x62, 0x7b, 0xd7, 0x98, 0x11, 0x09, 0xc4,
+  0x64, 0x94, 0x72, 0xb0, 0xe2, 0xc3, 0xd0, 0xec,
+  0x34, 0x93, 0xa1, 0x66, 0x34, 0x53, 0x06, 0xf0,
+  0xa0, 0xaa, 0x16, 0x63, 0x44, 0x24, 0xf0, 0x6d,
+  0xa3, 0xc1, 0xcf, 0x86, 0xa2, 0xd9, 0x49, 0xd9,
+  0x31, 0x73, 0xcc, 0x9d, 0x6c, 0x4e, 0xd2, 0x56,
+  0x0e, 0x10, 0x4a, 0x61, 0xf5, 0xfb, 0x2e, 0x88,
+  0x58, 0x10, 0x11, 0x33, 0x33, 0x04, 0xd8, 0xd8,
+  0x8e, 0x6c, 0x37, 0x94, 0xa4, 0xff, 0x7a, 0x08,
+  0xa5, 0xd4, 0x9d, 0x2c, 0x0a, 0xd8, 0xdc, 0x89,
+  0x88, 0xbb, 0x07, 0x77, 0x67, 0x6d, 0xa3, 0xf5,
+  0x60, 0x5e, 0x7f, 0x5a, 0xad, 0x3f, 0xcf, 0x71,
+  0xd8, 0xd9, 0xd9, 0x05, 0x91, 0xaf, 0x21, 0x17,
+  0xed, 0xb3, 0x53, 0x4b, 0x1d, 0x77, 0xc0, 0x59,
+  0x5e, 0x5a, 0xfb, 0xaf, 0xc3, 0xb4, 0xbc, 0x6c,
+  0x64, 0xe4, 0xde, 0x6f, 0xf8, 0x02, 0x4b, 0x1d,
+  0x75, 0x32, 0xd9, 0xc3, 0x00, 0x00, 0x00, 0x00,
+  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
diff --git a/samples/toolbar/bitmaps/page.bmp b/samples/toolbar/bitmaps/page.bmp
deleted file mode 100644
index 3dbd4b05b4..0000000000
Binary files a/samples/toolbar/bitmaps/page.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/page_png.c b/samples/toolbar/bitmaps/page_png.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samples/toolbar/bitmaps/paste.bmp b/samples/toolbar/bitmaps/paste.bmp
deleted file mode 100644
index 73032d58b0..0000000000
Binary files a/samples/toolbar/bitmaps/paste.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/paste.png b/samples/toolbar/bitmaps/paste.png
new file mode 100644
index 0000000000..24588a3a4d
Binary files /dev/null and b/samples/toolbar/bitmaps/paste.png differ
diff --git a/samples/toolbar/bitmaps/paste_png.c b/samples/toolbar/bitmaps/paste_png.c
new file mode 100644
index 0000000000..08a4cb87df
--- /dev/null
+++ b/samples/toolbar/bitmaps/paste_png.c
@@ -0,0 +1,73 @@
+/* paste.png - 561 bytes */
+static const unsigned char paste_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59,
+  0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b,
+  0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00,
+  0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xd5,
+  0x0a, 0x0e, 0x00, 0x1c, 0x15, 0xaf, 0xe2, 0xf1,
+  0x18, 0x00, 0x00, 0x01, 0xd0, 0x49, 0x44, 0x41,
+  0x54, 0x38, 0xcb, 0x95, 0x93, 0xb1, 0x6b, 0x53,
+  0x51, 0x14, 0xc6, 0x7f, 0xf7, 0xbd, 0x34, 0x82,
+  0x24, 0x31, 0x8d, 0xd4, 0x94, 0x0c, 0x85, 0x22,
+  0x06, 0x5c, 0x5c, 0xb4, 0x6a, 0x62, 0x04, 0xd1,
+  0x12, 0x70, 0x76, 0xd0, 0x21, 0x38, 0x14, 0x45,
+  0x6d, 0x1d, 0xc4, 0xc5, 0x41, 0x97, 0x82, 0x38,
+  0x08, 0x8e, 0xfa, 0x0f, 0x34, 0x83, 0xbb, 0x9b,
+  0xa8, 0x4b, 0xd5, 0x2e, 0xba, 0x38, 0x29, 0x91,
+  0x52, 0xa8, 0xd1, 0x48, 0x42, 0x5e, 0x6f, 0x6c,
+  0xd0, 0x46, 0xef, 0x39, 0x0e, 0xa1, 0x31, 0x2f,
+  0x6d, 0x20, 0x7e, 0xdb, 0xfd, 0xce, 0x3d, 0x3f,
+  0xce, 0xf9, 0xe0, 0x18, 0x06, 0x54, 0x2a, 0x95,
+  0x8c, 0xef, 0x7b, 0xcf, 0x9d, 0x93, 0xd9, 0x7e,
+  0xdf, 0xf7, 0xbd, 0x17, 0xce, 0x49, 0xb1, 0x5c,
+  0x2e, 0x6b, 0xbf, 0x6f, 0x00, 0x6e, 0xce, 0x9a,
+  0x2b, 0x06, 0x1e, 0x2a, 0x8c, 0x2b, 0x1e, 0x76,
+  0xf2, 0x12, 0xb9, 0xdc, 0x11, 0x3c, 0xcf, 0x00,
+  0x20, 0xa2, 0xac, 0xac, 0x7c, 0x60, 0x5f, 0xed,
+  0x29, 0x06, 0x01, 0x68, 0xaa, 0xea, 0xad, 0xc7,
+  0x2f, 0x59, 0x32, 0xf3, 0x67, 0x89, 0xf8, 0x9e,
+  0x09, 0x2e, 0x9c, 0x39, 0x18, 0xfb, 0xd2, 0xc9,
+  0xf0, 0x2e, 0xc8, 0xd2, 0xb4, 0x1d, 0xa6, 0xa7,
+  0xa7, 0x30, 0x66, 0x1b, 0x20, 0xac, 0xad, 0xad,
+  0x93, 0x4c, 0x44, 0x39, 0x9a, 0xfc, 0xcc, 0xa4,
+  0xbf, 0xce, 0xb3, 0xd7, 0xab, 0x56, 0x54, 0x53,
+  0x11, 0x20, 0xe6, 0x79, 0x66, 0x2c, 0x1a, 0xf1,
+  0x79, 0x5f, 0xcf, 0xb2, 0x78, 0xff, 0x11, 0x41,
+  0x10, 0x50, 0xa9, 0x54, 0x42, 0xab, 0xcd, 0xcd,
+  0x1d, 0x22, 0x95, 0x4a, 0x71, 0xef, 0xee, 0x6d,
+  0x2e, 0x66, 0xbe, 0x21, 0xaa, 0x31, 0x20, 0x1a,
+  0xe9, 0xff, 0xd4, 0xde, 0x82, 0x44, 0x22, 0x81,
+  0xaa, 0x30, 0x33, 0x73, 0x6c, 0x30, 0x1e, 0xe2,
+  0xf1, 0x38, 0x5b, 0x7f, 0xc0, 0xa9, 0xe9, 0x79,
+  0x3d, 0x80, 0x6a, 0x28, 0x1b, 0x96, 0xdf, 0xbc,
+  0x0d, 0xbd, 0x0b, 0xf9, 0x1c, 0xbb, 0x29, 0xc2,
+  0x10, 0x9d, 0x3e, 0x95, 0xe7, 0x1f, 0x5c, 0x10,
+  0x71, 0xc3, 0x01, 0xba, 0x4b, 0x61, 0x7b, 0x02,
+  0x55, 0x45, 0x45, 0xc8, 0x9d, 0x3c, 0xfe, 0x7f,
+  0x13, 0x14, 0xf2, 0x39, 0x44, 0x04, 0x11, 0x41,
+  0x55, 0xb0, 0xd6, 0x32, 0x31, 0x91, 0x1e, 0x0d,
+  0xd0, 0xdf, 0x28, 0xd2, 0x6d, 0x6e, 0xfd, 0x68,
+  0x8d, 0x3e, 0x81, 0x88, 0xeb, 0x41, 0xaa, 0x5f,
+  0xab, 0x34, 0x1a, 0xf5, 0x1d, 0x21, 0x87, 0x01,
+  0x03, 0x35, 0xe7, 0xba, 0x80, 0x56, 0xcb, 0xd2,
+  0xa8, 0xd7, 0x29, 0x16, 0xcf, 0x0f, 0xdb, 0x14,
+  0x6f, 0xd8, 0x04, 0xd6, 0x6e, 0x50, 0xfb, 0x5e,
+  0x43, 0x44, 0x7a, 0xfe, 0xf5, 0xf9, 0xab, 0x5c,
+  0x9e, 0x5a, 0x1e, 0xbe, 0xc2, 0xde, 0x31, 0xa5,
+  0x19, 0x34, 0x49, 0xa7, 0x33, 0xa4, 0xd3, 0x19,
+  0xb2, 0xd9, 0xc3, 0x58, 0xbb, 0x81, 0xaa, 0x70,
+  0x63, 0xe1, 0x5a, 0xaf, 0xd9, 0x37, 0x1a, 0x02,
+  0x6c, 0x8a, 0xe8, 0xef, 0xf6, 0x2f, 0xb7, 0xe7,
+  0x44, 0xf2, 0x23, 0x0f, 0x16, 0xef, 0xf0, 0xd3,
+  0xed, 0x8c, 0xa6, 0xb0, 0xff, 0x13, 0xab, 0xed,
+  0x03, 0x00, 0x24, 0xb5, 0x8a, 0x31, 0x66, 0x53,
+  0x55, 0x3b, 0x06, 0x60, 0xe1, 0x5c, 0xf7, 0x1a,
+  0x31, 0x8c, 0x33, 0x82, 0x54, 0xbb, 0xd7, 0xf8,
+  0xe4, 0x15, 0x4b, 0x7f, 0x01, 0x4f, 0xe6, 0xe1,
+  0x98, 0x78, 0x69, 0xc4, 0xda, 0x00, 0x00, 0x00,
+  0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+  0x82};
diff --git a/samples/toolbar/bitmaps/preview.bmp b/samples/toolbar/bitmaps/preview.bmp
deleted file mode 100644
index 4bf4165950..0000000000
Binary files a/samples/toolbar/bitmaps/preview.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/preview.xpm b/samples/toolbar/bitmaps/preview.xpm
deleted file mode 100644
index a2155a3e9b..0000000000
--- a/samples/toolbar/bitmaps/preview.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static const char *const paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"< c #FEECE4",
-"> c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
-"  c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
-/* pixels */
-"   ......       ",
-" .XoOOOOoo.     ",
-".+XOOOOOOX@.    ",
-".+XXXXXXXX@.    ",
-".#++$$%@.....   ",
-".##++$$%.&*.=.  ",
-".-##++$$.;&.==. ",
-".--##++$.:;.... ",
-".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
-".45<<>--....... ",
-".6453<>----.    ",
-"............    "
-};
diff --git a/samples/toolbar/bitmaps/preview_png.c b/samples/toolbar/bitmaps/preview_png.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samples/toolbar/bitmaps/print.bmp b/samples/toolbar/bitmaps/print.bmp
deleted file mode 100644
index 8758e136d8..0000000000
Binary files a/samples/toolbar/bitmaps/print.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/print.png b/samples/toolbar/bitmaps/print.png
new file mode 100644
index 0000000000..35c37bd73e
Binary files /dev/null and b/samples/toolbar/bitmaps/print.png differ
diff --git a/samples/toolbar/bitmaps/print.xpm b/samples/toolbar/bitmaps/print.xpm
deleted file mode 100644
index 5ad9d26a1a..0000000000
--- a/samples/toolbar/bitmaps/print.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static const char *const print_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 35 1",
-"y c #EDF2FB",
-"9 c #4E7FD0",
-"> c #B9CDED",
-"# c #3365B7",
-"r c #FFFFFF",
-"8 c #2C58A0",
-"X c #779DDB",
-"7 c #7FA2DD",
-"t c #3263B4",
-"q c #6E96D8",
-"= c #6992D7",
-"* c #D9E4F5",
-"0 c #356AC1",
-"& c #CBD9F1",
-"; c #97B4E3",
-"e c #3161B1",
-"  c None",
-"1 c #B5C9EB",
-", c #7CA0DC",
-"4 c #487BCE",
-"- c #4377CD",
-". c #5584D1",
-"6 c #3A70CA",
-"2 c #305FAC",
-"< c #5685D2",
-"w c #4075CC",
-"5 c #638ED5",
-"3 c #3467BC",
-"% c #2F5DA9",
-"o c #ECF1FA",
-": c #D6E1F4",
-"@ c #376EC9",
-"$ c #2D5AA5",
-"+ c #A2BCE6",
-"O c #CFDDF3",
-/* pixels */
-"   .XXXXXXXX    ",
-"   .oooooooX    ",
-"   .OOOOOOOX    ",
-"   .+++++++X    ",
-" @@#$%%%%%$%@@  ",
-"#&*=-=;:>,<#*&# ",
-".11.2345.63#11. ",
-"4;;;;;;;;;;;;;4 ",
-"677588888889776 ",
-"0qq60wwwwwweqq0 ",
-"3553rrrrrrr$553 ",
-"3<<tyrrrrrr$<<3 ",
-"XXX%rrrrrrr$XXX ",
-"   3rrrrrrr$    ",
-"   #XXXXXXX@    "
-};
diff --git a/samples/toolbar/bitmaps/print_png.c b/samples/toolbar/bitmaps/print_png.c
new file mode 100644
index 0000000000..8fd3e54bfe
--- /dev/null
+++ b/samples/toolbar/bitmaps/print_png.c
@@ -0,0 +1,71 @@
+/* print.png - 544 bytes */
+static const unsigned char print_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
+  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
+  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x11, 0x00,
+  0x00, 0x0b, 0x11, 0x01, 0x7f, 0x64, 0x5f, 0x91,
+  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
+  0x07, 0xd5, 0x0b, 0x15, 0x12, 0x0d, 0x2f, 0x9f,
+  0xed, 0x85, 0x8a, 0x00, 0x00, 0x01, 0xad, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x93, 0xcd,
+  0x8a, 0x13, 0x41, 0x14, 0x85, 0xbf, 0x7b, 0x33,
+  0x8b, 0xbc, 0x40, 0x76, 0x0d, 0x59, 0xa9, 0xab,
+  0xd0, 0x04, 0xe3, 0x26, 0x44, 0x07, 0x1f, 0xc2,
+  0x9f, 0x77, 0x10, 0xc1, 0x07, 0xd0, 0x1e, 0x67,
+  0x40, 0x10, 0x11, 0x74, 0x44, 0x7d, 0x86, 0x49,
+  0xf2, 0x04, 0xc9, 0x46, 0x46, 0xc2, 0x6c, 0xb2,
+  0x4c, 0x56, 0x13, 0x77, 0x2a, 0x04, 0x3a, 0x7f,
+  0x24, 0x81, 0xe9, 0x4e, 0xa7, 0xaa, 0x5c, 0x68,
+  0x1a, 0xdb, 0x44, 0x47, 0xb4, 0xa0, 0x16, 0xf7,
+  0x52, 0xf7, 0xd4, 0xe1, 0x7c, 0x55, 0xf0, 0x9f,
+  0x4b, 0x7e, 0x2e, 0x1a, 0xcd, 0xfa, 0x21, 0x10,
+  0xfc, 0xc5, 0xdc, 0xd1, 0xdd, 0x3b, 0xf7, 0x0e,
+  0xb6, 0xba, 0x8d, 0x66, 0xdd, 0xc5, 0x71, 0x9c,
+  0xd9, 0xcf, 0x5f, 0x3c, 0xcb, 0xd4, 0x51, 0x14,
+  0xb9, 0x46, 0xb3, 0xee, 0x36, 0x33, 0x7b, 0xbb,
+  0xe4, 0xbb, 0xdd, 0x2e, 0x00, 0x9d, 0xb3, 0x53,
+  0x00, 0x5e, 0x1d, 0xbf, 0xa4, 0x56, 0xdd, 0x07,
+  0xa0, 0x52, 0xa9, 0x64, 0xce, 0xea, 0x2e, 0x81,
+  0x52, 0xa9, 0x94, 0x0e, 0x6f, 0x56, 0xe7, 0xec,
+  0x14, 0xdf, 0xf7, 0x71, 0xce, 0x65, 0xfa, 0x5b,
+  0x0e, 0xac, 0xb5, 0xf4, 0x7a, 0x3d, 0x6a, 0xd5,
+  0x7d, 0x54, 0x95, 0x8f, 0x9d, 0x0f, 0xdc, 0xaa,
+  0xdd, 0x46, 0x44, 0xe8, 0xf7, 0xfb, 0x94, 0xcb,
+  0xe5, 0x3f, 0x0b, 0x00, 0x78, 0x9e, 0x87, 0xaa,
+  0x22, 0xf2, 0x3d, 0xe3, 0x62, 0xb1, 0x88, 0x88,
+  0x20, 0x22, 0x97, 0x3b, 0x70, 0xce, 0x51, 0x28,
+  0x14, 0xd2, 0xfa, 0xe1, 0x83, 0x47, 0x29, 0x2c,
+  0x91, 0xdf, 0x60, 0x7c, 0x12, 0x3c, 0x3e, 0x04,
+  0x82, 0x7c, 0x3e, 0xcf, 0xd5, 0x2b, 0xd7, 0xb0,
+  0xd6, 0xa2, 0xba, 0x1d, 0x8f, 0xb5, 0x16, 0x11,
+  0x61, 0xf0, 0xe9, 0x9c, 0x28, 0x8a, 0x00, 0x8e,
+  0x36, 0x0e, 0x82, 0x83, 0xe0, 0x29, 0xc6, 0x18,
+  0x92, 0x24, 0xb9, 0xf4, 0x11, 0xcc, 0xe7, 0x35,
+  0x54, 0x95, 0x77, 0xef, 0xdf, 0x06, 0xe9, 0x35,
+  0x22, 0xc2, 0x60, 0x30, 0x20, 0x8e, 0x63, 0xda,
+  0xed, 0x36, 0xce, 0x39, 0xc2, 0x30, 0x64, 0x3a,
+  0x9d, 0x32, 0x1e, 0x8f, 0x99, 0x4c, 0x26, 0x8c,
+  0x46, 0x23, 0x86, 0xc3, 0x21, 0xad, 0x56, 0x8b,
+  0xaf, 0x5f, 0x3e, 0x67, 0x33, 0x58, 0x2c, 0x16,
+  0x44, 0x17, 0x17, 0xcc, 0x66, 0x33, 0x7c, 0xdf,
+  0x27, 0x0c, 0x43, 0x00, 0x92, 0x24, 0x49, 0xad,
+  0x03, 0x18, 0x63, 0x18, 0x8f, 0x42, 0xa2, 0x78,
+  0x95, 0x15, 0x50, 0x55, 0xe6, 0x8b, 0x05, 0xed,
+  0x76, 0x8b, 0xe5, 0x72, 0x09, 0xc0, 0x7a, 0xbd,
+  0x46, 0x45, 0xb0, 0xd6, 0xb0, 0x36, 0x06, 0xd5,
+  0x1c, 0x7b, 0xb9, 0x1c, 0xd5, 0xda, 0xcd, 0xdd,
+  0x14, 0x8c, 0x31, 0x5c, 0xaf, 0xdc, 0x48, 0x69,
+  0xfc, 0xe0, 0x82, 0xb5, 0x0e, 0x63, 0x0c, 0xaa,
+  0x9a, 0xe2, 0xdd, 0x84, 0x9c, 0x0a, 0xac, 0x56,
+  0x2b, 0x3c, 0xcf, 0x4b, 0xad, 0xfe, 0xca, 0x7b,
+  0x43, 0x41, 0x55, 0x71, 0xce, 0x61, 0xad, 0xcd,
+  0x08, 0x9c, 0x1c, 0xbf, 0x79, 0x7d, 0xff, 0x1f,
+  0x7e, 0xf3, 0xc9, 0x37, 0xc1, 0x23, 0xd9, 0x67,
+  0xfd, 0x0b, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+  0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
diff --git a/samples/toolbar/bitmaps/save.bmp b/samples/toolbar/bitmaps/save.bmp
deleted file mode 100644
index 2da2da72ad..0000000000
Binary files a/samples/toolbar/bitmaps/save.bmp and /dev/null differ
diff --git a/samples/toolbar/bitmaps/save.png b/samples/toolbar/bitmaps/save.png
new file mode 100644
index 0000000000..22ff495710
Binary files /dev/null and b/samples/toolbar/bitmaps/save.png differ
diff --git a/samples/toolbar/bitmaps/save.xpm b/samples/toolbar/bitmaps/save.xpm
deleted file mode 100644
index 452a06b6fa..0000000000
--- a/samples/toolbar/bitmaps/save.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static const char *const save_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-": c #AAC1E8",
-"1 c #B9CDED",
-"O c #FFFFFF",
-"  c #2C58A0",
-"* c #B0C6EA",
-"; c #2D59A3",
-"X c #1C3866",
-"= c #C3D4EF",
-"2 c #CBD9F1",
-"- c #DAE5F6",
-"# c #97B4E3",
-". c None",
-"$ c #274D8B",
-"& c #9FB9E5",
-"@ c #5584D1",
-"% c #82A5DE",
-"o c #3A70CA",
-"< c #A5BEE7",
-", c #D2DFF4",
-"+ c #3467BC",
-"> c #C0D1EE",
-/* pixels */
-"               .",
-" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
-".             .."
-};
diff --git a/samples/toolbar/bitmaps/save_png.c b/samples/toolbar/bitmaps/save_png.c
new file mode 100644
index 0000000000..5a7e791ebc
--- /dev/null
+++ b/samples/toolbar/bitmaps/save_png.c
@@ -0,0 +1,116 @@
+/* save.png - 911 bytes */
+static const unsigned char save_png[] = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
+  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
+  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
+  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
+  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
+  0x07, 0xd5, 0x0b, 0x0a, 0x0d, 0x37, 0x0f, 0x9e,
+  0x2a, 0xd8, 0xbf, 0x00, 0x00, 0x00, 0x8c, 0x74,
+  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
+  0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
+  0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
+  0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
+  0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
+  0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
+  0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
+  0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
+  0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
+  0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
+  0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
+  0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
+  0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
+  0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
+  0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
+  0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
+  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
+  0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
+  0x8a, 0xc7, 0x47, 0x00, 0x00, 0x02, 0x84, 0x49,
+  0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
+  0x48, 0x54, 0x61, 0x14, 0x86, 0x9f, 0xb9, 0xdd,
+  0xf1, 0xe6, 0xcf, 0xe4, 0x4c, 0xe0, 0xb5, 0x31,
+  0xcd, 0x91, 0xb2, 0x51, 0x6c, 0x51, 0x51, 0x34,
+  0x26, 0x14, 0xb8, 0xc8, 0x16, 0x45, 0x14, 0x2e,
+  0x42, 0x28, 0x2c, 0x82, 0x8a, 0xa9, 0xc1, 0x56,
+  0x2d, 0x2a, 0xca, 0x45, 0x11, 0x54, 0x10, 0x06,
+  0x52, 0xb4, 0x28, 0x0a, 0x22, 0xb0, 0x28, 0x28,
+  0x6a, 0x5b, 0xd0, 0x22, 0x89, 0x44, 0x8a, 0xa6,
+  0x45, 0x99, 0x54, 0x6a, 0x86, 0xa4, 0xe8, 0xdc,
+  0x9b, 0xce, 0xfd, 0xf9, 0x4e, 0x0b, 0x61, 0x6c,
+  0xb2, 0x36, 0xbd, 0x9b, 0xf3, 0xc1, 0xe1, 0x3c,
+  0x9c, 0xf7, 0x3d, 0x5f, 0xe0, 0xc8, 0xd9, 0xe3,
+  0x27, 0x3f, 0x5b, 0x15, 0xda, 0xd8, 0xb8, 0x33,
+  0x09, 0x54, 0x01, 0x5b, 0x81, 0x86, 0xa0, 0x26,
+  0xd9, 0xd0, 0xc2, 0x9f, 0x3f, 0x16, 0x19, 0xce,
+  0xcd, 0xbb, 0xe7, 0xcf, 0x9d, 0xe0, 0x1f, 0x0a,
+  0x34, 0x77, 0x74, 0xed, 0x8d, 0xad, 0xac, 0x8f,
+  0x55, 0x97, 0x9b, 0x83, 0xab, 0x6b, 0xca, 0x3a,
+  0xaa, 0x23, 0x85, 0x6b, 0x6d, 0xcf, 0x27, 0xfd,
+  0x2d, 0xc3, 0xeb, 0xde, 0xe7, 0xea, 0xc3, 0xd7,
+  0x51, 0xe2, 0x91, 0x37, 0xcb, 0xba, 0x3b, 0xef,
+  0x0c, 0xff, 0x15, 0x90, 0x3c, 0x7d, 0xbe, 0xdb,
+  0x9d, 0x1a, 0x3b, 0xec, 0x89, 0xc6, 0xa8, 0x1f,
+  0x66, 0xda, 0x28, 0x63, 0x81, 0x1e, 0xa4, 0xad,
+  0x65, 0x23, 0xcb, 0x2b, 0x16, 0x73, 0xf9, 0xfe,
+  0x0b, 0xfc, 0xa1, 0x3e, 0x62, 0x05, 0xe3, 0x7f,
+  0x9b, 0xef, 0x24, 0x79, 0x2c, 0x25, 0x5f, 0x46,
+  0x06, 0x44, 0x44, 0x64, 0xe0, 0x73, 0x5a, 0x7a,
+  0xd3, 0x03, 0x92, 0xba, 0xf6, 0x44, 0x12, 0x07,
+  0x2f, 0x48, 0xcf, 0xab, 0x2f, 0xd2, 0xf5, 0xf4,
+  0xad, 0xb4, 0x9e, 0xba, 0x2e, 0xef, 0x06, 0x87,
+  0xe5, 0x77, 0x59, 0x96, 0x25, 0xa9, 0x8e, 0xa4,
+  0xe8, 0x86, 0xee, 0xb3, 0xb4, 0x3c, 0xc6, 0xc4,
+  0xc4, 0x04, 0xe1, 0x92, 0x72, 0xb4, 0xc0, 0x24,
+  0x85, 0xe2, 0x00, 0xd0, 0xf7, 0x71, 0x14, 0xb3,
+  0x44, 0xe7, 0xfb, 0x78, 0x86, 0xf7, 0x03, 0x9f,
+  0x58, 0xb2, 0xa8, 0x10, 0x02, 0x00, 0x42, 0x41,
+  0x41, 0x01, 0x00, 0xba, 0xe7, 0x82, 0x28, 0xc1,
+  0x57, 0x8a, 0xed, 0x27, 0x6e, 0xcc, 0xdb, 0xb1,
+  0x77, 0x70, 0x02, 0xd7, 0xf3, 0xb9, 0xd8, 0xf3,
+  0x92, 0x8b, 0x3d, 0x2f, 0x01, 0x78, 0x7c, 0x76,
+  0x1f, 0xc8, 0x6c, 0x5f, 0x03, 0x50, 0xa2, 0x50,
+  0xbe, 0xa2, 0xeb, 0x50, 0x23, 0x00, 0xed, 0xbb,
+  0x77, 0xd2, 0x98, 0x58, 0xc7, 0xcc, 0x8c, 0x4d,
+  0x34, 0xa4, 0xd1, 0x94, 0x58, 0xcf, 0xde, 0xd6,
+  0xed, 0x00, 0xec, 0x69, 0x5e, 0x81, 0xf2, 0x15,
+  0x22, 0x32, 0x07, 0x10, 0x11, 0x22, 0x91, 0x30,
+  0x15, 0x65, 0x31, 0x2e, 0x1d, 0x58, 0xc7, 0xcd,
+  0xbb, 0x0f, 0x88, 0xc7, 0xaa, 0xd0, 0x08, 0xa0,
+  0x11, 0x20, 0x51, 0x5f, 0xcd, 0xad, 0x7b, 0x8f,
+  0x68, 0xdb, 0x5c, 0xc3, 0x8e, 0xa6, 0xf5, 0x14,
+  0x15, 0x17, 0xe5, 0x03, 0x00, 0x2c, 0xcb, 0xc2,
+  0x34, 0x4d, 0xaa, 0xa3, 0xb5, 0x39, 0x48, 0xe3,
+  0xaa, 0xe5, 0xd4, 0xc6, 0x2a, 0xb9, 0x7c, 0xfb,
+  0x21, 0x6d, 0x9b, 0x6b, 0xd8, 0xb5, 0x29, 0x81,
+  0x69, 0x9a, 0x38, 0x8e, 0x93, 0xb3, 0xa8, 0x03,
+  0x28, 0xa5, 0xb0, 0x6d, 0x1b, 0x00, 0xd3, 0x34,
+  0x31, 0x4d, 0x93, 0xee, 0xa3, 0x85, 0x1c, 0xbb,
+  0xda, 0x43, 0xd6, 0xf5, 0xd9, 0xdf, 0x52, 0x4f,
+  0xfb, 0xb6, 0x2d, 0x68, 0x9a, 0xc6, 0xd4, 0xd4,
+  0x14, 0xb6, 0x6d, 0x13, 0x0a, 0x85, 0xe6, 0x00,
+  0x86, 0x61, 0x50, 0x59, 0x59, 0x99, 0x17, 0xde,
+  0x9a, 0x86, 0x0d, 0x3c, 0xbb, 0xb2, 0x01, 0x00,
+  0xdb, 0xb6, 0x71, 0x1c, 0x87, 0xe9, 0xe9, 0xe9,
+  0x79, 0x21, 0xeb, 0x00, 0xfd, 0xfd, 0xfd, 0xb8,
+  0xae, 0x9b, 0xd7, 0xf0, 0x3c, 0x0f, 0x5d, 0xd7,
+  0x73, 0xef, 0x3f, 0x15, 0x89, 0x44, 0xf2, 0x33,
+  0xf0, 0x3c, 0x8f, 0x74, 0x3a, 0xcd, 0xc8, 0xc8,
+  0x08, 0x99, 0x4c, 0x06, 0x11, 0x41, 0x44, 0x30,
+  0x0c, 0x83, 0xa1, 0xa1, 0x21, 0x42, 0xa1, 0x50,
+  0xae, 0x5a, 0x96, 0x85, 0x65, 0x59, 0xf9, 0x57,
+  0x50, 0x4a, 0x51, 0x5c, 0x5c, 0x44, 0x30, 0x18,
+  0xcc, 0x7d, 0x12, 0x00, 0xd7, 0x75, 0x11, 0x35,
+  0x0b, 0x13, 0x35, 0x7b, 0x3e, 0xe5, 0xfb, 0xf9,
+  0x16, 0xc2, 0xe1, 0x30, 0xa5, 0xa5, 0xa5, 0x44,
+  0xa3, 0x51, 0x00, 0xb2, 0xd9, 0x2c, 0x40, 0x2e,
+  0xed, 0x78, 0x5d, 0x1c, 0xa5, 0x14, 0xf1, 0xba,
+  0x3a, 0x94, 0x52, 0x2c, 0x89, 0x46, 0x73, 0x96,
+  0x03, 0xa9, 0x8e, 0xe4, 0x19, 0xe0, 0x34, 0xff,
+  0xa7, 0xce, 0x5f, 0x93, 0x3b, 0x33, 0x4c, 0xd5,
+  0x22, 0x62, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x49,
+  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
diff --git a/samples/toolbar/toolbar.bkl b/samples/toolbar/toolbar.bkl
index 1eddc53bc3..b69e4e144c 100644
--- a/samples/toolbar/toolbar.bkl
+++ b/samples/toolbar/toolbar.bkl
@@ -1,6 +1,14 @@
 <?xml version="1.0" ?>
 <makefile>
 
+    <!--
+        These files are used with wxBITMAP_PNG() and so must be
+        copied to the resources directory under Mac.
+     -->
+    <set var="BUNDLE_RESOURCES">
+        $(SRCDIR)/bitmaps/new.png $(SRCDIR)/bitmaps/open.png $(SRCDIR)/bitmaps/save.png $(SRCDIR)/bitmaps/copy.png $(SRCDIR)/bitmaps/cut.png $(SRCDIR)/bitmaps/paste.png $(SRCDIR)/bitmaps/print.png $(SRCDIR)/bitmaps/help.png
+    </set>
+
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="toolbar" template="wx_sample" template_append="wx_append">
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index cfad7bb099..d3dd1bdcf2 100644
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -31,14 +31,6 @@
 #include "wx/colordlg.h"
 #include "wx/srchctrl.h"
 
-// define this to use XPMs everywhere (by default, BMPs are used under Win)
-// BMPs use less space, but aren't compiled into the executable on other platforms
-#if defined(__WINDOWS__) && wxUSE_WXDIB
-    #define USE_XPM_BITMAPS 0
-#else
-    #define USE_XPM_BITMAPS 1
-#endif
-
 // If this is 1, the sample will test an extra toolbar identical to the
 // main one, but not managed by the frame. This can test subtle differences
 // in the way toolbars are handled, especially on Mac where there is one
@@ -52,20 +44,21 @@
 // resources
 // ----------------------------------------------------------------------------
 
+// Under Windows, PNG files are embedded as resources, see toolbar.rc, but
+// elsewhere we embed them in the program itself. We could also load them
+// during run-time.
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
-#endif
 
-#if USE_XPM_BITMAPS
-    #include "bitmaps/new.xpm"
-    #include "bitmaps/open.xpm"
-    #include "bitmaps/save.xpm"
-    #include "bitmaps/copy.xpm"
-    #include "bitmaps/cut.xpm"
-    #include "bitmaps/preview.xpm"  // paste XPM
-    #include "bitmaps/print.xpm"
-    #include "bitmaps/help.xpm"
-#endif // USE_XPM_BITMAPS
+    #include "bitmaps/new_png.c"
+    #include "bitmaps/open_png.c"
+    #include "bitmaps/save_png.c"
+    #include "bitmaps/copy_png.c"
+    #include "bitmaps/cut_png.c"
+    #include "bitmaps/paste_png.c"
+    #include "bitmaps/print_png.c"
+    #include "bitmaps/help_png.c"
+#endif // !wxHAS_IMAGES_IN_RESOURCES
 
 enum Positions
 {
@@ -301,6 +294,10 @@ bool MyApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
+    // Because we use PNG icons in the frame ctor, we need to register this
+    // image handler before creating the frame.
+    wxImage::AddHandler(new wxPNGHandler);
+
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  "wxToolBar Sample",
@@ -312,8 +309,6 @@ bool MyApp::OnInit()
     frame->SetStatusText("Hello, wxWidgets");
 #endif
 
-    wxInitAllImageHandlers();
-
     return true;
 }
 
@@ -382,13 +377,8 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
 
     wxBitmap toolBarBitmaps[Tool_Max];
 
-#if USE_XPM_BITMAPS
     #define INIT_TOOL_BMP(bmp) \
-        toolBarBitmaps[Tool_##bmp] = wxBitmap(bmp##_xpm)
-#else // !USE_XPM_BITMAPS
-    #define INIT_TOOL_BMP(bmp) \
-        toolBarBitmaps[Tool_##bmp] = wxBITMAP(bmp)
-#endif // USE_XPM_BITMAPS/!USE_XPM_BITMAPS
+        toolBarBitmaps[Tool_##bmp] = wxBITMAP_PNG(bmp)
 
     INIT_TOOL_BMP(new);
     INIT_TOOL_BMP(open);
@@ -739,12 +729,12 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
 
         m_tbar->SetMargins(4, 4);
 
-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_1, "First", wxBITMAP(new));
-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_2, "Second", wxBITMAP(open));
-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, "Third", wxBITMAP(save));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_1, "First", wxBITMAP_PNG(new));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_2, "Second", wxBITMAP_PNG(open));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, "Third", wxBITMAP_PNG(save));
         m_tbar->AddSeparator();
-        m_tbar->AddTool(wxID_HELP, "Help", wxBITMAP(help));
-        m_tbar->AddTool(IDM_TOOLBAR_OTHER_4, "Disabled", wxBITMAP(cut), wxBITMAP(paste));
+        m_tbar->AddTool(wxID_HELP, "Help", wxBITMAP_PNG(help));
+        m_tbar->AddTool(IDM_TOOLBAR_OTHER_4, "Disabled", wxBITMAP_PNG(cut), wxBITMAP_PNG(paste));
         m_tbar->EnableTool(IDM_TOOLBAR_OTHER_4, false);
 
         m_tbar->Realize();
@@ -992,7 +982,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 
     wxToolBarBase *tb = GetToolBar();
     tb->InsertTool(0, wxID_PRINT, "New print",
-                   wxBITMAP(print), wxNullBitmap,
+                   wxBITMAP_PNG(print), wxNullBitmap,
                    wxITEM_NORMAL,
                    "Delete this tool",
                    "This button was inserted into the toolbar");
diff --git a/samples/toolbar/toolbar.rc b/samples/toolbar/toolbar.rc
index 3a4920cf6c..ebad369ee3 100644
--- a/samples/toolbar/toolbar.rc
+++ b/samples/toolbar/toolbar.rc
@@ -1,11 +1,10 @@
 #include "../sample.rc"
 
-new BITMAP "bitmaps/new.bmp"
-open BITMAP "bitmaps/open.bmp"
-save BITMAP "bitmaps/save.bmp"
-copy BITMAP "bitmaps/copy.bmp"
-cut BITMAP "bitmaps/cut.bmp"
-paste BITMAP "bitmaps/paste.bmp"
-print BITMAP "bitmaps/print.bmp"
-help BITMAP "bitmaps/help.bmp"
-
+new        RCDATA "bitmaps/new.png"
+open       RCDATA "bitmaps/open.png"
+save       RCDATA "bitmaps/save.png"
+copy       RCDATA "bitmaps/copy.png"
+cut        RCDATA "bitmaps/cut.png"
+paste      RCDATA "bitmaps/paste.png"
+print      RCDATA "bitmaps/print.png"
+help       RCDATA "bitmaps/help.png"