diff --git a/samples/menu/copy.xpm b/samples/menu/copy.xpm
deleted file mode 100644
index 15eb885af9..0000000000
--- a/samples/menu/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/menu/menu.cpp b/samples/menu/menu.cpp
index 51119b2fae..07886e3a8d 100644
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -32,6 +32,7 @@
     #include "wx/textdlg.h"
 #endif
 
+#include "wx/artprov.h"
 #include "wx/filehistory.h"
 #include "wx/filename.h"
 
@@ -56,8 +57,6 @@
     #define USE_LOG_WINDOW 0
 #endif
 
-#include "copy.xpm"
-
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
@@ -559,7 +558,7 @@ MyFrame::MyFrame()
 #if USE_LOG_WINDOW
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       "Clear &log\tCtrl-L");
-    item->SetBitmap(wxBitmap(copy_xpm));
+    item->SetBitmap(wxArtProvider::GetBitmapBundle(wxART_DELETE, wxART_MENU));
     fileMenu->Append(item);
     fileMenu->AppendSeparator();
 #endif // USE_LOG_WINDOW
@@ -1248,7 +1247,8 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
         menu.Append(Menu_Popup_ToBeGreyed, "To be &greyed",
                     "This menu item should be initially greyed out");
         menu.AppendSeparator();
-        menu.Append(Menu_File_Quit, "E&xit");
+        menu.Append(Menu_File_Quit, "E&xit")
+            ->SetBitmap(wxArtProvider::GetBitmapBundle(wxART_QUIT, wxART_MENU));
 
         menu.Delete(Menu_Popup_ToBeDeleted);
         menu.Check(Menu_Popup_ToBeChecked, true);
diff --git a/src/zlib b/src/zlib
index 5888671274..414ab5c668 160000
--- a/src/zlib
+++ b/src/zlib
@@ -1 +1 @@
-Subproject commit 5888671274cde770edbe683b435f052de2b03681
+Subproject commit 414ab5c6683c0b7c5526be5db50adbaa7d7daac1