diff --git a/bitmaps_png/cpp_16/small_trash.cpp b/bitmaps_png/cpp_16/small_trash.cpp
index 261d114985..84ee18a6eb 100644
--- a/bitmaps_png/cpp_16/small_trash.cpp
+++ b/bitmaps_png/cpp_16/small_trash.cpp
@@ -8,30 +8,16 @@
 static const unsigned char 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, 0x04, 0x00, 0x00, 0x00, 0xb5, 0xfa, 0x37,
- 0xea, 0x00, 0x00, 0x01, 0x58, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x85, 0xd1, 0xcb, 0x2b, 0x44,
- 0x71, 0x14, 0xc0, 0xf1, 0xbb, 0x50, 0x14, 0x5b, 0x5b, 0x53, 0xf3, 0x0f, 0xd8, 0x4a, 0x29, 0xd9,
- 0x59, 0x72, 0x7f, 0x3f, 0x33, 0x86, 0x31, 0x57, 0xc3, 0x98, 0x90, 0x46, 0x63, 0xb2, 0x31, 0x5e,
- 0x45, 0x52, 0x93, 0x85, 0x47, 0x24, 0x77, 0x83, 0xe6, 0x6e, 0x91, 0x8d, 0x85, 0x05, 0x8b, 0x3b,
- 0x1b, 0x8f, 0xb2, 0x1a, 0x29, 0x1b, 0x45, 0x92, 0x7b, 0xfd, 0x3c, 0x32, 0x63, 0xea, 0x6b, 0xc3,
- 0x68, 0xa4, 0x9c, 0xb3, 0x3b, 0x7d, 0xea, 0xbc, 0x34, 0xed, 0xbf, 0x68, 0xf5, 0x88, 0x07, 0x71,
- 0x2b, 0x6d, 0x91, 0xd6, 0xd7, 0xf4, 0x79, 0x31, 0x27, 0xe6, 0xc4, 0x92, 0xd8, 0x90, 0xbb, 0xe2,
- 0x4c, 0xdc, 0x8b, 0x47, 0xdd, 0xab, 0xb5, 0x7a, 0x84, 0x2b, 0xf8, 0x3b, 0x75, 0x47, 0xf7, 0x6a,
- 0x9a, 0x26, 0x6b, 0x82, 0x6f, 0x27, 0x1c, 0x30, 0xca, 0x3c, 0x16, 0x16, 0x93, 0xcc, 0x72, 0xc4,
- 0x09, 0xbe, 0x7c, 0x63, 0xd9, 0x57, 0x1b, 0xff, 0xeb, 0x0d, 0x0a, 0x13, 0x0b, 0x85, 0x62, 0x91,
- 0x3d, 0x14, 0x67, 0x84, 0x2e, 0x8b, 0x73, 0x74, 0x5f, 0x04, 0x19, 0x65, 0x84, 0x61, 0x4c, 0x4c,
- 0xa2, 0x8c, 0x91, 0xc0, 0x20, 0x94, 0x2e, 0x82, 0xc0, 0xfa, 0x36, 0xa7, 0xac, 0x30, 0x82, 0x85,
- 0x45, 0x94, 0x4d, 0xce, 0x59, 0x78, 0x17, 0xb1, 0x22, 0x90, 0x91, 0xd4, 0x8b, 0x22, 0xc3, 0x38,
- 0x0a, 0x45, 0x1f, 0xd7, 0x28, 0xe2, 0x8e, 0x6c, 0xfa, 0x59, 0xb5, 0xae, 0xe7, 0xb5, 0x9f, 0x24,
- 0x06, 0x26, 0x26, 0x3e, 0x66, 0x18, 0xa2, 0xad, 0x20, 0xab, 0x8b, 0x20, 0x58, 0xe9, 0xcf, 0x67,
- 0xd9, 0xa7, 0x03, 0x8b, 0x2d, 0xfc, 0x1c, 0x62, 0xd3, 0xe1, 0x94, 0x9c, 0xab, 0xf3, 0x2e, 0xcb,
- 0x13, 0x7e, 0x1c, 0xae, 0xe8, 0x47, 0x71, 0x8c, 0x61, 0x97, 0x80, 0xae, 0x43, 0x83, 0x09, 0x02,
- 0xac, 0x90, 0x22, 0x4c, 0x92, 0x5e, 0xda, 0x17, 0x4a, 0x40, 0xdb, 0xf4, 0x6a, 0xc1, 0x26, 0xc2,
- 0x1a, 0x29, 0xe2, 0x64, 0x98, 0x7a, 0x96, 0xc1, 0x12, 0xa0, 0xeb, 0xe3, 0xae, 0x62, 0x02, 0x9b,
- 0x1d, 0x96, 0x51, 0xf4, 0x3d, 0xb5, 0xd4, 0xfe, 0x7a, 0x99, 0x2f, 0x17, 0x73, 0x07, 0xf2, 0xb3,
- 0x1f, 0xc9, 0x42, 0x3c, 0x37, 0xe8, 0xfa, 0x9e, 0x9b, 0xcb, 0x7f, 0x7d, 0x55, 0x56, 0x89, 0x06,
- 0x19, 0x96, 0x09, 0x99, 0x90, 0x61, 0x51, 0x6f, 0x54, 0x7c, 0xd7, 0x3f, 0x01, 0x47, 0x69, 0xeb,
- 0x08, 0x22, 0x43, 0x7e, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
+ 0xea, 0x00, 0x00, 0x00, 0x84, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x63, 0x60, 0x20, 0x1e, 0x04,
+ 0x2b, 0x85, 0x7c, 0x09, 0xf9, 0x0f, 0x84, 0x3f, 0x83, 0x4d, 0xd0, 0xa4, 0x42, 0x3e, 0x81, 0x25,
+ 0xd0, 0xe1, 0xcf, 0x00, 0x01, 0x98, 0x82, 0x8f, 0x58, 0x15, 0xfc, 0x80, 0x2b, 0x20, 0x08, 0x1a,
+ 0x98, 0x42, 0xfe, 0x62, 0xe8, 0xff, 0xdb, 0xc0, 0x84, 0xec, 0x8a, 0x6f, 0xe8, 0x0a, 0x82, 0xbf,
+ 0xa2, 0x3a, 0xf3, 0x35, 0x86, 0x09, 0xaf, 0x50, 0x15, 0xdc, 0x45, 0x57, 0x10, 0x7a, 0x07, 0x55,
+ 0xc1, 0x39, 0x0c, 0x2b, 0xce, 0xa2, 0x28, 0x08, 0xdd, 0x8d, 0x61, 0xc2, 0x2e, 0x14, 0x05, 0x41,
+ 0xcb, 0x31, 0xdc, 0xb0, 0x0c, 0xd5, 0x8a, 0x89, 0x18, 0x26, 0x4c, 0x40, 0x55, 0x90, 0x8b, 0xea,
+ 0xd1, 0xd0, 0xef, 0xc1, 0x79, 0x28, 0x0a, 0xfc, 0x78, 0x43, 0x4f, 0x05, 0xff, 0x83, 0x3b, 0xf0,
+ 0x5f, 0xe8, 0xa9, 0x68, 0x3e, 0x22, 0x43, 0x19, 0x00, 0xa3, 0xeb, 0xa5, 0x87, 0x9e, 0x7e, 0xaa,
+ 0xb0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE small_trash_xpm[1] = {{ png, sizeof( png ), "small_trash_xpm" }};
diff --git a/bitmaps_png/cpp_24/copy.cpp b/bitmaps_png/cpp_24/copy.cpp
index 33626a2430..2b8af83208 100644
--- a/bitmaps_png/cpp_24/copy.cpp
+++ b/bitmaps_png/cpp_24/copy.cpp
@@ -7,25 +7,15 @@
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
- 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x00, 0xfd, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
- 0xe3, 0xae, 0x5d, 0xbb, 0xf2, 0x77, 0xee, 0xdc, 0x79, 0x17, 0x88, 0xff, 0x93, 0x81, 0x7f, 0x00,
- 0xf1, 0x91, 0x1d, 0x3b, 0x76, 0x98, 0x31, 0x60, 0x03, 0x40, 0x89, 0x02, 0x32, 0x0d, 0x46, 0xc7,
- 0x5f, 0x80, 0x66, 0xa9, 0x60, 0x58, 0x00, 0x94, 0xb8, 0x47, 0x25, 0x0b, 0x40, 0xb8, 0x05, 0x9b,
- 0x05, 0xff, 0xa8, 0x68, 0xc1, 0x2a, 0x6c, 0x16, 0x60, 0x28, 0xdc, 0xb8, 0x6d, 0xe7, 0xff, 0xbc,
- 0xf9, 0xfb, 0xfe, 0x07, 0x4d, 0x3d, 0xf8, 0xdf, 0x7f, 0x0a, 0xf1, 0xd8, 0x69, 0xc2, 0xa1, 0xc7,
- 0x52, 0x8d, 0x47, 0x57, 0x49, 0x35, 0x1c, 0xee, 0x14, 0x6f, 0x38, 0xac, 0x84, 0xd5, 0x02, 0x90,
- 0xe1, 0x26, 0x5d, 0x87, 0xfe, 0x4b, 0x35, 0x1e, 0xa1, 0x14, 0x7f, 0x96, 0x6c, 0x3a, 0x6c, 0x8c,
- 0x61, 0x41, 0xce, 0xbc, 0x7d, 0xd4, 0x30, 0x1c, 0x82, 0x9b, 0x8e, 0xec, 0xc5, 0xb0, 0xc0, 0x77,
- 0xf2, 0x41, 0xea, 0x59, 0xd0, 0x78, 0xe4, 0x13, 0x86, 0x05, 0x1e, 0x13, 0xa9, 0x6a, 0xc1, 0xef,
- 0x51, 0x0b, 0x46, 0x2d, 0x18, 0x22, 0x16, 0xfc, 0xa4, 0xb5, 0x05, 0xc7, 0x68, 0x6a, 0xc1, 0xee,
- 0xdd, 0xbb, 0x2d, 0x40, 0x95, 0x05, 0xcd, 0x2c, 0x80, 0xd6, 0x6a, 0x2a, 0x40, 0xc3, 0xdb, 0x41,
- 0xe5, 0xb9, 0x4d, 0xcf, 0xc1, 0xe7, 0x54, 0xb7, 0x00, 0x19, 0x00, 0x05, 0xb7, 0x50, 0xd1, 0x82,
- 0x9f, 0x18, 0x16, 0x48, 0x36, 0x1e, 0xe9, 0xa3, 0xa2, 0x05, 0x17, 0x31, 0x7d, 0xd0, 0x7c, 0x44,
- 0x1d, 0x28, 0xf1, 0x8d, 0x1a, 0x16, 0x48, 0x37, 0x1d, 0x4d, 0xc0, 0xda, 0xd2, 0x90, 0x6e, 0x38,
- 0x62, 0x01, 0x54, 0x70, 0x90, 0x4c, 0x8b, 0xfe, 0x00, 0xf1, 0x15, 0x60, 0xd5, 0x99, 0x08, 0x32,
- 0x0b, 0x00, 0x3e, 0xd4, 0x68, 0x82, 0x19, 0x33, 0x90, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
- 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
+ 0x73, 0x00, 0x00, 0x00, 0x60, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x1d, 0x84,
+ 0xfc, 0xc7, 0x84, 0xa1, 0x7f, 0x42, 0x1c, 0xf0, 0x68, 0xf8, 0x8c, 0x01, 0x43, 0xfe, 0x47, 0xfc,
+ 0x0a, 0x75, 0x22, 0x42, 0x03, 0x51, 0xb6, 0xa1, 0x6a, 0x20, 0xc2, 0x36, 0xc2, 0x1a, 0xd0, 0xb4,
+ 0x10, 0xa3, 0x01, 0x45, 0x0b, 0x71, 0x1a, 0x90, 0xb4, 0x10, 0xab, 0x21, 0xe4, 0x7f, 0xd8, 0x1f,
+ 0xa2, 0x34, 0x20, 0xcb, 0x52, 0x4b, 0x03, 0x7a, 0x4c, 0x50, 0xdf, 0x06, 0x0a, 0x9c, 0x44, 0x2b,
+ 0x1b, 0x86, 0xa2, 0x86, 0x10, 0x9c, 0xe1, 0x82, 0x55, 0x03, 0xa1, 0xec, 0x4a, 0x40, 0x03, 0x7e,
+ 0x48, 0x46, 0x19, 0x03, 0x00, 0xc3, 0xcc, 0x04, 0xe7, 0x20, 0x69, 0xde, 0xfd, 0x00, 0x00, 0x00,
+ 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE copy_xpm[1] = {{ png, sizeof( png ), "copy_xpm" }};
diff --git a/bitmaps_png/cpp_24/cut.cpp b/bitmaps_png/cpp_24/cut.cpp
index 22d35dc41b..b31559fb9a 100644
--- a/bitmaps_png/cpp_24/cut.cpp
+++ b/bitmaps_png/cpp_24/cut.cpp
@@ -8,29 +8,27 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x01, 0x49, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x3e, 0x08,
- 0x89, 0x0b, 0x39, 0x1a, 0xf2, 0x31, 0xf4, 0x72, 0x48, 0x6b, 0x02, 0x07, 0x11, 0xca, 0x83, 0x27,
- 0x87, 0xfc, 0x87, 0xc3, 0x73, 0x04, 0xb5, 0x84, 0x3a, 0x85, 0xfc, 0x0b, 0xf9, 0x1c, 0x12, 0xe1,
- 0xc7, 0x1b, 0x64, 0x11, 0x7c, 0x2d, 0xe4, 0x7f, 0x70, 0x0b, 0x21, 0xe7, 0xf4, 0x85, 0xfc, 0x0f,
- 0xad, 0x86, 0xb0, 0x83, 0x2c, 0x80, 0x76, 0x5c, 0x22, 0x64, 0xc3, 0x1a, 0xa0, 0xa9, 0xc1, 0x10,
- 0x76, 0x34, 0x1f, 0x50, 0xc3, 0x47, 0x86, 0x90, 0xa9, 0x21, 0x6b, 0x43, 0x5d, 0x19, 0x18, 0x71,
- 0xd8, 0x50, 0x0f, 0x54, 0xb4, 0x10, 0xaa, 0x39, 0x16, 0xc8, 0x3e, 0xcc, 0x10, 0xf2, 0x00, 0xec,
- 0x9d, 0x1b, 0x21, 0xb9, 0xd1, 0x7c, 0x58, 0x6c, 0x50, 0x0c, 0xf9, 0x04, 0x94, 0x5d, 0x12, 0x9e,
- 0x1e, 0xbc, 0x3b, 0xe4, 0x27, 0xd0, 0x79, 0xe1, 0x0c, 0x91, 0x22, 0x21, 0x55, 0xc1, 0x8f, 0xc0,
- 0x9a, 0x3e, 0x07, 0x4f, 0x0b, 0xd6, 0xc6, 0xb0, 0x23, 0x28, 0xe4, 0x0b, 0x2c, 0x94, 0x82, 0xbb,
- 0xa0, 0x82, 0x0d, 0x4c, 0xc1, 0x2e, 0x21, 0x9b, 0x81, 0xe1, 0x01, 0x12, 0x3e, 0x13, 0x12, 0x97,
- 0xc6, 0x0a, 0x11, 0xf7, 0x64, 0x07, 0x3a, 0xe3, 0x04, 0x58, 0xe9, 0xbf, 0x90, 0xdb, 0x21, 0x29,
- 0x68, 0x66, 0x85, 0xab, 0x85, 0x74, 0x84, 0xbc, 0x03, 0x6b, 0x7a, 0x16, 0xd2, 0x11, 0x6a, 0x1c,
- 0xd2, 0x10, 0xf2, 0x0a, 0xcc, 0xfb, 0x10, 0x32, 0x31, 0x58, 0x09, 0x47, 0xa8, 0xf8, 0xf1, 0x86,
- 0xa6, 0x85, 0x5c, 0x42, 0x8e, 0xaa, 0xd0, 0x34, 0x5f, 0x2e, 0x3c, 0xc1, 0x48, 0x92, 0x06, 0x12,
- 0x9c, 0x44, 0x92, 0xa7, 0x09, 0x05, 0x6b, 0x70, 0x70, 0xc8, 0x57, 0xb8, 0x03, 0xbb, 0x41, 0xe1,
- 0x8c, 0x37, 0xe2, 0x82, 0x95, 0x80, 0x49, 0x0f, 0x29, 0xe2, 0x42, 0x22, 0x88, 0x49, 0x1a, 0x0b,
- 0xa0, 0x9a, 0x63, 0xc0, 0x49, 0x83, 0x70, 0xe2, 0x0b, 0x09, 0x42, 0x49, 0x7c, 0x04, 0x92, 0x77,
- 0x3f, 0x50, 0x51, 0x0d, 0x54, 0xb3, 0x25, 0x11, 0xc9, 0x3b, 0xc8, 0x11, 0x18, 0x76, 0x5f, 0x82,
- 0x23, 0xa3, 0xf9, 0x80, 0xca, 0xaf, 0x03, 0x35, 0x34, 0x13, 0xce, 0xd1, 0x93, 0x48, 0xca, 0xa2,
- 0xd0, 0x7c, 0x00, 0x2c, 0x04, 0x80, 0xf1, 0xdf, 0x4c, 0x94, 0x72, 0x74, 0x00, 0x00, 0x0e, 0x36,
- 0xea, 0x46, 0x65, 0x64, 0x5a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0x33, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x70, 0x10,
+ 0xae, 0x16, 0xba, 0x3e, 0xe4, 0x65, 0xc8, 0xe3, 0xe0, 0x45, 0x41, 0x92, 0x44, 0x28, 0x0f, 0xd6,
+ 0x0b, 0xf9, 0x1a, 0xf2, 0x1f, 0x0a, 0x5f, 0x45, 0x48, 0x11, 0xd4, 0x10, 0x72, 0x18, 0xa8, 0x70,
+ 0x71, 0xa0, 0x58, 0x84, 0x42, 0xc8, 0x2e, 0x20, 0x6b, 0x09, 0x01, 0xe5, 0x09, 0x1c, 0x21, 0xbf,
+ 0x42, 0xbe, 0x27, 0x70, 0x80, 0xd8, 0x41, 0xf2, 0x40, 0x0d, 0x4f, 0xc0, 0xc2, 0xa1, 0x5a, 0xa1,
+ 0xc6, 0xd8, 0x35, 0x84, 0x72, 0x86, 0xfc, 0x0e, 0xf9, 0xe6, 0xc9, 0x0e, 0xd6, 0x20, 0x03, 0xd4,
+ 0xf0, 0x14, 0x62, 0xed, 0xeb, 0x90, 0xff, 0xa1, 0xa7, 0x42, 0x13, 0x20, 0x26, 0xa1, 0x39, 0xe9,
+ 0x18, 0x50, 0xd9, 0xbc, 0x28, 0xc1, 0x60, 0x8d, 0x90, 0x3d, 0x40, 0xd6, 0x32, 0x88, 0x60, 0x31,
+ 0x48, 0x0b, 0x10, 0xbe, 0x09, 0xe9, 0x0e, 0x57, 0x46, 0xf3, 0xb4, 0x61, 0xc8, 0x0f, 0x98, 0xa7,
+ 0x43, 0xdf, 0x05, 0xc9, 0x40, 0x85, 0x3d, 0xd9, 0x43, 0x42, 0x43, 0x77, 0x83, 0x85, 0xff, 0x02,
+ 0xe9, 0xd0, 0x50, 0x66, 0xb8, 0x1f, 0xe2, 0x42, 0x2e, 0x42, 0x95, 0x3f, 0x8a, 0x92, 0x47, 0xb3,
+ 0x3e, 0xc8, 0x28, 0x78, 0x66, 0xc8, 0x17, 0xb0, 0xf4, 0x93, 0x90, 0x06, 0x60, 0x80, 0x36, 0x84,
+ 0xbc, 0x02, 0xf3, 0x3e, 0x04, 0xcf, 0x0c, 0xd7, 0xc4, 0x11, 0x2e, 0xa1, 0xfc, 0xa1, 0x69, 0xc1,
+ 0xd7, 0xe0, 0x21, 0xff, 0x3f, 0xe4, 0x4c, 0x68, 0x9a, 0x2f, 0x17, 0x9e, 0x80, 0x24, 0x49, 0x03,
+ 0x09, 0x4e, 0x22, 0xce, 0xd3, 0x11, 0x0a, 0xb0, 0xb0, 0xc6, 0x13, 0xac, 0xa1, 0xc6, 0x88, 0x60,
+ 0x0d, 0x79, 0x1f, 0x21, 0x4b, 0x30, 0xe2, 0x42, 0x8f, 0x87, 0xfc, 0x0f, 0x9e, 0x13, 0x20, 0x10,
+ 0xaa, 0x1e, 0x0c, 0x72, 0xc1, 0x72, 0xa2, 0x92, 0x46, 0x28, 0x1b, 0x3c, 0x69, 0x3c, 0x23, 0x2f,
+ 0xf1, 0x11, 0x4c, 0xde, 0x4b, 0x22, 0xc5, 0x43, 0x15, 0x41, 0x81, 0x12, 0xbc, 0x88, 0xa0, 0x86,
+ 0x50, 0x5d, 0xa4, 0x0c, 0xf4, 0x92, 0xb8, 0x3c, 0xa7, 0x1a, 0xb2, 0x36, 0xe4, 0x45, 0xf0, 0xa3,
+ 0x90, 0x05, 0xa1, 0x12, 0xf4, 0x29, 0x14, 0x00, 0x3a, 0x37, 0xd4, 0x91, 0xd8, 0x53, 0xc6, 0x47,
+ 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE cut_xpm[1] = {{ png, sizeof( png ), "cut_xpm" }};
diff --git a/bitmaps_png/cpp_24/duplicate.cpp b/bitmaps_png/cpp_24/duplicate.cpp
index 692c0f8ffe..cce77605e7 100644
--- a/bitmaps_png/cpp_24/duplicate.cpp
+++ b/bitmaps_png/cpp_24/duplicate.cpp
@@ -8,32 +8,14 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x79, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xd8, 0xb6, 0x6d, 0x9b,
- 0xe8, 0xce, 0x9d, 0x3b, 0xd7, 0x00, 0xf1, 0x17, 0x20, 0xfe, 0x4f, 0x24, 0x06, 0xa9, 0x5d, 0xbd,
- 0x7f, 0xff, 0x7e, 0x11, 0x06, 0x42, 0x60, 0xd7, 0xae, 0x5d, 0x6b, 0x49, 0x30, 0x18, 0x1d, 0xaf,
- 0x26, 0x68, 0x01, 0x89, 0x2e, 0x47, 0xc7, 0x9f, 0x89, 0xb1, 0xe0, 0x3f, 0x25, 0x78, 0xd4, 0x82,
- 0x61, 0x60, 0xc1, 0x9a, 0xad, 0xbb, 0xfe, 0xfb, 0x4d, 0x3e, 0xf0, 0x5f, 0xa9, 0xe5, 0xc8, 0x7f,
- 0xa9, 0x46, 0xa2, 0xf1, 0x67, 0xa9, 0xc6, 0xa3, 0xab, 0xa4, 0x1a, 0x80, 0xf9, 0x84, 0x90, 0x05,
- 0x20, 0xc3, 0x49, 0x30, 0x18, 0x0d, 0x1f, 0x5d, 0x45, 0xd0, 0x02, 0xc5, 0xe6, 0x23, 0x14, 0x58,
- 0x70, 0xe4, 0x33, 0x41, 0x0b, 0x28, 0x30, 0x1c, 0x8c, 0x21, 0x16, 0xec, 0xd8, 0xf1, 0x7f, 0xd7,
- 0x8a, 0xd5, 0x60, 0x9a, 0x16, 0x16, 0x7c, 0xd9, 0x93, 0x54, 0xf4, 0x7f, 0xbf, 0x9a, 0xe3, 0xff,
- 0x3d, 0x71, 0x79, 0xd4, 0xb7, 0x60, 0xf7, 0xa4, 0x99, 0xbb, 0xf7, 0xab, 0x3b, 0x81, 0x2d, 0xd8,
- 0xe7, 0x14, 0x41, 0x7d, 0x0b, 0xf6, 0x1b, 0x78, 0x4c, 0x01, 0x19, 0x0e, 0xb6, 0xc0, 0xdc, 0x1f,
- 0x61, 0x38, 0x30, 0xb8, 0x76, 0xf7, 0x4f, 0xff, 0x6f, 0x56, 0xb8, 0x8e, 0x42, 0x0b, 0x54, 0x1d,
- 0x77, 0xc0, 0x2c, 0x00, 0xe1, 0x03, 0xaa, 0x4e, 0x89, 0xa0, 0xfc, 0x71, 0x40, 0xdd, 0xd9, 0x11,
- 0xc4, 0xdf, 0xad, 0xe9, 0xf2, 0xdf, 0x3f, 0x65, 0x16, 0xf9, 0x16, 0x1c, 0x50, 0x73, 0xdc, 0x8b,
- 0x6c, 0x01, 0x10, 0xff, 0xd9, 0xa7, 0xea, 0x38, 0x6d, 0x9f, 0xb2, 0xa3, 0xf1, 0x7e, 0x55, 0x87,
- 0xe9, 0x20, 0xb1, 0xbd, 0x1a, 0x4e, 0xff, 0x23, 0xe2, 0x26, 0x91, 0x6d, 0xc1, 0x54, 0x34, 0x0b,
- 0x90, 0xf1, 0xa7, 0xb5, 0x06, 0x01, 0x90, 0xe0, 0x03, 0xe2, 0x6a, 0x9f, 0x72, 0x32, 0x82, 0x48,
- 0xcd, 0x41, 0x03, 0x68, 0xc0, 0x7b, 0x3c, 0x96, 0xa0, 0x60, 0xad, 0x8a, 0xed, 0xa4, 0x59, 0x00,
- 0x02, 0xfb, 0x35, 0x1d, 0x74, 0x0e, 0xa8, 0x3a, 0x6e, 0x04, 0x1a, 0xf0, 0x1b, 0xdd, 0xc0, 0x5d,
- 0x9a, 0xae, 0x50, 0x1f, 0x38, 0xfd, 0x2f, 0x08, 0x6a, 0x20, 0xdd, 0x07, 0xc8, 0x60, 0xbf, 0xb6,
- 0x03, 0xcf, 0x5e, 0x15, 0x27, 0x23, 0x60, 0x70, 0x38, 0xef, 0x53, 0x76, 0xb5, 0x06, 0xc6, 0xc1,
- 0x7c, 0x0a, 0xe3, 0x00, 0x77, 0x95, 0x0a, 0x4f, 0x45, 0xea, 0x2e, 0x7f, 0xc9, 0x4f, 0x45, 0xc0,
- 0xc2, 0x0e, 0x17, 0x00, 0xfa, 0x8d, 0xf1, 0x80, 0x9a, 0x93, 0xe7, 0x44, 0x87, 0x34, 0x1b, 0xe9,
- 0xc6, 0x23, 0x6b, 0x80, 0x1a, 0xbe, 0x90, 0x60, 0xf8, 0x17, 0x58, 0x71, 0x0d, 0x00, 0xad, 0x62,
- 0x01, 0x2b, 0x8e, 0x47, 0x2e, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x00, 0x5a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x4f, 0x09, 0x26, 0xca, 0x82, 0xcf, 0x9f, 0x3f, 0x93, 0x85, 0x29, 0xb2, 0x40,
+ 0xaa, 0xf1, 0x08, 0x45, 0x98, 0x28, 0x0b, 0xc8, 0xf5, 0xd9, 0xa8, 0x05, 0xc3, 0xc0, 0x82, 0xca,
+ 0xca, 0x4a, 0x30, 0xa6, 0x99, 0x05, 0xb0, 0x4c, 0x36, 0xb4, 0x2c, 0x00, 0x05, 0x09, 0xae, 0xe2,
+ 0x02, 0x3d, 0xb8, 0x06, 0xa7, 0x05, 0x43, 0x3f, 0x0e, 0xe8, 0x9a, 0x4c, 0x47, 0x60, 0x51, 0x81,
+ 0x0d, 0x53, 0xcd, 0x02, 0x5c, 0x80, 0x2e, 0x16, 0x50, 0xa5, 0xca, 0xa4, 0x25, 0x00, 0x00, 0x4b,
+ 0xb7, 0x06, 0xfa, 0xb4, 0xb6, 0x2e, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+ 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE duplicate_xpm[1] = {{ png, sizeof( png ), "duplicate_xpm" }};
diff --git a/bitmaps_png/cpp_24/paste.cpp b/bitmaps_png/cpp_24/paste.cpp
index d2b81311f5..c8cef1e253 100644
--- a/bitmaps_png/cpp_24/paste.cpp
+++ b/bitmaps_png/cpp_24/paste.cpp
@@ -8,18 +8,14 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x00, 0xa1, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x06, 0x08,
- 0xcd, 0x0f, 0xf9, 0x1f, 0xf2, 0x3f, 0x38, 0x8f, 0x28, 0xc5, 0x09, 0x2b, 0xc2, 0x7f, 0x81, 0x94,
- 0x83, 0xe1, 0xbf, 0x84, 0x35, 0x84, 0x4d, 0xff, 0xfb, 0xfe, 0xff, 0x67, 0x28, 0xfc, 0xf0, 0x3f,
- 0xf4, 0x0f, 0x0e, 0x65, 0x11, 0xb2, 0x21, 0xdb, 0x83, 0x3f, 0x81, 0x4c, 0x0d, 0xfd, 0xff, 0x09,
- 0xae, 0xe1, 0xed, 0xff, 0x08, 0x90, 0x3d, 0x7f, 0x42, 0xde, 0x84, 0xce, 0x0c, 0x14, 0x46, 0xd1,
- 0x10, 0x72, 0x0c, 0x28, 0x0c, 0x76, 0x46, 0xcc, 0x7f, 0xb8, 0x83, 0x80, 0x9a, 0xa3, 0x61, 0xec,
- 0x1f, 0x21, 0x7b, 0x50, 0x34, 0x04, 0xff, 0x08, 0xf9, 0x4f, 0x00, 0xfe, 0x46, 0xb5, 0xe1, 0x3f,
- 0x61, 0x38, 0xaa, 0x61, 0x54, 0x03, 0x51, 0x1a, 0x7e, 0x93, 0x9a, 0xf8, 0x4e, 0x86, 0xfe, 0xc5,
- 0xab, 0xfc, 0x4f, 0xe8, 0x29, 0xd4, 0x7c, 0xa6, 0x15, 0xf2, 0x15, 0x8f, 0x96, 0x3f, 0x21, 0xdf,
- 0x42, 0x75, 0xd1, 0xf2, 0x5c, 0xb0, 0x6a, 0xf0, 0xbe, 0x10, 0xec, 0xb9, 0xe2, 0x73, 0xc8, 0x9e,
- 0x70, 0x4d, 0xb2, 0x4b, 0x14, 0x00, 0xf8, 0x4b, 0xda, 0xe2, 0xb4, 0x68, 0x26, 0xe8, 0x00, 0x00,
- 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x00, 0x5e, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x06, 0x08,
+ 0x79, 0x17, 0xf2, 0x1f, 0x08, 0xdf, 0x13, 0xa5, 0x38, 0x61, 0x45, 0xf8, 0x2f, 0xb0, 0x72, 0x10,
+ 0xfc, 0x97, 0xb0, 0x86, 0xa0, 0x86, 0xd0, 0xbf, 0xef, 0xff, 0x7f, 0x86, 0xc2, 0x0f, 0xff, 0x43,
+ 0xff, 0xe0, 0x54, 0x18, 0xf6, 0x19, 0x6e, 0x2e, 0x16, 0x18, 0xf6, 0x19, 0xd3, 0xdd, 0xff, 0x77,
+ 0xe2, 0x81, 0x21, 0xff, 0xa9, 0xab, 0x01, 0xb7, 0xd3, 0x70, 0x6a, 0xf8, 0x8c, 0x15, 0x8e, 0x6a,
+ 0x18, 0xd5, 0x40, 0x13, 0x0d, 0xa8, 0x19, 0x88, 0x08, 0x0d, 0xa8, 0x49, 0x9d, 0x88, 0xe4, 0x4d,
+ 0x2c, 0x00, 0x00, 0xd4, 0x48, 0x6d, 0xf5, 0x79, 0x41, 0xef, 0x61, 0x00, 0x00, 0x00, 0x00, 0x49,
+ 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE paste_xpm[1] = {{ png, sizeof( png ), "paste_xpm" }};
diff --git a/bitmaps_png/cpp_24/trash.cpp b/bitmaps_png/cpp_24/trash.cpp
index 906e77aed8..edb910cfa9 100644
--- a/bitmaps_png/cpp_24/trash.cpp
+++ b/bitmaps_png/cpp_24/trash.cpp
@@ -8,42 +8,24 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x02, 0x24, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0xd4, 0x4f, 0x48, 0xd4,
- 0x41, 0x14, 0xc0, 0xf1, 0x9f, 0xda, 0xa1, 0x4b, 0x74, 0xea, 0x16, 0x1d, 0x84, 0x88, 0x6e, 0x39,
- 0x6f, 0x66, 0x17, 0xff, 0x2f, 0xea, 0x41, 0x53, 0xb2, 0xc0, 0xd5, 0x8c, 0x30, 0x94, 0x34, 0x8a,
- 0xc4, 0x4a, 0x08, 0x69, 0x29, 0x05, 0xed, 0x64, 0x16, 0x9a, 0x99, 0x97, 0x14, 0x82, 0x8a, 0x2e,
- 0xb6, 0x48, 0x48, 0x52, 0x10, 0x24, 0x09, 0x05, 0x21, 0x54, 0x07, 0xb1, 0x24, 0x2c, 0x16, 0xa4,
- 0x14, 0xe1, 0x15, 0x42, 0xb4, 0xfe, 0xbe, 0x1d, 0xdc, 0xa2, 0x65, 0x7f, 0x07, 0x9b, 0xb9, 0x3c,
- 0x78, 0x7c, 0x60, 0xde, 0xbc, 0x37, 0xe3, 0x79, 0xff, 0xbf, 0x6c, 0x93, 0xbc, 0x32, 0x53, 0x32,
- 0x62, 0x2f, 0x4a, 0xd4, 0x15, 0x18, 0xb1, 0xfb, 0x5c, 0x6e, 0xde, 0xae, 0xf0, 0xee, 0x03, 0x7b,
- 0x8d, 0xb8, 0x52, 0x7b, 0xd0, 0xb4, 0xda, 0x1e, 0x3b, 0x26, 0xd3, 0xe6, 0xb5, 0x69, 0xf6, 0x3c,
- 0xcf, 0xf3, 0x64, 0x4d, 0xd8, 0xe2, 0xfe, 0xbe, 0x09, 0x26, 0xb6, 0x0a, 0xec, 0xe4, 0xe6, 0x99,
- 0xb2, 0xed, 0x79, 0xe1, 0x2a, 0xbd, 0x9c, 0xa5, 0x11, 0x4b, 0x84, 0x2a, 0x22, 0x54, 0x50, 0x43,
- 0x31, 0x45, 0xb4, 0xd1, 0xc5, 0x75, 0xce, 0x21, 0x98, 0x32, 0x2f, 0x3b, 0x55, 0x85, 0xcb, 0x15,
- 0xee, 0xa1, 0x28, 0x4a, 0x39, 0x3d, 0xa9, 0x48, 0xa9, 0xa7, 0x3d, 0x15, 0xc5, 0x08, 0xad, 0xfe,
- 0x5b, 0x77, 0x96, 0xfb, 0xd1, 0x97, 0x4a, 0xd5, 0xd1, 0xf1, 0x17, 0x54, 0xd0, 0x9d, 0x8a, 0x1a,
- 0x36, 0xec, 0xd3, 0xf4, 0x9b, 0x9a, 0xad, 0xf1, 0xbb, 0xb8, 0x45, 0x9c, 0x63, 0x34, 0xf0, 0x81,
- 0x04, 0x09, 0xe6, 0x71, 0xc4, 0x78, 0xc4, 0x20, 0x9d, 0x84, 0x7d, 0xb9, 0x96, 0x06, 0xe4, 0x76,
- 0xd8, 0xaf, 0xc4, 0x06, 0x96, 0xea, 0xa8, 0x42, 0x90, 0x13, 0xe9, 0xe0, 0x8c, 0xf0, 0x91, 0x6f,
- 0xcc, 0xd1, 0x41, 0x3e, 0xf7, 0xb9, 0xc3, 0x38, 0x83, 0x08, 0x03, 0xbc, 0x65, 0x85, 0x38, 0x82,
- 0xcd, 0x4b, 0x07, 0x45, 0xc2, 0x34, 0x8a, 0x32, 0x8a, 0xf0, 0x15, 0x45, 0x79, 0x8e, 0x30, 0x83,
- 0xa2, 0xdc, 0xc0, 0x26, 0x23, 0xdb, 0xd3, 0xc1, 0x4e, 0xf1, 0x07, 0x58, 0x42, 0x79, 0x88, 0xb0,
- 0x80, 0xa2, 0x4c, 0x20, 0xbc, 0x47, 0x59, 0xe6, 0x24, 0xa1, 0xf9, 0x8c, 0x01, 0x09, 0x7d, 0xa9,
- 0x45, 0x28, 0xa7, 0x1e, 0xa1, 0x83, 0x7e, 0xfa, 0x69, 0x42, 0x68, 0xa6, 0x12, 0xc1, 0x61, 0x1e,
- 0x64, 0x4e, 0xd4, 0x64, 0xf5, 0xc6, 0x18, 0x57, 0x88, 0x22, 0x94, 0x52, 0x40, 0x3e, 0x85, 0x08,
- 0x4d, 0x74, 0x31, 0x84, 0x60, 0x62, 0x19, 0xc0, 0xf4, 0x39, 0x7f, 0x05, 0x65, 0x91, 0x3f, 0x4d,
- 0x8c, 0x51, 0x89, 0xa2, 0xbc, 0x44, 0x30, 0x35, 0x99, 0xa0, 0x41, 0x78, 0x83, 0xb2, 0x8a, 0x65,
- 0x18, 0x45, 0x39, 0x4d, 0x23, 0x8a, 0x72, 0x17, 0x41, 0xf6, 0x64, 0x82, 0xfd, 0x42, 0x0b, 0xa3,
- 0x3c, 0xa3, 0x84, 0xcb, 0xac, 0xb1, 0x4a, 0x1d, 0x2d, 0x3c, 0x61, 0x88, 0xe3, 0x84, 0xd4, 0xcb,
- 0xca, 0x00, 0xd1, 0x1c, 0xfb, 0xb3, 0x24, 0xb0, 0x6d, 0xc5, 0xd8, 0x99, 0xc0, 0x87, 0xe4, 0xe6,
- 0xda, 0xfc, 0x04, 0x2f, 0x38, 0xc2, 0x21, 0x6e, 0x32, 0x42, 0x88, 0x76, 0x66, 0x59, 0xa6, 0x28,
- 0x69, 0x87, 0x03, 0x81, 0x8c, 0x97, 0x25, 0x15, 0xa5, 0x93, 0xc3, 0x28, 0x09, 0x84, 0x31, 0x94,
- 0x05, 0x04, 0x7b, 0x2a, 0x18, 0x5c, 0x10, 0x16, 0x51, 0x7a, 0x29, 0x45, 0x79, 0x87, 0x10, 0x47,
- 0x79, 0x8c, 0xe0, 0x0a, 0x82, 0xdf, 0x76, 0x44, 0x70, 0x7e, 0x5d, 0xf2, 0x28, 0x8e, 0x21, 0xba,
- 0x11, 0x5a, 0xa9, 0x4d, 0x5a, 0xec, 0xaf, 0xc2, 0x1d, 0xc1, 0xbf, 0x41, 0x96, 0x54, 0x4b, 0xaf,
- 0x99, 0x0a, 0x7d, 0x76, 0xeb, 0x82, 0xe0, 0xd6, 0xc3, 0x9f, 0x24, 0x6e, 0x2e, 0x39, 0xb7, 0x85,
- 0x9f, 0x24, 0xb2, 0x2d, 0x9a, 0x13, 0x9c, 0xf9, 0x0d, 0x43, 0x8e, 0xed, 0xe1, 0xe0, 0x53, 0x7d,
- 0xe3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0x01, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x11, 0x30,
+ 0xa2, 0x0b, 0x04, 0x59, 0x33, 0xed, 0x60, 0xe0, 0x81, 0x72, 0xbe, 0xfc, 0xf3, 0x58, 0x77, 0x14,
+ 0x55, 0x9e, 0x09, 0x5d, 0x03, 0x53, 0x0c, 0x5c, 0x39, 0x03, 0x03, 0x0f, 0x63, 0x34, 0x56, 0x1b,
+ 0x82, 0xe3, 0x19, 0xe6, 0x33, 0x32, 0xe2, 0x77, 0xca, 0xff, 0xff, 0x8c, 0x09, 0x6b, 0x16, 0x61,
+ 0xb1, 0x81, 0x48, 0x10, 0x52, 0x12, 0xf2, 0x7f, 0xee, 0xff, 0xcf, 0x38, 0xe0, 0x9c, 0xff, 0x21,
+ 0xff, 0x43, 0x8a, 0x51, 0xfc, 0xc0, 0xf8, 0x83, 0x81, 0xe1, 0x17, 0x4e, 0xe3, 0x7e, 0x83, 0x9c,
+ 0xf4, 0x03, 0x45, 0x03, 0x88, 0xfb, 0x1b, 0xa7, 0x06, 0x90, 0x51, 0x4c, 0x98, 0x1a, 0xfe, 0x00,
+ 0xe9, 0x36, 0x20, 0x64, 0xc0, 0xa0, 0xff, 0x60, 0xda, 0xc0, 0x04, 0x75, 0xd2, 0x6d, 0x20, 0x64,
+ 0xc0, 0xa0, 0xa9, 0xe9, 0x24, 0xec, 0x00, 0x8f, 0x93, 0x70, 0x87, 0xd2, 0x3f, 0x54, 0x0d, 0xff,
+ 0xf0, 0xda, 0x00, 0xd2, 0xc0, 0x8c, 0xa9, 0xe1, 0x37, 0x29, 0x36, 0xb0, 0xe0, 0x75, 0xd2, 0x2f,
+ 0xa8, 0x0a, 0x24, 0x0d, 0x7f, 0x09, 0x7a, 0x1a, 0xcd, 0x06, 0x76, 0x82, 0x9e, 0xfe, 0x83, 0xaa,
+ 0xe1, 0x0f, 0xd4, 0x0f, 0xaa, 0x40, 0xc8, 0x80, 0x41, 0x83, 0x8c, 0xe2, 0xf9, 0x81, 0x92, 0xe3,
+ 0x1c, 0x58, 0x44, 0x7e, 0x33, 0x31, 0xcc, 0xc5, 0x61, 0x43, 0x32, 0xc3, 0x3f, 0x86, 0x37, 0xac,
+ 0x07, 0xfe, 0x20, 0xd9, 0x00, 0xe4, 0x3c, 0xf9, 0xc7, 0x70, 0x15, 0xab, 0xf2, 0x2b, 0x40, 0xe5,
+ 0x0c, 0x8f, 0x0e, 0xfc, 0x41, 0xcb, 0xd3, 0x21, 0xf5, 0x0c, 0x0d, 0x78, 0x32, 0x4c, 0xdd, 0x9a,
+ 0x66, 0xb4, 0x3c, 0xfd, 0xa6, 0xf5, 0x7f, 0x13, 0xc3, 0x13, 0xac, 0x8a, 0x9f, 0xfc, 0x6f, 0x7a,
+ 0xd3, 0xce, 0x40, 0x2e, 0x00, 0x00, 0xec, 0xfc, 0x8f, 0x28, 0x59, 0x88, 0xb0, 0xb5, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE trash_xpm[1] = {{ png, sizeof( png ), "trash_xpm" }};
diff --git a/bitmaps_png/sources/copy.svg b/bitmaps_png/sources/copy.svg
index 91d946d2fb..7ed343c18a 100755
--- a/bitmaps_png/sources/copy.svg
+++ b/bitmaps_png/sources/copy.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="copy.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:zoom="19.288749"
+     inkscape:cx="12.825237"
+     inkscape:cy="13.861564"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -80,11 +80,41 @@
   <title
      id="title751">copy</title>
   <path
-     class="cls-1"
-     d="m 3.2616,-0.0141 h 13.1317 a 3.2829,3.2829 0 0 1 3.2829,3.2829 v 13.1319 a 3.2829,3.2829 0 0 1 -3.2829,3.2829 H 3.2617 A 3.2831,3.2831 0 0 1 -0.0214,16.4 V 3.2689 a 3.283,3.283 0 0 1 3.283,-3.283 z"
-     id="path753" />
+     id="polygon25929-9"
+     sodipodi:nodetypes="ccccccc"
+     class="st0"
+     d="M 12.5,0.5 H 0.49999998 v 21 H 17.499999 V 5.4999999 Z"
+     style="display:none;fill:#f3f3f3;stroke:#545454;stroke-width:1;stroke-miterlimit:10" />
   <path
-     class="cls-2"
-     d="M 7.5687,4.2989 H 20.7 a 3.283,3.283 0 0 1 3.283,3.283 V 20.7135 A 3.2831,3.2831 0 0 1 20.7,23.9966 H 7.5689 A 3.2831,3.2831 0 0 1 4.2858,20.7135 V 7.5818 A 3.2829,3.2829 0 0 1 7.5687,4.2989 Z"
-     id="path755" />
+     id="polygon25929"
+     sodipodi:nodetypes="cccccc"
+     class="st0"
+     d="m 11.5,1.5 h -10 v 19 h 15 v -14 z"
+     style="fill:#f3f3f3;stroke:#545454;stroke-miterlimit:10" />
+  <path
+     id="polygon25931"
+     sodipodi:nodetypes="cccc"
+     class="st1"
+     d="M 17,7 11,1 v 6 z"
+     style="fill:#545454" />
+  <path
+     id="polygon25929-97"
+     sodipodi:nodetypes="cccccc"
+     class="st0"
+     d="m 17.5,3.5 h -10 v 19 h 15 v -14 z"
+     style="fill:#f3f3f3;stroke:#545454;stroke-miterlimit:10" />
+  <path
+     id="polygon25931-5"
+     sodipodi:nodetypes="cccc"
+     class="st1"
+     d="M 23,9 17,3 v 6 z"
+     style="fill:#545454" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 10,11.5 h 8"
+     id="path3435" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 10,14.5 h 5"
+     id="path3437" />
 </svg>
diff --git a/bitmaps_png/sources/cut.svg b/bitmaps_png/sources/cut.svg
index 3a892e9eeb..80e2382145 100755
--- a/bitmaps_png/sources/cut.svg
+++ b/bitmaps_png/sources/cut.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="cut.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:zoom="18.294187"
+     inkscape:cx="13.37627"
+     inkscape:cy="10.559529"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -81,30 +81,30 @@
      id="title827">cut</title>
   <ellipse
      class="cls-1"
-     cx="19.6346"
-     cy="18.648899"
-     rx="3.3654001"
-     ry="3.3511"
+     cx="18.940546"
+     cy="17.984011"
+     rx="3.0594547"
+     ry="3.0159903"
      id="ellipse829" />
   <line
      class="cls-2"
-     x1="1"
-     y1="7.1817999"
-     x2="20.9177"
-     y2="15.559601"
+     x1="2"
+     y1="7.66362"
+     x2="20.107"
+     y2="15.203642"
      id="line831" />
   <ellipse
      class="cls-1"
-     cx="19.6346"
-     cy="5.3511"
-     rx="3.3654001"
-     ry="3.3511"
+     cx="18.940546"
+     cy="6.0159903"
+     rx="3.0594547"
+     ry="3.0159903"
      id="ellipse833" />
   <line
      class="cls-2"
-     x1="1"
-     y1="16.818199"
-     x2="20.9177"
-     y2="8.4404001"
+     x1="2"
+     y1="16.33638"
+     x2="20.107"
+     y2="8.79636"
      id="line835" />
 </svg>
diff --git a/bitmaps_png/sources/duplicate.svg b/bitmaps_png/sources/duplicate.svg
index 04f1fe517f..be31167799 100755
--- a/bitmaps_png/sources/duplicate.svg
+++ b/bitmaps_png/sources/duplicate.svg
@@ -1,40 +1,102 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="duplicate.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2207" inkscape:window-height="1483" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="9.6550514" inkscape:cy="12.887521" inkscape:window-x="0" inkscape:window-y="37" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>add_arc</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs116718">
-      <style id="style116716">.cls-1{fill:#b9b9b9;}.cls-2{fill:#1a81c4;}.cls-3{fill:none;stroke:#bf2641;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
-   </defs>
-   <title id="title116720">duplicate</title>
-   <path class="cls-1" d="m 2.6662,-0.0019 h 10.6665 a 2.6667,2.6667 0 0 1 2.6667,2.6667 v 10.6665 a 2.6668,2.6668 0 0 1 -2.6668,2.6668 H 2.666 A 2.6666,2.6666 0 0 1 -6e-4,13.3315 V 2.6649 a 2.6668,2.6668 0 0 1 2.6668,-2.6668 z" id="path116722" />
-   <path class="cls-2" d="M 10.6667,8.0022 H 21.3334 A 2.6667,2.6667 0 0 1 24,10.6689 v 10.6665 a 2.6668,2.6668 0 0 1 -2.6668,2.6668 H 10.6669 A 2.6668,2.6668 0 0 1 8,21.3354 V 10.6688 a 2.6666,2.6666 0 0 1 2.6666,-2.6666 z" id="path116724" />
-   <g id="g2044" transform="matrix(1.3253403,0,0,0.99999998,-2.8350037,-0.60115351)" style="display:inline;stroke-width:0.868633">
-      <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bf2641;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.73727px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" d="m 4.0058594,13.4375 c -0.5522847,0 -0.7895589,0.578174 -1,1 -0.6590225,1.321 -0.8054951,3.169119 -0.6184761,4.38539 0.3256833,2.118067 1.5908746,2.631602 2.9404947,2.984886 C 7,22.245481 10.175781,21.04883 10.175781,21.04883 c 0.549555,-0.05484 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 0,0 -3.0894053,-0.122415 -4.3079676,-1.340978 C 4.780913,16.62095 5,15.5 5.0058594,14.4375 c 0.0026,-0.471397 -0.4477153,-1 -1,-1 z" id="path2020" sodipodi:nodetypes="sassssssss" />
-      <path id="polyline1446" style="fill:none;stroke:#bf2641;stroke-width:1.73726;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 8.0337885,17.101154 2.4259995,2.999382 -2.4259995,3.000618" sodipodi:nodetypes="ccc" />
-   </g>
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="duplicate.svg"
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="19.771006"
+     inkscape:cx="6.7958582"
+     inkscape:cy="10.642921"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>add_arc</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs116718">
+    <style
+       id="style116716">.cls-1{fill:#b9b9b9;}.cls-2{fill:#1a81c4;}.cls-3{fill:none;stroke:#bf2641;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title116720">duplicate</title>
+  <path
+     id="polygon25929"
+     sodipodi:nodetypes="ccccc"
+     class="st0"
+     d="m 1.5,1.5 v 19 h 15 v -19 z"
+     style="fill:#f3f3f3;stroke:#545454;stroke-miterlimit:10" />
+  <path
+     id="polygon25929-97"
+     sodipodi:nodetypes="ccccc"
+     class="st0"
+     d="m 7.5,3.5 v 19 h 15 v -19 z"
+     style="fill:#f3f3f3;stroke:#1a81c4;stroke-miterlimit:10;stroke-opacity:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 15,9.9999997 V 16"
+     id="path2083" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 12,13 h 6"
+     id="path2083-4" />
 </svg>
diff --git a/bitmaps_png/sources/paste.svg b/bitmaps_png/sources/paste.svg
index a5757e6d4b..f95b371b92 100644
--- a/bitmaps_png/sources/paste.svg
+++ b/bitmaps_png/sources/paste.svg
@@ -45,17 +45,17 @@
    guidetolerance="10"
    id="namedview30"
    inkscape:current-layer="Слой_1"
-   inkscape:cx="14.724903"
-   inkscape:cy="1.3964314"
+   inkscape:cx="11.309915"
+   inkscape:cy="11.691534"
    inkscape:document-rotation="0"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-height="995"
+   inkscape:window-height="715"
    inkscape:window-maximized="1"
-   inkscape:window-width="1920"
-   inkscape:window-x="1280"
+   inkscape:window-width="1280"
+   inkscape:window-x="0"
    inkscape:window-y="23"
-   inkscape:zoom="47.068379"
+   inkscape:zoom="17.952128"
    objecttolerance="10"
    pagecolor="#ffffff"
    showgrid="true">
@@ -71,37 +71,28 @@
 </sodipodi:namedview>
 <title
    id="title158895">paste</title>
-<g
-   id="path158897"
-   inkscape:connector-curvature="0"
-   style="fill:#545454;fill-opacity:1">
-	<path
+<path
    class="st0"
-   d="M10.5,3.1V1.5C10.5,1.2,10.7,1,11,1h2c0.3,0,0.5,0.2,0.5,0.5v1.6L10.5,3.1z"
+   d="M 10,3.1 V 1.5 C 10,1.2 10.2,1 10.5,1 h 3 c 0.3,0 0.589482,0.213656 0.5,0.5 v 1.6 z"
    id="path838"
-   style="fill:#545454;fill-opacity:1" />
-</g>
-<g
-   id="path158899"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="sssssssss"
    style="fill:#545454;fill-opacity:1"
-   transform="matrix(1.125,0,0,1,-1.5,0)">
-	<path
-   class="st0"
-   d="m 7.5,22.5 c -1.7,0 -3,-1.4 -3,-3.2 V 6.7 C 4.5,5.1 5.2,4.5 7,4.5 h 9.6 c 2.9,0 2.9,1.7 2.9,2.2 v 12.6 c 0,1.7 -1.3,3.2 -3,3.2 z"
-   id="path841"
-   style="fill:#545454;fill-opacity:1" />
-	<path
-   class="st1"
-   d="m 7,5 h 9.6 0.1 C 19,5 19,6.2 19,6.7 v 12.6 c 0,1.5 -1.1,2.7 -2.5,2.7 h -9 C 6.1,22 5,20.8 5,19.3 V 6.7 C 5,5.6 5.3,5 7,5 M 7,4 C 5.1,4 4,4.7 4,6.7 v 12.6 c 0,2 1.6,3.7 3.5,3.7 h 9 C 18.4,23 20,21.4 20,19.3 V 6.7 C 20,4.7 18.6,4 16.7,4 c 0,0 0,0 -0.1,0 z"
-   id="path843"
-   style="fill:#545454;fill-opacity:1" />
-</g>
+   sodipodi:nodetypes="csssscc" />
+
 <path
    id="path158905"
    inkscape:connector-curvature="0"
    sodipodi:nodetypes="sssssscss"
    class="st2"
    d="M9.5,2.5l5.2,0  c0.7,0,0.8,0.5,0.8,0.9l0,0.8c0,0.7-0.1,1.3-0.8,1.3H9.2c-0.7,0-0.7-0.3-0.7-1l0-1.1C8.5,2.7,8.8,2.5,9.5,2.5z" />
-</svg>
+<rect
+   style="fill:#b9b9b9;fill-opacity:1;stroke:#545454;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   id="rect846"
+   width="15"
+   height="17"
+   x="4.5"
+   y="4.5" /><path
+   id="polygon25929"
+   sodipodi:nodetypes="ccccc"
+   class="st0"
+   d="m 22.5,7.5 h -12 v 14.999999 h 12.000001 z"
+   style="fill:#f3f3f3;stroke:#545454;stroke-width:1;stroke-miterlimit:10;fill-opacity:1" /></svg>
diff --git a/bitmaps_png/sources/small_trash.svg b/bitmaps_png/sources/small_trash.svg
index 49719feaff..bc5dd76f23 100644
--- a/bitmaps_png/sources/small_trash.svg
+++ b/bitmaps_png/sources/small_trash.svg
@@ -13,7 +13,7 @@
    version="1.0"
    id="svg2"
    inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
-   sodipodi:docname="trash.svg"
+   sodipodi:docname="small_trash.svg"
    inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/trash2.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
@@ -55,15 +55,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview173"
      showgrid="true"
      inkscape:snap-grids="true"
      inkscape:snap-to-guides="true"
-     inkscape:zoom="45.202419"
-     inkscape:cx="4.9942591"
-     inkscape:cy="7.1101731"
+     inkscape:zoom="31.38764"
+     inkscape:cx="7.6592364"
+     inkscape:cy="9.0623318"
      inkscape:window-x="0"
      inkscape:window-y="23"
      inkscape:window-maximized="1"
@@ -529,45 +529,15 @@
        y2="7.75" />
   </defs>
   <path
-     id="path3871"
-     style="fill:#f2f2f2;fill-opacity:1;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 2.2242716,2.5440772 4.3648243,14.5 C 6.8211677,15.161041 9.2008841,15.172273 11.5,14.5 L 13.640553,2.5440772"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
+     fill="currentColor"
+     d="M 4.0002727,13.223214 3.5,5.5 h 9 l -0.50009,7.723214 C 11.954345,13.92691 11.419915,14.5 10.704456,14.5 H 5.2957273 c -0.7154599,0 -1.204881,-0.577457 -1.2954546,-1.276786 z"
+     id="path3438"
+     style="display:inline;fill:#545454;fill-opacity:1;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="sccssss" />
   <path
-     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 1.72,2 C 5.7764652,2.7259314 9.9932352,2.6050992 14.301684,2"
-     id="path3087"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 6.8621358,14.5 5.7918595,2.5440772"
-     id="path3859"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3865"
-     d="M 9.0026886,14.5 10.072964,2.5440772"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     sodipodi:nodetypes="cc" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 12.927035,5.5 C 9.5859843,6.2006337 6.2573434,6.1319655 2.9377892,5.5"
-     id="path3873"
-     inkscape:connector-curvature="0" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 12.570276,8.5 C 9.5427199,9.1319306 6.5637948,9.2006672 3.6513067,8.5"
-     id="path3877"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3879"
-     d="m 11.856759,11.5 c -2.5930589,0.69594 -5.2112575,0.636851 -7.8486934,0"
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     sodipodi:nodetypes="cc" />
+     fill="currentColor"
+     d="M 13.659092,2.0002024 H 10.420455 L 10.166766,1.353778 C 10.057148,1.1368694 9.8323771,0.9998299 9.5865091,1.0000047 H 6.5017068 C 6.2563014,0.9990761 6.0319547,1.1364947 5.9241503,1.353778 L 5.6704548,2.0002024 H 2.4318181 C 2.1933315,2.0002024 2,2.1907478 2,2.4257976 V 3.5742023 C 2,3.8092521 2.1933315,3.9997977 2.4318181,3.9997977 H 13.659092 c 0.238487,2e-7 0.431818,-0.1905454 0.431818,-0.4255953 V 2.4257976 c 0,-0.2350499 -0.193331,-0.4255955 -0.431818,-0.4255952 z"
+     id="path4028"
+     style="display:inline;fill:#545454;fill-opacity:1;stroke-width:0.999997;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:nodetypes="cccccccsssscssc" />
 </svg>
diff --git a/bitmaps_png/sources/trash.svg b/bitmaps_png/sources/trash.svg
index 092f63128c..ba09c3ed1d 100755
--- a/bitmaps_png/sources/trash.svg
+++ b/bitmaps_png/sources/trash.svg
@@ -11,8 +11,8 @@
    data-name="Слой 1"
    viewBox="0 0 24 24"
    version="1.1"
-   sodipodi:docname="trash24.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   sodipodi:docname="trash.svg"
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2443"
-     inkscape:window-height="1715"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="9.966641"
-     inkscape:cy="10.903933"
+     inkscape:zoom="18.172772"
+     inkscape:cx="9.7635385"
+     inkscape:cy="12.905794"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -80,45 +80,30 @@
   <title
      id="title27399">trash</title>
   <path
-     id="path3871"
-     style="fill:#f2f2f2;fill-opacity:1;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 3.2775734,3.5025271 6.507243,21.541657 c 3.706138,0.99738 7.296659,1.014327 10.76557,0 L 20.502484,3.5025271"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
+     fill="currentColor"
+     d="M 5.0001428,19.937498 4.5,4 h 15 l -0.500143,15.937498 c -0.03573,1.138528 -0.91142,2.0625 -2.035714,2.0625 H 7.0358571 c -1.124294,0 -1.9999856,-0.923973 -2.0357143,-2.0625 z"
+     id="path3438"
+     style="display:inline;fill:#f3f3f3;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="sccssss" />
   <path
-     style="fill:none;stroke:#333333;stroke-width:3.01761;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 2.5167266,2.6816225 c 6.1204036,1.0952864 12.4826764,0.9129747 18.9832734,0"
-     id="path3087"
-     inkscape:connector-curvature="0"
+     fill="currentColor"
+     d="M 20.821428,3.00025 H 15.732143 L 15.333488,1.5714875 C 15.161232,1.2210968 14.80802,0.9997252 14.421656,1.0000075 H 9.57411 c -0.385637,-0.0015 -0.7381817,0.220484 -0.9075886,0.57148 L 8.2678571,3.00025 H 3.1785713 C 2.8038067,3.00025 2.5,3.3080542 2.5,3.68775 v 0.6245 c 0,0.3796958 0.3038067,0.6875 0.6785713,0.6875 H 20.821428 C 21.196193,4.9997504 21.5,4.691946 21.5,4.31225 v -0.6245 c 0,-0.379696 -0.303807,-0.6875004 -0.678572,-0.6875 z"
+     id="path4028"
+     style="display:inline;fill:#545454;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:nodetypes="cccccccsssscssc" />
+  <path
+     style="display:inline;fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 12,9 v 9"
+     id="path4030"
      sodipodi:nodetypes="cc" />
   <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 10.275193,21.541657 8.6603566,3.5025271"
-     id="path3859"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3865"
-     d="M 13.504865,21.541657 15.119698,3.5025271"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="display:inline;fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 16,9 v 9"
+     id="path4030-0"
      sodipodi:nodetypes="cc" />
   <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 19.425927,7.9624304 c -5.040985,1.0571182 -10.063247,0.9535117 -15.0717976,0"
-     id="path3873"
-     inkscape:connector-curvature="0" />
-  <path
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 18.887648,12.488844 c -4.567984,0.953459 -9.0625924,1.057167 -13.4569611,0"
-     id="path3877"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path3879"
-     d="m 17.811092,17.01525 c -3.912414,1.050036 -7.8627587,0.960882 -11.8421263,0"
-     style="fill:none;stroke:#333333;stroke-width:1.5088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="display:inline;fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 8,9 v 9"
+     id="path4030-0-0"
      sodipodi:nodetypes="cc" />
 </svg>
diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp
index b98fa3d840..f779dd8bd6 100644
--- a/common/tool/actions.cpp
+++ b/common/tool/actions.cpp
@@ -171,8 +171,7 @@ TOOL_ACTION ACTIONS::selectAll( "common.Interactive.selectAll",
 
 TOOL_ACTION ACTIONS::pasteSpecial( "common.Interactive.pasteSpecial",
         AS_GLOBAL, 0, "",
-        _( "Paste Special..." ), _( "Paste item(s) from clipboard with options" ),
-        paste_xpm );
+        _( "Paste Special..." ), _( "Paste item(s) from clipboard with options" ) );
 
 TOOL_ACTION ACTIONS::duplicate( "common.Interactive.duplicate",
         AS_GLOBAL,