diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 148922febe..5d4386e1cd 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -267,6 +267,7 @@ set( BMAPS_MID
     group_enter
     group_leave
     group_remove
+    group_ungroup
     help
     help_online
     hidden_pin
@@ -452,7 +453,6 @@ set( BMAPS_MID
     tools
     trash
     undo
-    ungroup
     unit_inch
     unit_mil
     unit_mm
diff --git a/bitmaps_png/cpp_16/pintype_nic.cpp b/bitmaps_png/cpp_16/pintype_nic.cpp
index 5158823898..7bbebc3b61 100644
--- a/bitmaps_png/cpp_16/pintype_nic.cpp
+++ b/bitmaps_png/cpp_16/pintype_nic.cpp
@@ -7,26 +7,12 @@
 
 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, 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, 0x09, 0xd8, 0x00, 0x00, 0x09,
- 0xd8, 0x01, 0xc7, 0xa0, 0xb9, 0xad, 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, 0x00, 0x13, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x70, 0x69, 0x6e, 0x74, 0x79, 0x70, 0x65,
- 0x5f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x86, 0x31, 0x28, 0xad, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45,
- 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41,
- 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65,
- 0x41, 0x6c, 0x69, 0x6b, 0x65, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65,
- 0x61, 0x74, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67,
- 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f,
- 0x34, 0x2e, 0x30, 0x2f, 0xc3, 0x54, 0x62, 0x05, 0x00, 0x00, 0x00, 0x50, 0x49, 0x44, 0x41, 0x54,
- 0x38, 0x8d, 0x63, 0x64, 0x20, 0x13, 0x04, 0x05, 0x05, 0x59, 0x30, 0x31, 0x31, 0xcd, 0x61, 0x22,
- 0xd7, 0x00, 0x26, 0x26, 0x26, 0x59, 0x06, 0x06, 0x06, 0x6d, 0xb2, 0x0d, 0x80, 0x1b, 0x34, 0x6a,
- 0x00, 0x03, 0x4b, 0x70, 0x70, 0xf0, 0x04, 0x46, 0x46, 0x46, 0x29, 0x3c, 0x6a, 0x56, 0xaf, 0x59,
- 0xb3, 0x66, 0x35, 0xed, 0x5c, 0xb0, 0x76, 0xed, 0xda, 0x02, 0x4a, 0x0c, 0x18, 0xf8, 0x40, 0x1c,
- 0xc9, 0x06, 0xfc, 0xfb, 0xf7, 0xef, 0x31, 0x03, 0x03, 0xc3, 0x55, 0x00, 0xb2, 0xc0, 0x0e, 0x6b,
- 0x5c, 0x4d, 0xd8, 0x35, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0xb5, 0xfa, 0x37,
+ 0xea, 0x00, 0x00, 0x00, 0x29, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x63, 0x60, 0xc0, 0x03, 0x82,
+ 0x2c, 0x42, 0xae, 0xe0, 0x93, 0x67, 0x08, 0x09, 0x0d, 0xf9, 0x3f, 0x34, 0x14, 0x04, 0x4f, 0x08,
+ 0x59, 0x85, 0x02, 0x43, 0x49, 0x55, 0x30, 0x3c, 0xc2, 0x81, 0x50, 0x74, 0x03, 0x00, 0x62, 0x02,
+ 0x30, 0x29, 0xdb, 0x94, 0xf7, 0x27, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE pintype_nic_xpm[1] = {{ png, sizeof( png ), "pintype_nic_xpm" }};
diff --git a/bitmaps_png/cpp_24/copy_pad_settings.cpp b/bitmaps_png/cpp_24/copy_pad_settings.cpp
index 654457dfd0..3728a70966 100644
--- a/bitmaps_png/cpp_24/copy_pad_settings.cpp
+++ b/bitmaps_png/cpp_24/copy_pad_settings.cpp
@@ -8,64 +8,71 @@
 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, 0x03, 0x79, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x9d, 0x55, 0xdd, 0x4b, 0x53,
- 0x61, 0x18, 0x7f, 0xf2, 0x23, 0x3f, 0xb2, 0x12, 0x0a, 0x82, 0xe8, 0xa2, 0x1b, 0x67, 0x75, 0x91,
- 0x54, 0x57, 0x49, 0xe4, 0x66, 0x79, 0x21, 0xb9, 0xc4, 0xb6, 0xd9, 0xc8, 0xd2, 0x4d, 0x61, 0x88,
- 0x51, 0x41, 0x08, 0x45, 0x10, 0xcc, 0x8b, 0x84, 0x10, 0xca, 0x33, 0x13, 0xd9, 0x45, 0x10, 0xd1,
- 0x4d, 0x33, 0xbf, 0xa7, 0xa9, 0x91, 0x9b, 0x49, 0x5e, 0x98, 0xfd, 0x0d, 0x5d, 0x84, 0xd2, 0xd4,
- 0xe5, 0xc7, 0x44, 0xa5, 0xaf, 0xd3, 0xef, 0x39, 0xbe, 0x47, 0x8e, 0xc7, 0x33, 0x97, 0x1d, 0x78,
- 0x78, 0x76, 0x9e, 0xf3, 0xbc, 0xbf, 0xdf, 0xf3, 0xf9, 0x8e, 0x48, 0xf7, 0x38, 0x1c, 0x8e, 0x0c,
- 0x9b, 0xcd, 0x56, 0x0d, 0xdd, 0x6b, 0xb7, 0xdb, 0xfb, 0x20, 0x03, 0x90, 0x20, 0xa4, 0x1b, 0xe2,
- 0xb6, 0x5a, 0xad, 0x99, 0xf4, 0xbf, 0x0f, 0x40, 0x2f, 0x41, 0x46, 0x20, 0xae, 0xe2, 0xe2, 0xe2,
- 0x34, 0xb6, 0xa9, 0x80, 0xb0, 0x65, 0x81, 0xa0, 0x12, 0x12, 0x86, 0x94, 0xec, 0x18, 0x1c, 0x87,
- 0xea, 0x11, 0xb9, 0xdf, 0xe5, 0x72, 0xa5, 0x43, 0x5b, 0x01, 0x38, 0x08, 0xdb, 0x02, 0x44, 0x86,
- 0x2c, 0x8b, 0x2c, 0x4a, 0xc5, 0xf7, 0x16, 0x7c, 0xbf, 0xbf, 0xa3, 0xc8, 0x71, 0xb8, 0x8d, 0xcb,
- 0x03, 0xfd, 0x4a, 0x80, 0xc6, 0x93, 0x00, 0x67, 0x07, 0xdd, 0x0a, 0x71, 0xfc, 0x0b, 0x38, 0x83,
- 0x86, 0x38, 0x32, 0x03, 0xf0, 0x08, 0x64, 0x12, 0x32, 0xab, 0xb3, 0xb7, 0x7b, 0x3c, 0x9e, 0x54,
- 0x9c, 0x1d, 0xe5, 0xf3, 0x89, 0x08, 0x6a, 0x90, 0x72, 0x15, 0x97, 0x45, 0x03, 0xb0, 0xc2, 0x0d,
- 0xf5, 0x7a, 0xbd, 0x49, 0xec, 0xc3, 0x9a, 0xfd, 0x60, 0x5b, 0x55, 0x7d, 0xd8, 0x1f, 0x72, 0x1d,
- 0x76, 0x4f, 0xa2, 0xda, 0xf7, 0x70, 0xf4, 0xa2, 0xe6, 0x2a, 0x81, 0x3b, 0x8e, 0xaf, 0x13, 0xa0,
- 0x0d, 0xd0, 0xf9, 0x15, 0x15, 0x15, 0xfb, 0xd4, 0x0a, 0x24, 0x22, 0x08, 0x42, 0xed, 0xd2, 0x34,
- 0x34, 0x82, 0x43, 0xc9, 0x46, 0xbe, 0x4b, 0xcf, 0xe8, 0xc0, 0x92, 0x44, 0xf5, 0x90, 0xa0, 0x22,
- 0xcd, 0x34, 0x00, 0xdd, 0xb9, 0xe4, 0xa3, 0x9e, 0x45, 0x89, 0xee, 0xcc, 0x3e, 0xa6, 0xbd, 0x46,
- 0x25, 0xea, 0x17, 0x7d, 0x50, 0xa2, 0xc7, 0xef, 0x09, 0x43, 0x70, 0x1f, 0xb9, 0x62, 0x12, 0x0d,
- 0x43, 0x5b, 0x65, 0x2f, 0xa5, 0xb0, 0xed, 0xbb, 0x9f, 0xf6, 0xb3, 0xc6, 0xfb, 0x6e, 0x10, 0x95,
- 0xe1, 0xfb, 0x10, 0xc4, 0x69, 0x94, 0x01, 0x89, 0x51, 0x64, 0x92, 0x59, 0xb5, 0xf6, 0x1b, 0xe0,
- 0x12, 0x35, 0x02, 0xf8, 0x91, 0x1c, 0xa2, 0x14, 0x44, 0x5d, 0x02, 0x79, 0x0f, 0xdb, 0x02, 0x44,
- 0x86, 0xfc, 0xe0, 0xf7, 0x98, 0x8f, 0xae, 0xc8, 0x7e, 0x4a, 0xc5, 0x7b, 0x13, 0xde, 0x1f, 0x68,
- 0x09, 0xba, 0xc5, 0x12, 0x05, 0x35, 0x59, 0xd4, 0x68, 0xc0, 0xdd, 0x0a, 0xb8, 0x8f, 0xd2, 0xf0,
- 0xbb, 0x5d, 0x80, 0x1a, 0x4b, 0x33, 0x75, 0x4c, 0xfb, 0x29, 0x93, 0x49, 0x90, 0x49, 0xb9, 0x4a,
- 0xe0, 0x16, 0x1b, 0x5a, 0xaa, 0x69, 0x32, 0x4f, 0x8b, 0x73, 0xfe, 0x29, 0x65, 0xa3, 0xb6, 0xef,
- 0xe4, 0x00, 0x25, 0x83, 0xa4, 0x4b, 0x07, 0x38, 0x0d, 0xc0, 0x4f, 0xd0, 0x33, 0x3a, 0xfb, 0x1b,
- 0x2e, 0x21, 0x97, 0x6b, 0xa6, 0x95, 0xb2, 0x94, 0xab, 0x80, 0xd7, 0x5f, 0xec, 0x41, 0x40, 0x33,
- 0x86, 0x0d, 0x4a, 0x43, 0xd7, 0x4b, 0x72, 0x59, 0x03, 0xb0, 0x0c, 0xd2, 0x1b, 0x00, 0x49, 0x12,
- 0xf5, 0x4f, 0x52, 0xb2, 0x94, 0x68, 0x55, 0xe3, 0x53, 0x1a, 0x6b, 0x26, 0x07, 0x48, 0x6e, 0xaa,
- 0x59, 0x94, 0xf0, 0xfa, 0x8b, 0x0d, 0x6d, 0x17, 0x24, 0xf9, 0x70, 0xec, 0xe7, 0x68, 0xa0, 0xdf,
- 0xaa, 0x87, 0x19, 0x3c, 0xce, 0x10, 0x54, 0xab, 0x3e, 0xe8, 0xc7, 0xa0, 0x52, 0x52, 0x4c, 0x97,
- 0xb6, 0x17, 0xf7, 0x3a, 0x4f, 0x16, 0x4d, 0x85, 0x72, 0xcc, 0xe3, 0xbc, 0x44, 0x3c, 0xe7, 0x3c,
- 0x86, 0x82, 0x20, 0x26, 0x0e, 0x4f, 0xa9, 0x91, 0xeb, 0x1f, 0xa5, 0x8c, 0x12, 0x45, 0xd5, 0x2c,
- 0x05, 0x69, 0xd7, 0x26, 0xa7, 0x11, 0x93, 0xe5, 0x77, 0xc8, 0x64, 0x91, 0xaf, 0x96, 0xd9, 0x2b,
- 0xbd, 0xeb, 0xa9, 0xf7, 0x89, 0xe6, 0xaa, 0xa9, 0x7f, 0xdc, 0x6e, 0xa7, 0x10, 0xf9, 0x67, 0xd5,
- 0x57, 0x7e, 0x42, 0x19, 0xbc, 0x2b, 0x9b, 0x1c, 0x00, 0xfe, 0x8b, 0x09, 0x9c, 0xb6, 0xf2, 0x5a,
- 0xee, 0x09, 0x97, 0x48, 0x4c, 0xd2, 0xaa, 0x98, 0x92, 0x48, 0x82, 0x0c, 0xe6, 0x54, 0x3f, 0x85,
- 0x10, 0x8d, 0x36, 0x24, 0x08, 0x90, 0x23, 0x79, 0xfc, 0xc8, 0xd9, 0x8c, 0x89, 0x82, 0x53, 0x91,
- 0xf0, 0xf1, 0x82, 0x87, 0x9c, 0xc9, 0x46, 0x16, 0x58, 0x38, 0xc3, 0x1e, 0x48, 0x74, 0x57, 0x93,
- 0x69, 0x90, 0x27, 0x68, 0x53, 0x0f, 0xf4, 0x04, 0xc3, 0xb9, 0x45, 0x87, 0xc3, 0xc7, 0xcc, 0x3f,
- 0xf9, 0x7d, 0xe2, 0xfc, 0xe9, 0x0e, 0xcd, 0x61, 0xce, 0xc6, 0xcd, 0x11, 0x6b, 0x22, 0x67, 0xf0,
- 0xb5, 0x8d, 0x26, 0xb7, 0x50, 0x21, 0x86, 0xe1, 0x1a, 0x26, 0xa9, 0xce, 0x90, 0x20, 0x94, 0x53,
- 0x58, 0x8b, 0x7e, 0x78, 0xc6, 0x4e, 0x14, 0x3c, 0x0f, 0xe7, 0x5a, 0xfe, 0xb0, 0x6d, 0xf2, 0x42,
- 0xde, 0x57, 0xdd, 0xbc, 0x47, 0x45, 0xcd, 0xa3, 0x3a, 0xfb, 0x0b, 0x71, 0x75, 0x7c, 0xd8, 0x72,
- 0x37, 0x01, 0x68, 0x4d, 0x21, 0x88, 0x23, 0x5f, 0xea, 0x0e, 0x0d, 0x6d, 0xbb, 0xc9, 0x12, 0xbd,
- 0xe4, 0xa9, 0x43, 0xf4, 0x6d, 0xbc, 0x07, 0x5b, 0xea, 0x38, 0x92, 0x6b, 0xa9, 0x0e, 0x9b, 0x2c,
- 0x7e, 0x55, 0x46, 0x4d, 0x96, 0xd7, 0x00, 0x5e, 0x61, 0xf0, 0xb1, 0xbc, 0x73, 0xf3, 0x93, 0xd6,
- 0x33, 0x99, 0x7c, 0xd9, 0x89, 0xad, 0x56, 0xef, 0xa2, 0x28, 0xd7, 0x7a, 0xd9, 0x47, 0x17, 0x39,
- 0x72, 0x06, 0x87, 0x2d, 0xf1, 0xdf, 0x69, 0xe8, 0xa8, 0x39, 0x1b, 0xc0, 0xd3, 0x0c, 0x8e, 0x32,
- 0x0d, 0xcd, 0x35, 0xa6, 0x56, 0x29, 0x97, 0x1a, 0x22, 0xe3, 0xd1, 0xd5, 0xfa, 0x7e, 0x6b, 0xa2,
- 0x3d, 0x5c, 0x73, 0x00, 0x8f, 0x19, 0x46, 0x6e, 0x48, 0x60, 0x32, 0x1f, 0x44, 0x16, 0x11, 0x10,
- 0x04, 0x41, 0x96, 0xce, 0xb6, 0xa8, 0x8f, 0xf6, 0x2d, 0xfa, 0xe8, 0xb6, 0xf8, 0x3f, 0xe8, 0xe7,
- 0x0d, 0x57, 0xae, 0x70, 0x89, 0x7a, 0x41, 0x70, 0x4b, 0xb9, 0x7b, 0x74, 0xcf, 0x5f, 0xc0, 0x25,
- 0xdd, 0x21, 0x2c, 0x2e, 0x66, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x03, 0xed, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x9d, 0x55, 0x5d, 0x68, 0x93,
+ 0x57, 0x18, 0x7e, 0xad, 0x5a, 0xb5, 0xfe, 0x82, 0x37, 0x03, 0xef, 0x65, 0x57, 0x5e, 0xec, 0x52,
+ 0xb6, 0x81, 0x9b, 0x88, 0xc5, 0xc6, 0xa2, 0x4d, 0x46, 0xb7, 0xaa, 0x4d, 0xda, 0xb5, 0x71, 0x73,
+ 0x4e, 0x98, 0x5e, 0x88, 0x50, 0xa8, 0x82, 0xc2, 0x10, 0x5c, 0x93, 0x2a, 0xd2, 0xbb, 0xea, 0x26,
+ 0x0c, 0x9d, 0xb6, 0x9a, 0xd4, 0xb5, 0xba, 0x99, 0x3a, 0x29, 0xa2, 0xad, 0x6e, 0xcc, 0x8b, 0x5d,
+ 0x89, 0x0c, 0xfc, 0x69, 0xda, 0xa6, 0x89, 0x49, 0x4c, 0xd2, 0x2f, 0xf9, 0xfa, 0xee, 0x79, 0x4f,
+ 0xcf, 0x71, 0xdf, 0xb2, 0xaf, 0xed, 0xdc, 0x07, 0x0f, 0x27, 0xdf, 0xf9, 0xde, 0xf3, 0x3c, 0xef,
+ 0xef, 0x09, 0x51, 0xd9, 0xe3, 0xf3, 0xf9, 0x96, 0xd5, 0xd5, 0xd5, 0x35, 0x61, 0xbd, 0xe6, 0xf5,
+ 0x7a, 0x23, 0xc0, 0x75, 0x20, 0x0a, 0xf4, 0x02, 0x01, 0x8f, 0xc7, 0x53, 0x45, 0xff, 0xf7, 0x01,
+ 0xe9, 0x36, 0xe0, 0x16, 0xe0, 0xaf, 0xae, 0xae, 0x5e, 0x22, 0x7b, 0x86, 0x10, 0x7b, 0x2b, 0x20,
+ 0xb0, 0x07, 0x18, 0x04, 0x6a, 0xde, 0x98, 0x1c, 0x87, 0x0e, 0xc1, 0xf3, 0x2e, 0xbf, 0xdf, 0xbf,
+ 0x14, 0xab, 0x07, 0x84, 0xfd, 0xd8, 0x4b, 0x01, 0x0c, 0x64, 0x75, 0x14, 0xb5, 0xfa, 0x7b, 0x27,
+ 0xbe, 0x1f, 0x7e, 0x23, 0xcf, 0x71, 0xf8, 0xac, 0xa4, 0x07, 0xeb, 0x77, 0x9a, 0x74, 0x36, 0x5c,
+ 0x94, 0xe8, 0xb0, 0x9e, 0x01, 0x7c, 0xff, 0x85, 0x5c, 0x48, 0x63, 0xe2, 0x99, 0x0b, 0x79, 0x1c,
+ 0x18, 0x01, 0xc6, 0xcb, 0xf6, 0x2f, 0xb5, 0xb6, 0xb6, 0x2e, 0xc6, 0xd9, 0xdb, 0x72, 0x7e, 0x3e,
+ 0x81, 0x66, 0x84, 0xdc, 0x28, 0x69, 0x71, 0x10, 0xe4, 0xa4, 0xa0, 0xed, 0xed, 0xed, 0x15, 0x62,
+ 0x23, 0xab, 0xd8, 0x61, 0x2f, 0x6f, 0x6c, 0xc4, 0x1e, 0xd8, 0x85, 0xfd, 0xd6, 0xf9, 0x72, 0x7f,
+ 0x55, 0xbc, 0xd7, 0x39, 0x37, 0x02, 0x81, 0x59, 0x6c, 0xeb, 0x41, 0x7a, 0x14, 0xeb, 0xc6, 0x86,
+ 0x86, 0x86, 0x55, 0x26, 0x03, 0xf3, 0x09, 0x44, 0xb1, 0x2c, 0x70, 0x14, 0x34, 0x8e, 0x43, 0x0b,
+ 0xdd, 0x6c, 0xd3, 0xa7, 0x69, 0x6d, 0x3a, 0x44, 0x87, 0x80, 0xa8, 0x42, 0x07, 0x5d, 0xc7, 0x7a,
+ 0x25, 0x1d, 0xa6, 0xab, 0x2f, 0x43, 0x74, 0x60, 0xfc, 0x6b, 0x5a, 0xe9, 0x96, 0xa2, 0x3e, 0x5d,
+ 0x07, 0xe5, 0x3d, 0x7e, 0xdf, 0x77, 0x25, 0x0f, 0x93, 0x3f, 0x13, 0xa2, 0x1b, 0x58, 0x3d, 0xdc,
+ 0x4e, 0x8b, 0x64, 0x6f, 0xb2, 0x8b, 0x56, 0xcb, 0x8a, 0xf7, 0x4a, 0x08, 0xed, 0xc0, 0xf7, 0x01,
+ 0xa0, 0xde, 0x2d, 0x02, 0xd2, 0xad, 0x28, 0x22, 0xe3, 0x26, 0xf7, 0xaf, 0xc9, 0x43, 0x74, 0x02,
+ 0xc4, 0xc7, 0x39, 0x46, 0x8b, 0xe0, 0x75, 0x0d, 0xf0, 0x33, 0xf6, 0x52, 0x00, 0x03, 0x96, 0xbc,
+ 0x67, 0xc2, 0xb4, 0x93, 0xbb, 0x68, 0x31, 0xde, 0x4f, 0xe2, 0xfd, 0x88, 0x53, 0xa0, 0x57, 0x0f,
+ 0x51, 0xd4, 0x11, 0x45, 0xb3, 0x83, 0x3c, 0xa0, 0xc8, 0xc3, 0xb4, 0x04, 0xbf, 0x2f, 0x69, 0x52,
+ 0x77, 0x74, 0xd0, 0xe5, 0xe7, 0x5d, 0x54, 0x25, 0x22, 0x88, 0xe4, 0x23, 0x23, 0x10, 0xd0, 0x13,
+ 0x5a, 0xeb, 0x28, 0xb2, 0x74, 0x4b, 0x7d, 0xf2, 0x1b, 0x5a, 0x83, 0xdc, 0xde, 0xe4, 0x8b, 0xb4,
+ 0x10, 0x22, 0x3d, 0x65, 0x84, 0xcf, 0x41, 0x38, 0x8c, 0x75, 0xac, 0x6c, 0xff, 0x07, 0x49, 0xa1,
+ 0xa4, 0x6b, 0xec, 0x0c, 0xad, 0x50, 0x57, 0x81, 0x8c, 0x3f, 0xd2, 0x52, 0xd5, 0xd6, 0xd6, 0x36,
+ 0xd0, 0xd2, 0xd2, 0x62, 0xda, 0xf0, 0xa8, 0x2a, 0xe8, 0x4c, 0x4a, 0xb6, 0x3b, 0x08, 0xb2, 0x10,
+ 0xdd, 0x0d, 0x92, 0x0a, 0x9d, 0xff, 0x0a, 0x15, 0x65, 0x88, 0xf2, 0x0e, 0x9b, 0xda, 0x4c, 0x07,
+ 0xf9, 0x20, 0xb2, 0x4f, 0x45, 0x11, 0x0c, 0x06, 0x77, 0xc6, 0xe3, 0xa3, 0xa3, 0xcc, 0x76, 0xba,
+ 0x58, 0x9c, 0x2a, 0x9d, 0x3b, 0xd7, 0x2d, 0x22, 0x1b, 0x61, 0xd8, 0x27, 0xde, 0x60, 0xfd, 0xd1,
+ 0x1c, 0x16, 0xf2, 0x59, 0x9a, 0xa0, 0xc9, 0xd8, 0xa0, 0x1e, 0xfd, 0x2a, 0xa5, 0xe8, 0x2e, 0xf5,
+ 0x11, 0xc4, 0x7b, 0x4b, 0xa5, 0xe2, 0xd4, 0x6f, 0x8d, 0x07, 0x79, 0xa4, 0x6e, 0x2f, 0xdb, 0x76,
+ 0xb1, 0x10, 0x89, 0x44, 0xd6, 0x49, 0x1b, 0x6a, 0x81, 0x8c, 0x3e, 0xfc, 0xcc, 0x78, 0x5e, 0xfe,
+ 0xa8, 0x34, 0x86, 0x28, 0x61, 0xa2, 0xd4, 0xa2, 0x3d, 0x46, 0xe0, 0x38, 0xf3, 0x34, 0xdf, 0xde,
+ 0xb0, 0x95, 0x63, 0xeb, 0x37, 0xf1, 0xd4, 0xab, 0x6c, 0x0e, 0x22, 0x27, 0xac, 0x3f, 0xce, 0x3f,
+ 0xe6, 0xfc, 0xd8, 0xfb, 0x8e, 0xd0, 0x87, 0xe6, 0x9a, 0x29, 0x78, 0xfe, 0xc0, 0xd8, 0xf2, 0x29,
+ 0x5a, 0x26, 0xb3, 0x62, 0x04, 0x8e, 0x89, 0xc0, 0x9d, 0x77, 0xb6, 0x29, 0x81, 0xc2, 0xe4, 0x44,
+ 0xc1, 0xb6, 0xac, 0x57, 0x13, 0x83, 0x77, 0xd9, 0xce, 0xe7, 0xb2, 0xf9, 0xc1, 0x7d, 0x96, 0xee,
+ 0x92, 0xf8, 0x3c, 0x11, 0x4c, 0x18, 0x3b, 0x25, 0x88, 0x42, 0x6b, 0x81, 0x52, 0x00, 0x02, 0x99,
+ 0x07, 0xde, 0xcf, 0x94, 0xc0, 0xe4, 0xd0, 0x30, 0x3f, 0xfb, 0x3e, 0xa2, 0x7e, 0xff, 0xda, 0x70,
+ 0x80, 0x4b, 0xe9, 0x64, 0x29, 0x3f, 0xf8, 0xc5, 0x4c, 0x14, 0x18, 0x38, 0xd7, 0x1a, 0x84, 0xe8,
+ 0x2b, 0x47, 0xa4, 0x51, 0xe9, 0x20, 0x47, 0x0d, 0x78, 0x03, 0xa2, 0xc8, 0x3c, 0x09, 0x77, 0x2b,
+ 0xd2, 0x7b, 0x5b, 0x76, 0xf3, 0xd3, 0x6f, 0x7b, 0x78, 0xe8, 0x5d, 0xaf, 0x7a, 0x7f, 0xf8, 0xf1,
+ 0x7e, 0x2e, 0x26, 0xe3, 0x9c, 0xff, 0xa9, 0x89, 0x75, 0xb7, 0x04, 0xc4, 0x63, 0x87, 0xe7, 0x42,
+ 0x5e, 0x78, 0x5d, 0xe4, 0x4e, 0xfa, 0x00, 0xcd, 0xf0, 0x09, 0x3a, 0xe9, 0xf3, 0xbf, 0x43, 0x64,
+ 0xfb, 0x51, 0x29, 0x97, 0xb3, 0x47, 0x76, 0x04, 0x15, 0xa9, 0x13, 0xb7, 0x80, 0x61, 0x4f, 0x33,
+ 0x4f, 0x5b, 0x69, 0x10, 0x2c, 0x30, 0x5e, 0x26, 0x74, 0xce, 0x13, 0x65, 0x73, 0xd0, 0xad, 0xaf,
+ 0x8e, 0x5f, 0xfe, 0x71, 0x37, 0x21, 0x8a, 0xf5, 0x10, 0x49, 0xda, 0x85, 0x82, 0x25, 0xde, 0xff,
+ 0x1e, 0x3c, 0xc2, 0x43, 0xef, 0xf9, 0x38, 0xf6, 0xf6, 0x87, 0x33, 0x51, 0x55, 0x37, 0xe2, 0xb3,
+ 0x65, 0xa7, 0x4f, 0x57, 0xf2, 0x1c, 0xd3, 0x7c, 0x5e, 0xba, 0x0e, 0xde, 0x9f, 0x95, 0x39, 0xf8,
+ 0x77, 0xa1, 0x98, 0xdf, 0x42, 0x2d, 0x7a, 0xc1, 0x34, 0x65, 0x25, 0x92, 0x7c, 0x6f, 0x6b, 0xa3,
+ 0x22, 0xbf, 0x5f, 0xd3, 0xcc, 0xd6, 0xc4, 0x98, 0x85, 0x5a, 0x5d, 0x90, 0xcb, 0x4e, 0x4f, 0xb5,
+ 0xb9, 0x8b, 0x12, 0x92, 0xeb, 0x6c, 0x98, 0x36, 0x8b, 0xe7, 0x42, 0x8e, 0xbd, 0xb9, 0xff, 0x4e,
+ 0x21, 0x90, 0x7a, 0x7a, 0xa1, 0x57, 0x91, 0x0f, 0x6f, 0xff, 0x94, 0xad, 0xc4, 0x64, 0x6e, 0x3a,
+ 0xf3, 0xe7, 0xa3, 0x74, 0xe7, 0xd2, 0x98, 0x78, 0x26, 0x43, 0xe4, 0xb4, 0x1f, 0x3d, 0x49, 0xcb,
+ 0x25, 0xe7, 0x20, 0xbe, 0xe3, 0xea, 0xb9, 0x8b, 0xc0, 0x88, 0xd4, 0xe3, 0xc5, 0x95, 0x7e, 0x2e,
+ 0xa6, 0x52, 0x39, 0x44, 0x35, 0x80, 0xe8, 0x2a, 0x13, 0x61, 0x5a, 0xf5, 0x32, 0x4c, 0x5f, 0xea,
+ 0xff, 0x83, 0x3e, 0x99, 0x70, 0x75, 0x85, 0x87, 0xe8, 0x1a, 0x04, 0xf6, 0xab, 0xbb, 0xa7, 0xec,
+ 0xf9, 0x0b, 0x8e, 0x46, 0x6a, 0xde, 0x99, 0x13, 0xc8, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE copy_pad_settings_xpm[1] = {{ png, sizeof( png ), "copy_pad_settings_xpm" }};
diff --git a/bitmaps_png/cpp_24/directory_browser.cpp b/bitmaps_png/cpp_24/directory_browser.cpp
index eac1a50d03..577637c314 100644
--- a/bitmaps_png/cpp_24/directory_browser.cpp
+++ b/bitmaps_png/cpp_24/directory_browser.cpp
@@ -8,7 +8,7 @@
 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, 0xc7, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xc4,
+ 0xf8, 0x00, 0x00, 0x01, 0xe1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xc4,
  0x80, 0xd0, 0xd0, 0x50, 0xef, 0x90, 0x90, 0x90, 0xa7, 0x40, 0xfc, 0x1f, 0x1b, 0x0e, 0x0e, 0x0e,
  0xbe, 0x1f, 0x11, 0x11, 0xa1, 0x40, 0xb6, 0x05, 0x40, 0x43, 0x1e, 0xe3, 0x32, 0x9c, 0x2a, 0x96,
  0x10, 0x32, 0x9c, 0x62, 0x4b, 0x88, 0xb5, 0x80, 0x04, 0x0c, 0x0a, 0x11, 0x4f, 0x5a, 0x5a, 0x00,
@@ -18,26 +18,28 @@ static const unsigned char png[] = {
  0x6a, 0x8e, 0x58, 0xf1, 0x2e, 0x4d, 0xa7, 0xff, 0xe5, 0xae, 0x7e, 0xe4, 0x59, 0x50, 0xe9, 0xec,
  0xfb, 0x7f, 0x1f, 0xd0, 0x90, 0x23, 0xa6, 0x7e, 0xff, 0x5f, 0x6d, 0x3f, 0xf0, 0xff, 0x62, 0x52,
  0x19, 0x56, 0x4b, 0x40, 0x6a, 0x40, 0x96, 0x90, 0x64, 0x01, 0x28, 0x58, 0x76, 0x41, 0x5d, 0x7e,
- 0x39, 0xab, 0xf6, 0x3f, 0x08, 0xbc, 0xda, 0x71, 0x00, 0xaf, 0x4f, 0x0e, 0xa9, 0xd8, 0x8a, 0x12,
- 0x6d, 0x01, 0x28, 0xcc, 0x61, 0x9a, 0xaf, 0xe4, 0xd4, 0x41, 0x2c, 0xd8, 0x79, 0x08, 0xa7, 0x05,
- 0x60, 0x9f, 0xa8, 0x3a, 0x36, 0x11, 0x6d, 0xc1, 0x5a, 0x3d, 0x17, 0x9c, 0x16, 0x1c, 0xb3, 0x09,
- 0xf9, 0x7f, 0x7f, 0xe2, 0xfc, 0xff, 0x47, 0xad, 0x82, 0xd0, 0x2d, 0x39, 0x4f, 0xb4, 0x05, 0xbb,
- 0x35, 0x1c, 0x71, 0x5a, 0x70, 0xb7, 0x7b, 0x16, 0x98, 0xff, 0xf5, 0xee, 0x43, 0xa0, 0x25, 0xc1,
- 0xc8, 0x16, 0x7c, 0x21, 0xda, 0x82, 0xed, 0x5a, 0xce, 0x18, 0x16, 0xbc, 0x3d, 0x7c, 0xea, 0xff,
- 0x09, 0xe7, 0xa8, 0xff, 0x67, 0x02, 0xd2, 0xfe, 0x7f, 0xbd, 0xf3, 0x10, 0x2c, 0xf6, 0xed, 0xc1,
- 0x93, 0xff, 0xc7, 0x6c, 0xc3, 0x60, 0x6a, 0xbf, 0x13, 0x6d, 0x01, 0x28, 0x9d, 0xc3, 0x2c, 0xb8,
- 0x9c, 0x0d, 0x89, 0x64, 0x5c, 0xe0, 0xd7, 0xfb, 0x8f, 0x60, 0x75, 0x07, 0xd4, 0x1c, 0x2f, 0x12,
- 0x5d, 0x5c, 0xb7, 0xdb, 0x79, 0xc3, 0x2d, 0x38, 0x66, 0x17, 0xf6, 0xff, 0xf3, 0xd5, 0x5b, 0xff,
- 0xbf, 0x3d, 0x7a, 0x06, 0xc7, 0x3f, 0x5e, 0xbc, 0xfe, 0xff, 0xef, 0xef, 0x5f, 0xb0, 0x05, 0x9f,
- 0xaf, 0xdf, 0x81, 0xa8, 0x55, 0x75, 0xa8, 0x86, 0x59, 0xe0, 0x49, 0xc8, 0x92, 0x38, 0xff, 0x20,
- 0x9c, 0x19, 0xec, 0x94, 0x77, 0xd2, 0xff, 0xdf, 0x1f, 0x3f, 0x41, 0x93, 0xee, 0xc1, 0xff, 0x07,
- 0xb4, 0x5c, 0xff, 0xef, 0x55, 0x77, 0xfc, 0x7a, 0x58, 0xd7, 0x46, 0x90, 0xa4, 0x62, 0x1d, 0x98,
- 0xec, 0xa2, 0x80, 0x06, 0xfe, 0x43, 0xb7, 0xe0, 0x76, 0xdb, 0x54, 0x14, 0xc3, 0x81, 0x62, 0xbf,
- 0x81, 0xae, 0xf7, 0x21, 0xab, 0x72, 0x82, 0x5a, 0xf2, 0x09, 0xd9, 0x02, 0x90, 0xa1, 0xe7, 0x22,
- 0xf3, 0xfe, 0x1f, 0xd0, 0x04, 0x27, 0xe5, 0x4f, 0xfb, 0xd4, 0x1d, 0xc3, 0x28, 0xaa, 0xc3, 0x0f,
- 0x69, 0xda, 0x4a, 0x02, 0x23, 0xb0, 0x12, 0x94, 0xce, 0x81, 0xf8, 0x07, 0x10, 0xff, 0xda, 0xaf,
- 0xea, 0x78, 0x19, 0x58, 0x44, 0xb4, 0x81, 0xe4, 0x90, 0xd5, 0x02, 0x00, 0xf3, 0x86, 0x6b, 0xd7,
- 0x4b, 0xc9, 0x6c, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xb5, 0xa0, 0xe9, 0x3f, 0x08, 0xbc, 0xd8, 0xb4, 0x1b, 0xaf, 0x4f, 0x0e, 0xa9, 0xd8, 0x8a, 0x12,
+ 0x6d, 0x01, 0x28, 0xcc, 0x61, 0x9a, 0xef, 0x76, 0xcd, 0x04, 0x5b, 0xf0, 0x68, 0xf6, 0x0a, 0x9c,
+ 0x16, 0x80, 0x7d, 0xa2, 0xea, 0xd8, 0x44, 0xb4, 0x05, 0x6b, 0xf5, 0x5c, 0xe0, 0x1a, 0xef, 0x4f,
+ 0x9c, 0x0f, 0xb6, 0xe0, 0xfe, 0xe4, 0x05, 0x60, 0xfe, 0x31, 0x9b, 0x10, 0xb0, 0xd8, 0x51, 0xab,
+ 0x20, 0x74, 0x4b, 0xce, 0x13, 0x6d, 0xc1, 0x6e, 0x0d, 0x84, 0xc6, 0x9b, 0x75, 0x7d, 0x60, 0x0b,
+ 0x9e, 0xad, 0xde, 0x0a, 0xf1, 0x51, 0xf7, 0x2c, 0x30, 0xff, 0xeb, 0xdd, 0x87, 0x40, 0x4b, 0x82,
+ 0x91, 0x2d, 0xf8, 0x42, 0xb4, 0x05, 0xdb, 0xb5, 0x9c, 0xe1, 0x1a, 0x4f, 0xfb, 0xa7, 0x82, 0x0d,
+ 0xfc, 0xfd, 0xf9, 0xeb, 0xff, 0x6b, 0xc5, 0xad, 0xff, 0x4f, 0x79, 0x27, 0xfe, 0xff, 0x7c, 0xe3,
+ 0x2e, 0x58, 0xec, 0xdb, 0xfd, 0xc7, 0xff, 0x8f, 0xd9, 0x86, 0xc1, 0xd4, 0x7e, 0x27, 0xda, 0x02,
+ 0x50, 0x3a, 0x47, 0xf6, 0xfe, 0xb3, 0x35, 0xdb, 0xfe, 0xe3, 0x02, 0xbf, 0xde, 0x7f, 0x04, 0xab,
+ 0x39, 0xa0, 0xe6, 0x78, 0x91, 0xe8, 0xe2, 0xba, 0xdd, 0xce, 0x1b, 0x35, 0x7c, 0xd5, 0x9d, 0xfe,
+ 0x5f, 0xaf, 0xec, 0xfc, 0xff, 0xee, 0xf8, 0xb9, 0xff, 0x3f, 0x9e, 0xbf, 0xfa, 0xff, 0xef, 0xef,
+ 0xdf, 0xff, 0xff, 0xff, 0xfd, 0x03, 0x5b, 0xf0, 0xf9, 0xfa, 0x1d, 0x88, 0x1a, 0x55, 0x87, 0x6a,
+ 0x98, 0x05, 0x9e, 0x84, 0x2c, 0x89, 0xf3, 0x0f, 0xc2, 0x99, 0xc1, 0x4e, 0x79, 0x27, 0xfd, 0xff,
+ 0xfd, 0xf1, 0x13, 0xd8, 0xf0, 0x57, 0x3b, 0x0e, 0xfe, 0x3f, 0xa0, 0xe5, 0xfa, 0x7f, 0xaf, 0xba,
+ 0xe3, 0xd7, 0xc3, 0xba, 0x36, 0x82, 0x24, 0x15, 0xeb, 0xc0, 0x64, 0x17, 0x05, 0x34, 0xf0, 0x1f,
+ 0xba, 0x05, 0xb7, 0xdb, 0xa6, 0xa2, 0x18, 0x0e, 0x14, 0xfb, 0x0d, 0x74, 0xbd, 0x0f, 0x59, 0x95,
+ 0x13, 0xd4, 0x92, 0x4f, 0xc8, 0x16, 0x80, 0x0c, 0x3d, 0x17, 0x99, 0xf7, 0xff, 0x80, 0x26, 0x38,
+ 0x29, 0x7f, 0xda, 0xa7, 0xee, 0x18, 0x46, 0x51, 0x1d, 0x7e, 0x48, 0xd3, 0x56, 0x12, 0x18, 0x81,
+ 0x95, 0xa0, 0x74, 0x0e, 0xc4, 0x3f, 0x80, 0xf8, 0xd7, 0x7e, 0x55, 0xc7, 0xcb, 0xc0, 0x22, 0xa2,
+ 0x0d, 0x24, 0x87, 0xac, 0x16, 0x00, 0x47, 0x50, 0x68, 0x7d, 0x3e, 0xd7, 0x10, 0xf6, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE directory_browser_xpm[1] = {{ png, sizeof( png ), "directory_browser_xpm" }};
diff --git a/bitmaps_png/cpp_24/find_replace.cpp b/bitmaps_png/cpp_24/find_replace.cpp
index ffcba71074..2fc48606e7 100644
--- a/bitmaps_png/cpp_24/find_replace.cpp
+++ b/bitmaps_png/cpp_24/find_replace.cpp
@@ -8,7 +8,7 @@
 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, 0xe4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x37, 0x08,
+ 0xf8, 0x00, 0x00, 0x02, 0x1d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x37, 0x08,
  0x0e, 0x0e, 0x56, 0x0a, 0x09, 0x09, 0xf9, 0x07, 0xc4, 0xff, 0x41, 0x38, 0x30, 0x30, 0x50, 0x9f,
  0xaa, 0x16, 0x84, 0x86, 0x86, 0x56, 0x43, 0x0d, 0xff, 0x0d, 0xa5, 0x3b, 0xa9, 0x6a, 0x01, 0xd0,
  0xc0, 0x2b, 0x50, 0x83, 0xa7, 0x83, 0x68, 0xa0, 0x8f, 0x1e, 0x35, 0x34, 0x34, 0x30, 0x51, 0xc5,
@@ -20,26 +20,30 @@ static const unsigned char png[] = {
  0x78, 0x19, 0xd9, 0x86, 0xa7, 0xa5, 0xa5, 0xb1, 0x02, 0x0d, 0x78, 0x0d, 0x35, 0xe8, 0x06, 0x30,
  0x38, 0x76, 0x23, 0xe1, 0xcb, 0x50, 0xf1, 0xaf, 0x40, 0x36, 0x0f, 0xb9, 0xae, 0xf7, 0x81, 0xb9,
  0x14, 0x68, 0x88, 0x25, 0x5a, 0xbe, 0x50, 0x81, 0xc9, 0x01, 0x83, 0x29, 0x86, 0xdc, 0xdc, 0xbb,
- 0x14, 0x6a, 0xc8, 0x4b, 0x6c, 0x69, 0x1e, 0xe4, 0x2b, 0xa8, 0xe5, 0x5b, 0x91, 0x2c, 0x66, 0x06,
- 0xe2, 0x34, 0x64, 0x0c, 0x54, 0x13, 0x0d, 0xa4, 0xed, 0x41, 0x21, 0x82, 0x6e, 0x41, 0x36, 0x50,
- 0xb2, 0x1c, 0x48, 0x07, 0xe3, 0x70, 0x80, 0x17, 0x48, 0x1e, 0x88, 0x8b, 0x41, 0xa9, 0x0d, 0x24,
- 0xe6, 0xe9, 0xe9, 0xc9, 0x8e, 0x27, 0xbe, 0xde, 0x01, 0x2d, 0x8a, 0xc2, 0xe9, 0xa3, 0xfd, 0x6a,
- 0x8e, 0x87, 0x41, 0x18, 0x9f, 0xaf, 0xd1, 0x2c, 0xd8, 0x06, 0xc4, 0xdd, 0x40, 0xbc, 0x04, 0x88,
- 0x3f, 0x43, 0xc5, 0x3e, 0x27, 0x24, 0x24, 0x70, 0xe0, 0xb2, 0xe0, 0x3f, 0x08, 0x93, 0x60, 0x41,
- 0x0a, 0x5a, 0x68, 0xc0, 0xe2, 0x53, 0x8e, 0x28, 0x0b, 0x0e, 0xaa, 0xd8, 0x19, 0xee, 0x51, 0x74,
- 0x16, 0x27, 0x64, 0x01, 0x28, 0xec, 0x81, 0x16, 0xcc, 0x81, 0x8a, 0xbd, 0xc1, 0x88, 0x0b, 0x6c,
- 0x16, 0xec, 0xd5, 0x74, 0x92, 0xdf, 0xa7, 0xe6, 0xf8, 0x17, 0xc8, 0x7f, 0xbc, 0x5f, 0xd9, 0x41,
- 0x05, 0x87, 0x05, 0x5f, 0x41, 0xe1, 0x0e, 0xc4, 0x3f, 0x60, 0x05, 0x24, 0xde, 0x8c, 0x89, 0x6c,
- 0xc1, 0x19, 0x63, 0x63, 0xd6, 0xfd, 0xaa, 0x8e, 0xfb, 0xa1, 0x62, 0x70, 0x4b, 0x08, 0x44, 0xf2,
- 0x1b, 0x20, 0xae, 0x22, 0x68, 0x01, 0x0e, 0xfc, 0xfa, 0xb0, 0xae, 0x8d, 0x20, 0xb6, 0x20, 0x82,
- 0x96, 0xc0, 0xdd, 0x48, 0x71, 0x60, 0x83, 0x2f, 0x15, 0x61, 0xb5, 0x60, 0x9f, 0x9a, 0xd3, 0xcf,
- 0x83, 0xca, 0x76, 0xb2, 0xb8, 0x22, 0x19, 0x58, 0xb4, 0xcb, 0x23, 0x59, 0x90, 0x49, 0x54, 0x46,
- 0xdc, 0xaf, 0xea, 0x34, 0x01, 0x6a, 0xc1, 0x8f, 0x03, 0x6a, 0x4e, 0x9e, 0xb8, 0x22, 0x19, 0x68,
- 0xa0, 0x10, 0x90, 0xdd, 0x83, 0x64, 0x41, 0x20, 0x41, 0xc3, 0xf7, 0xaa, 0x38, 0x29, 0xa3, 0x1b,
- 0x4e, 0x44, 0x1c, 0x80, 0x0c, 0xbf, 0x8c, 0x33, 0x1f, 0x20, 0x03, 0x60, 0x4c, 0x33, 0x1e, 0x50,
- 0x75, 0xca, 0xdd, 0xaf, 0xe6, 0x60, 0x83, 0x27, 0x99, 0x22, 0xa7, 0xa6, 0x2b, 0xc0, 0x14, 0xd4,
- 0x12, 0x15, 0x15, 0x25, 0x48, 0x97, 0x56, 0x0a, 0x00, 0x4e, 0x15, 0x9e, 0x16, 0xad, 0x39, 0xa8,
- 0xfe, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x14, 0x6a, 0xc8, 0x4b, 0x50, 0x9a, 0x3f, 0xa2, 0x6e, 0xcd, 0xbb, 0x5f, 0xcd, 0x21, 0x1e, 0x44,
+ 0x43, 0x1d, 0x70, 0x03, 0x6a, 0xf9, 0x56, 0x24, 0x8b, 0x99, 0x81, 0x38, 0x0d, 0x19, 0x03, 0xd5,
+ 0x44, 0x03, 0x69, 0x7b, 0x50, 0x88, 0xa0, 0x5b, 0x90, 0x0d, 0x94, 0x2c, 0x07, 0xd2, 0xc1, 0x20,
+ 0xfe, 0x01, 0x55, 0xc7, 0xd2, 0xfd, 0x6a, 0x8e, 0xff, 0x41, 0x34, 0x54, 0xde, 0x0b, 0x24, 0x0f,
+ 0xc4, 0xc5, 0xa0, 0xd4, 0x06, 0x12, 0xf3, 0xf4, 0xf4, 0x64, 0xc7, 0x13, 0x5f, 0xef, 0x80, 0x16,
+ 0x45, 0xe1, 0xf4, 0xd1, 0x3e, 0x35, 0xc7, 0x3a, 0x90, 0x05, 0xfb, 0xd5, 0x9c, 0x1a, 0x70, 0xa9,
+ 0x41, 0xb3, 0x60, 0x1b, 0x10, 0x77, 0x03, 0xf1, 0x12, 0x20, 0xfe, 0x0c, 0x15, 0xfb, 0x9c, 0x90,
+ 0x90, 0xc0, 0x81, 0xcb, 0x82, 0x2c, 0xa8, 0x05, 0xb3, 0xc1, 0x3e, 0x52, 0x77, 0x9c, 0x78, 0x40,
+ 0xcd, 0x71, 0xe6, 0x2a, 0x6d, 0x44, 0x5e, 0x40, 0xb3, 0x20, 0x05, 0x2d, 0x34, 0x60, 0xf1, 0x29,
+ 0x87, 0xd5, 0x82, 0xbd, 0x6a, 0x4e, 0x66, 0x10, 0x0b, 0x1c, 0x1f, 0xef, 0x57, 0x70, 0x10, 0x00,
+ 0xd2, 0x8f, 0xa0, 0x16, 0x6e, 0xde, 0xa6, 0xe2, 0xc9, 0x8e, 0xcb, 0x02, 0x50, 0xd8, 0x03, 0x2d,
+ 0x98, 0x03, 0x15, 0x7b, 0x83, 0x11, 0x17, 0x30, 0xf0, 0x1f, 0x18, 0xce, 0x40, 0x17, 0x9f, 0x84,
+ 0x5a, 0xf2, 0x66, 0xbf, 0xaa, 0xc3, 0xae, 0xfd, 0xaa, 0x8e, 0xdf, 0xc0, 0xf1, 0xa2, 0xe6, 0x74,
+ 0x0a, 0x64, 0x09, 0x9a, 0x05, 0x5f, 0x41, 0xe1, 0x0e, 0xc4, 0x3f, 0x60, 0x05, 0x24, 0xc1, 0x8c,
+ 0x09, 0xf4, 0x85, 0x34, 0xd0, 0x92, 0xbd, 0x50, 0x4b, 0x50, 0x30, 0xd0, 0x92, 0x58, 0x02, 0x91,
+ 0xfc, 0x06, 0x88, 0xab, 0x88, 0x4a, 0xc2, 0xfb, 0xd4, 0x1d, 0xd5, 0x0f, 0xa8, 0xdb, 0x67, 0xee,
+ 0x57, 0x77, 0x7c, 0x0e, 0xb5, 0xe0, 0xd1, 0x21, 0x15, 0x5b, 0x51, 0x6c, 0x41, 0x04, 0x2d, 0x81,
+ 0xbb, 0x91, 0xe2, 0xc0, 0x86, 0x28, 0x4b, 0x80, 0x79, 0xe2, 0x14, 0xc4, 0xe5, 0x8e, 0x57, 0xf7,
+ 0x28, 0x3a, 0x8b, 0xe3, 0x8b, 0x64, 0x60, 0xd1, 0x2e, 0x8f, 0x64, 0x41, 0x26, 0x91, 0x16, 0x38,
+ 0x1e, 0x06, 0xe2, 0x33, 0x3b, 0x95, 0xdd, 0xc4, 0xf0, 0xa5, 0x22, 0xa0, 0x81, 0x42, 0x40, 0x76,
+ 0x0f, 0x92, 0x05, 0x81, 0x64, 0x97, 0x5f, 0x04, 0xe2, 0x00, 0x64, 0xf8, 0x65, 0x9c, 0xf9, 0x80,
+ 0x02, 0x0b, 0x40, 0xa9, 0xe9, 0x0a, 0x30, 0x05, 0xb5, 0x44, 0x45, 0x45, 0x09, 0xd2, 0xa5, 0x95,
+ 0x02, 0x00, 0x4f, 0x11, 0x9d, 0xa3, 0x26, 0x98, 0x72, 0x78, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE find_replace_xpm[1] = {{ png, sizeof( png ), "find_replace_xpm" }};
diff --git a/bitmaps_png/cpp_24/group.cpp b/bitmaps_png/cpp_24/group.cpp
index 2a852d1788..b08aa2d8c9 100644
--- a/bitmaps_png/cpp_24/group.cpp
+++ b/bitmaps_png/cpp_24/group.cpp
@@ -7,29 +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, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 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, 0x00, 0x0d, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x72, 0x63,
- 0x16, 0x64, 0x63, 0xf9, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79,
- 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75,
- 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65, 0x20,
- 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65, 0x63,
- 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e,
- 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3, 0x54,
- 0x62, 0x05, 0x00, 0x00, 0x00, 0x91, 0x49, 0x44, 0x41, 0x54, 0x48, 0x89, 0xe5, 0x55, 0x41, 0x0e,
- 0xc0, 0x20, 0x08, 0xc3, 0x65, 0x4f, 0xe4, 0x99, 0xfe, 0xd1, 0x9d, 0x46, 0x98, 0xa9, 0x04, 0x49,
- 0xea, 0x65, 0x3d, 0x22, 0xb6, 0x80, 0x08, 0x22, 0x64, 0x34, 0x11, 0x11, 0x55, 0x1d, 0xde, 0xd8,
- 0x7b, 0x6f, 0x15, 0x32, 0xc4, 0x73, 0x67, 0x1c, 0x67, 0x61, 0x7f, 0x8e, 0x6c, 0x1e, 0x50, 0x00,
- 0x65, 0x80, 0x48, 0xe7, 0x3b, 0x48, 0xe4, 0x42, 0x02, 0x14, 0xac, 0x52, 0xcc, 0x9e, 0xaf, 0x7c,
- 0x29, 0x19, 0xf8, 0x12, 0xd2, 0x4b, 0x44, 0x11, 0xa0, 0x97, 0xc8, 0xe3, 0xd3, 0xa6, 0x3b, 0x0f,
- 0xf9, 0x1f, 0x58, 0x3b, 0xa9, 0xea, 0xc8, 0xce, 0xa0, 0x4c, 0x29, 0x5f, 0x2e, 0x38, 0x2a, 0x32,
- 0x88, 0x82, 0x39, 0xda, 0x45, 0x26, 0x50, 0x1d, 0xd1, 0x69, 0x01, 0x16, 0x4c, 0x80, 0xf5, 0x07,
- 0x4a, 0x1b, 0x6d, 0xd5, 0x71, 0x88, 0xe7, 0xec, 0xa8, 0xf0, 0x91, 0x44, 0xeb, 0x71, 0xb6, 0x47,
- 0xa0, 0x2f, 0xfd, 0x0a, 0xcf, 0x16, 0x1e, 0x72, 0x17, 0x56, 0x14, 0xdd, 0x9c, 0x0e, 0xe4, 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, 0x65, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x08, 0xf9, 0x0f, 0x82,
+ 0x0c, 0x44, 0x00, 0xa8, 0x4a, 0x08, 0x85, 0xd0, 0x86, 0x9b, 0x85, 0xa2, 0x81, 0x04, 0x1b, 0x40,
+ 0x0c, 0x54, 0x33, 0xd0, 0xed, 0x44, 0xd6, 0x02, 0xa7, 0x42, 0xfe, 0x63, 0x03, 0xd4, 0xd2, 0x00,
+ 0x61, 0x12, 0xa3, 0x01, 0x45, 0x2f, 0x09, 0x1a, 0x70, 0x3b, 0xe9, 0x3f, 0x71, 0x7e, 0xc0, 0x1d,
+ 0x62, 0x38, 0x35, 0xe0, 0x72, 0x1e, 0x0e, 0x4f, 0x13, 0xe5, 0x1f, 0x92, 0x34, 0x90, 0xec, 0x24,
+ 0xd4, 0xa4, 0x41, 0xa4, 0x06, 0xe2, 0xe2, 0x04, 0x67, 0xbc, 0x50, 0x3b, 0xd6, 0x49, 0x76, 0x12,
+ 0x15, 0x34, 0xe0, 0x4d, 0x1a, 0x83, 0xaf, 0x10, 0x00, 0x00, 0x1a, 0x32, 0x33, 0x4a, 0xa7, 0xe0,
+ 0x1b, 0x81, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_xpm[1] = {{ png, sizeof( png ), "group_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_enter.cpp b/bitmaps_png/cpp_24/group_enter.cpp
index 20630b35a2..8a9e49b64d 100644
--- a/bitmaps_png/cpp_24/group_enter.cpp
+++ b/bitmaps_png/cpp_24/group_enter.cpp
@@ -8,29 +8,36 @@
 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, 0x4d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
- 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
- 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
- 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
- 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
- 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
- 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0xae, 0x94, 0x77,
- 0xfc, 0x07, 0x61, 0x5c, 0x96, 0x00, 0xf1, 0xbf, 0x7d, 0xaa, 0x8e, 0xc1, 0x24, 0x05, 0x11, 0xc8,
- 0xeb, 0x30, 0x97, 0x7f, 0xf9, 0xf4, 0x09, 0x8c, 0xf1, 0x58, 0x00, 0xf6, 0xc9, 0x4e, 0x65, 0x37,
- 0x31, 0xa2, 0x2d, 0x00, 0x6a, 0x68, 0x85, 0x69, 0xfe, 0xfa, 0xf5, 0x2b, 0x18, 0xe3, 0xb3, 0x00,
- 0x8c, 0xd5, 0x9d, 0x5a, 0x48, 0xb1, 0xe0, 0x22, 0x2e, 0x0b, 0x2e, 0xa4, 0x55, 0xfe, 0x3f, 0xee,
- 0x1a, 0x83, 0xcd, 0x17, 0x17, 0x89, 0x8f, 0x5c, 0x35, 0xc7, 0x6f, 0xd8, 0x2c, 0x38, 0xee, 0x12,
- 0x03, 0x66, 0x7f, 0x7a, 0xf1, 0xf2, 0xff, 0x29, 0xff, 0x54, 0x54, 0x0b, 0xd4, 0x1d, 0xbf, 0x52,
- 0x6c, 0xc1, 0x7e, 0x0d, 0xa7, 0xff, 0x8f, 0x37, 0xee, 0xc4, 0x6a, 0x09, 0x8a, 0x05, 0x04, 0x23,
- 0x19, 0x98, 0xe6, 0xd1, 0x2d, 0xc0, 0x8a, 0xbf, 0x7c, 0xf9, 0x7f, 0xcc, 0x39, 0x0a, 0x35, 0x88,
- 0x88, 0x29, 0xae, 0x91, 0x23, 0xf9, 0xc5, 0x91, 0x53, 0x44, 0x59, 0x00, 0x8f, 0x64, 0x62, 0x2c,
- 0x00, 0x25, 0x53, 0xa0, 0xa6, 0x4f, 0x18, 0x29, 0x05, 0x47, 0x10, 0xed, 0x04, 0x8a, 0xc3, 0x93,
- 0x29, 0xb1, 0x55, 0xe6, 0x3e, 0x35, 0x47, 0x2f, 0xa0, 0xe6, 0xdf, 0xc8, 0x16, 0x60, 0x8b, 0x64,
- 0xa0, 0xba, 0xff, 0xe5, 0xae, 0xbe, 0xe4, 0xd5, 0x68, 0x07, 0xd4, 0x9d, 0x42, 0xd1, 0x7d, 0x82,
- 0x9c, 0x4c, 0x77, 0x69, 0x3a, 0xfd, 0xaf, 0x74, 0xf1, 0xfd, 0x4f, 0x59, 0x79, 0x04, 0x0c, 0x2e,
- 0xa0, 0x2b, 0xdb, 0xa0, 0x11, 0xff, 0x0b, 0x88, 0x7f, 0x00, 0xd9, 0xe7, 0x60, 0x85, 0x1d, 0xb2,
- 0x5a, 0x00, 0x15, 0x9f, 0x31, 0x4c, 0x93, 0xc5, 0x50, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
- 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0xc1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
+ 0x0f, 0xc3, 0x0c, 0x54, 0x02, 0x28, 0x66, 0x22, 0x73, 0xb0, 0x59, 0x46, 0x8e, 0x18, 0x4e, 0x0b,
+ 0x68, 0xe2, 0x03, 0x98, 0x00, 0x03, 0x95, 0x01, 0x8a, 0x99, 0x43, 0xdf, 0x82, 0xa1, 0x0f, 0x46,
+ 0x5e, 0x24, 0x1f, 0xd2, 0xb4, 0x95, 0xdc, 0xa7, 0xe6, 0xd8, 0xb6, 0x5f, 0xcd, 0xe9, 0xd2, 0x7e,
+ 0x35, 0xc7, 0x6f, 0x40, 0xfc, 0x05, 0xc8, 0x3e, 0xb7, 0x4f, 0xd5, 0xb1, 0xe9, 0x90, 0x8a, 0xad,
+ 0x28, 0x45, 0x8e, 0x3e, 0xa0, 0xea, 0x14, 0x09, 0x34, 0xf0, 0x13, 0x10, 0xff, 0xc7, 0x86, 0x0f,
+ 0xa8, 0x39, 0x7e, 0x04, 0x5a, 0x14, 0x4c, 0x96, 0xe1, 0x40, 0x8d, 0x51, 0x40, 0x43, 0xfe, 0x1d,
+ 0x31, 0xf5, 0xfb, 0xff, 0x6a, 0xfb, 0x81, 0xff, 0x17, 0x93, 0xca, 0xfe, 0xe3, 0xb0, 0xe8, 0x1f,
+ 0x8a, 0x25, 0xc4, 0x78, 0x07, 0x14, 0x2c, 0x40, 0x8d, 0x9f, 0x41, 0x06, 0x5c, 0x2d, 0x68, 0xfa,
+ 0x0f, 0x02, 0x2f, 0x36, 0xed, 0xc6, 0x65, 0xc1, 0xff, 0x5d, 0x9a, 0x4e, 0xff, 0x61, 0xc1, 0x45,
+ 0x94, 0x05, 0x40, 0xaf, 0xb7, 0xc2, 0x34, 0xdf, 0xed, 0x9a, 0x09, 0xb6, 0xe0, 0xd1, 0xec, 0x15,
+ 0x38, 0x2d, 0x00, 0x61, 0x50, 0x9c, 0x10, 0x6d, 0x01, 0x50, 0xc3, 0x15, 0x98, 0xc6, 0xfb, 0x13,
+ 0xe7, 0x83, 0x2d, 0xb8, 0x3f, 0x79, 0x01, 0x98, 0x7f, 0xcc, 0x26, 0x04, 0x2c, 0x76, 0xd4, 0x2a,
+ 0x08, 0xdd, 0x92, 0xf3, 0xc4, 0x47, 0xae, 0xba, 0xe3, 0x57, 0x98, 0xc6, 0x9b, 0x75, 0x7d, 0x60,
+ 0x0b, 0x9e, 0xad, 0xde, 0x0a, 0xf1, 0x51, 0xf7, 0x2c, 0x30, 0xff, 0xeb, 0xdd, 0x87, 0x40, 0x4b,
+ 0x82, 0x91, 0x2d, 0xf8, 0x42, 0xb4, 0x05, 0x40, 0xc5, 0xaf, 0x61, 0x1a, 0x4f, 0xfb, 0xa7, 0x82,
+ 0x0d, 0xfc, 0xfd, 0xf9, 0xeb, 0xff, 0x6b, 0xc5, 0xad, 0xff, 0x4f, 0x79, 0x27, 0xfe, 0xff, 0x7c,
+ 0xe3, 0x2e, 0x58, 0xec, 0xdb, 0xfd, 0xc7, 0xff, 0x8f, 0xd9, 0x86, 0xc1, 0x2c, 0xf8, 0x4e, 0x42,
+ 0x10, 0x39, 0x9d, 0x43, 0xf6, 0xfe, 0xb3, 0x35, 0xdb, 0xfe, 0xe3, 0x02, 0xbf, 0xde, 0x7f, 0x84,
+ 0x25, 0xd9, 0x8b, 0xa4, 0x44, 0x72, 0x25, 0x4a, 0xf8, 0xaa, 0x3b, 0xfd, 0xbf, 0x5e, 0xd9, 0xf9,
+ 0xff, 0xdd, 0xf1, 0x73, 0xff, 0x7f, 0x3c, 0x7f, 0xf5, 0xff, 0xdf, 0xdf, 0xbf, 0xff, 0xff, 0xff,
+ 0xfb, 0x07, 0xb6, 0xe0, 0xf3, 0xf5, 0x3b, 0x10, 0x35, 0xaa, 0x0e, 0xd5, 0x44, 0x5b, 0xb0, 0x4b,
+ 0xdd, 0x55, 0x0a, 0x57, 0x06, 0x3b, 0xe5, 0x9d, 0xf4, 0xff, 0xf7, 0xc7, 0x4f, 0x60, 0xc3, 0x5f,
+ 0xed, 0x38, 0xf8, 0xff, 0x80, 0x96, 0x2b, 0x38, 0x99, 0x1e, 0xd6, 0xb5, 0x11, 0x24, 0xa9, 0xca,
+ 0x84, 0x65, 0x34, 0x74, 0x0b, 0x6e, 0xb7, 0x4d, 0x45, 0x31, 0x7c, 0x2f, 0x50, 0xac, 0xc4, 0xcd,
+ 0x8f, 0xbc, 0x4a, 0x1f, 0x64, 0xc9, 0x4e, 0x0d, 0x27, 0xd4, 0xe2, 0x01, 0x68, 0xe8, 0xb9, 0xc8,
+ 0xbc, 0xff, 0x07, 0x34, 0x5d, 0xfe, 0x83, 0xe4, 0x2a, 0x5c, 0xfd, 0x28, 0xab, 0xf4, 0x41, 0xb9,
+ 0x1a, 0x1a, 0x27, 0xe7, 0x81, 0xf8, 0x07, 0x10, 0xff, 0xda, 0xaf, 0xea, 0x78, 0x19, 0x54, 0x00,
+ 0x82, 0xe4, 0x90, 0xcd, 0x04, 0x00, 0x75, 0x38, 0x2a, 0xb1, 0xfc, 0x96, 0x2c, 0x96, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_enter_xpm[1] = {{ png, sizeof( png ), "group_enter_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_leave.cpp b/bitmaps_png/cpp_24/group_leave.cpp
index 13b6d9ae1a..7818646951 100644
--- a/bitmaps_png/cpp_24/group_leave.cpp
+++ b/bitmaps_png/cpp_24/group_leave.cpp
@@ -8,30 +8,37 @@
 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, 0x65, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
- 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
- 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
- 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
- 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
- 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
- 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0x40, 0x06, 0x1d,
- 0x73, 0x8c, 0x00, 0x63, 0x1c, 0x16, 0xfd, 0xdb, 0xa7, 0xea, 0x18, 0x4c, 0x52, 0x10, 0x81, 0xbc,
- 0x0e, 0x73, 0xf9, 0x29, 0xff, 0xd4, 0xff, 0x5f, 0xbf, 0x7c, 0x01, 0x63, 0x10, 0x1b, 0x97, 0x4f,
- 0x76, 0x2a, 0xbb, 0x89, 0x11, 0x6d, 0x01, 0x50, 0x43, 0x2b, 0xcc, 0xf0, 0x4f, 0x2f, 0x5e, 0xfe,
- 0xff, 0xfa, 0xf5, 0x2b, 0x18, 0x83, 0xd8, 0xb8, 0x2c, 0xd9, 0xaf, 0xee, 0xd4, 0x42, 0x8a, 0x05,
- 0x17, 0x8f, 0xbb, 0xc6, 0xa0, 0x18, 0x8e, 0x6c, 0x09, 0x48, 0x0e, 0x8b, 0x2f, 0x2e, 0x12, 0x1f,
- 0xb9, 0x6a, 0x8e, 0xdf, 0x2e, 0xa4, 0x57, 0x81, 0x0d, 0x7c, 0xbc, 0x71, 0x27, 0xdc, 0x70, 0x18,
- 0x1b, 0x24, 0x87, 0x61, 0x81, 0xba, 0xe3, 0x57, 0x92, 0x2c, 0x00, 0x69, 0x3a, 0xee, 0x02, 0x74,
- 0xa9, 0x86, 0x13, 0xdc, 0x02, 0x10, 0x1b, 0x2c, 0x86, 0x2d, 0x1e, 0x90, 0x2d, 0x20, 0x18, 0xc9,
- 0xc0, 0x34, 0x8f, 0xac, 0x19, 0x6e, 0x01, 0x8e, 0xe4, 0x8a, 0x12, 0x44, 0xc4, 0x14, 0xd7, 0xb0,
- 0x48, 0x86, 0x5b, 0x00, 0x4a, 0x45, 0x68, 0x71, 0x01, 0xc2, 0x5f, 0x3e, 0x7d, 0xfa, 0x7f, 0xa5,
- 0xac, 0x1d, 0x35, 0x92, 0x89, 0xb1, 0x00, 0x94, 0x4c, 0x81, 0x9a, 0x3e, 0xc1, 0x2c, 0x78, 0x71,
- 0xe4, 0x14, 0x5e, 0x0b, 0x76, 0x02, 0x83, 0x0e, 0x9e, 0x4c, 0x89, 0xad, 0x32, 0xf7, 0xa9, 0x39,
- 0x7a, 0x01, 0x0d, 0xff, 0x8d, 0x2f, 0x58, 0x40, 0x18, 0xa8, 0xee, 0x7f, 0xb9, 0xab, 0x2f, 0x79,
- 0x35, 0xda, 0x01, 0x75, 0xa7, 0x50, 0x64, 0x9f, 0xa0, 0xe3, 0x5d, 0x9a, 0x4e, 0xff, 0x2b, 0x5d,
- 0x7c, 0xff, 0x53, 0x56, 0x1e, 0x01, 0x83, 0x0b, 0xe8, 0xca, 0x36, 0x68, 0xc4, 0x83, 0x8a, 0x8e,
- 0x1f, 0x40, 0xf6, 0x39, 0x58, 0x61, 0x87, 0xac, 0x16, 0x00, 0x06, 0x6f, 0x31, 0x42, 0xb8, 0x93,
- 0x4c, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0xd6, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
+ 0x0f, 0xc3, 0x0c, 0x54, 0x02, 0x28, 0x66, 0x22, 0x73, 0xb0, 0x59, 0x46, 0x8e, 0x18, 0x4e, 0x0b,
+ 0x68, 0xe2, 0x03, 0x98, 0x00, 0x03, 0x95, 0x01, 0x8a, 0x99, 0x43, 0xdf, 0x82, 0xa1, 0x0f, 0x06,
+ 0x75, 0x1c, 0x00, 0x35, 0x32, 0x52, 0xdd, 0x82, 0xfd, 0xca, 0x0e, 0x2a, 0xfb, 0xd5, 0x1c, 0xa7,
+ 0x1c, 0x50, 0x73, 0xbc, 0x0b, 0xa4, 0xff, 0x03, 0xe9, 0x9f, 0x40, 0xfa, 0xfa, 0x3e, 0x35, 0xc7,
+ 0xb6, 0x9d, 0xca, 0x6e, 0x62, 0x14, 0x39, 0x7a, 0xbf, 0x9a, 0x53, 0x0e, 0xd0, 0xb0, 0x1f, 0x20,
+ 0x83, 0xb1, 0x61, 0xa0, 0x65, 0x1f, 0x0f, 0xa8, 0x39, 0x05, 0x92, 0x65, 0xf8, 0x3e, 0x55, 0xc7,
+ 0x3c, 0x90, 0x21, 0x07, 0xf5, 0x3c, 0xfe, 0x7f, 0x7b, 0xf8, 0xf4, 0xff, 0xaf, 0xf7, 0x1f, 0xff,
+ 0x1f, 0xb5, 0x0a, 0xc2, 0xb0, 0x04, 0xe8, 0x93, 0xbf, 0xfb, 0xd4, 0x1d, 0xfd, 0x48, 0x0a, 0xa2,
+ 0x3d, 0x1a, 0xce, 0x6a, 0xa0, 0xa0, 0x00, 0x19, 0xfe, 0xee, 0xc8, 0x99, 0xff, 0x30, 0xf0, 0xe5,
+ 0xf6, 0x83, 0xff, 0x47, 0x2d, 0x03, 0x31, 0x2c, 0xd9, 0xa1, 0xe9, 0xf4, 0xff, 0xb0, 0xae, 0x8d,
+ 0x20, 0xd1, 0x16, 0xec, 0x57, 0x75, 0x98, 0x7e, 0x50, 0xd7, 0x1d, 0xc5, 0x70, 0xb8, 0x25, 0xb7,
+ 0xee, 0xfd, 0x3f, 0x62, 0x1e, 0x80, 0x25, 0xc8, 0x9c, 0x2a, 0x88, 0xb7, 0x40, 0xcd, 0xf1, 0xc9,
+ 0xa5, 0xd4, 0x0a, 0xb0, 0x81, 0x3f, 0x5f, 0xbf, 0x03, 0xd3, 0x7f, 0xbe, 0xff, 0x04, 0x1b, 0x0e,
+ 0x02, 0xb7, 0x5b, 0xa7, 0x60, 0x8b, 0x93, 0x23, 0x44, 0x85, 0xfd, 0x31, 0x19, 0x4b, 0x4e, 0x70,
+ 0xd8, 0xeb, 0xb8, 0xfd, 0xbf, 0xd5, 0x34, 0xf1, 0xff, 0x09, 0xe7, 0xa8, 0xff, 0xbf, 0x3f, 0x7e,
+ 0x06, 0x1b, 0x7c, 0x1c, 0xc8, 0xbe, 0xdd, 0x32, 0xe5, 0xff, 0x11, 0x53, 0x3f, 0x6c, 0x16, 0x3c,
+ 0x23, 0xc5, 0x82, 0x7f, 0xc8, 0x9a, 0x3f, 0x5e, 0xbc, 0x0e, 0xb6, 0xe0, 0x72, 0x76, 0xed, 0x7f,
+ 0x5c, 0x29, 0x0a, 0x88, 0x9f, 0x93, 0x12, 0x44, 0x77, 0x90, 0x35, 0xdf, 0x6a, 0x9c, 0x08, 0xb6,
+ 0xe0, 0xf7, 0xe7, 0xaf, 0xff, 0x5f, 0x6c, 0xd8, 0xf5, 0xff, 0xe1, 0xec, 0xe5, 0xff, 0x9f, 0x2c,
+ 0x5e, 0xff, 0xff, 0xd5, 0xf6, 0x03, 0xff, 0x2f, 0xc4, 0x17, 0xc3, 0x92, 0xec, 0x41, 0xa2, 0x2d,
+ 0x00, 0x2a, 0x6e, 0x45, 0x71, 0x9d, 0x86, 0xd3, 0xff, 0xe7, 0xeb, 0x76, 0xfc, 0xc7, 0x06, 0x9e,
+ 0x2e, 0xdf, 0x04, 0x55, 0xe7, 0x50, 0x4c, 0xbc, 0x0f, 0x34, 0x1c, 0x14, 0x0e, 0xa8, 0x3b, 0x7e,
+ 0x45, 0x0f, 0x86, 0x53, 0xde, 0x49, 0xff, 0xaf, 0x57, 0x74, 0xfe, 0xbf, 0xd3, 0x35, 0x03, 0x1c,
+ 0x3f, 0x97, 0x33, 0xaa, 0xff, 0x1f, 0x32, 0xf0, 0xfa, 0xbf, 0x4d, 0xdb, 0xf9, 0xff, 0x36, 0x15,
+ 0x4f, 0x3e, 0x92, 0xaa, 0x4c, 0x60, 0x52, 0x4d, 0x40, 0x8f, 0x0b, 0x6c, 0x78, 0xb7, 0x86, 0xe3,
+ 0xff, 0x1c, 0xaf, 0x00, 0xf2, 0x2a, 0xfd, 0xfd, 0xea, 0x0e, 0x31, 0x3b, 0x81, 0xc1, 0x83, 0xcb,
+ 0xf0, 0x6d, 0x5a, 0xce, 0xff, 0x0b, 0xdd, 0xfd, 0x29, 0xab, 0xf4, 0x0f, 0x69, 0xda, 0x4a, 0xee,
+ 0x57, 0x77, 0x6a, 0x01, 0x66, 0xa4, 0x73, 0xc0, 0xb8, 0x79, 0x0b, 0x34, 0xf8, 0x0d, 0x10, 0x1f,
+ 0x07, 0x65, 0xac, 0xfd, 0x0a, 0x0e, 0x02, 0xc8, 0x66, 0x02, 0x00, 0x77, 0xd6, 0x2e, 0x25, 0x73,
+ 0x1f, 0x1d, 0xd3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_leave_xpm[1] = {{ png, sizeof( png ), "group_leave_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_remove.cpp b/bitmaps_png/cpp_24/group_remove.cpp
index 860c9c1f53..580450aa4a 100644
--- a/bitmaps_png/cpp_24/group_remove.cpp
+++ b/bitmaps_png/cpp_24/group_remove.cpp
@@ -8,25 +8,25 @@
 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, 0x11, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
- 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
- 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
- 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
- 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
- 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
- 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0x70, 0x19, 0x8e,
- 0x84, 0xff, 0xed, 0x53, 0x75, 0x0c, 0x26, 0x29, 0x88, 0x40, 0x5e, 0xc7, 0xe7, 0x72, 0x6c, 0x3e,
- 0xd9, 0xa9, 0xec, 0x26, 0x46, 0xb4, 0x05, 0x40, 0x0d, 0xad, 0xc4, 0x1a, 0x0e, 0xc7, 0xea, 0x4e,
- 0x2d, 0xa4, 0x58, 0x70, 0x91, 0x54, 0x0b, 0x40, 0x7a, 0x88, 0x8f, 0x5c, 0x35, 0xc7, 0x6f, 0x20,
- 0x4d, 0xe7, 0x93, 0x4a, 0xff, 0x7f, 0xfe, 0xf0, 0xf1, 0xff, 0xd7, 0xaf, 0x5f, 0xb1, 0x62, 0x90,
- 0x1c, 0x48, 0x0d, 0xd8, 0x02, 0x75, 0xc7, 0xaf, 0xf4, 0xb3, 0x80, 0x60, 0x24, 0x03, 0xd3, 0x3c,
- 0xd9, 0x41, 0x44, 0x4c, 0x71, 0x4d, 0x51, 0x24, 0x13, 0x63, 0x01, 0x28, 0x99, 0x02, 0x35, 0x7d,
- 0x22, 0xd6, 0xf0, 0x9d, 0x1a, 0x4e, 0xff, 0xe1, 0xc9, 0x94, 0xd8, 0x2a, 0x73, 0x9f, 0x9a, 0xa3,
- 0x17, 0x50, 0xf3, 0x6f, 0x42, 0x86, 0x03, 0xd5, 0xfd, 0x2f, 0x77, 0xf5, 0x25, 0xaf, 0x46, 0x3b,
- 0xa0, 0xee, 0x14, 0x8a, 0xcf, 0x27, 0xbb, 0x34, 0x9d, 0xfe, 0x57, 0xba, 0xf8, 0xfe, 0xa7, 0xac,
- 0x3c, 0x02, 0x06, 0x17, 0xd0, 0x95, 0x6d, 0xd0, 0x88, 0x07, 0x15, 0x1d, 0x3f, 0x80, 0xec, 0x73,
- 0xb0, 0xc2, 0x0e, 0x59, 0x2d, 0x00, 0x95, 0x43, 0x0d, 0x69, 0x48, 0x9b, 0xb2, 0x3d, 0x00, 0x00,
- 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x09, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
+ 0x0f, 0xc3, 0x0c, 0x54, 0x02, 0x28, 0x66, 0x22, 0x73, 0xb0, 0x59, 0x46, 0x8e, 0x18, 0x4e, 0x0b,
+ 0x68, 0xe2, 0x03, 0x98, 0x00, 0x03, 0x95, 0x01, 0x8a, 0x99, 0x43, 0xdf, 0x82, 0xa1, 0x0f, 0x46,
+ 0x5e, 0x24, 0xef, 0x51, 0x74, 0x16, 0xdf, 0xaf, 0xee, 0xd0, 0xbc, 0x5f, 0xcd, 0xe9, 0xd2, 0x01,
+ 0x35, 0xc7, 0x8f, 0x40, 0xfc, 0x72, 0xbf, 0x9a, 0xe3, 0x69, 0xa0, 0x58, 0xf9, 0x7e, 0x6d, 0x07,
+ 0x09, 0x8a, 0x1c, 0x0d, 0x34, 0x24, 0x04, 0x64, 0x28, 0xd0, 0xc0, 0xff, 0xd8, 0x30, 0x44, 0xce,
+ 0x21, 0x9c, 0x2c, 0xc3, 0x0f, 0xa8, 0x39, 0x79, 0x02, 0x0d, 0xf9, 0x85, 0xcb, 0x70, 0x24, 0xfc,
+ 0x6f, 0x9f, 0xaa, 0x63, 0x30, 0x49, 0x41, 0x04, 0xf2, 0x3a, 0x3e, 0x97, 0xa3, 0xe3, 0x5d, 0x9a,
+ 0x4e, 0xff, 0x77, 0x2a, 0xbb, 0x89, 0x11, 0x6d, 0x01, 0xd0, 0xf0, 0x56, 0x62, 0x0d, 0x87, 0x63,
+ 0x75, 0xa7, 0x16, 0x52, 0x2c, 0xb8, 0x48, 0xaa, 0x05, 0x20, 0x3d, 0xc4, 0x47, 0xae, 0x9a, 0xe3,
+ 0x37, 0x90, 0xa6, 0xf3, 0x49, 0xa5, 0xff, 0x3f, 0x7f, 0xf8, 0xf8, 0xff, 0xeb, 0xd7, 0xaf, 0x58,
+ 0x31, 0x48, 0x0e, 0xa4, 0x06, 0x6c, 0x81, 0xba, 0xe3, 0x57, 0xfa, 0x58, 0x40, 0x54, 0x24, 0x03,
+ 0xd3, 0x3c, 0xd9, 0x41, 0x34, 0x28, 0x22, 0x19, 0x94, 0x4c, 0x81, 0x9a, 0x3e, 0x11, 0x6b, 0xf8,
+ 0x4e, 0x0d, 0x68, 0x32, 0x25, 0xa5, 0xca, 0xdc, 0xa7, 0xe6, 0xe8, 0x05, 0xd4, 0xfc, 0x9b, 0x90,
+ 0xe1, 0x40, 0x75, 0xff, 0xcb, 0x5d, 0x7d, 0xc9, 0xab, 0xf4, 0x0f, 0xa8, 0x3b, 0x85, 0x82, 0x5c,
+ 0x87, 0x2f, 0x83, 0x55, 0xba, 0xf8, 0x52, 0x56, 0xe9, 0x83, 0x82, 0x0b, 0xe8, 0xca, 0x36, 0x68,
+ 0xc4, 0x83, 0x8a, 0x8e, 0x1f, 0x40, 0xf6, 0x39, 0x58, 0x61, 0x87, 0x6c, 0x26, 0x00, 0x88, 0x81,
+ 0x05, 0x93, 0xef, 0x23, 0xb7, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_remove_xpm[1] = {{ png, sizeof( png ), "group_remove_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_ungroup.cpp b/bitmaps_png/cpp_24/group_ungroup.cpp
index e9a916e69e..a5975c3165 100644
--- a/bitmaps_png/cpp_24/group_ungroup.cpp
+++ b/bitmaps_png/cpp_24/group_ungroup.cpp
@@ -7,31 +7,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, 0x58, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
- 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
- 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
- 0x44, 0x83, 0xca, 0x82, 0xfd, 0xda, 0x0e, 0x12, 0xfb, 0xd5, 0x9d, 0x5a, 0xf6, 0xab, 0x3a, 0x5e,
- 0xde, 0xaf, 0xe6, 0xf8, 0x09, 0x88, 0x5f, 0x03, 0xf1, 0x99, 0xfd, 0x6a, 0x4e, 0x15, 0x87, 0x34,
- 0x6d, 0x25, 0x29, 0x72, 0xec, 0x01, 0x75, 0xa7, 0x50, 0xa8, 0xa1, 0xff, 0xb1, 0xe1, 0x03, 0x6a,
- 0x8e, 0x1f, 0xf7, 0xab, 0x39, 0x44, 0x90, 0x65, 0xf8, 0x3e, 0x35, 0x47, 0x2f, 0xa0, 0x21, 0xbf,
- 0x71, 0x19, 0x8e, 0x84, 0xff, 0xed, 0x53, 0x75, 0x0c, 0x26, 0x29, 0x88, 0x40, 0x5e, 0x87, 0xb8,
- 0xce, 0xf1, 0xff, 0x21, 0x43, 0xaf, 0xff, 0xd7, 0xea, 0x7a, 0xff, 0x1f, 0x36, 0xf3, 0x87, 0x1b,
- 0x0a, 0x62, 0x83, 0xc4, 0x40, 0x72, 0x50, 0xb1, 0x4f, 0x3b, 0x95, 0xdd, 0xc4, 0x88, 0xb6, 0x00,
- 0xe8, 0xfa, 0x36, 0x98, 0x61, 0xd7, 0x6a, 0x7b, 0xff, 0x7f, 0xfd, 0xfa, 0xf5, 0xff, 0x9b, 0x4b,
- 0xd7, 0xfe, 0x1f, 0xb1, 0x08, 0x00, 0x63, 0x10, 0x1b, 0x24, 0x06, 0x92, 0x83, 0xfb, 0x04, 0x18,
- 0x4f, 0x44, 0x5b, 0x00, 0x8c, 0xc0, 0x4b, 0x70, 0xd7, 0x9a, 0xfa, 0xc1, 0x0d, 0x7c, 0x7b, 0xf5,
- 0x26, 0x18, 0xc3, 0x2c, 0x04, 0xc9, 0x21, 0xc5, 0xc7, 0x45, 0xa2, 0xc3, 0x1f, 0xa8, 0xe1, 0x1b,
- 0x72, 0x38, 0x1f, 0x36, 0x07, 0xba, 0xfa, 0xca, 0x0d, 0xb0, 0xc1, 0x20, 0xfc, 0xee, 0xc6, 0x9d,
- 0xff, 0x47, 0x2c, 0x83, 0x50, 0x23, 0x5c, 0xdd, 0xf1, 0x2b, 0x45, 0x16, 0xbc, 0xbd, 0x72, 0x1d,
- 0xd5, 0x02, 0xab, 0x60, 0xdc, 0x16, 0x10, 0x0a, 0x22, 0x90, 0x77, 0xc9, 0x0e, 0x22, 0x62, 0x8a,
- 0x6b, 0xa0, 0xe2, 0x56, 0xb2, 0x23, 0x99, 0x18, 0x0b, 0x40, 0xb9, 0x97, 0x94, 0x64, 0xba, 0x4b,
- 0xd3, 0xe9, 0x3f, 0x3c, 0x99, 0x12, 0x5b, 0x65, 0x42, 0x33, 0xda, 0x2f, 0x42, 0x19, 0x0d, 0xa8,
- 0xee, 0x7f, 0xb9, 0xab, 0x2f, 0x79, 0x35, 0xda, 0x7e, 0x75, 0x87, 0x10, 0x98, 0x4f, 0xb0, 0x61,
- 0x90, 0xcb, 0x2b, 0x5d, 0x7c, 0x29, 0xaa, 0x19, 0x61, 0xc1, 0xd5, 0x0a, 0x8d, 0x78, 0x90, 0x8f,
- 0x7e, 0x00, 0xf3, 0xc9, 0x39, 0xa0, 0xe5, 0xe5, 0x20, 0x39, 0x64, 0xb5, 0x00, 0xbd, 0x1f, 0x24,
- 0x4c, 0xed, 0x0f, 0x42, 0x0c, 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, 0x54, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x0b, 0x08,
+ 0xf9, 0x0f, 0x82, 0xc4, 0x89, 0x22, 0x49, 0x61, 0x87, 0x78, 0x34, 0xa0, 0x03, 0x3c, 0x1a, 0x40,
+ 0x5a, 0xb0, 0x01, 0x9c, 0xca, 0xe9, 0xab, 0x01, 0xd5, 0x3f, 0x38, 0x43, 0x0c, 0x5d, 0x03, 0xc1,
+ 0x10, 0xc3, 0x65, 0x03, 0xce, 0x10, 0x0b, 0x41, 0x91, 0x24, 0xc2, 0x3f, 0x24, 0x6a, 0x40, 0x75,
+ 0x06, 0xd1, 0x1a, 0x60, 0xda, 0x88, 0xd6, 0x30, 0x24, 0x62, 0x9d, 0x28, 0x0d, 0x24, 0x27, 0x75,
+ 0x32, 0x33, 0x13, 0x09, 0xd9, 0x95, 0xea, 0x00, 0x00, 0x54, 0x8a, 0xe3, 0xb5, 0x08, 0x9f, 0x34,
+ 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_ungroup_xpm[1] = {{ png, sizeof( png ), "group_ungroup_xpm" }};
diff --git a/bitmaps_png/cpp_24/import_hierarchical_label.cpp b/bitmaps_png/cpp_24/import_hierarchical_label.cpp
index be2903f5dd..9d0ff24186 100644
--- a/bitmaps_png/cpp_24/import_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_24/import_hierarchical_label.cpp
@@ -8,48 +8,48 @@
 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, 0x02, 0x89, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x95, 0xef, 0x6b, 0x52,
- 0x61, 0x14, 0xc7, 0xef, 0x1f, 0x51, 0xfd, 0x03, 0x95, 0xd2, 0xab, 0xea, 0x55, 0xaf, 0x82, 0x39,
- 0x22, 0xa8, 0xa0, 0x46, 0x98, 0xb5, 0x72, 0xd3, 0xdc, 0x5c, 0xd0, 0x0f, 0x2a, 0xa8, 0x18, 0x23,
- 0x16, 0x2a, 0x23, 0xda, 0x60, 0x1a, 0xd5, 0x98, 0x2d, 0x73, 0x54, 0x60, 0xa3, 0x55, 0x58, 0xdd,
- 0x85, 0x5a, 0xde, 0xcb, 0x5d, 0xa3, 0x91, 0xd5, 0x2a, 0x88, 0x6a, 0xd1, 0x20, 0x94, 0x82, 0x35,
- 0xc2, 0x69, 0x12, 0xd1, 0xea, 0x74, 0xcf, 0x19, 0x57, 0xef, 0xbd, 0x5e, 0xe7, 0xa3, 0xf4, 0xc0,
- 0x17, 0x1e, 0xcf, 0xf3, 0xdc, 0xef, 0xe7, 0xb9, 0xe7, 0x39, 0xe7, 0xca, 0xd9, 0x6c, 0xb6, 0xbc,
- 0xd5, 0x6a, 0x85, 0xff, 0x21, 0xf4, 0xe2, 0xf4, 0x03, 0x17, 0x5e, 0x4d, 0x8c, 0xd6, 0xac, 0x78,
- 0x34, 0x04, 0x8f, 0xee, 0x5f, 0xd5, 0xc4, 0xd0, 0xab, 0x2a, 0x20, 0x78, 0xa1, 0x07, 0xec, 0xfb,
- 0x9a, 0x49, 0xc2, 0xd8, 0x70, 0x05, 0xf3, 0x2b, 0xe0, 0x68, 0xb5, 0x83, 0xd3, 0x61, 0xd7, 0x40,
- 0x98, 0x00, 0x07, 0x3a, 0x5c, 0xe0, 0x6e, 0x73, 0xd2, 0xe6, 0xf3, 0x7d, 0x67, 0xca, 0xcc, 0xd1,
- 0x70, 0xd1, 0xbc, 0x85, 0x00, 0x6a, 0x48, 0x55, 0xc0, 0xd8, 0xed, 0xcb, 0xb4, 0x69, 0x20, 0xe0,
- 0x83, 0x23, 0x07, 0xdd, 0xd0, 0xe6, 0x72, 0xc0, 0xd4, 0x93, 0x92, 0xf9, 0xe3, 0x07, 0x61, 0x32,
- 0x46, 0x00, 0x9a, 0x26, 0xf9, 0xd2, 0xef, 0xc4, 0xbd, 0x50, 0x75, 0xc0, 0x59, 0x5f, 0x27, 0x6d,
- 0x42, 0xa3, 0x4b, 0x01, 0x2f, 0xcd, 0xa3, 0x23, 0x03, 0x8b, 0xe6, 0xb2, 0xa1, 0xfe, 0xc4, 0xca,
- 0x1b, 0x29, 0xf1, 0x25, 0x01, 0xcf, 0xa5, 0x11, 0x68, 0xb1, 0xef, 0x05, 0x77, 0xbb, 0x13, 0x26,
- 0x93, 0x91, 0xe2, 0xdb, 0x78, 0xbb, 0x4f, 0x96, 0x19, 0xd5, 0x05, 0x88, 0x0c, 0xfb, 0x0d, 0x4b,
- 0xaf, 0x79, 0xcf, 0x6e, 0x78, 0x26, 0xde, 0xa4, 0x3d, 0xfa, 0x94, 0xa8, 0x53, 0x56, 0x35, 0x45,
- 0x5d, 0xa7, 0x8e, 0xd2, 0x86, 0x8b, 0xfd, 0x1e, 0x08, 0x0f, 0x9e, 0x23, 0x9d, 0xee, 0x3c, 0x46,
- 0xb1, 0x6b, 0x43, 0x7d, 0x86, 0x27, 0x66, 0xbe, 0xe4, 0x89, 0xc4, 0x0d, 0xb9, 0x49, 0x76, 0x81,
- 0x6b, 0x7f, 0xab, 0x7c, 0xa9, 0xb7, 0x54, 0x97, 0x1e, 0xa4, 0x87, 0x4e, 0x1c, 0x3f, 0xa4, 0xa9,
- 0xa4, 0x49, 0xf1, 0x2e, 0xc4, 0xe3, 0x31, 0xc8, 0x64, 0x32, 0xb0, 0xb0, 0xf0, 0x1b, 0xfe, 0xc8,
- 0xfa, 0x59, 0x98, 0x07, 0x9e, 0xe7, 0x8d, 0x01, 0xe3, 0xb1, 0xeb, 0x10, 0x09, 0xfb, 0x81, 0x1f,
- 0x0d, 0x6a, 0x8c, 0x10, 0x86, 0xa9, 0x43, 0xe1, 0xfc, 0xf5, 0xd3, 0x3b, 0x30, 0xf7, 0xf5, 0x13,
- 0xfc, 0x9a, 0xfb, 0x0e, 0x33, 0xfe, 0x10, 0xa4, 0x76, 0xb8, 0x41, 0x5a, 0xbb, 0x85, 0x94, 0x6a,
- 0xea, 0x80, 0x99, 0x40, 0x08, 0x62, 0x2b, 0x37, 0xaf, 0xa8, 0xab, 0x93, 0xd1, 0x3c, 0x9f, 0x9d,
- 0x85, 0xd9, 0x87, 0x22, 0x48, 0xeb, 0xb7, 0x81, 0x60, 0xb2, 0x54, 0x52, 0x4e, 0x30, 0x37, 0x58,
- 0x6b, 0x06, 0xe0, 0xc9, 0xd1, 0x5c, 0x30, 0x37, 0x6a, 0x0c, 0xdf, 0x76, 0xf5, 0x92, 0x74, 0x90,
- 0xbf, 0x45, 0x08, 0x0b, 0xe0, 0xfd, 0x54, 0x82, 0xd2, 0x62, 0x74, 0xf2, 0x1f, 0xb9, 0x1c, 0x49,
- 0x1f, 0x17, 0x4d, 0x96, 0x79, 0x69, 0xd5, 0xc6, 0xe5, 0x4c, 0x80, 0x6f, 0x5f, 0x3e, 0x52, 0xce,
- 0x8d, 0x52, 0x52, 0x28, 0x14, 0x48, 0x46, 0x6b, 0xc9, 0xd5, 0x16, 0x2f, 0x13, 0x00, 0x2b, 0x24,
- 0xb5, 0xbd, 0xbd, 0x66, 0x80, 0x60, 0x6a, 0x7c, 0xc9, 0x04, 0xc0, 0x32, 0x94, 0xd6, 0x6d, 0x2d,
- 0xbd, 0xfe, 0x9a, 0x4d, 0x30, 0xbe, 0xa1, 0xa9, 0x0c, 0x80, 0x31, 0x5c, 0x53, 0x5f, 0x38, 0x3b,
- 0x40, 0x95, 0xff, 0xcf, 0x91, 0x28, 0xe5, 0xfd, 0xcd, 0xe1, 0xee, 0x22, 0x00, 0xe7, 0x18, 0xc3,
- 0x35, 0xf5, 0x3d, 0x70, 0x2c, 0xff, 0x68, 0xe9, 0x74, 0x9a, 0x6a, 0x5e, 0x79, 0xf0, 0x9d, 0x27,
- 0x40, 0xa6, 0x68, 0xa8, 0x00, 0x94, 0x39, 0xae, 0x69, 0x52, 0xc4, 0x3a, 0xe4, 0xb2, 0xf3, 0xa9,
- 0xf3, 0x3b, 0xdd, 0x3f, 0x54, 0x34, 0x57, 0x84, 0x31, 0x5d, 0x25, 0x79, 0x98, 0x01, 0xd8, 0xa1,
- 0xd4, 0x44, 0x15, 0x20, 0x7a, 0x73, 0x59, 0x59, 0xc1, 0xd4, 0xb0, 0x8c, 0xab, 0x65, 0x60, 0xf3,
- 0x50, 0x13, 0xa9, 0x8c, 0x3e, 0xf4, 0x0e, 0x92, 0xf4, 0x8d, 0x26, 0x97, 0xe8, 0x4e, 0xae, 0x9e,
- 0x81, 0x10, 0xbc, 0xbc, 0x25, 0x3e, 0x15, 0xd9, 0xba, 0xcd, 0x95, 0x81, 0x1d, 0x8a, 0x4d, 0x24,
- 0x9a, 0x2d, 0x2f, 0x64, 0xc3, 0x3c, 0x0a, 0xe7, 0x98, 0x73, 0x7d, 0x5a, 0xfe, 0x01, 0x8d, 0xa9,
- 0xda, 0xf6, 0x9b, 0xd2, 0xe7, 0x12, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0xf8, 0x00, 0x00, 0x02, 0x89, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x95, 0x5b, 0x6b, 0x13,
+ 0x51, 0x14, 0x85, 0xf3, 0x23, 0xd4, 0x3f, 0xa0, 0x26, 0xf8, 0xa4, 0x3e, 0xf9, 0x24, 0x34, 0x45,
+ 0x04, 0x15, 0xb4, 0x48, 0x2e, 0xad, 0x4d, 0xda, 0x52, 0xb4, 0x08, 0x55, 0xa1, 0x52, 0xc5, 0xd4,
+ 0x1b, 0xf1, 0x4e, 0x2a, 0x49, 0x44, 0x41, 0x41, 0xd3, 0xa4, 0x96, 0x18, 0xa3, 0x45, 0x69, 0x75,
+ 0x2c, 0x49, 0x6b, 0x67, 0x98, 0x7a, 0xc3, 0xa8, 0x55, 0x41, 0xbc, 0x61, 0x41, 0x12, 0x14, 0x6a,
+ 0x91, 0x34, 0x31, 0x88, 0x58, 0x5d, 0xce, 0x3e, 0x65, 0xd2, 0x99, 0xe9, 0x34, 0x99, 0x04, 0x0f,
+ 0x2c, 0x38, 0xd9, 0x27, 0xb3, 0xbe, 0x3d, 0xfb, 0xec, 0x9d, 0x98, 0x1c, 0x0e, 0x47, 0xde, 0x66,
+ 0xb3, 0xe1, 0x7f, 0x88, 0xbc, 0x4c, 0xda, 0x45, 0x07, 0x2f, 0x1f, 0xf6, 0x57, 0xac, 0xe4, 0x40,
+ 0x08, 0x23, 0x77, 0x7a, 0x54, 0x31, 0xf2, 0x2a, 0x0b, 0xb8, 0x16, 0xf6, 0xc3, 0xd5, 0xd8, 0x80,
+ 0xce, 0x8e, 0xf6, 0x12, 0xe6, 0x57, 0xd0, 0xdc, 0xe4, 0x42, 0x4b, 0xb3, 0x4b, 0x05, 0x31, 0x04,
+ 0xd8, 0xb7, 0xb7, 0x1d, 0x3b, 0xdb, 0x5a, 0xd9, 0x97, 0xc9, 0x48, 0x6b, 0x4e, 0x86, 0xb3, 0xe6,
+ 0x6e, 0x06, 0x50, 0x42, 0xca, 0x02, 0x84, 0xa1, 0x5e, 0xd8, 0xed, 0x36, 0x44, 0x7b, 0xfc, 0x68,
+ 0x6d, 0x69, 0x42, 0xf7, 0xa9, 0x83, 0x2a, 0xf3, 0xfb, 0x77, 0xc3, 0xcc, 0x98, 0x00, 0x64, 0x3a,
+ 0xca, 0xcd, 0x7d, 0x1e, 0x1e, 0x0c, 0x95, 0x07, 0x04, 0xbb, 0x8f, 0xa2, 0xa1, 0xde, 0x89, 0xa7,
+ 0xc2, 0x75, 0x9c, 0x3d, 0x7d, 0x08, 0x6e, 0x77, 0x23, 0x9e, 0x89, 0xf1, 0x59, 0x73, 0xc9, 0x50,
+ 0x9b, 0xb1, 0xfc, 0x46, 0x72, 0xbc, 0x24, 0x60, 0xfc, 0xc1, 0x4d, 0x96, 0xb5, 0x67, 0xff, 0x1e,
+ 0xf0, 0xf7, 0x22, 0x88, 0xf7, 0x06, 0xd9, 0x03, 0xb1, 0x48, 0x60, 0x9e, 0x51, 0x55, 0x80, 0xfe,
+ 0xe8, 0x79, 0xdd, 0xd6, 0x3b, 0xd0, 0xb9, 0xbb, 0x68, 0xa6, 0x2d, 0x89, 0xb2, 0x64, 0x65, 0x4b,
+ 0x74, 0xd8, 0xd3, 0x01, 0xb7, 0x6b, 0x1b, 0x78, 0x2e, 0xc2, 0xde, 0x80, 0xe4, 0x3b, 0xd9, 0x25,
+ 0xdd, 0x89, 0x1d, 0x62, 0xe2, 0xaa, 0x6e, 0xc6, 0x86, 0x2f, 0xf9, 0xd1, 0x48, 0x14, 0xf5, 0x4e,
+ 0x27, 0xce, 0x9c, 0xf0, 0xa8, 0x2e, 0x95, 0x32, 0xa6, 0xf3, 0x0b, 0x7e, 0xaf, 0x2a, 0xfe, 0x44,
+ 0xb8, 0x8d, 0x64, 0x32, 0x81, 0x4c, 0x26, 0x83, 0x99, 0x99, 0xdf, 0xf8, 0x23, 0xe9, 0x67, 0x61,
+ 0x1a, 0x1c, 0xc7, 0xe9, 0x03, 0xc6, 0x12, 0x7d, 0x88, 0x85, 0x03, 0xaa, 0x4c, 0x65, 0xdd, 0xe8,
+ 0x3b, 0x87, 0xc1, 0xf8, 0x45, 0xb6, 0x7f, 0xf5, 0xf8, 0x16, 0xa6, 0xbe, 0x7e, 0xc2, 0xaf, 0xa9,
+ 0xef, 0x98, 0x08, 0x84, 0x90, 0xda, 0xb2, 0x03, 0xe2, 0xca, 0x0d, 0x4c, 0xa9, 0xba, 0x36, 0x4c,
+ 0x04, 0x43, 0x48, 0x2c, 0x5d, 0xbf, 0xa4, 0xaa, 0x49, 0x26, 0xf3, 0x7c, 0x76, 0x12, 0x93, 0x43,
+ 0x02, 0xc4, 0xd5, 0x9b, 0xc0, 0x9b, 0xad, 0x0b, 0x29, 0xc7, 0x5b, 0x6a, 0x6c, 0x15, 0x03, 0x28,
+ 0x73, 0x32, 0xe7, 0x2d, 0xb5, 0x2a, 0xc3, 0x37, 0x5d, 0x3e, 0x26, 0x0d, 0xe4, 0x6f, 0x11, 0x62,
+ 0x04, 0xf0, 0x6e, 0x7c, 0x98, 0x95, 0x45, 0x2f, 0xf3, 0x1f, 0xb9, 0x1c, 0x93, 0x36, 0x2e, 0x98,
+ 0xad, 0xd3, 0xe2, 0xb2, 0xb5, 0x8b, 0x0d, 0x01, 0xbe, 0x7d, 0xf9, 0xc8, 0x6a, 0xae, 0x57, 0x92,
+ 0x42, 0xa1, 0xc0, 0xa4, 0x77, 0x36, 0xba, 0xdc, 0x7a, 0xcc, 0x10, 0x80, 0x3a, 0x24, 0xb5, 0x79,
+ 0x7b, 0xc5, 0x00, 0xde, 0x5c, 0xfb, 0xc2, 0x10, 0x80, 0xda, 0x50, 0x5c, 0xb5, 0x71, 0xee, 0xf5,
+ 0x57, 0xac, 0xc3, 0xd8, 0x9a, 0xba, 0x79, 0x00, 0x8a, 0xd1, 0x99, 0xf2, 0xc2, 0x8d, 0x03, 0x14,
+ 0xf5, 0xff, 0x1c, 0x1b, 0x60, 0x75, 0x7f, 0xbd, 0xeb, 0x48, 0x11, 0x40, 0x7b, 0x8a, 0xd1, 0x99,
+ 0xf2, 0x1e, 0x4c, 0x46, 0xfe, 0xd1, 0xd2, 0xe9, 0x34, 0xeb, 0x79, 0xf9, 0xc1, 0xb7, 0xde, 0x20,
+ 0x33, 0x25, 0x43, 0x19, 0x20, 0xef, 0xe9, 0x4c, 0x55, 0x22, 0xa3, 0x4b, 0x6a, 0xbb, 0xe3, 0xca,
+ 0xfa, 0x7e, 0xf0, 0x5f, 0x2e, 0x9a, 0xcb, 0xa2, 0x98, 0xa6, 0x93, 0xbc, 0x86, 0x01, 0x34, 0xa1,
+ 0x6c, 0x88, 0x16, 0x80, 0x68, 0xcd, 0x25, 0x65, 0x79, 0x73, 0xcd, 0x22, 0x53, 0x25, 0x8b, 0x86,
+ 0x87, 0x0d, 0x91, 0xc2, 0xe8, 0xbd, 0xef, 0x12, 0x93, 0x76, 0xd0, 0xa4, 0x16, 0xdd, 0x6a, 0xaa,
+ 0x66, 0x11, 0x84, 0x2e, 0xaf, 0xc4, 0x4f, 0x45, 0xb6, 0x6a, 0x73, 0x79, 0xd1, 0x84, 0xd2, 0x10,
+ 0x09, 0x16, 0xeb, 0x73, 0xc9, 0x30, 0x4f, 0xa2, 0x3d, 0xd5, 0x5c, 0x5b, 0x96, 0x7f, 0x19, 0xeb,
+ 0xe0, 0xf4, 0x58, 0xc1, 0x19, 0x71, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
  0x60, 0x82,
 };
 
diff --git a/bitmaps_png/cpp_24/mirror_h.cpp b/bitmaps_png/cpp_24/mirror_h.cpp
index 2e0ae1dc7d..c9e3676493 100644
--- a/bitmaps_png/cpp_24/mirror_h.cpp
+++ b/bitmaps_png/cpp_24/mirror_h.cpp
@@ -8,41 +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, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 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, 0x00, 0x0d, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x61, 0x64, 0x64, 0x5f, 0x61, 0x72, 0x63,
- 0x16, 0x64, 0x63, 0xf9, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79,
- 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75,
- 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65, 0x20,
- 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65, 0x63,
- 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e,
- 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3, 0x54,
- 0x62, 0x05, 0x00, 0x00, 0x01, 0x66, 0x49, 0x44, 0x41, 0x54, 0x48, 0x89, 0xe5, 0xd4, 0xbf, 0x4a,
- 0xc3, 0x50, 0x14, 0xc7, 0xf1, 0xef, 0x4d, 0x69, 0x91, 0xe2, 0x12, 0x44, 0xa4, 0x4d, 0x07, 0x8b,
- 0x8e, 0x05, 0x67, 0x9d, 0xfd, 0x33, 0x5a, 0x37, 0xa5, 0x83, 0xa2, 0x28, 0x2a, 0x4a, 0xa5, 0x11,
- 0x5c, 0x63, 0x07, 0xe7, 0x86, 0x40, 0xa1, 0xaf, 0x90, 0x97, 0xe8, 0x20, 0x16, 0x7d, 0x02, 0x9f,
- 0xa0, 0xef, 0x50, 0x5a, 0x7b, 0x8f, 0x8b, 0x96, 0x96, 0xa6, 0x69, 0xd2, 0x16, 0x1c, 0x3c, 0x53,
- 0x72, 0xef, 0xc9, 0xef, 0x43, 0x12, 0xce, 0x85, 0x7f, 0x53, 0xae, 0xeb, 0xee, 0xfc, 0x5e, 0x5b,
- 0xd5, 0xb7, 0xed, 0xa8, 0xcf, 0x19, 0x51, 0x1b, 0x45, 0xc4, 0x1e, 0xba, 0xb1, 0x43, 0x5a, 0xe3,
- 0x03, 0x9e, 0xe7, 0xe5, 0x81, 0xc3, 0x41, 0x3e, 0x14, 0x73, 0x4e, 0x6b, 0x73, 0x61, 0x80, 0xd6,
- 0xda, 0x06, 0x12, 0x43, 0x4b, 0x09, 0x8d, 0x2e, 0x2f, 0x04, 0xa8, 0xd7, 0xeb, 0xa6, 0x88, 0x9c,
- 0x8e, 0x6d, 0x28, 0xce, 0xad, 0x97, 0x8f, 0x95, 0xb9, 0x81, 0x6e, 0xb7, 0x7b, 0x03, 0x2c, 0x07,
- 0x6c, 0xa5, 0x75, 0xaf, 0x77, 0x35, 0x17, 0xe0, 0x38, 0x4e, 0x0a, 0xb8, 0x9b, 0xb4, 0xaf, 0xa0,
- 0xbc, 0xee, 0x34, 0x97, 0x66, 0x06, 0x4c, 0xd3, 0x2c, 0x01, 0x99, 0x90, 0x96, 0xb5, 0x9e, 0x91,
- 0x3a, 0x9e, 0x19, 0xd0, 0x3a, 0xc2, 0x8f, 0x14, 0xb1, 0x11, 0x51, 0xb1, 0x81, 0x5a, 0xad, 0x76,
- 0xa0, 0x94, 0xda, 0x9a, 0x9a, 0x0f, 0x85, 0xec, 0x73, 0x6b, 0x2f, 0x36, 0x00, 0x44, 0x1e, 0x26,
- 0x8c, 0xc9, 0x83, 0x17, 0x08, 0xb8, 0xae, 0x5b, 0x00, 0x76, 0x23, 0x03, 0xc2, 0xbe, 0x55, 0x7d,
- 0x0d, 0x7c, 0xdb, 0x40, 0x40, 0x6b, 0xfd, 0x08, 0x4c, 0xfc, 0xae, 0x81, 0x86, 0x56, 0x0f, 0x91,
- 0x00, 0xcf, 0xf3, 0xb2, 0x4a, 0xa9, 0x93, 0x38, 0xe1, 0x00, 0x28, 0x4a, 0x96, 0xf3, 0x9e, 0x9b,
- 0x0a, 0xf4, 0xfb, 0xfd, 0x7b, 0x20, 0x15, 0x1b, 0x80, 0x24, 0xea, 0xeb, 0x36, 0x14, 0x68, 0x34,
- 0x1a, 0x69, 0xe0, 0x72, 0x86, 0x70, 0x00, 0x04, 0xae, 0x57, 0x9d, 0xe6, 0xc8, 0xd4, 0x8f, 0x00,
- 0x9d, 0x4e, 0xe7, 0x02, 0x98, 0x7a, 0xbe, 0x84, 0x94, 0x99, 0x34, 0x92, 0x67, 0x81, 0x80, 0xef,
- 0xfb, 0x09, 0x11, 0x89, 0x74, 0x42, 0x86, 0x96, 0x50, 0xc1, 0xf7, 0x07, 0x27, 0xef, 0x00, 0x68,
- 0xb7, 0xdb, 0x47, 0xc0, 0xc6, 0xdc, 0x00, 0xe4, 0x33, 0x9f, 0x56, 0x71, 0x0c, 0x50, 0x4a, 0x55,
- 0x16, 0x10, 0xfe, 0x13, 0x2a, 0x4f, 0x8b, 0xca, 0xfa, 0xfb, 0xfa, 0x06, 0x26, 0xf9, 0x62, 0x2f,
- 0x68, 0xc5, 0xcd, 0x66, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x32, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x31, 0x60,
+ 0xe2, 0xc4, 0x89, 0x56, 0x30, 0xb6, 0x74, 0xd3, 0x51, 0x4b, 0xaa, 0x5b, 0x30, 0x61, 0xc2, 0x84,
+ 0xb5, 0x70, 0x0b, 0x1a, 0x8f, 0xac, 0xa1, 0xaa, 0xe1, 0x93, 0x27, 0x4f, 0x56, 0x04, 0x5a, 0xf0,
+ 0x07, 0xc6, 0x97, 0x6a, 0x3c, 0xf2, 0x47, 0xa6, 0xe1, 0x98, 0x0a, 0x35, 0x83, 0x67, 0x0a, 0xd0,
+ 0x82, 0xff, 0x48, 0x16, 0xfc, 0x97, 0x6a, 0x38, 0x32, 0x99, 0x2a, 0x86, 0x4f, 0x9b, 0x36, 0x4d,
+ 0x10, 0x68, 0xf8, 0x67, 0x0c, 0x0b, 0x1a, 0x8f, 0x7c, 0x95, 0x6e, 0x3b, 0x29, 0x4c, 0x8d, 0xb0,
+ 0xaf, 0x02, 0x19, 0x8e, 0xc5, 0x82, 0xff, 0x92, 0x8d, 0x47, 0x2a, 0x29, 0x32, 0xbc, 0xa1, 0xa1,
+ 0x81, 0x0d, 0x68, 0xf0, 0x33, 0x5c, 0x16, 0x00, 0xf1, 0x0b, 0x85, 0x86, 0xfd, 0x1c, 0x94, 0x84,
+ 0x7d, 0x22, 0xcc, 0x70, 0x1c, 0x16, 0xfc, 0x07, 0x26, 0xd9, 0x04, 0xb2, 0x2d, 0xe8, 0xef, 0xef,
+ 0xbf, 0x40, 0xd0, 0x82, 0xc6, 0x23, 0x97, 0x19, 0xfe, 0xff, 0x67, 0x24, 0x27, 0xec, 0xdd, 0x91,
+ 0x0d, 0xc7, 0x65, 0x01, 0x24, 0x45, 0x1d, 0x75, 0x23, 0xc7, 0x82, 0x5d, 0x44, 0x5b, 0xd0, 0x74,
+ 0x64, 0x27, 0xa9, 0x61, 0xaf, 0x03, 0x34, 0xf0, 0x1f, 0xd1, 0x16, 0x80, 0xe3, 0xe2, 0xb0, 0x3e,
+ 0x29, 0x61, 0xbf, 0x00, 0xdd, 0x70, 0x42, 0x16, 0x00, 0x33, 0xde, 0x7c, 0x62, 0x8b, 0x05, 0x29,
+ 0xa0, 0x61, 0x3f, 0x49, 0xb6, 0xa0, 0xf1, 0xc8, 0x2f, 0xe9, 0x86, 0x13, 0x32, 0xc4, 0x84, 0x7d,
+ 0x3b, 0x36, 0xc3, 0x89, 0xb0, 0x00, 0x94, 0xa2, 0xda, 0xf0, 0x1a, 0x3e, 0x73, 0xe6, 0x4c, 0x2e,
+ 0xa0, 0x41, 0x6f, 0xc8, 0xb5, 0x00, 0x88, 0xdf, 0x89, 0x36, 0xec, 0xe7, 0xc1, 0x17, 0xb9, 0xb9,
+ 0xb8, 0x0c, 0x27, 0xd2, 0x02, 0x50, 0x8a, 0xca, 0xc1, 0x6a, 0xf8, 0xaa, 0x55, 0xab, 0x98, 0x81,
+ 0x86, 0xdc, 0xa1, 0xd8, 0x82, 0xc6, 0x23, 0xf7, 0x80, 0x86, 0x31, 0x63, 0x4b, 0x39, 0x21, 0xf8,
+ 0x0c, 0x27, 0xc1, 0x02, 0x60, 0x21, 0x78, 0x34, 0x18, 0x5b, 0xe4, 0x1e, 0xa3, 0x96, 0x05, 0xc0,
+ 0xc8, 0x3e, 0x35, 0x7c, 0x1a, 0x0b, 0x00, 0x29, 0x6e, 0xf0, 0xe5, 0x11, 0x92, 0x09, 0xac, 0x00,
+ 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE mirror_h_xpm[1] = {{ png, sizeof( png ), "mirror_h_xpm" }};
diff --git a/bitmaps_png/cpp_24/mirror_v.cpp b/bitmaps_png/cpp_24/mirror_v.cpp
index 29660e1a76..3dc8b77c80 100644
--- a/bitmaps_png/cpp_24/mirror_v.cpp
+++ b/bitmaps_png/cpp_24/mirror_v.cpp
@@ -8,41 +8,23 @@
 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, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 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, 0x00, 0x0e, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f,
- 0x68, 0x1c, 0x96, 0x58, 0x4c, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70,
- 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62,
- 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65,
- 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65,
- 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65,
- 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3,
- 0x54, 0x62, 0x05, 0x00, 0x00, 0x01, 0x63, 0x49, 0x44, 0x41, 0x54, 0x48, 0x89, 0xdd, 0x94, 0xc1,
- 0x4a, 0x02, 0x51, 0x14, 0x86, 0xff, 0xa3, 0x33, 0x05, 0x2d, 0x7c, 0x80, 0xde, 0xa0, 0x27, 0x68,
- 0xa8, 0x08, 0x5a, 0x35, 0x4f, 0xe0, 0xde, 0xbd, 0xca, 0xcc, 0x22, 0x18, 0x82, 0xcc, 0x36, 0x91,
- 0x0c, 0x85, 0x22, 0x85, 0x42, 0x0b, 0x09, 0x5a, 0x44, 0x9b, 0x02, 0x71, 0xd5, 0xc2, 0x45, 0xd2,
- 0xa2, 0x56, 0x45, 0x50, 0x6d, 0x6c, 0xa1, 0x86, 0x8b, 0x16, 0x09, 0xc6, 0x45, 0xf2, 0x9e, 0x16,
- 0x35, 0x31, 0x0b, 0x91, 0x51, 0x67, 0xa0, 0xfa, 0x56, 0x07, 0xee, 0xbd, 0xff, 0x77, 0x39, 0xdc,
- 0x7b, 0x80, 0xbf, 0x4e, 0xd8, 0x29, 0xb2, 0xd9, 0xec, 0x8d, 0xae, 0xeb, 0x42, 0xd3, 0xb4, 0xfb,
- 0x6a, 0xb5, 0x2a, 0xfd, 0x12, 0x90, 0x4b, 0xc0, 0xdf, 0x65, 0x1d, 0x40, 0x51, 0x08, 0x51, 0xb0,
- 0x2c, 0xeb, 0x2d, 0x08, 0x81, 0x43, 0x07, 0x40, 0x29, 0x14, 0x0a, 0xd9, 0xc9, 0x64, 0xb2, 0x11,
- 0x84, 0xc0, 0xa1, 0x07, 0xe0, 0x1c, 0x80, 0x6d, 0x18, 0xc6, 0x75, 0x10, 0x02, 0x37, 0x35, 0x29,
- 0x65, 0xc6, 0x34, 0xcd, 0x32, 0x11, 0x79, 0xd9, 0x3f, 0xb2, 0xe0, 0xeb, 0x10, 0xd1, 0x13, 0x80,
- 0x83, 0x48, 0x24, 0x52, 0x8c, 0xc5, 0x62, 0xc2, 0x77, 0x81, 0x8b, 0x36, 0x33, 0x17, 0x54, 0x55,
- 0xcd, 0xc7, 0xe3, 0xf1, 0xd7, 0x20, 0x04, 0x0e, 0x82, 0x99, 0x4f, 0x15, 0x45, 0xd9, 0x4e, 0x24,
- 0x12, 0x0f, 0x41, 0x08, 0x1c, 0x24, 0x80, 0x0a, 0x33, 0xe7, 0x4c, 0xd3, 0xbc, 0xf0, 0x21, 0xef,
- 0x17, 0xf0, 0xd3, 0xa2, 0xd9, 0xad, 0x4b, 0x7f, 0x5a, 0x44, 0x54, 0x01, 0xfa, 0x3b, 0xad, 0xd4,
- 0x72, 0x0d, 0x00, 0x14, 0x1f, 0x42, 0x01, 0xa0, 0x4b, 0x4c, 0xc7, 0x1c, 0xe6, 0xbd, 0xd6, 0xc6,
- 0xe2, 0xa3, 0x7b, 0x61, 0x52, 0x41, 0x1b, 0xe0, 0x02, 0xa9, 0x53, 0xf9, 0xe6, 0xfa, 0xfc, 0xc0,
- 0x67, 0x3a, 0xae, 0xe0, 0x96, 0x89, 0xf7, 0xa7, 0xe5, 0xc7, 0xd1, 0x73, 0x7a, 0x65, 0xe8, 0x47,
- 0x1b, 0x55, 0x50, 0x03, 0x38, 0xd3, 0x4a, 0x2d, 0x95, 0xe1, 0x71, 0x54, 0x78, 0x11, 0xf4, 0x08,
- 0x74, 0x42, 0x44, 0x76, 0x23, 0xb5, 0x70, 0x07, 0x00, 0xd8, 0xf4, 0x7e, 0xa3, 0x61, 0x82, 0x0e,
- 0x98, 0x4b, 0x04, 0xd5, 0x6e, 0xa6, 0xb5, 0xb1, 0xc7, 0xf5, 0x20, 0x41, 0x9d, 0xc1, 0x39, 0x39,
- 0xf3, 0x7e, 0xd8, 0x5e, 0x5b, 0xed, 0x8e, 0x1b, 0x3c, 0x48, 0x70, 0xc5, 0xa0, 0xdd, 0x97, 0xb9,
- 0xe6, 0x19, 0xa2, 0xd1, 0xfe, 0xa4, 0xc1, 0xff, 0x87, 0x4f, 0x3d, 0xf3, 0x8e, 0xc2, 0x6f, 0x6e,
- 0xfd, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x00, 0xf6, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x36, 0x60,
+ 0xc2, 0x84, 0x09, 0x67, 0x80, 0x38, 0xae, 0xa1, 0xa1, 0x81, 0x85, 0x56, 0x16, 0xfc, 0x87, 0xe2,
+ 0x7b, 0x40, 0x5c, 0xde, 0xd1, 0xd1, 0xc1, 0x4f, 0x2b, 0x0b, 0x60, 0xf8, 0x23, 0x10, 0x4f, 0x9c,
+ 0x34, 0x69, 0x92, 0x0c, 0xad, 0x2c, 0x80, 0xe1, 0x9f, 0x40, 0xbc, 0x0a, 0x88, 0x4d, 0x69, 0x65,
+ 0x01, 0x32, 0x3e, 0xd2, 0xd7, 0xd7, 0xe7, 0xfb, 0xff, 0xff, 0x7f, 0x46, 0x5a, 0x59, 0x00, 0xc6,
+ 0x13, 0x27, 0x4e, 0xbc, 0x09, 0xc4, 0xf9, 0xf3, 0xe7, 0xcf, 0xe7, 0xa0, 0x89, 0x05, 0x48, 0xf8,
+ 0x45, 0x7f, 0x7f, 0x7f, 0xc3, 0x94, 0x29, 0x53, 0x84, 0x69, 0x65, 0x01, 0x0c, 0x7f, 0x07, 0x5a,
+ 0xb4, 0x68, 0xf2, 0xe4, 0xc9, 0x1a, 0xb4, 0xb2, 0x00, 0x86, 0xff, 0x02, 0xf1, 0x66, 0xa0, 0x65,
+ 0x2e, 0x0c, 0xc3, 0x0f, 0x48, 0x35, 0x1e, 0xf9, 0x4f, 0x05, 0xfc, 0x57, 0xaa, 0xe9, 0xe8, 0x66,
+ 0xa9, 0xa6, 0x43, 0xd6, 0xd4, 0xb6, 0xe0, 0x8b, 0x74, 0xc3, 0xd1, 0x99, 0x52, 0xcd, 0x47, 0xd4,
+ 0xa9, 0xed, 0x83, 0x17, 0x52, 0x8d, 0x87, 0x1b, 0xa4, 0xdb, 0x4e, 0x0a, 0x53, 0x3b, 0x88, 0x2e,
+ 0x4a, 0x36, 0x1d, 0x4e, 0x53, 0x68, 0xd8, 0xcf, 0x41, 0xed, 0x38, 0x38, 0x02, 0x74, 0xb1, 0x2f,
+ 0x03, 0x39, 0x45, 0x05, 0x1e, 0x43, 0x7f, 0x4a, 0x37, 0x1e, 0x5d, 0x24, 0xd3, 0x74, 0x4c, 0x97,
+ 0xda, 0xa9, 0xe8, 0xa3, 0x54, 0xc3, 0xe1, 0x89, 0xd2, 0x0d, 0x27, 0x64, 0xa8, 0x9d, 0x4c, 0xef,
+ 0x49, 0x36, 0x1e, 0xce, 0x17, 0xef, 0xde, 0xc9, 0x4d, 0xed, 0x7c, 0x70, 0x4c, 0xb2, 0xf1, 0x68,
+ 0x30, 0xc3, 0xaa, 0x55, 0xcc, 0x0c, 0xa3, 0x00, 0x09, 0x00, 0x00, 0xa5, 0x28, 0xf4, 0x54, 0x06,
+ 0xc7, 0x12, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE mirror_v_xpm[1] = {{ png, sizeof( png ), "mirror_v_xpm" }};
diff --git a/bitmaps_png/cpp_24/options_pad.cpp b/bitmaps_png/cpp_24/options_pad.cpp
index 074b8ca016..19c8e69a65 100644
--- a/bitmaps_png/cpp_24/options_pad.cpp
+++ b/bitmaps_png/cpp_24/options_pad.cpp
@@ -8,60 +8,68 @@
 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, 0x03, 0x38, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x55, 0xeb, 0x4b, 0x14,
- 0x51, 0x14, 0x3f, 0x45, 0x9f, 0x52, 0x7a, 0x11, 0x14, 0x15, 0x41, 0xd1, 0xce, 0x6a, 0x96, 0x64,
- 0x0a, 0x51, 0xa6, 0xed, 0x6c, 0x7d, 0x88, 0x5e, 0x98, 0x41, 0x49, 0x2a, 0xe6, 0x87, 0x82, 0x88,
- 0xea, 0x2f, 0x50, 0x08, 0x8c, 0xc0, 0x55, 0x77, 0x67, 0xd4, 0x62, 0x09, 0xbf, 0x04, 0x7d, 0xac,
- 0x40, 0x88, 0x1e, 0xc4, 0xee, 0xba, 0xca, 0x96, 0x16, 0x2a, 0xa6, 0x28, 0x28, 0x5a, 0x04, 0x3e,
- 0xd7, 0xd6, 0xf5, 0x9d, 0xb2, 0x73, 0x3b, 0x67, 0x76, 0x66, 0x9b, 0x19, 0x67, 0x7d, 0x54, 0x17,
- 0x0e, 0x3b, 0x3b, 0xf7, 0xde, 0xdf, 0xef, 0x3c, 0x7e, 0xe7, 0x0c, 0x40, 0x9c, 0x35, 0xe1, 0x84,
- 0xa3, 0x93, 0x02, 0x54, 0xa2, 0xb5, 0xa0, 0x0d, 0xa0, 0xf5, 0xa1, 0x75, 0xcb, 0xff, 0x45, 0x78,
- 0x18, 0x12, 0x21, 0x0d, 0xfe, 0x66, 0x4d, 0xd6, 0x00, 0x37, 0x25, 0xc2, 0x5b, 0x04, 0x6a, 0x08,
- 0xbb, 0xa0, 0x60, 0xda, 0x05, 0x3b, 0xb4, 0xfb, 0xd3, 0xb5, 0xb0, 0x13, 0xf7, 0x8a, 0xd0, 0xfc,
- 0x48, 0xf4, 0x2a, 0x2c, 0x80, 0x65, 0xd5, 0xe0, 0x53, 0x2e, 0xb8, 0x42, 0x5e, 0xe2, 0xa5, 0x73,
- 0x72, 0x14, 0x8f, 0x61, 0x6b, 0x58, 0x84, 0x7c, 0x7c, 0xe7, 0x40, 0x73, 0xe3, 0xfb, 0xb2, 0x29,
- 0x01, 0xf2, 0x7e, 0xba, 0x61, 0x33, 0xed, 0xd3, 0x39, 0xed, 0xf9, 0xe5, 0xc1, 0x45, 0xc8, 0xc5,
- 0x83, 0xad, 0x33, 0xd5, 0xb0, 0x6b, 0xb4, 0x16, 0x12, 0xd1, 0xbb, 0x0a, 0xbc, 0x3c, 0x87, 0xc6,
- 0x8c, 0x86, 0x24, 0x33, 0xf8, 0xfb, 0x68, 0xd8, 0x01, 0x09, 0x4a, 0x44, 0xed, 0xcb, 0x92, 0x50,
- 0x98, 0xe4, 0x09, 0x81, 0xcf, 0x8a, 0xb0, 0x07, 0xc1, 0x3b, 0xcd, 0x80, 0x8d, 0x86, 0xf7, 0xda,
- 0x66, 0xab, 0x60, 0xb7, 0x42, 0xd2, 0x1d, 0xae, 0x82, 0x03, 0xe6, 0x79, 0x17, 0xe0, 0x0d, 0x79,
- 0x40, 0x1e, 0xe1, 0x73, 0x97, 0x09, 0xd8, 0x3c, 0xda, 0x38, 0xda, 0x82, 0x09, 0x49, 0x2b, 0xdd,
- 0xc3, 0x54, 0x9e, 0xc7, 0xff, 0x2f, 0xe3, 0xa9, 0xa5, 0x41, 0x26, 0x8a, 0xa6, 0x45, 0x0b, 0x10,
- 0x44, 0x80, 0xc2, 0x41, 0x37, 0x6c, 0xa4, 0x7d, 0x39, 0x75, 0x02, 0x14, 0xa3, 0x0d, 0xe9, 0xce,
- 0xa1, 0xaa, 0x14, 0x47, 0xfd, 0xd3, 0x4e, 0x38, 0x62, 0xf4, 0xde, 0x41, 0x6a, 0x09, 0x39, 0x61,
- 0x8b, 0x92, 0xdb, 0x18, 0xf8, 0x44, 0x35, 0xec, 0x8b, 0x23, 0xe1, 0xfd, 0xb8, 0x3f, 0xa8, 0xad,
- 0xc9, 0xb8, 0x08, 0x9b, 0xc8, 0x19, 0x12, 0x82, 0x91, 0xa0, 0x85, 0x72, 0xa8, 0xa8, 0x45, 0x1b,
- 0x7a, 0xe1, 0xb2, 0x72, 0x8e, 0x46, 0xa2, 0x2d, 0xfc, 0x55, 0xaa, 0x21, 0x3e, 0x37, 0xeb, 0xd5,
- 0x23, 0xc0, 0x77, 0x35, 0x12, 0x6d, 0xce, 0xd5, 0xb4, 0xc4, 0x5b, 0xb4, 0x8f, 0xe7, 0x22, 0x26,
- 0x69, 0xea, 0x31, 0x7a, 0xd2, 0xaf, 0xfc, 0x3e, 0x8d, 0x1d, 0x76, 0xc1, 0xc8, 0x6a, 0xfa, 0xa6,
- 0xaf, 0x78, 0xef, 0xa4, 0x97, 0xe3, 0x19, 0x99, 0x3f, 0x25, 0x7b, 0xce, 0x9b, 0x62, 0xa3, 0x1a,
- 0x0d, 0x18, 0x09, 0xe4, 0x17, 0x08, 0x5a, 0xae, 0x89, 0x60, 0x81, 0x0a, 0xba, 0x52, 0x04, 0x1d,
- 0x17, 0x93, 0x23, 0x2a, 0x81, 0x4c, 0x72, 0x28, 0x2b, 0x95, 0x6a, 0x63, 0x4c, 0xd1, 0x17, 0xb3,
- 0x1a, 0x60, 0xc8, 0x37, 0x8c, 0xa0, 0x5e, 0xab, 0x2d, 0xc3, 0xc7, 0xf1, 0x2f, 0xbc, 0x9c, 0x2d,
- 0xa7, 0xe3, 0x52, 0x72, 0x9d, 0xff, 0x70, 0x16, 0xd3, 0x11, 0x1c, 0xcc, 0x6e, 0xfa, 0x71, 0x7f,
- 0x7b, 0x0f, 0x3e, 0xd7, 0x78, 0x38, 0xfe, 0x19, 0x03, 0x58, 0xa7, 0x4a, 0xb3, 0x08, 0x9b, 0x64,
- 0x9b, 0x41, 0x45, 0x43, 0xa4, 0x16, 0x15, 0x9c, 0x0e, 0x23, 0x70, 0x8b, 0x16, 0x70, 0x45, 0xb3,
- 0xda, 0xf2, 0xd5, 0x3e, 0xf0, 0xc7, 0xe9, 0x83, 0x41, 0x8a, 0x84, 0xd2, 0xe1, 0xb1, 0xf0, 0xb9,
- 0x46, 0x00, 0x5f, 0x92, 0x8d, 0x75, 0xdd, 0xbc, 0xc5, 0xfa, 0x1e, 0x94, 0xcf, 0x04, 0x4e, 0x5d,
- 0x0b, 0x99, 0x90, 0xf4, 0xeb, 0x3a, 0x59, 0x69, 0xa4, 0xaf, 0x26, 0x9d, 0x2c, 0x8d, 0x94, 0x26,
- 0x04, 0x03, 0xe9, 0xc7, 0x25, 0x2d, 0xc0, 0x48, 0x7d, 0x3d, 0x53, 0x97, 0xb4, 0xb8, 0xc8, 0xda,
- 0x0b, 0xee, 0xc5, 0x6a, 0x82, 0x29, 0x8a, 0xf8, 0xac, 0x7c, 0x49, 0x74, 0x16, 0xe1, 0x0c, 0x41,
- 0x4f, 0x7b, 0xa9, 0x16, 0xf2, 0x2c, 0x32, 0x27, 0x61, 0xa1, 0xf2, 0x0d, 0xac, 0x21, 0x25, 0x5b,
- 0x06, 0xf8, 0x78, 0xf2, 0x2c, 0x33, 0xae, 0xa0, 0x27, 0xa0, 0xf1, 0xde, 0x5e, 0xa1, 0x57, 0x93,
- 0x13, 0x72, 0x68, 0x2a, 0x12, 0x89, 0x12, 0x89, 0xc3, 0x50, 0x13, 0x36, 0x51, 0xb9, 0x3e, 0x46,
- 0x10, 0x38, 0x71, 0x61, 0xce, 0x48, 0x30, 0xf6, 0xbe, 0xf1, 0x4f, 0xfa, 0x38, 0xbe, 0x76, 0x69,
- 0x77, 0x12, 0x09, 0x46, 0x42, 0x83, 0x2b, 0xf6, 0x3d, 0x10, 0xe0, 0x3a, 0x49, 0x78, 0xb8, 0x24,
- 0xf1, 0x79, 0x53, 0x5a, 0xe6, 0xa8, 0x2e, 0x45, 0xaf, 0x3d, 0x92, 0x0a, 0x1e, 0x99, 0xff, 0xc5,
- 0x5a, 0xf3, 0xee, 0xea, 0x6b, 0xc4, 0xf1, 0xee, 0xa5, 0xa3, 0x9b, 0xd2, 0x85, 0x35, 0x41, 0x6b,
- 0xa4, 0x71, 0x41, 0xed, 0x4f, 0xef, 0x7d, 0x9c, 0xfd, 0xf2, 0xd2, 0x22, 0xdb, 0xa5, 0xce, 0x3b,
- 0xa5, 0x52, 0x6f, 0x59, 0x35, 0xfb, 0x74, 0xa6, 0x40, 0x8a, 0x5b, 0x64, 0xb3, 0x45, 0x53, 0x51,
- 0x6e, 0x3e, 0x17, 0x7c, 0xa6, 0x71, 0x82, 0xd1, 0x7d, 0x6b, 0xce, 0xcc, 0x58, 0x58, 0x93, 0x4c,
- 0x39, 0x5b, 0xde, 0x9a, 0xbe, 0xd7, 0x9e, 0x24, 0x3e, 0x1d, 0x95, 0xf1, 0x0e, 0x2f, 0x16, 0x45,
- 0x8d, 0x0f, 0xea, 0x22, 0xc2, 0x3d, 0x94, 0xf3, 0x31, 0x52, 0x8f, 0xd7, 0x62, 0x7b, 0x22, 0x37,
- 0xda, 0xbf, 0x2c, 0x9f, 0x85, 0xaf, 0xd3, 0x12, 0x7c, 0xb0, 0x9e, 0x4e, 0x85, 0xff, 0xb9, 0x7c,
- 0x56, 0xfb, 0x6d, 0x04, 0x56, 0x73, 0x3f, 0x46, 0xc3, 0xce, 0x78, 0xe6, 0x37, 0x06, 0x1f, 0x43,
- 0xf6, 0xd7, 0x1a, 0x8f, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
+ 0xf8, 0x00, 0x00, 0x03, 0xc5, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xa5, 0x56, 0x5b, 0x6c, 0x0c,
+ 0x61, 0x14, 0x3e, 0x1e, 0x78, 0x70, 0xe7, 0xa5, 0x82, 0x07, 0x04, 0x71, 0x8d, 0x6b, 0xc4, 0x93,
+ 0xc4, 0x3d, 0x68, 0xc4, 0x25, 0xee, 0xaa, 0x6e, 0x89, 0x17, 0xa4, 0x84, 0x07, 0x1e, 0x10, 0x2a,
+ 0xa2, 0x4b, 0xbb, 0xbb, 0x45, 0x94, 0x26, 0x2e, 0x0f, 0x12, 0x75, 0x8f, 0x04, 0xd1, 0x26, 0xb4,
+ 0x25, 0xa9, 0x45, 0x8b, 0x5e, 0xe9, 0xb6, 0xd5, 0xa6, 0x76, 0x95, 0x6e, 0xf7, 0x32, 0xb7, 0xdd,
+ 0xd9, 0x99, 0xfd, 0x9d, 0x33, 0xdd, 0x1d, 0xb3, 0xd3, 0xdd, 0x2a, 0xfe, 0xe4, 0x64, 0x76, 0xe6,
+ 0xfc, 0x73, 0xbe, 0x73, 0xbe, 0xf3, 0x9d, 0x7f, 0x16, 0x20, 0xc9, 0xf2, 0xe5, 0xc0, 0xcc, 0x80,
+ 0x0d, 0xce, 0xa3, 0x39, 0xd0, 0x9a, 0xd0, 0x9c, 0x68, 0xb5, 0xda, 0xbd, 0x1d, 0x4e, 0x7b, 0xed,
+ 0x30, 0x03, 0xfe, 0x65, 0x05, 0x2e, 0xc0, 0x78, 0xce, 0x0e, 0xcf, 0x30, 0x50, 0xb1, 0xdf, 0x0a,
+ 0x5b, 0x79, 0x2b, 0xa4, 0x18, 0xfd, 0xfc, 0x45, 0x18, 0x86, 0xbe, 0x74, 0xb4, 0x12, 0x04, 0x7a,
+ 0xe0, 0xb7, 0xc1, 0xb8, 0x1e, 0x07, 0xe7, 0xac, 0xb0, 0x96, 0xb2, 0xc4, 0x97, 0x96, 0x6b, 0x55,
+ 0x5c, 0x82, 0x21, 0x7e, 0x3b, 0x6c, 0xc1, 0x67, 0x16, 0xb4, 0x3c, 0x7c, 0x9e, 0xc9, 0xd9, 0x60,
+ 0x63, 0x47, 0x1e, 0x0c, 0x22, 0x3f, 0xed, 0x33, 0xee, 0xef, 0x3e, 0xb8, 0x1d, 0xd6, 0xe0, 0xc6,
+ 0x72, 0x21, 0x17, 0x86, 0xff, 0xb8, 0x08, 0xfd, 0x31, 0xbb, 0x73, 0xf8, 0xb2, 0x84, 0xc6, 0xcc,
+ 0x86, 0x20, 0x02, 0x5e, 0xcf, 0x7c, 0xb7, 0x40, 0xbf, 0x68, 0x45, 0x1f, 0xba, 0x05, 0xa1, 0x32,
+ 0x29, 0x13, 0x0a, 0x2e, 0xda, 0x61, 0x24, 0x06, 0xaf, 0x4a, 0x14, 0xd8, 0x6c, 0xf8, 0x5e, 0x85,
+ 0x98, 0x0d, 0x23, 0xa2, 0x20, 0xb5, 0xfe, 0x6c, 0x18, 0x9b, 0x98, 0x77, 0x1b, 0x3c, 0xa5, 0x0c,
+ 0x28, 0x23, 0xfc, 0x5d, 0x9d, 0x20, 0x58, 0x10, 0xcd, 0x83, 0x26, 0x27, 0x00, 0x29, 0xa7, 0xf7,
+ 0x90, 0xca, 0x15, 0x78, 0x7f, 0x3f, 0x99, 0x5a, 0x8a, 0x35, 0xa0, 0x4e, 0x5a, 0x8c, 0x01, 0xda,
+ 0x31, 0x40, 0x9a, 0x2b, 0x0f, 0xfa, 0x92, 0x5f, 0xa3, 0xce, 0x06, 0x3b, 0xd0, 0xdc, 0x71, 0xfb,
+ 0x50, 0x55, 0xd1, 0x44, 0x4b, 0xf8, 0x1c, 0x98, 0x6e, 0xce, 0xde, 0x42, 0x6a, 0xf1, 0xe6, 0xc0,
+ 0xe0, 0x28, 0xb7, 0x7a, 0x70, 0x5f, 0x2e, 0x8c, 0x4e, 0x22, 0xe1, 0x31, 0xe8, 0x77, 0x19, 0x7b,
+ 0xe2, 0xb1, 0xc3, 0x40, 0x4a, 0x86, 0x84, 0x60, 0x06, 0x70, 0x10, 0x87, 0x51, 0xb5, 0x18, 0x4b,
+ 0x4f, 0xeb, 0x56, 0xce, 0x9d, 0x95, 0x18, 0x1b, 0xbf, 0x9e, 0x7a, 0x88, 0xbf, 0xdf, 0xc4, 0xab,
+ 0xc7, 0x06, 0xcd, 0xb1, 0x4a, 0x8c, 0x9c, 0xc7, 0x68, 0x49, 0xb6, 0xc8, 0x8f, 0xfb, 0xd4, 0x04,
+ 0x34, 0xd5, 0x99, 0x33, 0x69, 0x8c, 0x5e, 0xaf, 0xea, 0x9b, 0xad, 0xd0, 0xd6, 0x93, 0xb9, 0x11,
+ 0xee, 0xcc, 0xeb, 0x90, 0x5b, 0x3f, 0xb1, 0x70, 0xfb, 0x57, 0xa6, 0x74, 0xb8, 0x85, 0xb0, 0x9f,
+ 0xcb, 0xa4, 0xa9, 0x37, 0x03, 0x68, 0x0f, 0x30, 0x68, 0x96, 0xa1, 0x02, 0x99, 0x1a, 0xfa, 0xa7,
+ 0x0a, 0x82, 0x95, 0x05, 0x91, 0xfa, 0xcc, 0x0b, 0xac, 0x6c, 0xe1, 0x66, 0x56, 0xb6, 0x38, 0x8d,
+ 0x45, 0x14, 0x25, 0xcc, 0xe5, 0xf6, 0x71, 0x99, 0x29, 0x7a, 0x97, 0xa8, 0x07, 0x58, 0xf2, 0x76,
+ 0x73, 0x50, 0xc6, 0x58, 0x3f, 0x55, 0x92, 0x4e, 0xe1, 0x75, 0x9b, 0xf8, 0x38, 0xf5, 0x70, 0xf8,
+ 0x87, 0x93, 0x95, 0x6f, 0xda, 0xcf, 0x5e, 0x8c, 0x9f, 0xaf, 0x59, 0xa8, 0xdd, 0x23, 0x4a, 0x45,
+ 0xbb, 0x9d, 0xe8, 0x5f, 0xae, 0x04, 0xf8, 0xeb, 0x78, 0x9d, 0x13, 0x93, 0x66, 0x3a, 0x0e, 0xc9,
+ 0x50, 0x93, 0x8a, 0xdc, 0xa4, 0x16, 0x23, 0x80, 0xc2, 0x0b, 0x37, 0xda, 0x8b, 0x5e, 0x87, 0xbc,
+ 0x8e, 0x0a, 0x5e, 0x0d, 0x8a, 0xac, 0xc9, 0x9e, 0xcf, 0x5e, 0x4e, 0x5c, 0xa4, 0x03, 0x54, 0x6c,
+ 0x3d, 0xc0, 0xa4, 0x96, 0x16, 0x99, 0x6f, 0x68, 0x0e, 0x34, 0x66, 0xe7, 0x33, 0x45, 0x10, 0xbd,
+ 0xb1, 0x39, 0x28, 0x49, 0x32, 0x07, 0x2e, 0xaa, 0x84, 0xe8, 0xc0, 0x6c, 0xa6, 0x22, 0x80, 0x58,
+ 0x3a, 0x7b, 0xa5, 0x16, 0xac, 0x78, 0xca, 0x12, 0x3d, 0x70, 0x32, 0xfb, 0xfe, 0xa8, 0x50, 0x8c,
+ 0x9b, 0xe4, 0xe8, 0x20, 0x55, 0x26, 0x98, 0xe4, 0x48, 0xa8, 0xec, 0x14, 0xe7, 0xba, 0xfd, 0xa8,
+ 0x4b, 0x90, 0xea, 0x03, 0x27, 0x99, 0xfb, 0xee, 0x13, 0xe6, 0xcc, 0xca, 0x63, 0x25, 0xd3, 0x96,
+ 0xc5, 0xf9, 0x3e, 0xee, 0x3c, 0xcc, 0x3a, 0xcf, 0x22, 0x3c, 0x43, 0x30, 0xd3, 0x7a, 0xea, 0x85,
+ 0x76, 0x16, 0x25, 0x00, 0xe1, 0xaf, 0x8d, 0x42, 0xb5, 0x34, 0x61, 0xb0, 0xdf, 0x20, 0xd5, 0x19,
+ 0x27, 0x91, 0x06, 0x89, 0xd1, 0x52, 0xa5, 0x10, 0xf3, 0xbd, 0xaf, 0xd4, 0x7d, 0x55, 0xfb, 0x8e,
+ 0xa9, 0xaa, 0x14, 0xe4, 0x7e, 0xab, 0x29, 0x07, 0x56, 0xd1, 0xa9, 0x48, 0x20, 0xd1, 0x4a, 0x2c,
+ 0xa6, 0x9e, 0x30, 0xee, 0x6a, 0x0a, 0x23, 0xee, 0x75, 0x0a, 0x1e, 0x3e, 0x67, 0xc6, 0xa5, 0x86,
+ 0x64, 0x56, 0x3a, 0x2b, 0x55, 0xf3, 0x7d, 0xbb, 0xfd, 0x58, 0xc4, 0x47, 0x19, 0xf1, 0x92, 0x25,
+ 0x10, 0xac, 0x84, 0x0e, 0x2e, 0xfd, 0x7b, 0x60, 0x83, 0xcd, 0x9a, 0x84, 0x73, 0x7b, 0x5f, 0x91,
+ 0x6b, 0x0b, 0x1c, 0xb2, 0xc7, 0x23, 0xc7, 0x00, 0x9c, 0x67, 0x2f, 0x63, 0xe6, 0x41, 0x1d, 0x80,
+ 0xaa, 0x79, 0x39, 0x69, 0xb1, 0xe6, 0x6b, 0xc8, 0xce, 0x97, 0xb1, 0xc9, 0xcd, 0x5d, 0x8f, 0x6e,
+ 0xa2, 0x0b, 0x7b, 0x82, 0x56, 0x4a, 0xc7, 0x05, 0x8d, 0xbf, 0x26, 0x51, 0x55, 0xdd, 0xe3, 0xff,
+ 0x58, 0x23, 0xbc, 0x9a, 0xbb, 0x5a, 0xaf, 0x80, 0x1a, 0xcd, 0xd5, 0xd6, 0x33, 0x45, 0x94, 0xb0,
+ 0xb2, 0x20, 0xab, 0x39, 0x78, 0x3a, 0x62, 0xec, 0x41, 0xdd, 0x51, 0x4b, 0x24, 0xe9, 0x20, 0xd1,
+ 0xa9, 0xa8, 0x65, 0x6e, 0x85, 0xb7, 0x74, 0x9c, 0x48, 0x4f, 0xd6, 0xb5, 0x09, 0x5f, 0xea, 0x22,
+ 0x2f, 0x26, 0x2c, 0x88, 0x6f, 0x34, 0xde, 0xd3, 0xa0, 0x15, 0x4f, 0x5d, 0xda, 0x45, 0x00, 0x0d,
+ 0x67, 0x2f, 0x2b, 0x3d, 0xfe, 0x9c, 0x22, 0x03, 0xbd, 0xc2, 0x1c, 0x5f, 0xf1, 0xf9, 0x84, 0x35,
+ 0x52, 0xb5, 0xff, 0x04, 0xfb, 0x59, 0x58, 0x2a, 0xbe, 0x5b, 0xbd, 0x27, 0x2e, 0x20, 0xf1, 0xdf,
+ 0x7a, 0xf3, 0x9e, 0xd4, 0x7a, 0xeb, 0x61, 0xb0, 0x7c, 0xc3, 0x5e, 0x9a, 0x03, 0xf1, 0xaf, 0xfe,
+ 0x10, 0x20, 0xc8, 0x64, 0x9c, 0x85, 0x16, 0xd9, 0x17, 0x78, 0xcb, 0x54, 0x76, 0x04, 0xf9, 0x17,
+ 0x1c, 0xa9, 0xbb, 0x74, 0x00, 0xbe, 0xae, 0x91, 0x57, 0x78, 0xf1, 0x26, 0xd2, 0x95, 0x25, 0xfb,
+ 0xb8, 0x66, 0x95, 0x17, 0x0f, 0xc1, 0xff, 0xac, 0xb0, 0xd7, 0x5f, 0x58, 0xb5, 0xef, 0xb8, 0x0e,
+ 0x80, 0x2a, 0x92, 0x31, 0x89, 0x01, 0xc6, 0x3d, 0xbf, 0x00, 0x9a, 0x79, 0xc9, 0x55, 0x45, 0x5a,
+ 0x4d, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE options_pad_xpm[1] = {{ png, sizeof( png ), "options_pad_xpm" }};
diff --git a/bitmaps_png/cpp_24/pin_size_to.cpp b/bitmaps_png/cpp_24/pin_size_to.cpp
index 1e79d7e3fa..04366fa7fa 100644
--- a/bitmaps_png/cpp_24/pin_size_to.cpp
+++ b/bitmaps_png/cpp_24/pin_size_to.cpp
@@ -8,7 +8,7 @@
 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, 0x02, 0xca, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x36, 0x20,
+ 0xf8, 0x00, 0x00, 0x03, 0x17, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x36, 0x20,
  0x24, 0x24, 0x24, 0x34, 0x21, 0x21, 0x81, 0x03, 0xc6, 0x0f, 0x0d, 0x0d, 0xe5, 0x07, 0x8a, 0xf9,
  0x03, 0x69, 0x4e, 0x64, 0x75, 0xb1, 0xb1, 0xb1, 0xdc, 0x40, 0x31, 0xbf, 0xe8, 0xe8, 0x68, 0x3e,
  0x98, 0x98, 0xaf, 0xaf, 0x2f, 0x17, 0x50, 0x2c, 0x04, 0xaf, 0x05, 0xc1, 0xc1, 0xc1, 0x37, 0xc3,
@@ -27,34 +27,38 @@ static const unsigned char png[] = {
  0x38, 0x2c, 0xf2, 0x2a, 0x5e, 0x0b, 0xd4, 0xcb, 0x57, 0x83, 0x5c, 0xfd, 0x5f, 0xba, 0xf1, 0x88,
  0x23, 0xb2, 0x38, 0x50, 0xec, 0x2d, 0xc2, 0x27, 0xb8, 0xb1, 0x7a, 0xc5, 0x9a, 0x2f, 0x78, 0x2d,
  0x90, 0xaf, 0xdd, 0xbd, 0x1f, 0xe2, 0x83, 0xa3, 0x11, 0x70, 0xc3, 0x81, 0x91, 0x2d, 0xd9, 0x78,
- 0xf8, 0x8b, 0x54, 0x03, 0xd8, 0xe2, 0xfb, 0x40, 0x7c, 0x17, 0x84, 0xf5, 0x2a, 0xb6, 0x3e, 0x28,
- 0xf3, 0xab, 0x7e, 0xbf, 0xd4, 0x24, 0xec, 0xe7, 0x2e, 0x4d, 0xd7, 0x7f, 0x3b, 0x35, 0xdd, 0xfe,
- 0xae, 0x34, 0x0a, 0xf8, 0xb8, 0x4f, 0xd5, 0xb1, 0xe9, 0x90, 0x8a, 0xad, 0x28, 0x56, 0x0b, 0x24,
+ 0xf8, 0x8b, 0x54, 0x03, 0xd8, 0xe2, 0xfb, 0x40, 0x7c, 0x17, 0x84, 0xd5, 0xab, 0x76, 0xdd, 0xcf,
+ 0x09, 0x69, 0x7a, 0x3b, 0xc7, 0x32, 0xf6, 0xfb, 0x26, 0x3d, 0xef, 0x3f, 0x1b, 0xf5, 0x7c, 0x7e,
+ 0x2f, 0x31, 0x0e, 0x7a, 0xbf, 0x5f, 0xdd, 0xa1, 0x7c, 0xbf, 0x82, 0x83, 0x00, 0x56, 0x0b, 0x24,
  0x9b, 0x0e, 0xa7, 0x41, 0x5d, 0xf3, 0x54, 0xba, 0xe1, 0x68, 0x88, 0x74, 0xc3, 0x11, 0x0b, 0xa0,
- 0x65, 0x9b, 0xa1, 0x62, 0x47, 0x60, 0xea, 0xf6, 0xa9, 0x39, 0x7a, 0xed, 0x57, 0x73, 0xfc, 0x04,
- 0xc4, 0xff, 0xb1, 0xe1, 0x03, 0x6a, 0x8e, 0x20, 0x8b, 0x82, 0x31, 0x6d, 0x68, 0xf8, 0xcf, 0x04,
- 0x74, 0xdd, 0x36, 0x2c, 0xde, 0x7f, 0x23, 0xd1, 0x70, 0x48, 0x0b, 0xa4, 0xe4, 0x80, 0xba, 0x53,
- 0x28, 0xd0, 0x90, 0xdf, 0x0f, 0xa6, 0x2e, 0xfa, 0x0f, 0xc2, 0xb8, 0x2c, 0x01, 0xe2, 0x7f, 0x38,
- 0x2d, 0x91, 0x6a, 0x3a, 0x9c, 0x25, 0xd9, 0x74, 0x64, 0x2b, 0xd0, 0xe0, 0xe3, 0x40, 0x5f, 0xf4,
- 0x8b, 0x36, 0xec, 0x97, 0x00, 0x49, 0xed, 0xd7, 0x76, 0x90, 0x80, 0xb9, 0xfc, 0xdf, 0xdf, 0x7f,
- 0x60, 0x8c, 0xc7, 0x02, 0xb0, 0x4f, 0x70, 0x06, 0x17, 0x36, 0x00, 0xd4, 0xd0, 0x0a, 0xd3, 0x0c,
- 0x03, 0xf8, 0x2c, 0x00, 0x61, 0x50, 0x9c, 0x10, 0x6d, 0xc1, 0x7e, 0x55, 0xc7, 0xcb, 0xb8, 0x2c,
- 0x38, 0x66, 0x13, 0xf2, 0xff, 0xfe, 0xc4, 0xf9, 0xff, 0x8f, 0x5a, 0x05, 0xa1, 0x59, 0xe2, 0x74,
- 0x8e, 0x78, 0x0b, 0xd4, 0x1c, 0xbf, 0xe0, 0xb2, 0xe0, 0x6e, 0xf7, 0x2c, 0x30, 0xff, 0xeb, 0xdd,
- 0x87, 0x40, 0x4b, 0x82, 0x91, 0x2d, 0xf9, 0x44, 0x8a, 0x05, 0xaf, 0xd0, 0x2d, 0x38, 0xe1, 0x1c,
- 0x05, 0xc6, 0x67, 0x02, 0xd2, 0xfe, 0x7f, 0xbd, 0xf3, 0x10, 0x6a, 0xc9, 0x23, 0x64, 0x4b, 0xbe,
- 0x90, 0x62, 0xc1, 0x19, 0x74, 0x0b, 0x70, 0x81, 0x8f, 0xe7, 0xae, 0xc0, 0x2c, 0x38, 0x4f, 0xb4,
- 0x05, 0xfb, 0xd4, 0x1d, 0xcb, 0x60, 0x16, 0xbc, 0xd8, 0xb4, 0xfb, 0xff, 0xb7, 0x47, 0xcf, 0x50,
- 0xf0, 0x8f, 0x17, 0xaf, 0x81, 0x29, 0xeb, 0x2f, 0xd8, 0x82, 0x17, 0x1b, 0x76, 0xc2, 0xe2, 0xa0,
- 0x82, 0x78, 0x1f, 0x40, 0x92, 0xe9, 0x07, 0x6c, 0xa9, 0xe5, 0x94, 0x77, 0xd2, 0xff, 0xdf, 0x1f,
- 0x3f, 0x81, 0x0d, 0x7f, 0xb5, 0xe3, 0xe0, 0xff, 0x03, 0x5a, 0xae, 0x20, 0xf1, 0xf7, 0xbb, 0x95,
- 0x5c, 0xf8, 0x49, 0xaa, 0x56, 0x81, 0xbe, 0x08, 0x03, 0x65, 0x22, 0x74, 0x0b, 0x6e, 0xb7, 0x4d,
- 0x45, 0x37, 0xfc, 0xd7, 0x7e, 0x75, 0x07, 0x0f, 0xb2, 0xea, 0xee, 0xfd, 0x6a, 0x0e, 0xe1, 0xa0,
- 0x4c, 0x84, 0x92, 0xa9, 0x80, 0x86, 0x9e, 0x8b, 0xcc, 0xfb, 0x7f, 0x40, 0xd3, 0x05, 0xc4, 0xff,
- 0x00, 0x4c, 0xff, 0x41, 0x14, 0x35, 0x10, 0x40, 0xc1, 0x05, 0x8d, 0x13, 0x50, 0xc4, 0x7f, 0x07,
- 0xe2, 0x1f, 0xa0, 0x08, 0x05, 0xba, 0xba, 0x79, 0x8f, 0xa2, 0xb3, 0x38, 0xb2, 0x5a, 0x00, 0x62,
- 0xa7, 0x97, 0x1f, 0xa0, 0x89, 0x1b, 0x18, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
- 0x42, 0x60, 0x82,
+ 0x65, 0x9b, 0xa1, 0x62, 0x47, 0x60, 0xea, 0x0e, 0xa8, 0x39, 0x79, 0xee, 0x57, 0x73, 0x7c, 0x05,
+ 0xc4, 0xff, 0xb1, 0xe1, 0x03, 0x6a, 0x8e, 0x6f, 0x0f, 0xa8, 0x38, 0xf9, 0x62, 0xda, 0xd0, 0xf0,
+ 0x9f, 0x09, 0xe8, 0xba, 0x6d, 0x58, 0xbc, 0xff, 0x46, 0xa2, 0xe1, 0x90, 0x16, 0x48, 0xc9, 0x3e,
+ 0x55, 0x47, 0x6f, 0xa0, 0x21, 0xbf, 0x0f, 0x19, 0x78, 0xfd, 0x7f, 0xb6, 0x72, 0xcb, 0xff, 0x0b,
+ 0xf1, 0xc5, 0x58, 0x2d, 0xd9, 0xa7, 0xe6, 0xf8, 0x77, 0xbf, 0x9a, 0x43, 0x00, 0x56, 0x4b, 0xa4,
+ 0x9a, 0x0e, 0x67, 0x49, 0x36, 0x1d, 0xd9, 0x0a, 0x34, 0xf8, 0x38, 0xd0, 0x17, 0xfd, 0xa2, 0x0d,
+ 0xfb, 0x25, 0x40, 0x52, 0x87, 0x75, 0x6d, 0x04, 0x81, 0x9a, 0xdf, 0x80, 0x0c, 0xb8, 0x9c, 0x51,
+ 0xfd, 0x1f, 0x04, 0x5e, 0xed, 0x38, 0xf0, 0x1f, 0x8f, 0x4f, 0x3e, 0x1e, 0x52, 0xb1, 0x15, 0x25,
+ 0xba, 0xac, 0x02, 0xba, 0xaa, 0x0a, 0xa6, 0xf9, 0x56, 0xf3, 0x24, 0xb0, 0x05, 0x4f, 0x16, 0xad,
+ 0xc3, 0x69, 0x01, 0xd4, 0x92, 0x56, 0xa2, 0x2d, 0x00, 0x7a, 0xf9, 0x14, 0x4c, 0xe3, 0xdd, 0x9e,
+ 0x59, 0x60, 0x0b, 0x1e, 0xce, 0x5c, 0x06, 0xe6, 0x1f, 0x31, 0xf5, 0xfb, 0x7f, 0xbb, 0x65, 0xca,
+ 0xff, 0x23, 0xe6, 0x01, 0xa8, 0x96, 0xa8, 0x3a, 0x5e, 0x26, 0xda, 0x02, 0x50, 0xe4, 0xc1, 0x34,
+ 0xde, 0xa8, 0xec, 0x02, 0x5b, 0xf0, 0x7c, 0xdd, 0x0e, 0x30, 0xff, 0x76, 0xeb, 0x14, 0x30, 0xff,
+ 0xcb, 0xad, 0x7b, 0xff, 0x8f, 0x5a, 0x06, 0x22, 0x5b, 0xf2, 0x83, 0x04, 0x1f, 0x38, 0x3e, 0x81,
+ 0x69, 0x3c, 0xe5, 0x93, 0x0c, 0x36, 0xf0, 0xf7, 0xe7, 0xaf, 0xff, 0x2f, 0x67, 0xd7, 0xfe, 0x3f,
+ 0xee, 0x1c, 0x05, 0x36, 0x1c, 0x6c, 0xc9, 0xed, 0x07, 0xff, 0x8f, 0x5a, 0x07, 0xc1, 0x2c, 0xf8,
+ 0x43, 0x56, 0x10, 0x81, 0xf0, 0xf3, 0xf5, 0x3b, 0xff, 0x23, 0x83, 0x3f, 0xdf, 0x7f, 0xc0, 0xd9,
+ 0xbf, 0xdf, 0x7f, 0x82, 0xa9, 0xbb, 0x4d, 0xbc, 0x05, 0xa0, 0x4c, 0x84, 0x1c, 0xbe, 0x1a, 0x4e,
+ 0xff, 0x6f, 0x35, 0x4c, 0xf8, 0xff, 0xf1, 0xe2, 0xf5, 0xff, 0xbf, 0x3f, 0x7e, 0x42, 0xb1, 0xec,
+ 0xdb, 0xa3, 0xa7, 0x50, 0x75, 0x4e, 0x1d, 0x44, 0x5b, 0xb0, 0x4b, 0xdd, 0x55, 0x0a, 0xa8, 0xe9,
+ 0x13, 0xb6, 0xd4, 0x72, 0x02, 0x18, 0x44, 0x3f, 0x5f, 0xbf, 0x03, 0x1b, 0xfe, 0xee, 0xc8, 0x99,
+ 0xff, 0x07, 0xf5, 0x3c, 0x40, 0xe2, 0xdf, 0xf7, 0x6b, 0x3b, 0x48, 0x90, 0x54, 0xad, 0x02, 0x73,
+ 0x71, 0x2c, 0x50, 0xe3, 0x3f, 0x74, 0x0b, 0x60, 0xc9, 0x16, 0xc9, 0xf0, 0x7f, 0x40, 0x1f, 0x47,
+ 0x93, 0x55, 0x77, 0xef, 0x57, 0x75, 0x48, 0x38, 0xa0, 0xee, 0xf8, 0x15, 0xd9, 0x82, 0x83, 0x3a,
+ 0x6e, 0xff, 0x2f, 0xa5, 0x55, 0xfe, 0x3f, 0xa8, 0xeb, 0x0e, 0x4e, 0x39, 0xc0, 0x3c, 0x93, 0x46,
+ 0x51, 0x03, 0x61, 0xaf, 0xa6, 0x93, 0x3c, 0xb0, 0xd8, 0x68, 0x02, 0x26, 0xdd, 0x9b, 0x48, 0x16,
+ 0x3d, 0x00, 0x8a, 0x4d, 0xdb, 0xaf, 0xec, 0xa0, 0x82, 0xac, 0x16, 0x00, 0x6c, 0xc5, 0x92, 0x5e,
+ 0x7d, 0x98, 0xac, 0xb7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE pin_size_to_xpm[1] = {{ png, sizeof( png ), "pin_size_to_xpm" }};
diff --git a/bitmaps_png/cpp_24/rotate_ccw.cpp b/bitmaps_png/cpp_24/rotate_ccw.cpp
index b989afb53d..bd59e3a492 100644
--- a/bitmaps_png/cpp_24/rotate_ccw.cpp
+++ b/bitmaps_png/cpp_24/rotate_ccw.cpp
@@ -7,32 +7,26 @@
 
 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, 0x73, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x52, 0xb1, 0x4e, 0xc2,
- 0x50, 0x14, 0x7d, 0xb8, 0x14, 0x8c, 0x21, 0x98, 0x38, 0xe1, 0xe0, 0x62, 0x70, 0x71, 0x72, 0x94,
- 0x84, 0xbd, 0x83, 0x49, 0xe9, 0x3b, 0x2f, 0xa0, 0x4d, 0x84, 0xfa, 0x11, 0x48, 0x9c, 0x1c, 0xfd,
- 0x05, 0x7f, 0xc1, 0x44, 0x74, 0x05, 0xa3, 0x49, 0x47, 0x74, 0x17, 0x18, 0xc5, 0x09, 0x1c, 0x6a,
- 0xd0, 0xc1, 0x45, 0xea, 0x7d, 0x7d, 0xd8, 0xa4, 0x20, 0x6d, 0xbd, 0x77, 0xe8, 0xcd, 0xeb, 0x3d,
- 0xf7, 0x9e, 0x73, 0xde, 0x63, 0x6c, 0x49, 0x94, 0x77, 0x71, 0x75, 0xbe, 0xc2, 0x92, 0x85, 0xb9,
- 0xc5, 0x2f, 0xf1, 0x0d, 0x2f, 0x11, 0xe0, 0x70, 0x03, 0x17, 0xf8, 0x82, 0x27, 0x53, 0xdc, 0xc2,
- 0x3e, 0x5a, 0x8f, 0x6c, 0xaf, 0x14, 0xf0, 0xa2, 0x9a, 0x83, 0x7c, 0xc7, 0x99, 0xc8, 0x44, 0x40,
- 0x74, 0x0d, 0x42, 0xdc, 0xcd, 0x36, 0xd4, 0xd1, 0xc6, 0x94, 0xaa, 0x27, 0xb1, 0x19, 0xa7, 0x62,
- 0x8f, 0x54, 0x7c, 0x4a, 0x0d, 0xd8, 0x47, 0x9f, 0x20, 0xaf, 0xb1, 0x10, 0xc6, 0x88, 0x7d, 0x4a,
- 0x7e, 0xad, 0xac, 0x70, 0xe4, 0x96, 0x7a, 0x9a, 0x25, 0x0d, 0x2b, 0xcb, 0x07, 0x44, 0xb0, 0xc9,
- 0x92, 0x87, 0x59, 0x94, 0xf2, 0x63, 0x1c, 0x0b, 0x07, 0x3a, 0xd2, 0x84, 0x7f, 0x00, 0xc8, 0x31,
- 0x0f, 0xad, 0x65, 0xd3, 0x4c, 0xbc, 0x61, 0x2c, 0xca, 0x21, 0xc0, 0x0e, 0x01, 0xfa, 0xaa, 0x74,
- 0x84, 0x13, 0xea, 0x4f, 0x51, 0xbb, 0xbc, 0x87, 0x91, 0x72, 0x49, 0xc5, 0xc1, 0x2a, 0x9d, 0x4c,
- 0xd4, 0xbc, 0x09, 0xb1, 0xcb, 0x84, 0x00, 0xe3, 0x48, 0x80, 0x6f, 0xd9, 0x76, 0x68, 0x7d, 0x19,
- 0x23, 0x8c, 0xb8, 0x31, 0xf7, 0x68, 0x02, 0x4a, 0x37, 0x54, 0x1e, 0xc7, 0x89, 0xe6, 0x27, 0xd4,
- 0x75, 0xad, 0x28, 0xd9, 0x54, 0xb6, 0x63, 0x5d, 0x7a, 0x80, 0xc7, 0x6b, 0xb3, 0x27, 0x00, 0x17,
- 0x53, 0xb3, 0x18, 0x79, 0x71, 0x25, 0x1a, 0xea, 0x1a, 0xb9, 0x5f, 0x74, 0x53, 0xf2, 0xb3, 0xb2,
- 0xcb, 0xda, 0x8d, 0x9c, 0xd4, 0x89, 0x46, 0x70, 0x50, 0x4f, 0x8b, 0x47, 0x12, 0xee, 0xfc, 0x0d,
- 0x31, 0x72, 0xfe, 0xe3, 0xeb, 0x86, 0x1e, 0x5f, 0x35, 0xcf, 0x87, 0xc4, 0x71, 0xb0, 0x48, 0xcc,
- 0x2c, 0xc9, 0xe9, 0x7c, 0x58, 0xcd, 0xcf, 0xfd, 0xa8, 0xe6, 0xe5, 0x16, 0xca, 0x0e, 0xec, 0x4a,
- 0x41, 0xac, 0xe9, 0x5a, 0xa5, 0x40, 0xce, 0xdc, 0xfb, 0x67, 0xdd, 0x85, 0x76, 0x45, 0x0c, 0xa7,
- 0x24, 0xdf, 0x9b, 0x4b, 0x17, 0x0d, 0x5d, 0x63, 0x11, 0xf2, 0x6a, 0x68, 0xf1, 0x67, 0x7c, 0x50,
- 0xf6, 0xa8, 0xaa, 0x05, 0xce, 0xcc, 0xe2, 0x07, 0x88, 0x44, 0xbb, 0x44, 0xbc, 0xde, 0x72, 0xae,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
+ 0xf8, 0x00, 0x00, 0x01, 0x14, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xa3,
+ 0x60, 0xf8, 0x82, 0x43, 0x2a, 0xb6, 0xa2, 0xfb, 0xd5, 0x1d, 0xf2, 0x77, 0x68, 0xbb, 0x0b, 0x51,
+ 0x64, 0x90, 0x4c, 0xc3, 0x61, 0x07, 0x74, 0xb1, 0x3d, 0x8a, 0xce, 0xe2, 0x07, 0xd4, 0x1c, 0xaf,
+ 0xee, 0x57, 0x73, 0xfc, 0x0f, 0xa4, 0x0b, 0x29, 0xb2, 0x40, 0xb2, 0xe9, 0xc8, 0x7e, 0x14, 0x97,
+ 0x6b, 0xda, 0x4a, 0xee, 0x57, 0x73, 0xba, 0x06, 0x32, 0x1c, 0x48, 0x5f, 0xda, 0xa3, 0xe1, 0x2c,
+ 0x4c, 0x91, 0xeb, 0xa5, 0x1a, 0x8f, 0xfc, 0x47, 0x16, 0xdb, 0xaf, 0xee, 0x78, 0x1d, 0x6c, 0xb8,
+ 0xaa, 0xd3, 0x9f, 0xfd, 0x6a, 0x0e, 0xaf, 0x81, 0x3e, 0xd8, 0x0b, 0x0c, 0xaa, 0xf2, 0xfd, 0xda,
+ 0x0e, 0x3c, 0x64, 0xb9, 0x1e, 0xc3, 0x02, 0x35, 0xa7, 0x43, 0x10, 0xd7, 0xa3, 0x62, 0x70, 0x90,
+ 0x29, 0x38, 0x08, 0x90, 0xec, 0x7a, 0x74, 0x0b, 0xb6, 0xa9, 0x78, 0xb2, 0x03, 0x5d, 0xbc, 0x09,
+ 0x6a, 0xf0, 0x3b, 0xa0, 0xc1, 0x59, 0xa0, 0xa0, 0x82, 0xf0, 0x1d, 0xda, 0x49, 0x76, 0x3d, 0xba,
+ 0x05, 0x20, 0xb0, 0x4a, 0x3b, 0x94, 0x0d, 0x68, 0xe0, 0x06, 0x90, 0xa1, 0xfb, 0x80, 0x16, 0x1c,
+ 0x50, 0x73, 0xb6, 0x85, 0x5a, 0x78, 0x9e, 0x64, 0xd7, 0x63, 0xb3, 0x00, 0x1c, 0x54, 0x0e, 0x0e,
+ 0x2c, 0x7b, 0x35, 0x9c, 0xac, 0x40, 0xf4, 0x66, 0x29, 0x5f, 0x2e, 0xa8, 0x05, 0x3f, 0x48, 0x76,
+ 0x3d, 0xcc, 0x82, 0x84, 0x84, 0x84, 0x23, 0x49, 0x49, 0x49, 0x2e, 0xb8, 0xf4, 0x40, 0x7d, 0xf3,
+ 0x97, 0x64, 0xd7, 0x23, 0x59, 0xf0, 0x1f, 0x8a, 0xb1, 0x5a, 0x04, 0x0c, 0xff, 0x5d, 0x20, 0x4c,
+ 0xb2, 0xeb, 0xb1, 0x58, 0x80, 0xd7, 0x22, 0x92, 0x5d, 0x8f, 0xc7, 0x02, 0xd2, 0x2d, 0xc2, 0xe6,
+ 0x7a, 0x22, 0x2c, 0x20, 0xce, 0x22, 0x5c, 0xae, 0x27, 0xc1, 0x02, 0xfc, 0x16, 0xe1, 0x72, 0x3d,
+ 0x19, 0x16, 0x90, 0x1f, 0x47, 0x83, 0x12, 0x00, 0x00, 0x59, 0x87, 0x4a, 0x6a, 0x47, 0x67, 0xf7,
+ 0x5a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE rotate_ccw_xpm[1] = {{ png, sizeof( png ), "rotate_ccw_xpm" }};
diff --git a/bitmaps_png/cpp_24/rotate_cw.cpp b/bitmaps_png/cpp_24/rotate_cw.cpp
index 16928a307f..8b90a2e49c 100644
--- a/bitmaps_png/cpp_24/rotate_cw.cpp
+++ b/bitmaps_png/cpp_24/rotate_cw.cpp
@@ -7,32 +7,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, 0x75, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0xcb, 0x2e, 0x43,
- 0x51, 0x14, 0x86, 0x77, 0x3b, 0x51, 0x42, 0x5c, 0x66, 0xc2, 0x90, 0x7a, 0x00, 0x23, 0xb7, 0x07,
- 0x30, 0x20, 0xf4, 0x7c, 0x4b, 0x13, 0x83, 0xf6, 0xe8, 0xc0, 0x1b, 0x48, 0x84, 0x49, 0x5f, 0xc3,
- 0x2b, 0x08, 0xc1, 0xcc, 0x2d, 0xa2, 0x31, 0x30, 0xc0, 0x54, 0x5d, 0x46, 0xc2, 0xa4, 0x24, 0x4d,
- 0x31, 0x11, 0x83, 0xfe, 0x06, 0xad, 0xc6, 0x71, 0xf4, 0x62, 0xed, 0xd1, 0x5e, 0xe7, 0xfb, 0x93,
- 0x7f, 0xfd, 0x67, 0x2f, 0xe7, 0x42, 0x95, 0x8d, 0xda, 0x91, 0x8d, 0xba, 0xd6, 0x2b, 0x1b, 0x45,
- 0x94, 0xd9, 0xf4, 0x86, 0x5b, 0x80, 0xad, 0xcf, 0xcb, 0xd8, 0x1e, 0x42, 0x88, 0x4f, 0x6f, 0x23,
- 0xd1, 0xdf, 0x08, 0x6e, 0xb7, 0x75, 0x5e, 0xab, 0xf0, 0xf7, 0x79, 0x48, 0xc6, 0xeb, 0xe0, 0x89,
- 0x41, 0xbb, 0x42, 0x94, 0x6d, 0x7f, 0x21, 0x5d, 0x85, 0x2f, 0x6d, 0x79, 0xa6, 0xa3, 0x2e, 0xce,
- 0x13, 0x22, 0xcf, 0xb8, 0x73, 0xd9, 0x28, 0x1f, 0x6c, 0x26, 0x26, 0x1a, 0x9b, 0xb9, 0x42, 0x76,
- 0x32, 0xdb, 0xe5, 0x9c, 0x73, 0x2e, 0xb2, 0xd8, 0xdb, 0x6c, 0xd4, 0x75, 0x44, 0xbe, 0x8a, 0xb7,
- 0x92, 0x0c, 0xaf, 0xc8, 0xc6, 0x5a, 0xce, 0xdd, 0xcb, 0x20, 0x0e, 0xfe, 0xf1, 0xa3, 0xd8, 0x45,
- 0xa4, 0xfe, 0x23, 0xb8, 0x47, 0x36, 0x14, 0xe8, 0x24, 0x78, 0xe1, 0xd9, 0xe6, 0xeb, 0x09, 0xde,
- 0x90, 0x1f, 0xfb, 0xd1, 0x88, 0xf0, 0x82, 0x10, 0x05, 0x17, 0x09, 0xcc, 0x9a, 0xb3, 0x5c, 0x4d,
- 0x30, 0xdd, 0x16, 0x10, 0x3c, 0x87, 0x05, 0x33, 0x1d, 0x88, 0xb7, 0xca, 0xd0, 0xb7, 0x28, 0xf8,
- 0xd0, 0x6c, 0x9e, 0x02, 0x05, 0x6f, 0xee, 0x67, 0x2f, 0x19, 0x47, 0xe4, 0x2b, 0x9f, 0x77, 0x90,
- 0x97, 0x6e, 0x1a, 0xbe, 0x8f, 0x6c, 0xab, 0x62, 0x69, 0x09, 0x71, 0xd8, 0x34, 0x9a, 0xe3, 0x5a,
- 0x96, 0xd6, 0x47, 0x89, 0xb2, 0x4d, 0x36, 0xc4, 0xa7, 0x10, 0xc5, 0xb9, 0x9e, 0xef, 0xeb, 0x1a,
- 0xe2, 0xa6, 0x76, 0x0d, 0xdb, 0xe9, 0xe6, 0x0e, 0xd9, 0x4a, 0xad, 0xe1, 0xc7, 0xb8, 0x40, 0x9c,
- 0x5a, 0x77, 0x1d, 0xfc, 0x0c, 0xd9, 0x79, 0x20, 0x49, 0x1b, 0xe0, 0x11, 0x71, 0x13, 0x36, 0x66,
- 0x93, 0xdc, 0x23, 0x1e, 0x42, 0xbb, 0x67, 0x03, 0x5c, 0x20, 0xc4, 0xb1, 0x97, 0x49, 0xc6, 0xa7,
- 0xdb, 0xac, 0xd3, 0x46, 0x58, 0xe2, 0x10, 0x21, 0x3b, 0xff, 0x73, 0x55, 0xfd, 0x98, 0xad, 0x52,
- 0xfa, 0xb5, 0xa2, 0xa2, 0x68, 0x2b, 0x01, 0x33, 0xc1, 0x5a, 0xec, 0x35, 0xdf, 0x76, 0xc8, 0xf3,
- 0xce, 0xbb, 0x77, 0xcd, 0x36, 0xa9, 0xdf, 0x51, 0x7c, 0x01, 0x5d, 0x80, 0xbb, 0x93, 0x35, 0xc5,
- 0xb3, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
+ 0xf8, 0x00, 0x00, 0x01, 0x21, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xa3,
+ 0x60, 0x68, 0x83, 0x1d, 0xda, 0xee, 0x42, 0xfb, 0x54, 0x1d, 0xf3, 0xf6, 0xab, 0x39, 0x88, 0xd0,
+ 0xc4, 0x82, 0x03, 0x6a, 0x8e, 0x85, 0xfb, 0xd5, 0x1c, 0xff, 0x03, 0xf1, 0x95, 0x3d, 0x8a, 0xce,
+ 0xe2, 0xe8, 0xf2, 0x32, 0x0d, 0x87, 0x1d, 0x28, 0xb2, 0x60, 0x8f, 0x86, 0xb3, 0xf0, 0x7e, 0x55,
+ 0xc7, 0xcb, 0x20, 0x4b, 0x80, 0x96, 0x5d, 0xdd, 0xaf, 0xed, 0x20, 0x81, 0x2c, 0x2f, 0xd9, 0x74,
+ 0x64, 0x3f, 0x59, 0x06, 0xef, 0x56, 0x72, 0xe1, 0x07, 0x06, 0x4b, 0x3d, 0xd0, 0xd0, 0xa3, 0x40,
+ 0xc3, 0xbf, 0x40, 0x7d, 0x01, 0xc4, 0x0e, 0xd7, 0x90, 0xd5, 0x49, 0x35, 0x1e, 0xf9, 0x4f, 0xb2,
+ 0x2f, 0x40, 0xe1, 0xbe, 0x5f, 0xd5, 0xe9, 0x16, 0xc2, 0x50, 0x04, 0xde, 0xa7, 0xe6, 0x74, 0x10,
+ 0xdd, 0x02, 0x92, 0x7d, 0x01, 0x74, 0x75, 0x2f, 0x38, 0x48, 0xd4, 0x1d, 0xcf, 0x02, 0x5d, 0x9c,
+ 0x02, 0x64, 0xbf, 0x81, 0x5a, 0xb0, 0x65, 0x9b, 0x8a, 0x27, 0x3b, 0xba, 0x05, 0x24, 0xfb, 0x62,
+ 0xbf, 0x9a, 0xd3, 0x25, 0xb0, 0x05, 0x2a, 0xce, 0x96, 0xfb, 0xd4, 0x1c, 0xb3, 0xc0, 0x6c, 0x55,
+ 0xc7, 0x8d, 0xab, 0xb4, 0x43, 0xd9, 0xd0, 0xd5, 0xc2, 0x2c, 0x20, 0xc9, 0x17, 0x40, 0x1f, 0xfc,
+ 0x04, 0xbb, 0x58, 0xc1, 0x81, 0x63, 0xbf, 0x83, 0x03, 0xcb, 0x3e, 0x75, 0x47, 0x6b, 0x10, 0x8d,
+ 0x4d, 0x2d, 0xcc, 0x02, 0x92, 0x7c, 0x01, 0x74, 0xf5, 0x5f, 0x90, 0x05, 0xb8, 0xe4, 0x93, 0x92,
+ 0x92, 0x6c, 0xe2, 0xe3, 0xe3, 0x77, 0xa3, 0x5b, 0x40, 0xb4, 0x2f, 0x80, 0x3e, 0xd8, 0x0a, 0xc2,
+ 0xb8, 0x0c, 0x4e, 0x48, 0x48, 0xf8, 0x0f, 0xc2, 0xe8, 0x16, 0x90, 0x95, 0xa2, 0xb0, 0x19, 0x8c,
+ 0xcf, 0x02, 0x92, 0xe2, 0x02, 0x97, 0xc1, 0xf8, 0x2c, 0x20, 0xca, 0x17, 0x84, 0x0c, 0x26, 0x64,
+ 0x01, 0x4e, 0x5f, 0x10, 0x6b, 0x30, 0x21, 0x0b, 0x30, 0x7c, 0x41, 0xaa, 0xc1, 0xc4, 0x58, 0x40,
+ 0x76, 0x19, 0x35, 0x28, 0x01, 0x00, 0x4a, 0xa9, 0x49, 0xf5, 0x9e, 0x2b, 0xdd, 0xc1, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE rotate_cw_xpm[1] = {{ png, sizeof( png ), "rotate_cw_xpm" }};
diff --git a/bitmaps_png/cpp_24/save_as.cpp b/bitmaps_png/cpp_24/save_as.cpp
index b219e0c1df..fe1da27847 100644
--- a/bitmaps_png/cpp_24/save_as.cpp
+++ b/bitmaps_png/cpp_24/save_as.cpp
@@ -8,7 +8,7 @@
 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, 0x02, 0x17, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x10, 0xf8,
+ 0xf8, 0x00, 0x00, 0x02, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x10, 0xf8,
  0xfa, 0xfa, 0x72, 0x45, 0x45, 0x45, 0x09, 0x82, 0x30, 0x4e, 0x45, 0x21, 0x21, 0x21, 0x2f, 0x80,
  0xf8, 0x3f, 0x39, 0x38, 0x34, 0x34, 0xf4, 0x17, 0x90, 0xfe, 0x1e, 0x1c, 0x1c, 0xfc, 0x03, 0x48,
  0x1f, 0x48, 0x48, 0x48, 0xe0, 0xc0, 0x66, 0x01, 0x86, 0xc6, 0xcf, 0x9f, 0x3f, 0x13, 0x85, 0xd1,
@@ -16,33 +16,36 @@ static const unsigned char png[] = {
  0xd3, 0x27, 0x6c, 0x16, 0x60, 0xb7, 0x84, 0xca, 0x16, 0x80, 0x2d, 0x01, 0xaa, 0x3d, 0x02, 0x34,
  0x9a, 0x91, 0x56, 0x16, 0x80, 0xf0, 0xaf, 0xe8, 0xe8, 0x68, 0x3e, 0x92, 0x2c, 0xc0, 0x26, 0x8f,
  0xcf, 0x02, 0xa0, 0x83, 0x78, 0x68, 0x6a, 0x41, 0x6c, 0x6c, 0x2c, 0x37, 0xb5, 0x53, 0x11, 0x4a,
- 0xf2, 0x05, 0xe5, 0x11, 0x9c, 0x16, 0x50, 0x8a, 0x29, 0xb2, 0x20, 0x3e, 0x20, 0xe8, 0x7f, 0x8f,
- 0x8d, 0xd7, 0xff, 0x35, 0x7a, 0xae, 0xff, 0x77, 0x6b, 0x38, 0x81, 0xf1, 0x2a, 0x7d, 0xd7, 0xff,
- 0xdd, 0xb6, 0x5e, 0xff, 0x63, 0x81, 0x72, 0x50, 0x75, 0xbf, 0xe1, 0x49, 0x95, 0x14, 0xc3, 0x8b,
- 0xdd, 0xfc, 0xfe, 0xef, 0x04, 0x1a, 0xb8, 0x5f, 0xcd, 0x11, 0x2b, 0xde, 0xa5, 0xe9, 0xf4, 0xbf,
- 0xcc, 0xd5, 0xef, 0x3f, 0x30, 0x67, 0xff, 0x86, 0xe7, 0x6a, 0x62, 0xc3, 0xff, 0xe1, 0xba, 0xed,
- 0xff, 0x0f, 0x68, 0xba, 0xfc, 0x3f, 0x6c, 0xe2, 0xf7, 0xff, 0xe5, 0xb6, 0xfd, 0xff, 0x2f, 0x26,
- 0x97, 0x63, 0xb5, 0x64, 0x1f, 0x10, 0x03, 0x2d, 0xf9, 0xeb, 0xe9, 0xe9, 0xc9, 0x4e, 0xb4, 0x05,
- 0xef, 0x1e, 0x3c, 0xfa, 0x7f, 0xd0, 0xc0, 0x0b, 0x6c, 0xc0, 0xe5, 0x8c, 0xea, 0xff, 0x20, 0xf0,
- 0x6a, 0xe7, 0x21, 0xbc, 0x3e, 0x59, 0xa5, 0xef, 0x24, 0x4d, 0xb4, 0x05, 0x37, 0x3a, 0xa7, 0xc3,
- 0x35, 0x5f, 0xce, 0xaa, 0x05, 0x5b, 0xf0, 0x7a, 0xf7, 0x61, 0x9c, 0x16, 0x80, 0xf0, 0x1e, 0x35,
- 0xc7, 0x56, 0xa2, 0x2d, 0x38, 0xe1, 0x95, 0x88, 0xd3, 0x82, 0xa3, 0x56, 0xc1, 0xff, 0xef, 0x4d,
- 0x98, 0x0b, 0xa6, 0xd1, 0x82, 0xea, 0x3c, 0xd1, 0x16, 0x1c, 0xd4, 0x75, 0xc7, 0x69, 0xc1, 0x1d,
- 0xa0, 0xef, 0x40, 0xe0, 0xeb, 0xdd, 0x87, 0xff, 0x8f, 0x5a, 0x87, 0x20, 0x5b, 0xf2, 0x89, 0x78,
- 0x0b, 0x74, 0xdc, 0x30, 0x2c, 0x78, 0x77, 0xe4, 0xcc, 0xff, 0x13, 0xce, 0x51, 0xff, 0xcf, 0x04,
- 0xa4, 0xfe, 0xff, 0x7a, 0xe7, 0x01, 0x58, 0xec, 0xdb, 0xc3, 0xa7, 0xff, 0x8f, 0xd9, 0x85, 0x81,
- 0xd5, 0x1d, 0x50, 0x77, 0xfc, 0x4a, 0x5e, 0x10, 0x65, 0xd6, 0xfc, 0xc7, 0x07, 0x7e, 0x7f, 0xf8,
- 0x04, 0x53, 0x4b, 0x7c, 0x10, 0xdd, 0xe8, 0x98, 0x06, 0xb7, 0x00, 0xe4, 0xc2, 0xcf, 0xd7, 0x6e,
- 0xff, 0xff, 0xf6, 0xe8, 0x19, 0x1c, 0xff, 0x78, 0xfe, 0xfa, 0xff, 0xbf, 0xbf, 0x7f, 0xc1, 0x16,
- 0x7c, 0xb9, 0x7d, 0x1f, 0xac, 0x6e, 0xaf, 0xaa, 0x43, 0x33, 0xf1, 0xc9, 0xf4, 0xfe, 0xc3, 0xff,
- 0x87, 0x8c, 0xbc, 0xb1, 0xa6, 0x96, 0x93, 0x9e, 0x09, 0xff, 0x7f, 0xbd, 0xff, 0x08, 0x89, 0x97,
- 0xbd, 0x47, 0xff, 0x1f, 0xd4, 0x76, 0x05, 0x27, 0xd3, 0xad, 0x0a, 0x0e, 0x12, 0x24, 0xe5, 0xe4,
- 0x0a, 0x60, 0x0e, 0xdd, 0x87, 0xc5, 0x82, 0xdb, 0x2d, 0x53, 0x50, 0x0c, 0xdf, 0xab, 0xee, 0xf4,
- 0xbf, 0xc8, 0xdd, 0xef, 0x3f, 0x59, 0x95, 0x3e, 0xc8, 0x92, 0x9d, 0x9a, 0xa8, 0x45, 0x05, 0xc8,
- 0xd0, 0xf3, 0xd1, 0xf9, 0xff, 0x0f, 0x68, 0xb9, 0x82, 0xe5, 0x40, 0x45, 0x05, 0xc8, 0x4c, 0xb2,
- 0x9b, 0x2a, 0xfb, 0xb5, 0x1d, 0x24, 0xf6, 0xab, 0x3b, 0x34, 0x03, 0x0d, 0xbf, 0x00, 0xc4, 0xdf,
- 0xa1, 0xf8, 0x3c, 0x48, 0x6c, 0xa7, 0xb2, 0x9b, 0x18, 0xb2, 0x5a, 0x00, 0x7e, 0x19, 0xfc, 0xd7,
- 0x82, 0xec, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf2, 0x05, 0xe5, 0x11, 0x9c, 0x16, 0x50, 0x8a, 0x29, 0xb2, 0x20, 0x3a, 0x30, 0xf8, 0x7f, 0xab,
+ 0xbd, 0xf7, 0xff, 0x65, 0x86, 0x6e, 0xff, 0xb7, 0x69, 0x3b, 0xff, 0xdf, 0xa2, 0xe5, 0xfc, 0x7f,
+ 0x99, 0x81, 0xeb, 0xff, 0x36, 0xa0, 0x18, 0x48, 0x0e, 0xaa, 0xee, 0x37, 0x3c, 0xa9, 0x92, 0x62,
+ 0x78, 0xb1, 0xbb, 0xff, 0xff, 0x6d, 0x40, 0x03, 0xf7, 0xab, 0x39, 0x62, 0xc5, 0x3b, 0x34, 0x9d,
+ 0xfe, 0x97, 0xba, 0xf9, 0xff, 0x07, 0xe6, 0xec, 0xdf, 0xf0, 0x5c, 0x4d, 0x6c, 0xf8, 0x3f, 0xd9,
+ 0xbe, 0xff, 0xff, 0x01, 0x4d, 0x97, 0xff, 0x87, 0x0c, 0xbc, 0xfe, 0x3f, 0x5b, 0xb9, 0xe5, 0xff,
+ 0x85, 0xf8, 0x62, 0xac, 0x96, 0xec, 0x53, 0x77, 0xfc, 0x5f, 0xe6, 0xe6, 0xf7, 0xd7, 0xd3, 0xd3,
+ 0x93, 0x9d, 0x68, 0x0b, 0x3e, 0x3c, 0x7b, 0xfe, 0xff, 0xb0, 0xa9, 0x1f, 0xd8, 0x80, 0xcb, 0x19,
+ 0xd5, 0xff, 0x41, 0xe0, 0xd5, 0x8e, 0x03, 0x38, 0x7d, 0xb2, 0x0b, 0xe8, 0x93, 0x55, 0xfa, 0x4e,
+ 0xd2, 0x44, 0x5b, 0x70, 0x6b, 0xe2, 0x3c, 0xb8, 0xe6, 0x5b, 0xcd, 0x93, 0xc0, 0x16, 0x3c, 0x59,
+ 0xb4, 0x0e, 0xa7, 0x05, 0x20, 0xbc, 0x57, 0xdd, 0xa9, 0x83, 0x68, 0x0b, 0x4e, 0x05, 0xa6, 0xc1,
+ 0x35, 0xde, 0xed, 0x99, 0x05, 0xb6, 0xe0, 0xe1, 0xcc, 0x65, 0x60, 0xfe, 0x11, 0xa0, 0xcf, 0x6e,
+ 0xb7, 0x4c, 0xf9, 0x7f, 0xc4, 0x3c, 0x00, 0x35, 0xa8, 0x54, 0x1d, 0xaf, 0x10, 0x6d, 0xc1, 0x61,
+ 0x13, 0x5f, 0xb8, 0xc6, 0x1b, 0x95, 0x5d, 0x60, 0x0b, 0x9e, 0xaf, 0xdb, 0x01, 0xe6, 0xdf, 0x6e,
+ 0x9d, 0x02, 0xe6, 0x7f, 0xb9, 0x75, 0xef, 0xff, 0x51, 0xcb, 0x40, 0x64, 0x4b, 0x7e, 0x10, 0x6d,
+ 0xc1, 0x51, 0x9b, 0x10, 0xb8, 0xc6, 0x53, 0x3e, 0xc9, 0x60, 0x03, 0x7f, 0x7f, 0xfe, 0xfa, 0xff,
+ 0x72, 0x76, 0xed, 0xff, 0xe3, 0xce, 0x51, 0x60, 0xc3, 0xc1, 0x96, 0xdc, 0x7e, 0xf0, 0xff, 0xa8,
+ 0x75, 0x10, 0x4c, 0xed, 0x1f, 0xb2, 0x82, 0x08, 0x84, 0x9f, 0xaf, 0xdf, 0xf9, 0x1f, 0x19, 0xfc,
+ 0xf9, 0xfe, 0x03, 0xce, 0xfe, 0xfd, 0xfe, 0x13, 0x4c, 0xdd, 0x6d, 0xa2, 0x2d, 0xb8, 0x3d, 0x65,
+ 0x01, 0x6a, 0x24, 0x6a, 0x38, 0xfd, 0xbf, 0xd5, 0x30, 0xe1, 0xff, 0xc7, 0x8b, 0xd7, 0xff, 0xff,
+ 0xfe, 0xf8, 0x09, 0xc5, 0xb2, 0x6f, 0x8f, 0x9e, 0xc2, 0xe2, 0xa0, 0x93, 0x68, 0x0b, 0xde, 0xde,
+ 0x7b, 0xf8, 0xff, 0x20, 0x30, 0xfd, 0x63, 0x4b, 0x2d, 0x27, 0x80, 0x41, 0xf4, 0xf3, 0xf5, 0x3b,
+ 0xb0, 0xe1, 0xef, 0x8e, 0x9c, 0xf9, 0x7f, 0x50, 0xcf, 0xe3, 0xff, 0x1e, 0xa0, 0x03, 0x76, 0x68,
+ 0xda, 0x4a, 0x92, 0x94, 0x93, 0xab, 0x9d, 0x7d, 0xff, 0xef, 0xc3, 0x62, 0x01, 0x2c, 0xd9, 0xc2,
+ 0x0c, 0x07, 0xa9, 0xa9, 0x72, 0xf1, 0xfd, 0x4f, 0x56, 0xa5, 0x5f, 0xe3, 0xe4, 0xf3, 0x7f, 0xb7,
+ 0x06, 0xaa, 0x05, 0x07, 0x75, 0xdc, 0xfe, 0x5f, 0x4a, 0xab, 0xfc, 0x7f, 0x50, 0xd7, 0xfd, 0xff,
+ 0x1e, 0x60, 0x2e, 0xae, 0x73, 0xf4, 0x01, 0xa9, 0x7d, 0x41, 0x76, 0x53, 0x65, 0xaf, 0xa6, 0x93,
+ 0x3c, 0x30, 0x7c, 0x9b, 0x0e, 0xa8, 0x39, 0xde, 0x44, 0xb2, 0xe8, 0x01, 0x50, 0x6c, 0xda, 0x7e,
+ 0x65, 0x07, 0x15, 0x64, 0xb5, 0x00, 0x5c, 0xdf, 0xfa, 0x65, 0x04, 0x64, 0x39, 0x4e, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE save_as_xpm[1] = {{ png, sizeof( png ), "save_as_xpm" }};
diff --git a/bitmaps_png/cpp_24/ungroup.cpp b/bitmaps_png/cpp_24/ungroup.cpp
index 5550985a7b..34e76d3421 100644
--- a/bitmaps_png/cpp_24/ungroup.cpp
+++ b/bitmaps_png/cpp_24/ungroup.cpp
@@ -7,28 +7,13 @@
 
 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, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc3, 0x00, 0x00, 0x0e,
- 0xc3, 0x01, 0xc7, 0x6f, 0xa8, 0x64, 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, 0x00, 0x0b, 0x74,
- 0x45, 0x58, 0x74, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x57, 0xde,
- 0x0d, 0x88, 0x00, 0x00, 0x00, 0x52, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69,
- 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69,
- 0x6f, 0x6e, 0x2d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x41, 0x6c, 0x69, 0x6b, 0x65, 0x20, 0x68, 0x74,
- 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d,
- 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65,
- 0x73, 0x2f, 0x62, 0x79, 0x2d, 0x73, 0x61, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0xc3, 0x54, 0x62, 0x05,
- 0x00, 0x00, 0x00, 0x8f, 0x49, 0x44, 0x41, 0x54, 0x48, 0x89, 0xc5, 0x94, 0x3b, 0x12, 0x80, 0x20,
- 0x0c, 0x44, 0x83, 0x63, 0xe1, 0x01, 0x73, 0xcc, 0x3d, 0xa0, 0x56, 0xda, 0xe8, 0x4c, 0x0a, 0x88,
- 0x2c, 0x10, 0x78, 0x15, 0x13, 0x86, 0x2c, 0xf9, 0x8a, 0x04, 0x93, 0x44, 0x44, 0x54, 0xf5, 0xb6,
- 0x46, 0x00, 0xe9, 0x3b, 0x7b, 0x77, 0x35, 0xec, 0x39, 0xe3, 0xeb, 0xf4, 0x62, 0x1c, 0x51, 0x02,
- 0x5e, 0x04, 0x2c, 0x5b, 0xcf, 0x63, 0x8a, 0xbf, 0x9f, 0xaa, 0xea, 0xd9, 0xe2, 0xd7, 0x46, 0x30,
- 0x24, 0xe7, 0x9e, 0x40, 0x08, 0xe1, 0x6d, 0x1a, 0x1e, 0x41, 0x69, 0x0e, 0x9a, 0x0a, 0x5a, 0x2d,
- 0x00, 0xe0, 0x30, 0x62, 0x5d, 0x73, 0x40, 0xe5, 0xb3, 0x24, 0xfa, 0xd5, 0x25, 0x67, 0xcf, 0x46,
- 0xd0, 0x2b, 0x68, 0x19, 0x52, 0x64, 0x00, 0xa9, 0xd4, 0x5d, 0xf3, 0x56, 0x05, 0x8b, 0x97, 0x16,
- 0x7b, 0x17, 0x1e, 0xc1, 0x9c, 0x55, 0xc1, 0xc2, 0xb4, 0xe9, 0x9a, 0x55, 0xc1, 0xb2, 0x74, 0x0e,
- 0xc2, 0x79, 0x00, 0x79, 0x9c, 0x42, 0x08, 0x67, 0x1a, 0xe9, 0x97, 0x00, 0x00, 0x00, 0x00, 0x49,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
+ 0x73, 0x00, 0x00, 0x00, 0x4e, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x1d, 0x84,
+ 0xfc, 0x87, 0x40, 0x6c, 0x3c, 0xbc, 0x1a, 0x80, 0xf0, 0x07, 0x10, 0x12, 0xaf, 0x81, 0x64, 0x1b,
+ 0x88, 0xd6, 0x00, 0x52, 0x84, 0xc6, 0xff, 0x41, 0xc8, 0xdb, 0x3f, 0x68, 0xab, 0x81, 0xf6, 0x9e,
+ 0x46, 0x89, 0x85, 0x1f, 0xb4, 0x09, 0x56, 0xc2, 0x06, 0x11, 0x19, 0x3b, 0x98, 0x90, 0x36, 0x36,
+ 0x90, 0xe0, 0x33, 0x54, 0x05, 0x44, 0x04, 0x04, 0xad, 0x35, 0xd0, 0xde, 0xd3, 0xb4, 0x8f, 0x07,
+ 0xec, 0x00, 0x00, 0xc7, 0xe4, 0xc6, 0x5d, 0x2a, 0x8c, 0xfe, 0x24, 0x00, 0x00, 0x00, 0x00, 0x49,
  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
diff --git a/bitmaps_png/cpp_24/unit_inch.cpp b/bitmaps_png/cpp_24/unit_inch.cpp
index 735f4f5bd7..a468cc725d 100644
--- a/bitmaps_png/cpp_24/unit_inch.cpp
+++ b/bitmaps_png/cpp_24/unit_inch.cpp
@@ -8,18 +8,18 @@
 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, 0xa5, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0xfc, 0xa0,
- 0x81, 0x89, 0x24, 0xe5, 0x21, 0xdb, 0x42, 0x5e, 0x84, 0xb2, 0x91, 0xa0, 0x21, 0x38, 0x35, 0xa4,
- 0x95, 0x24, 0x1b, 0x42, 0x33, 0x83, 0xdb, 0x81, 0xa4, 0x68, 0x48, 0x47, 0xa8, 0x56, 0x48, 0x7a,
- 0xf0, 0xb4, 0x90, 0x5c, 0x02, 0xf6, 0x85, 0x1c, 0x0d, 0xf9, 0x0b, 0xb4, 0x47, 0x23, 0xe4, 0x7f,
- 0xc8, 0xcb, 0x90, 0xc7, 0x21, 0xcf, 0x80, 0x74, 0x1b, 0xb1, 0x1a, 0x6e, 0x7b, 0xb2, 0x03, 0x6d,
- 0xfa, 0x17, 0x7a, 0x9c, 0x58, 0x0d, 0x4b, 0xc0, 0xfc, 0x8f, 0x21, 0x17, 0x89, 0xd5, 0x30, 0x9b,
- 0x36, 0x1a, 0x42, 0x77, 0x84, 0xbc, 0x01, 0x6a, 0x50, 0x0d, 0x79, 0x17, 0x32, 0x11, 0xac, 0xe1,
- 0x61, 0xc8, 0x61, 0x6a, 0x26, 0x8a, 0x60, 0x2f, 0xac, 0x91, 0xe9, 0x85, 0x25, 0xb9, 0x84, 0xf2,
- 0x87, 0xe6, 0x87, 0xdc, 0x0d, 0xf9, 0x8f, 0xd5, 0x5f, 0xff, 0x81, 0x32, 0xe5, 0x91, 0x22, 0x08,
- 0xc5, 0xc6, 0xc1, 0x33, 0x43, 0xbe, 0x02, 0x85, 0xf1, 0xc3, 0x1f, 0x21, 0xab, 0x42, 0x6d, 0xc8,
- 0xd3, 0x40, 0xb2, 0x93, 0xc8, 0xf2, 0xf4, 0x90, 0x06, 0x00, 0x65, 0x24, 0x84, 0x44, 0x6a, 0x09,
- 0x08, 0xa9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x00, 0xa7, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x76, 0x20,
+ 0xa4, 0x24, 0xe4, 0x52, 0x03, 0x13, 0x09, 0x1a, 0x82, 0x1c, 0x43, 0x1a, 0x48, 0xb3, 0xc1, 0x21,
+ 0xb4, 0x88, 0x81, 0x21, 0x40, 0x20, 0xa4, 0x3c, 0x52, 0x3c, 0x24, 0x2b, 0xb8, 0x2b, 0xc4, 0x87,
+ 0x90, 0x86, 0xce, 0x90, 0x2f, 0x0c, 0x0c, 0xc1, 0x4a, 0x21, 0xff, 0x83, 0x1f, 0x85, 0x6c, 0x0b,
+ 0x39, 0x13, 0xf2, 0x3f, 0xd4, 0x8f, 0x58, 0x0d, 0x33, 0x19, 0x18, 0x12, 0x38, 0x42, 0xbe, 0x04,
+ 0x4f, 0x20, 0x52, 0x43, 0x48, 0x0a, 0x98, 0xff, 0x30, 0x64, 0x36, 0x91, 0x1a, 0x42, 0x63, 0x69,
+ 0xa4, 0xa1, 0x21, 0xe4, 0x09, 0x03, 0x43, 0x84, 0x42, 0xc8, 0xbb, 0xe0, 0x30, 0x30, 0xff, 0x52,
+ 0xc8, 0x44, 0xea, 0xc5, 0x72, 0x03, 0x53, 0xb0, 0x17, 0x36, 0xf1, 0x60, 0x2f, 0x2c, 0x71, 0x1f,
+ 0xca, 0x1f, 0x9a, 0x1f, 0x72, 0x37, 0xe4, 0x3f, 0x56, 0x67, 0xfe, 0x07, 0xca, 0x94, 0x47, 0x8a,
+ 0x20, 0x14, 0x1b, 0x07, 0xcf, 0x0c, 0xf9, 0x0a, 0x14, 0xc6, 0x0f, 0x7f, 0x84, 0xac, 0x0a, 0xb5,
+ 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb, 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x28, 0xc7, 0x7d, 0x5c,
+ 0x02, 0x62, 0x5f, 0x8e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE unit_inch_xpm[1] = {{ png, sizeof( png ), "unit_inch_xpm" }};
diff --git a/bitmaps_png/cpp_24/unit_mil.cpp b/bitmaps_png/cpp_24/unit_mil.cpp
index 21f137a299..c852a77897 100644
--- a/bitmaps_png/cpp_24/unit_mil.cpp
+++ b/bitmaps_png/cpp_24/unit_mil.cpp
@@ -8,23 +8,22 @@
 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, 0xf2, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x6a, 0xa0,
- 0x81, 0x09, 0x44, 0x26, 0x70, 0x44, 0x09, 0xa6, 0xb1, 0x12, 0xa1, 0x3c, 0x4a, 0x30, 0xe4, 0x5d,
- 0xc8, 0x12, 0x06, 0x86, 0xd0, 0xa2, 0x90, 0xff, 0x21, 0x41, 0x44, 0x68, 0x08, 0x65, 0x0b, 0x99,
- 0x18, 0x1a, 0x82, 0x55, 0x43, 0x70, 0x52, 0x70, 0x7c, 0x90, 0x51, 0x48, 0x4f, 0x48, 0x53, 0xa8,
- 0x4a, 0xb0, 0x79, 0x48, 0x4f, 0x70, 0x57, 0xa8, 0x22, 0x50, 0x21, 0x67, 0x48, 0x47, 0x68, 0x02,
- 0x56, 0x0d, 0x21, 0xdb, 0x43, 0x3e, 0x84, 0xbc, 0x0e, 0xbe, 0x09, 0x94, 0x78, 0x0e, 0x74, 0xc6,
- 0xf5, 0x90, 0xff, 0xc1, 0x37, 0x19, 0x18, 0x02, 0x04, 0x80, 0xfc, 0x2d, 0xb8, 0x34, 0xfc, 0x0f,
- 0xf6, 0x65, 0x60, 0x0c, 0x39, 0x17, 0xf2, 0x3f, 0x34, 0x10, 0xc8, 0x3f, 0x06, 0xa4, 0x45, 0x09,
- 0x68, 0x88, 0x14, 0x01, 0xd2, 0x1b, 0x42, 0xfe, 0x47, 0x48, 0x01, 0xe9, 0xe5, 0x40, 0x0d, 0x72,
- 0x04, 0x34, 0x84, 0xf2, 0x00, 0xa5, 0xd6, 0x83, 0x4c, 0x06, 0xf2, 0x97, 0x51, 0x5d, 0xc3, 0xea,
- 0x90, 0x77, 0xb1, 0xdc, 0x40, 0x7a, 0x49, 0xc8, 0x3b, 0xb0, 0xd3, 0x66, 0x87, 0xbc, 0x0b, 0x92,
- 0x09, 0xe5, 0x0f, 0x79, 0x17, 0xbc, 0x02, 0xc8, 0xcb, 0x02, 0x06, 0x84, 0x0f, 0x35, 0x92, 0x41,
- 0xb0, 0x17, 0x36, 0xf1, 0x60, 0x2f, 0x48, 0x02, 0x41, 0x8d, 0x53, 0xfe, 0xd0, 0xfc, 0x90, 0xbb,
- 0x21, 0xff, 0xb1, 0x69, 0x00, 0xba, 0xff, 0x6e, 0x48, 0x39, 0xc8, 0xa1, 0x30, 0xc5, 0xc6, 0xc1,
- 0x33, 0x43, 0xbe, 0x02, 0x85, 0xf1, 0xc3, 0x1f, 0x21, 0xab, 0x42, 0x6d, 0xc8, 0xd3, 0x40, 0xb2,
- 0x93, 0xc8, 0xf2, 0xf4, 0x90, 0x06, 0x00, 0xa7, 0x53, 0xb6, 0xc2, 0x06, 0x3f, 0x4e, 0x33, 0x00,
- 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x00, 0xe0, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x9a, 0x20,
+ 0x94, 0x33, 0x4a, 0x90, 0x48, 0xa5, 0x21, 0xe7, 0x43, 0x2a, 0x19, 0x18, 0x82, 0x5b, 0x42, 0x7e,
+ 0x10, 0xab, 0xa1, 0x36, 0xd4, 0x15, 0xab, 0x86, 0x40, 0x9d, 0xe0, 0xd4, 0x70, 0xe5, 0x90, 0x9a,
+ 0x90, 0xca, 0x70, 0xe5, 0x70, 0xe5, 0xd0, 0xea, 0x90, 0xe6, 0x60, 0x55, 0x90, 0x78, 0x70, 0x5e,
+ 0x88, 0x33, 0x56, 0x0d, 0x21, 0x71, 0x21, 0xbf, 0x82, 0x6f, 0x86, 0xae, 0x09, 0x79, 0x17, 0xf2,
+ 0x22, 0xf8, 0x0e, 0x90, 0x7e, 0x1d, 0xf2, 0xd4, 0x93, 0x1d, 0x28, 0xfe, 0x26, 0x78, 0x02, 0x2e,
+ 0x0d, 0xff, 0x43, 0x22, 0x80, 0x74, 0x6e, 0xc8, 0xff, 0xd0, 0x58, 0x20, 0x9d, 0x12, 0xf2, 0x3f,
+ 0x5c, 0x93, 0x80, 0x86, 0x60, 0x0d, 0x20, 0x1d, 0x0a, 0xa4, 0xf5, 0x80, 0xb4, 0x0f, 0x50, 0xa3,
+ 0x31, 0x01, 0x0d, 0xa1, 0x8a, 0x10, 0x0d, 0xa1, 0x5a, 0xb4, 0xd0, 0x10, 0x1a, 0x1e, 0xf2, 0x2e,
+ 0x48, 0x1e, 0xa8, 0xc0, 0x3f, 0xe4, 0x5d, 0xa8, 0x3a, 0x50, 0x89, 0x7b, 0xc8, 0xbb, 0x40, 0x7d,
+ 0x20, 0x7d, 0x27, 0xb8, 0x1d, 0x28, 0x5a, 0x13, 0xf2, 0x9c, 0x1a, 0x09, 0xa0, 0x81, 0x29, 0xd8,
+ 0x0b, 0x9b, 0x78, 0xb0, 0x57, 0x03, 0x13, 0x66, 0x6a, 0xe1, 0x0f, 0xcd, 0x0f, 0xb9, 0x1b, 0xf2,
+ 0x1f, 0x6b, 0x6c, 0xff, 0x07, 0xca, 0x94, 0x47, 0x8a, 0x20, 0x14, 0x1b, 0x07, 0xcf, 0x0c, 0xf9,
+ 0x0a, 0x14, 0xc6, 0x0f, 0x7f, 0x84, 0xac, 0x0a, 0xb5, 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb,
+ 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x9a, 0xf1, 0xa5, 0xae, 0x8f, 0x94, 0xaf, 0x36, 0x00, 0x00, 0x00,
+ 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE unit_mil_xpm[1] = {{ png, sizeof( png ), "unit_mil_xpm" }};
diff --git a/bitmaps_png/cpp_24/unit_mm.cpp b/bitmaps_png/cpp_24/unit_mm.cpp
index 53a893b548..996a53b34c 100644
--- a/bitmaps_png/cpp_24/unit_mm.cpp
+++ b/bitmaps_png/cpp_24/unit_mm.cpp
@@ -8,26 +8,25 @@
 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, 0x19, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0x44,
- 0x81, 0xe0, 0xa4, 0xd0, 0x84, 0x20, 0x8b, 0x90, 0x9e, 0x90, 0xe6, 0x60, 0xd5, 0x60, 0x73, 0x20,
- 0xdd, 0x1d, 0xaa, 0xc8, 0xc0, 0x90, 0xc0, 0x11, 0xd2, 0x11, 0x6c, 0x18, 0x1c, 0x13, 0x32, 0x25,
- 0x24, 0xd7, 0x97, 0x2b, 0x38, 0x3e, 0x78, 0x5a, 0x48, 0x81, 0x27, 0x3b, 0x58, 0x43, 0xc8, 0xf6,
- 0x90, 0x8f, 0x21, 0xef, 0x82, 0x6f, 0x86, 0xfc, 0x0f, 0x79, 0x1e, 0xf2, 0x2e, 0xe4, 0x7a, 0xc8,
- 0xff, 0xe0, 0x9b, 0x0c, 0x0c, 0xa1, 0xfc, 0x40, 0xfe, 0xb3, 0x90, 0xa7, 0x21, 0x2f, 0x81, 0xfc,
- 0xfb, 0x40, 0x99, 0xe7, 0x40, 0x7e, 0x33, 0x4c, 0xc3, 0xff, 0x60, 0x5f, 0x06, 0xc6, 0xd0, 0xb3,
- 0x21, 0xff, 0x43, 0x03, 0x81, 0xfc, 0x63, 0x40, 0x5a, 0x14, 0xac, 0xe1, 0x55, 0x28, 0x4f, 0xb8,
- 0x1a, 0x90, 0x7e, 0xe3, 0xc7, 0x1b, 0x2a, 0x07, 0xa4, 0xf7, 0xc2, 0x35, 0x44, 0x8a, 0x00, 0xe9,
- 0x0d, 0x21, 0xff, 0x23, 0xa4, 0x80, 0xf4, 0xf2, 0x90, 0xff, 0x41, 0xf2, 0x60, 0x0d, 0x7b, 0x18,
- 0x18, 0x3c, 0xd9, 0x81, 0xf4, 0x21, 0xb0, 0xba, 0x7f, 0x21, 0xc7, 0xe0, 0x1a, 0x42, 0x79, 0x80,
- 0x8e, 0x58, 0x0f, 0x32, 0x19, 0xc8, 0x5f, 0x06, 0xd7, 0xb0, 0x05, 0xaa, 0x61, 0x0f, 0x85, 0x1a,
- 0x56, 0x87, 0xbc, 0x8b, 0xe5, 0x06, 0xd2, 0x4b, 0x42, 0xde, 0x81, 0x9d, 0x36, 0x3b, 0xe4, 0x5d,
- 0x84, 0x6c, 0x34, 0x1f, 0x30, 0x20, 0x56, 0x80, 0x35, 0xbc, 0x0b, 0xd9, 0x00, 0x56, 0xf7, 0x36,
- 0x64, 0x27, 0x65, 0xf1, 0xd1, 0xc0, 0x14, 0xec, 0x85, 0x35, 0x9e, 0xbc, 0x1a, 0x98, 0x30, 0x04,
- 0x43, 0xf9, 0x43, 0xf3, 0x43, 0xee, 0x86, 0xfc, 0xc7, 0xa6, 0x01, 0xe8, 0x87, 0xbb, 0x21, 0xe5,
- 0x20, 0xc7, 0xc2, 0x14, 0x1b, 0x07, 0xcf, 0x0c, 0xf9, 0x0a, 0x14, 0xc6, 0x0f, 0x7f, 0x84, 0xac,
- 0x0a, 0xb5, 0x21, 0x4f, 0x03, 0xc9, 0x4e, 0x22, 0xcb, 0xd3, 0x43, 0x1a, 0x00, 0x00, 0x44, 0x45,
- 0xc2, 0x29, 0x3f, 0x44, 0x9d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0x08, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0x44,
+ 0x81, 0x60, 0xf3, 0x90, 0x88, 0x50, 0xdd, 0x90, 0x86, 0x90, 0xe2, 0x08, 0x29, 0x10, 0x1d, 0x5a,
+ 0x17, 0x2a, 0xcd, 0xc0, 0x10, 0xca, 0x1c, 0x52, 0x1e, 0x24, 0x1f, 0x9a, 0x16, 0xd2, 0x16, 0xec,
+ 0x1e, 0xca, 0x19, 0x9c, 0x1a, 0xd2, 0x1d, 0xec, 0x0b, 0xd5, 0x10, 0x52, 0x1e, 0xf2, 0x21, 0xf8,
+ 0x4e, 0xe8, 0x9a, 0x90, 0xaf, 0x21, 0xf7, 0x82, 0xef, 0x87, 0xac, 0x0e, 0xf9, 0x1c, 0x72, 0x89,
+ 0x81, 0xc1, 0x93, 0x3d, 0xe4, 0x7f, 0xc8, 0x93, 0x90, 0x9d, 0x21, 0x97, 0x42, 0xfe, 0x87, 0x5e,
+ 0x0e, 0xdd, 0x1d, 0x72, 0x0e, 0xc8, 0x77, 0x86, 0x69, 0xf8, 0x1f, 0x6a, 0x0f, 0xa4, 0xdb, 0x20,
+ 0x42, 0xa1, 0x75, 0x40, 0x3e, 0x3f, 0x48, 0x43, 0xe8, 0x7a, 0x06, 0x86, 0x40, 0x31, 0xa0, 0xe8,
+ 0x16, 0xa0, 0x28, 0x7f, 0xc8, 0xdf, 0x90, 0x06, 0x84, 0x06, 0x7e, 0xa0, 0xd3, 0xf2, 0x80, 0xb4,
+ 0x28, 0x50, 0x2a, 0x2d, 0xe4, 0x7f, 0x90, 0x24, 0x58, 0x43, 0x1d, 0x58, 0xfe, 0x6f, 0x48, 0x2b,
+ 0x98, 0xfe, 0x12, 0xd2, 0x09, 0xd7, 0x90, 0xc0, 0x01, 0xd1, 0x10, 0x20, 0x80, 0xa2, 0xa1, 0x02,
+ 0xaa, 0xa1, 0x81, 0x32, 0x0d, 0xa1, 0xf9, 0x21, 0xef, 0x3c, 0xd9, 0xc1, 0x0a, 0xdf, 0x81, 0x9d,
+ 0x16, 0x1f, 0xf2, 0x2e, 0x52, 0x1c, 0xa8, 0xe1, 0x5d, 0x48, 0x01, 0x58, 0xe1, 0x1b, 0xa8, 0xc6,
+ 0x27, 0x50, 0x3f, 0x90, 0x0d, 0x1a, 0x98, 0x82, 0xbd, 0xb0, 0xc6, 0x93, 0x57, 0x03, 0x13, 0x86,
+ 0x60, 0x28, 0x3f, 0xd0, 0x61, 0x77, 0x43, 0xfe, 0x63, 0xd3, 0x00, 0x0c, 0xd6, 0xbb, 0x21, 0xe5,
+ 0x91, 0x22, 0x08, 0xc5, 0xc6, 0xc1, 0x33, 0x81, 0x91, 0xf6, 0x9f, 0x00, 0xfc, 0x11, 0xb2, 0x2a,
+ 0xd4, 0x86, 0x3c, 0x0d, 0x24, 0x3b, 0x89, 0x2c, 0x4f, 0x0f, 0x69, 0x00, 0x00, 0x23, 0x4a, 0xb4,
+ 0xa4, 0xde, 0x2e, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+ 0x82,
 };
 
 const BITMAP_OPAQUE unit_mm_xpm[1] = {{ png, sizeof( png ), "unit_mm_xpm" }};
diff --git a/bitmaps_png/cpp_48/icon_cvpcb.cpp b/bitmaps_png/cpp_48/icon_cvpcb.cpp
index ff4b686112..5fd342ffa5 100644
--- a/bitmaps_png/cpp_48/icon_cvpcb.cpp
+++ b/bitmaps_png/cpp_48/icon_cvpcb.cpp
@@ -8,105 +8,105 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9,
- 0x87, 0x00, 0x00, 0x06, 0x08, 0x49, 0x44, 0x41, 0x54, 0x68, 0xde, 0xed, 0x99, 0x5f, 0x50, 0x54,
- 0x55, 0x18, 0xc0, 0x57, 0x7b, 0xe8, 0xa5, 0x1e, 0x7a, 0xe9, 0x21, 0x7b, 0x28, 0x13, 0x16, 0x4d,
- 0x6b, 0x26, 0x1c, 0x66, 0xb0, 0xc1, 0x76, 0x17, 0x50, 0x71, 0x6a, 0x73, 0x65, 0x61, 0x97, 0x05,
- 0x01, 0xc9, 0x41, 0x18, 0x08, 0x68, 0x90, 0x21, 0x9b, 0x41, 0x56, 0x43, 0x40, 0x87, 0x4c, 0x0c,
- 0x53, 0x10, 0x33, 0xa3, 0x04, 0x82, 0x52, 0xf2, 0x0f, 0x16, 0x2c, 0xcb, 0xba, 0x08, 0xc8, 0x20,
- 0x68, 0x98, 0xfc, 0x37, 0x49, 0xd1, 0x99, 0x1a, 0x45, 0xfe, 0x97, 0x18, 0x5f, 0xe7, 0x3b, 0x7a,
- 0x2e, 0xf7, 0xb2, 0xbb, 0xee, 0x95, 0x85, 0xda, 0x9d, 0xe9, 0x9b, 0xf9, 0x66, 0x77, 0xce, 0xb9,
- 0x70, 0xbe, 0xdf, 0x39, 0xdf, 0xbf, 0x73, 0x57, 0x22, 0x99, 0x65, 0x51, 0xab, 0xd5, 0xe6, 0xa0,
- 0xa0, 0xa0, 0x36, 0xf2, 0xe9, 0x23, 0x71, 0x45, 0x21, 0x86, 0xc3, 0x23, 0x9d, 0x24, 0x5a, 0xa0,
- 0xd3, 0xe9, 0x9e, 0x73, 0x49, 0x00, 0x8d, 0x46, 0xc3, 0x40, 0x6e, 0x93, 0x13, 0xd1, 0xb8, 0x1c,
- 0xc0, 0x97, 0xe5, 0x67, 0x21, 0x2e, 0x31, 0x99, 0x41, 0x00, 0x81, 0x38, 0xad, 0xd5, 0x6a, 0x5f,
- 0x72, 0x46, 0x83, 0xcd, 0x3c, 0xb7, 0xe1, 0xb4, 0xfc, 0xa7, 0x46, 0x28, 0xfb, 0xb1, 0x01, 0x72,
- 0xf2, 0x0e, 0x83, 0x2e, 0x34, 0x8c, 0x8d, 0x8f, 0x12, 0x4d, 0x25, 0x30, 0x4f, 0xb9, 0x04, 0x00,
- 0xd3, 0xaf, 0x2b, 0x6a, 0x60, 0xcb, 0xd6, 0x6d, 0xfc, 0xd3, 0xb8, 0x44, 0xd4, 0xcb, 0xa9, 0x5d,
- 0x88, 0x0f, 0xc0, 0xf4, 0xb3, 0xc3, 0xc5, 0x10, 0x11, 0x19, 0xc5, 0x40, 0xfe, 0x0e, 0x0c, 0x0c,
- 0xcc, 0x57, 0x2a, 0x95, 0xcf, 0x3a, 0x35, 0x40, 0x61, 0xc9, 0x49, 0xf8, 0xf4, 0xe0, 0x51, 0xaa,
- 0x7b, 0xf3, 0x8b, 0xe0, 0xab, 0xef, 0xab, 0x40, 0x9f, 0xb5, 0x87, 0x9c, 0x42, 0x30, 0x03, 0xb9,
- 0x49, 0x4e, 0x43, 0xe5, 0x94, 0x00, 0xe8, 0x3a, 0xc1, 0xc1, 0x1a, 0x81, 0x6b, 0xc5, 0xc6, 0x27,
- 0xd2, 0xb9, 0x43, 0xc5, 0x3f, 0x40, 0x74, 0x6c, 0x3c, 0x7f, 0xee, 0x24, 0x01, 0x59, 0xe0, 0x54,
- 0x00, 0x25, 0x67, 0xcc, 0xf0, 0x5e, 0x74, 0x0c, 0xcf, 0xc8, 0x20, 0xf8, 0x48, 0x9f, 0xc9, 0x73,
- 0xab, 0x06, 0xd8, 0xb5, 0xaf, 0x00, 0x42, 0x42, 0x74, 0xec, 0x99, 0x01, 0x02, 0x91, 0xa8, 0xd7,
- 0xeb, 0xe7, 0x3b, 0x65, 0x0c, 0xd8, 0xd2, 0xa2, 0x13, 0x06, 0x48, 0x4a, 0xd9, 0xca, 0x3f, 0x0d,
- 0xac, 0xe6, 0x4b, 0x5c, 0x06, 0x80, 0x69, 0xee, 0xa1, 0x6f, 0x20, 0x3c, 0x62, 0x23, 0x83, 0xb8,
- 0x4f, 0x34, 0x3b, 0x20, 0x20, 0xe0, 0x69, 0x97, 0x01, 0x40, 0x2d, 0x3e, 0x65, 0x82, 0xd4, 0xb4,
- 0x1d, 0x98, 0x6a, 0xc1, 0x5a, 0x7a, 0xc6, 0xd3, 0xf9, 0x1f, 0xe0, 0x49, 0x01, 0xbe, 0x3d, 0x5b,
- 0x0f, 0x19, 0x39, 0x79, 0xb0, 0xaf, 0xf0, 0x98, 0x6b, 0xba, 0x10, 0x16, 0x30, 0xda, 0xe0, 0x69,
- 0x43, 0xac, 0x07, 0xf1, 0xf1, 0x6a, 0x48, 0xda, 0xe2, 0xa4, 0x41, 0xfc, 0xe1, 0xb6, 0x0c, 0x9a,
- 0x3e, 0xd9, 0xb8, 0x96, 0x40, 0x20, 0x10, 0x3f, 0x8d, 0x6a, 0x9d, 0x39, 0x8d, 0x6e, 0x8e, 0x4b,
- 0xb0, 0xf0, 0xe3, 0x9d, 0x9f, 0xec, 0x77, 0x8d, 0x42, 0xc6, 0xaa, 0x71, 0x5a, 0xc6, 0x6e, 0xae,
- 0x90, 0xed, 0x2d, 0x28, 0x82, 0xb4, 0x8f, 0x77, 0x91, 0x0a, 0xed, 0x02, 0xad, 0x04, 0x1f, 0x22,
- 0x86, 0x9c, 0x44, 0x62, 0x72, 0x2a, 0xbf, 0x99, 0x9b, 0x20, 0x9a, 0x4b, 0x8c, 0x7f, 0xc6, 0xe5,
- 0xda, 0xe9, 0x0f, 0x56, 0x2b, 0xbb, 0xbe, 0x5b, 0xe6, 0x7b, 0xa4, 0xd6, 0x5d, 0x6e, 0x32, 0xba,
- 0xcb, 0x6f, 0x10, 0x1d, 0x23, 0x3a, 0x42, 0xb4, 0xc3, 0xe8, 0x26, 0x37, 0x1a, 0xdd, 0x65, 0xe9,
- 0x86, 0x45, 0x8a, 0x37, 0x40, 0x22, 0x99, 0xe7, 0x14, 0x17, 0x9a, 0xd0, 0xb0, 0x0d, 0xa0, 0x0e,
- 0x54, 0x43, 0x9a, 0xef, 0x3b, 0x7f, 0x55, 0x2e, 0x56, 0xfc, 0x4e, 0x0c, 0x05, 0x71, 0xaa, 0xb8,
- 0x5a, 0xe3, 0x26, 0x0f, 0xfc, 0x57, 0x40, 0x1e, 0x77, 0xa5, 0xdc, 0xa4, 0x54, 0x01, 0xd9, 0xf1,
- 0x7b, 0xe2, 0x0d, 0xb7, 0xd0, 0x46, 0x93, 0x74, 0xe5, 0xcb, 0xff, 0xc9, 0xa5, 0x3e, 0x65, 0x95,
- 0xf2, 0xae, 0xc1, 0x43, 0x31, 0xea, 0x80, 0xf1, 0x4c, 0xff, 0x30, 0x7a, 0xc8, 0x64, 0x76, 0x0d,
- 0x78, 0x61, 0x7b, 0x1d, 0x58, 0x53, 0xb1, 0xf3, 0x9c, 0x1b, 0x91, 0x56, 0x20, 0x52, 0x9d, 0x04,
- 0x55, 0x1e, 0x7e, 0xd4, 0x00, 0xd3, 0x6b, 0x6b, 0xa0, 0x27, 0xeb, 0x73, 0x18, 0x6a, 0xeb, 0x80,
- 0x07, 0x63, 0x7f, 0x12, 0x1d, 0x87, 0xc1, 0xd6, 0x5f, 0xa0, 0x6b, 0x47, 0x2e, 0x98, 0x96, 0xae,
- 0x12, 0x0b, 0x71, 0xdf, 0x2e, 0x84, 0xa3, 0x00, 0xab, 0xc2, 0x13, 0x60, 0x6d, 0x58, 0x0c, 0xac,
- 0x8c, 0xcb, 0x87, 0xca, 0x25, 0xab, 0xe9, 0xc2, 0x0d, 0x32, 0x2d, 0x8c, 0x74, 0xfd, 0x0a, 0xb6,
- 0x64, 0xe8, 0x4a, 0x17, 0xd4, 0xfb, 0x04, 0x89, 0x3e, 0x89, 0xc7, 0xba, 0x93, 0xa3, 0x00, 0xf8,
- 0xfd, 0xc5, 0x74, 0x33, 0x14, 0x7a, 0x87, 0xd1, 0x05, 0xcf, 0xbd, 0xbe, 0x06, 0x46, 0xba, 0xaf,
- 0x83, 0x3d, 0x19, 0xeb, 0xeb, 0x27, 0xa0, 0x1a, 0xd1, 0x31, 0x61, 0x33, 0xb0, 0x67, 0x03, 0x20,
- 0x38, 0x22, 0x8f, 0x5b, 0xac, 0x67, 0xf7, 0xc1, 0x29, 0x2b, 0x27, 0x27, 0xa1, 0xff, 0x58, 0x05,
- 0x34, 0xab, 0x36, 0xc3, 0x45, 0x75, 0x2c, 0xdc, 0x2e, 0xaf, 0x14, 0x40, 0x8c, 0xdf, 0xb8, 0x45,
- 0x4f, 0x4b, 0x14, 0x84, 0x54, 0xa6, 0xb6, 0x9a, 0x06, 0x6d, 0x19, 0x28, 0x76, 0x7e, 0x81, 0xde,
- 0x0c, 0xc5, 0x9e, 0x6a, 0x6e, 0x21, 0x74, 0x0f, 0x26, 0xfd, 0xa4, 0x7d, 0x98, 0x6e, 0x08, 0xc6,
- 0x85, 0x00, 0xe2, 0xe6, 0x6d, 0x38, 0xbf, 0x62, 0xbd, 0x18, 0x88, 0x76, 0x7a, 0x0a, 0xd3, 0xf3,
- 0xb7, 0xa3, 0x00, 0x6f, 0xc5, 0x17, 0x0b, 0x16, 0xc2, 0x80, 0x65, 0xd2, 0xa2, 0x7d, 0xdf, 0xaa,
- 0x31, 0xdd, 0x3b, 0xf3, 0xe8, 0xe9, 0x30, 0xb9, 0x73, 0xee, 0x82, 0xa8, 0x53, 0xc0, 0x62, 0x67,
- 0x51, 0xfa, 0x6d, 0x19, 0x28, 0x76, 0x3e, 0x79, 0x5d, 0x9a, 0x60, 0x91, 0x89, 0xe1, 0x51, 0xce,
- 0xb0, 0x4b, 0x1b, 0xb7, 0x08, 0x8d, 0xf0, 0x50, 0x58, 0x77, 0x35, 0x22, 0xcd, 0xaa, 0x68, 0x11,
- 0x10, 0xb2, 0xf4, 0x59, 0x07, 0xd8, 0xef, 0x13, 0x25, 0x58, 0x64, 0xa0, 0xe9, 0xf2, 0xd4, 0xce,
- 0x9a, 0xc8, 0xce, 0x4a, 0x15, 0x5c, 0x66, 0x1a, 0xed, 0xed, 0xa3, 0xf1, 0xf0, 0xd0, 0xa7, 0x15,
- 0xc4, 0xdd, 0x3a, 0xb9, 0x67, 0x11, 0xc8, 0x1e, 0x00, 0x69, 0x45, 0x0c, 0x1c, 0x00, 0xf6, 0x2b,
- 0x33, 0xbd, 0x06, 0xf2, 0xd5, 0xb0, 0x5c, 0x29, 0x58, 0xa4, 0x3d, 0x35, 0x5b, 0xb0, 0xb3, 0x8d,
- 0xfe, 0x1b, 0x04, 0x60, 0x13, 0x83, 0x43, 0x1c, 0x04, 0xc6, 0x08, 0x93, 0xdf, 0x0e, 0x97, 0xd2,
- 0xb1, 0xf3, 0xde, 0x2a, 0xa8, 0xf3, 0x7a, 0xd7, 0x16, 0x40, 0xa7, 0x84, 0x74, 0x83, 0x4d, 0xb4,
- 0xdc, 0x47, 0xc7, 0xce, 0x0a, 0x84, 0x71, 0x5a, 0x51, 0xaa, 0x5d, 0xec, 0x0b, 0x77, 0xeb, 0x9a,
- 0xa9, 0x51, 0xc3, 0xed, 0x3d, 0x74, 0xec, 0x62, 0x70, 0x9c, 0x00, 0xaa, 0x73, 0xdb, 0x1e, 0x3a,
- 0x8e, 0x85, 0x8d, 0x49, 0xef, 0xee, 0x7c, 0xce, 0xb5, 0x30, 0x11, 0x98, 0x3d, 0xdf, 0xb6, 0x06,
- 0x31, 0x2c, 0x51, 0xa9, 0x54, 0xcf, 0x3f, 0xfa, 0x45, 0x85, 0x42, 0xe0, 0xa5, 0xda, 0x21, 0x80,
- 0xc5, 0x7e, 0x16, 0x0b, 0xe1, 0xe2, 0x68, 0x04, 0x73, 0x8b, 0x6b, 0x7b, 0x0a, 0x39, 0x43, 0xef,
- 0xb5, 0x5c, 0xa1, 0x63, 0x08, 0x21, 0x88, 0x81, 0xc0, 0x18, 0x3a, 0x8e, 0xd0, 0x28, 0xb8, 0x09,
- 0xfc, 0x98, 0xa1, 0x9b, 0x23, 0x95, 0x8f, 0xd2, 0x54, 0x8a, 0x10, 0x04, 0xa0, 0x17, 0x21, 0xf0,
- 0x62, 0xed, 0x90, 0x0b, 0x79, 0xad, 0xb3, 0x7a, 0xdc, 0xe8, 0x06, 0xe8, 0x0e, 0xf8, 0xfd, 0xc6,
- 0x91, 0x32, 0x8b, 0xd4, 0x8a, 0x6e, 0x84, 0xee, 0x84, 0x32, 0xd0, 0xd8, 0x4a, 0xc7, 0xd0, 0xdd,
- 0xf8, 0x72, 0x35, 0x25, 0x73, 0xfa, 0xff, 0xbd, 0xce, 0xea, 0xcf, 0x3c, 0x56, 0x0f, 0xf0, 0xc6,
- 0xe4, 0x08, 0x40, 0xd5, 0xda, 0x28, 0xbb, 0xc1, 0xd7, 0x9b, 0x53, 0xc0, 0x6b, 0x23, 0x3a, 0xb9,
- 0xc0, 0x6e, 0x5e, 0x1f, 0x43, 0x03, 0x9b, 0xab, 0xc8, 0x64, 0x1c, 0x03, 0x9f, 0xc9, 0xc0, 0x85,
- 0xd6, 0xe9, 0x59, 0xa8, 0x86, 0x19, 0x7f, 0xe0, 0x61, 0x07, 0xa9, 0x85, 0x23, 0x65, 0x95, 0x0e,
- 0x01, 0x9c, 0x89, 0xdf, 0x6e, 0x17, 0x00, 0x77, 0x9b, 0x2f, 0xcc, 0xdf, 0xa7, 0xa7, 0x56, 0xd4,
- 0xcb, 0x51, 0x29, 0xdc, 0x73, 0x13, 0x83, 0xc3, 0x82, 0x39, 0x72, 0x57, 0xd8, 0x81, 0x59, 0x28,
- 0x97, 0x19, 0x9f, 0xf7, 0x45, 0xa9, 0xc3, 0x41, 0x5c, 0x71, 0xa0, 0x44, 0x54, 0x11, 0xba, 0x63,
- 0x6e, 0x12, 0xb4, 0x18, 0xdd, 0x99, 0xfb, 0xad, 0x3e, 0xd7, 0xa2, 0x4b, 0xe0, 0x1e, 0x7b, 0x30,
- 0x3a, 0x26, 0x8c, 0x81, 0x45, 0xbe, 0xde, 0x08, 0xf0, 0x00, 0x01, 0x66, 0xc3, 0x78, 0xa6, 0xd5,
- 0xf2, 0x10, 0xbb, 0x00, 0xd8, 0x2e, 0x60, 0xdb, 0xc0, 0x97, 0x9e, 0xec, 0x03, 0x16, 0xcf, 0xdd,
- 0x2a, 0x3d, 0x35, 0xe5, 0x6e, 0x3f, 0x77, 0x08, 0x5a, 0x09, 0xab, 0x97, 0x70, 0x47, 0x0b, 0x19,
- 0x7e, 0x0f, 0x09, 0xdf, 0x27, 0xea, 0x14, 0xb0, 0x98, 0x61, 0x03, 0xc7, 0x17, 0x6c, 0xf0, 0xb0,
- 0xd1, 0xc3, 0x2c, 0x44, 0xeb, 0x02, 0xaf, 0xc5, 0x10, 0x9c, 0x92, 0x54, 0x16, 0x3a, 0x67, 0x00,
- 0xd8, 0xd0, 0x15, 0xac, 0x88, 0x10, 0x09, 0xa1, 0xa1, 0xad, 0xb4, 0x3d, 0x19, 0xe9, 0xba, 0x06,
- 0xa6, 0x65, 0xab, 0x2d, 0xdb, 0x69, 0x06, 0x10, 0x19, 0xb5, 0x89, 0xaa, 0x2d, 0x03, 0x9f, 0x74,
- 0x7e, 0x79, 0xf2, 0x71, 0x38, 0xbd, 0x34, 0x40, 0x14, 0x04, 0x5e, 0x66, 0xf8, 0x6d, 0x84, 0x85,
- 0xf1, 0x9d, 0xbd, 0xfc, 0x36, 0xfb, 0x2e, 0x69, 0xe2, 0x5e, 0xe1, 0xdf, 0x61, 0x7b, 0x67, 0xb3,
- 0x1b, 0xe5, 0x8f, 0xf9, 0xc7, 0x1e, 0x85, 0x6a, 0x0f, 0x3f, 0x51, 0x10, 0xa6, 0x57, 0xfd, 0xa1,
- 0x6b, 0x7b, 0x2e, 0x2d, 0x6c, 0x18, 0xac, 0xf4, 0xca, 0x79, 0xe9, 0x2a, 0x74, 0x67, 0xe4, 0xf1,
- 0x77, 0x7e, 0xac, 0xd6, 0xcd, 0xd7, 0x5f, 0x70, 0x81, 0xc1, 0x17, 0x4b, 0xe4, 0xd7, 0xc2, 0x85,
- 0x4c, 0x6d, 0x19, 0x38, 0xd3, 0x79, 0x84, 0x10, 0x7b, 0x12, 0x76, 0x74, 0xc8, 0x20, 0x55, 0x28,
- 0xe6, 0xfc, 0x52, 0x6f, 0x6d, 0xce, 0x33, 0xf9, 0x04, 0x1a, 0x50, 0x37, 0x63, 0xe3, 0xa5, 0xb2,
- 0xfa, 0x6a, 0x77, 0xbf, 0x85, 0xa2, 0x5e, 0x8b, 0xcc, 0x05, 0x00, 0xaa, 0x5e, 0xa2, 0x9f, 0x6f,
- 0x74, 0x93, 0x45, 0x92, 0x37, 0x6f, 0x6d, 0x4f, 0x60, 0x7c, 0x07, 0x66, 0x1b, 0xfc, 0x5b, 0xd1,
- 0xef, 0x75, 0xe6, 0x0a, 0x80, 0xcd, 0x63, 0xf6, 0xa8, 0x91, 0xca, 0xdf, 0x24, 0x6d, 0x42, 0x06,
- 0xbe, 0x46, 0x24, 0x0d, 0x59, 0x1f, 0x31, 0x74, 0x1c, 0x83, 0x93, 0xb4, 0xc7, 0xfd, 0xe4, 0xb3,
- 0x8a, 0xb4, 0x08, 0x59, 0x06, 0x77, 0x85, 0x97, 0x98, 0x37, 0x72, 0xff, 0x00, 0x97, 0xa7, 0x4f,
- 0x30, 0x07, 0x23, 0x21, 0x95, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
+ 0x87, 0x00, 0x00, 0x06, 0x09, 0x49, 0x44, 0x41, 0x54, 0x68, 0xde, 0xed, 0x99, 0x6d, 0x50, 0x54,
+ 0x55, 0x18, 0x80, 0x57, 0xfb, 0xd1, 0x9f, 0xfa, 0xd1, 0x9f, 0x7e, 0x64, 0x3f, 0xca, 0x84, 0x45,
+ 0xd3, 0x9a, 0x09, 0x87, 0x19, 0x6c, 0xb0, 0xdd, 0x05, 0x44, 0x9c, 0xda, 0x5c, 0x77, 0x61, 0x97,
+ 0x0f, 0x01, 0xc9, 0x41, 0x18, 0x48, 0x6c, 0x90, 0x21, 0x9b, 0x01, 0x56, 0x42, 0x45, 0xc6, 0x48,
+ 0x68, 0x4d, 0x41, 0xc8, 0x8c, 0x12, 0x08, 0x4a, 0xc9, 0x0f, 0x2c, 0x58, 0x96, 0x75, 0x51, 0xd1,
+ 0xc1, 0xaf, 0x34, 0x84, 0x05, 0x4c, 0x52, 0x64, 0xa6, 0x46, 0x51, 0x3e, 0x4b, 0xc8, 0xb7, 0xf3,
+ 0x1e, 0x3d, 0x97, 0x7b, 0xd9, 0x5d, 0xf7, 0xca, 0x42, 0xed, 0xce, 0xf4, 0xce, 0xbc, 0xb3, 0x3b,
+ 0xe7, 0xdc, 0xe5, 0xbc, 0xcf, 0x39, 0xef, 0xd7, 0xb9, 0x48, 0x24, 0xd3, 0x2c, 0x1a, 0x8d, 0xc6,
+ 0x12, 0x16, 0x16, 0x76, 0x99, 0x7c, 0x06, 0x48, 0x3c, 0x51, 0x88, 0xe1, 0xf0, 0x48, 0x1f, 0x10,
+ 0x2d, 0x89, 0x8c, 0x8c, 0x7c, 0xce, 0x23, 0x01, 0xb4, 0x5a, 0x2d, 0x03, 0xe9, 0x23, 0x27, 0xa2,
+ 0xf5, 0x38, 0x80, 0x2f, 0x6b, 0x8e, 0x43, 0x72, 0x6a, 0x1a, 0x83, 0x00, 0x02, 0x71, 0x54, 0xa7,
+ 0xd3, 0xbd, 0xe4, 0x8e, 0x06, 0x5b, 0x78, 0x6e, 0xc3, 0x69, 0xcd, 0x4f, 0x2d, 0x50, 0xfd, 0xe3,
+ 0x69, 0xd8, 0x61, 0x28, 0x83, 0xc8, 0xa8, 0x68, 0x36, 0x3e, 0x4c, 0x34, 0x83, 0xc0, 0x3c, 0xe5,
+ 0x11, 0x00, 0x4c, 0xbf, 0xae, 0x6d, 0x84, 0x8d, 0x9b, 0xb2, 0xf8, 0xa7, 0x71, 0x91, 0xa8, 0x9f,
+ 0x5b, 0xbb, 0x10, 0x1f, 0x80, 0xe9, 0x67, 0x65, 0x15, 0x10, 0x1b, 0x17, 0xcf, 0x40, 0xfe, 0x56,
+ 0xab, 0xd5, 0xc5, 0x4a, 0xa5, 0xf2, 0x59, 0xb7, 0x06, 0x28, 0xad, 0x3c, 0x0c, 0x9f, 0xee, 0xd9,
+ 0x4f, 0x75, 0x67, 0x71, 0x39, 0x7c, 0xf5, 0x7d, 0x3d, 0xe8, 0xb7, 0x15, 0x90, 0x53, 0x08, 0x67,
+ 0x20, 0x37, 0xc9, 0x69, 0xa8, 0xdc, 0x12, 0x00, 0x5d, 0x27, 0x3c, 0x5c, 0x2b, 0x70, 0xad, 0xa4,
+ 0x94, 0x54, 0x3a, 0xb7, 0xb7, 0xe2, 0x07, 0x48, 0x48, 0x4a, 0xe1, 0xcf, 0x1d, 0x26, 0x20, 0x73,
+ 0xdc, 0x0a, 0xa0, 0xf2, 0x98, 0x05, 0xde, 0x4b, 0x48, 0xe4, 0x19, 0x19, 0x06, 0x1f, 0xe9, 0xb7,
+ 0xf2, 0xdc, 0xea, 0x34, 0x6c, 0x2f, 0x2a, 0x81, 0x88, 0x88, 0x48, 0xf6, 0x4c, 0x3f, 0x81, 0x48,
+ 0xd5, 0xeb, 0xf5, 0xb3, 0xdd, 0x32, 0x06, 0x1c, 0x69, 0xf9, 0x21, 0x23, 0x6c, 0x48, 0xdf, 0xc4,
+ 0x3f, 0x0d, 0xac, 0xe6, 0x0b, 0x3c, 0x06, 0x80, 0x69, 0xe1, 0xde, 0x6f, 0x20, 0x26, 0x76, 0x0d,
+ 0x83, 0xb8, 0x4f, 0x34, 0x2f, 0x34, 0x34, 0xf4, 0x69, 0x8f, 0x01, 0x40, 0xad, 0x38, 0x62, 0x86,
+ 0x8c, 0xcc, 0x1c, 0x4c, 0xb5, 0x60, 0x2f, 0x3d, 0xe3, 0xe9, 0xfc, 0x0f, 0xf0, 0xa4, 0x00, 0xdf,
+ 0x1e, 0x3f, 0x05, 0xb9, 0x3b, 0x0c, 0x50, 0x54, 0x7a, 0xc0, 0x33, 0x5d, 0x08, 0x0b, 0x18, 0x6d,
+ 0xf0, 0x74, 0x11, 0xf6, 0x83, 0xf8, 0x60, 0x03, 0x6c, 0xd8, 0xe8, 0xa6, 0x41, 0xfc, 0x61, 0x56,
+ 0x2e, 0x4d, 0x9f, 0x6c, 0x5c, 0x47, 0x20, 0x10, 0x88, 0x9f, 0x46, 0x75, 0xee, 0x9c, 0x46, 0xd7,
+ 0x25, 0xaf, 0xb7, 0xf1, 0xe3, 0x2d, 0x9f, 0xec, 0xf2, 0x8c, 0x42, 0xc6, 0xaa, 0x71, 0x66, 0x6e,
+ 0x3e, 0x57, 0xc8, 0x76, 0x96, 0x94, 0x43, 0xe6, 0xc7, 0xdb, 0x49, 0x85, 0xf6, 0x80, 0x56, 0x82,
+ 0x0f, 0x91, 0x48, 0x4e, 0x22, 0x35, 0x2d, 0x83, 0xdf, 0xcc, 0x8d, 0x11, 0x2d, 0x24, 0xc6, 0x3f,
+ 0xe3, 0x71, 0xed, 0xf4, 0x07, 0x21, 0x4a, 0xeb, 0x77, 0x8b, 0x02, 0xf7, 0x35, 0x79, 0xcb, 0xcd,
+ 0x26, 0x6f, 0xf9, 0x0d, 0xa2, 0x23, 0x44, 0x87, 0x88, 0xb6, 0x9b, 0xbc, 0xe4, 0x26, 0x93, 0xb7,
+ 0x2c, 0xdb, 0x38, 0x4f, 0xf1, 0x06, 0x48, 0x24, 0xb3, 0xdc, 0xe2, 0x42, 0x13, 0x15, 0xbd, 0x1a,
+ 0x34, 0x6a, 0x0d, 0x64, 0x06, 0xbe, 0xf3, 0x57, 0xdd, 0x7c, 0xc5, 0xef, 0xc4, 0x50, 0x10, 0xa7,
+ 0x8a, 0xb6, 0x46, 0x2f, 0xb9, 0xfa, 0x5f, 0x01, 0x79, 0xdc, 0x95, 0x72, 0xad, 0x52, 0x05, 0x64,
+ 0xc7, 0xef, 0x8a, 0x37, 0xdc, 0x46, 0x5b, 0xcc, 0xd2, 0xa5, 0x2f, 0xff, 0x27, 0x97, 0xfa, 0xf4,
+ 0x65, 0xca, 0x3b, 0x46, 0x1f, 0xc5, 0xb0, 0x0b, 0xc6, 0x33, 0xfd, 0xc3, 0xe4, 0x23, 0x93, 0x39,
+ 0x35, 0xe0, 0x85, 0xcd, 0xcd, 0x60, 0x4f, 0xc5, 0xce, 0x73, 0x6e, 0x44, 0x5a, 0x81, 0x38, 0xcd,
+ 0x06, 0xa8, 0xf7, 0x09, 0xa2, 0x06, 0x98, 0x5f, 0x5b, 0x0e, 0x5d, 0xdb, 0x3e, 0x87, 0x81, 0xcb,
+ 0xed, 0x30, 0x3e, 0xf2, 0x27, 0xd1, 0x51, 0xb8, 0x77, 0xe1, 0x17, 0xb0, 0xe6, 0x14, 0x82, 0x79,
+ 0xe1, 0x32, 0xb1, 0x10, 0xf7, 0x9d, 0x42, 0xb8, 0x0a, 0xb0, 0x2c, 0x66, 0x3d, 0xac, 0x88, 0x4e,
+ 0x84, 0xa5, 0xc9, 0xc5, 0x50, 0xb7, 0x20, 0x84, 0x2e, 0x7c, 0x5a, 0xa6, 0x83, 0x21, 0xeb, 0xaf,
+ 0xe0, 0x48, 0x06, 0xae, 0x58, 0xe1, 0x54, 0x40, 0x98, 0xe8, 0x93, 0x78, 0xac, 0x3b, 0xb9, 0x0a,
+ 0x80, 0xdf, 0x5f, 0xcc, 0xb6, 0x40, 0xa9, 0x7f, 0x34, 0x5d, 0xf0, 0xc4, 0xeb, 0xcb, 0x61, 0xa8,
+ 0xf3, 0x3a, 0x38, 0x93, 0x91, 0x9e, 0x5e, 0x02, 0xaa, 0x15, 0x1d, 0x13, 0x0e, 0x03, 0x7b, 0x3a,
+ 0x00, 0xc2, 0x63, 0x0d, 0xdc, 0x62, 0x5d, 0xf9, 0x7b, 0x26, 0xac, 0x7c, 0xf0, 0x00, 0x7a, 0x0f,
+ 0xd4, 0x42, 0xab, 0x6a, 0x1d, 0x9c, 0xd3, 0x24, 0x41, 0x5f, 0x4d, 0x9d, 0x00, 0x62, 0xf4, 0xc6,
+ 0x2d, 0x7a, 0x5a, 0xa2, 0x20, 0xa4, 0x32, 0x8d, 0xdd, 0x34, 0xe8, 0xc8, 0x40, 0xb1, 0xf3, 0x73,
+ 0xf4, 0x16, 0xa8, 0xf0, 0xd5, 0x70, 0x0b, 0xa1, 0x7b, 0x30, 0xe9, 0x25, 0xed, 0xc3, 0x64, 0x43,
+ 0x30, 0x2e, 0x04, 0x10, 0x37, 0xfb, 0xe0, 0xe4, 0x92, 0x55, 0x62, 0x20, 0xae, 0xd2, 0x53, 0x98,
+ 0x9c, 0xbf, 0x5d, 0x05, 0x78, 0x2b, 0xa5, 0x42, 0xb0, 0x10, 0x06, 0x2c, 0x93, 0xf3, 0xba, 0xf7,
+ 0xed, 0x1a, 0xd3, 0xb9, 0xc5, 0x40, 0x4f, 0x87, 0xc9, 0xed, 0x13, 0x67, 0x44, 0x9d, 0x02, 0x16,
+ 0x3b, 0x9b, 0xd2, 0xef, 0xc8, 0x40, 0xb1, 0xf3, 0x69, 0x2b, 0x33, 0x05, 0x8b, 0x8c, 0x0d, 0x0e,
+ 0x73, 0x86, 0x5d, 0x5c, 0xb3, 0x51, 0x68, 0x84, 0x8f, 0xc2, 0xbe, 0xab, 0x11, 0x69, 0x55, 0x25,
+ 0x88, 0x80, 0x90, 0x65, 0x4f, 0x3b, 0xc0, 0xae, 0x80, 0x78, 0xc1, 0x22, 0xfd, 0x67, 0x2f, 0x4d,
+ 0xec, 0xac, 0x99, 0xec, 0xac, 0x54, 0xc1, 0x65, 0xa6, 0xe1, 0xee, 0x1e, 0x1a, 0x0f, 0x0f, 0x7d,
+ 0x5a, 0x41, 0xdc, 0xad, 0x83, 0x7b, 0x16, 0x81, 0x9c, 0x01, 0x90, 0x56, 0xc4, 0xc8, 0x01, 0x60,
+ 0xbf, 0x32, 0xd5, 0x6b, 0x20, 0x5f, 0x8d, 0x8b, 0x95, 0x82, 0x45, 0xae, 0x66, 0xe4, 0x09, 0x76,
+ 0xb6, 0x25, 0x78, 0xb5, 0x00, 0x6c, 0xec, 0xde, 0x00, 0x07, 0x81, 0x31, 0xc2, 0xe4, 0xb7, 0xb2,
+ 0x2a, 0x3a, 0x76, 0xd2, 0x5f, 0x05, 0xcd, 0x7e, 0xef, 0x3a, 0x02, 0xe8, 0x90, 0x90, 0x6e, 0xf0,
+ 0x2c, 0x2d, 0xf7, 0x09, 0x49, 0xd3, 0x02, 0x61, 0x9a, 0x54, 0x94, 0x9a, 0xe6, 0x07, 0xc2, 0x9d,
+ 0xe6, 0x56, 0x6a, 0xd4, 0xe0, 0xd5, 0x2e, 0x3a, 0x76, 0x2e, 0x3c, 0x59, 0x00, 0xd5, 0x91, 0x55,
+ 0x40, 0xc7, 0xb1, 0xb0, 0x31, 0xe9, 0xce, 0x2f, 0xe6, 0x5c, 0x0b, 0x13, 0x81, 0xc5, 0xf7, 0x6d,
+ 0x7b, 0x10, 0x83, 0x12, 0x95, 0x4a, 0xf5, 0xfc, 0xa3, 0xff, 0xa8, 0x50, 0x08, 0xbc, 0x54, 0xbb,
+ 0x04, 0x30, 0x3f, 0xc8, 0x66, 0x21, 0x5c, 0x1c, 0x8d, 0x60, 0x6e, 0x71, 0xad, 0xa0, 0x94, 0x33,
+ 0xf4, 0xee, 0xf9, 0x2b, 0x74, 0x0c, 0x21, 0x04, 0x31, 0xa0, 0x4e, 0xa4, 0xe3, 0x08, 0x8d, 0x82,
+ 0x9b, 0xc0, 0x8f, 0x19, 0xba, 0x39, 0x52, 0xf9, 0x30, 0x4d, 0xa5, 0x08, 0x41, 0x00, 0xba, 0x11,
+ 0x02, 0x2f, 0xd6, 0x2e, 0xb9, 0x90, 0xdf, 0x4a, 0xbb, 0xc7, 0x8d, 0x6e, 0x80, 0xee, 0x80, 0xdf,
+ 0x6f, 0xec, 0xab, 0xb6, 0x49, 0xad, 0xe8, 0x46, 0xe8, 0x4e, 0x28, 0xfd, 0x2d, 0x17, 0xe8, 0x18,
+ 0xba, 0x1b, 0x5f, 0xda, 0xd2, 0xb7, 0x4e, 0xfe, 0xbb, 0xd7, 0x59, 0xfd, 0x99, 0xc5, 0xea, 0x01,
+ 0xde, 0x98, 0x5c, 0x01, 0xa8, 0x5f, 0x11, 0xef, 0x34, 0xf8, 0xba, 0x77, 0x94, 0xf0, 0xda, 0x88,
+ 0x0e, 0x2e, 0xb0, 0x5b, 0x57, 0x25, 0xd2, 0xc0, 0xe6, 0x2a, 0x32, 0x19, 0xc7, 0xc0, 0x67, 0xd2,
+ 0x7f, 0xe6, 0xc2, 0xe4, 0x2c, 0xd4, 0xc8, 0x8c, 0xdf, 0xfd, 0xb0, 0x83, 0xd4, 0xc1, 0xbe, 0xea,
+ 0x3a, 0x97, 0x00, 0x8e, 0xa5, 0x6c, 0x76, 0x0a, 0x80, 0xbb, 0xcd, 0x17, 0xe6, 0xef, 0x93, 0x53,
+ 0x2b, 0xea, 0xa5, 0xf8, 0x74, 0xee, 0xb9, 0xb1, 0x7b, 0x83, 0x82, 0x39, 0x72, 0x57, 0xc8, 0xc1,
+ 0x2c, 0x54, 0xc8, 0x8c, 0x37, 0x7c, 0x51, 0xe5, 0x72, 0x10, 0xd7, 0xee, 0xae, 0x14, 0x55, 0x84,
+ 0x6e, 0x5b, 0xce, 0x0a, 0x5a, 0x8c, 0xce, 0xad, 0xbb, 0xec, 0x3e, 0x77, 0x3e, 0x72, 0x3d, 0xf7,
+ 0xd8, 0xf8, 0xf0, 0x88, 0x30, 0x06, 0xe6, 0x05, 0xfa, 0x23, 0xc0, 0x38, 0x02, 0x4c, 0x87, 0xf1,
+ 0x4c, 0x1b, 0xe4, 0x11, 0x4e, 0x01, 0xb0, 0x5d, 0xc0, 0xb6, 0x81, 0x2f, 0x5d, 0x79, 0xbb, 0x6d,
+ 0x9e, 0xbb, 0x55, 0x75, 0x64, 0xc2, 0xdd, 0x7e, 0x6e, 0x17, 0xb4, 0x12, 0x76, 0x2f, 0xe1, 0xae,
+ 0x16, 0x32, 0xfc, 0x1e, 0x11, 0x53, 0x24, 0xea, 0x14, 0xb0, 0x98, 0x61, 0x03, 0xc7, 0x17, 0x6c,
+ 0xf0, 0xb0, 0xd1, 0xc3, 0x2c, 0x44, 0xeb, 0x02, 0xaf, 0xc5, 0x10, 0x9c, 0x92, 0x54, 0x16, 0x35,
+ 0x63, 0x00, 0xd8, 0xd0, 0x95, 0x2c, 0x89, 0x15, 0x09, 0xa1, 0xa5, 0xad, 0xb4, 0x33, 0x19, 0xb2,
+ 0x5e, 0x03, 0xf3, 0xa2, 0x10, 0xdb, 0x76, 0x9a, 0x01, 0xc4, 0xc5, 0xaf, 0xa5, 0xea, 0xc8, 0xc0,
+ 0x27, 0x9d, 0x5f, 0x9c, 0x76, 0x10, 0x8e, 0x2e, 0x0c, 0x15, 0x05, 0x81, 0x97, 0x19, 0x7e, 0x1b,
+ 0x61, 0x63, 0x7c, 0x47, 0x37, 0xbf, 0xcd, 0xbe, 0x43, 0x9a, 0xb8, 0x57, 0xf8, 0x77, 0xd8, 0xee,
+ 0xe9, 0xec, 0x46, 0xf9, 0x63, 0xc1, 0x49, 0xfb, 0xa1, 0xc1, 0x27, 0x48, 0x14, 0x84, 0xf9, 0xd5,
+ 0x60, 0xb0, 0x6e, 0x2e, 0xa4, 0x85, 0x0d, 0x83, 0x95, 0x5e, 0x39, 0x2f, 0xb6, 0x41, 0x67, 0xae,
+ 0x81, 0xbf, 0xf3, 0x23, 0x4d, 0x5e, 0x81, 0xc1, 0x82, 0x0b, 0x0c, 0xbe, 0x58, 0x52, 0xab, 0xd5,
+ 0x73, 0x99, 0x3a, 0x32, 0x70, 0xaa, 0xf3, 0x08, 0x21, 0xf6, 0x24, 0x9c, 0xe8, 0x80, 0x51, 0xaa,
+ 0x50, 0xcc, 0xf8, 0xa5, 0xde, 0xde, 0x9c, 0x6f, 0xda, 0x21, 0x34, 0xa0, 0x79, 0xca, 0xc6, 0x4b,
+ 0x65, 0xa7, 0x1a, 0xbc, 0x83, 0xe6, 0x8a, 0x7a, 0x2d, 0x32, 0x13, 0x00, 0xa8, 0x7a, 0x89, 0x7e,
+ 0xb6, 0xc9, 0x4b, 0x16, 0x67, 0xf2, 0x92, 0x5f, 0x7e, 0x02, 0xe3, 0xdb, 0x31, 0xdb, 0xe0, 0x6f,
+ 0x45, 0xbf, 0xd7, 0x99, 0x29, 0x00, 0x36, 0x8f, 0xd9, 0xa3, 0x51, 0x2a, 0x7f, 0x93, 0xb4, 0x09,
+ 0xb9, 0xf8, 0x1a, 0x91, 0x34, 0x64, 0x3d, 0xc4, 0xd0, 0x51, 0x0c, 0x4e, 0xd2, 0x1e, 0xf7, 0x92,
+ 0xcf, 0x7a, 0xd2, 0x22, 0x6c, 0x33, 0x7a, 0x2b, 0xfc, 0xc4, 0xbc, 0x91, 0xfb, 0x07, 0x97, 0xa7,
+ 0x4f, 0x30, 0xa0, 0xfc, 0xb0, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE icon_cvpcb_xpm[1] = {{ png, sizeof( png ), "icon_cvpcb_xpm" }};
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 310734223f..d52687cf52 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -195,6 +195,7 @@ EXTERN_BITMAP( group_xpm )
 EXTERN_BITMAP( group_enter_xpm )
 EXTERN_BITMAP( group_leave_xpm )
 EXTERN_BITMAP( group_remove_xpm )
+EXTERN_BITMAP( group_ungroup_xpm )
 EXTERN_BITMAP( help_xpm )
 EXTERN_BITMAP( help_online_xpm )
 EXTERN_BITMAP( hidden_pin_xpm )
@@ -499,7 +500,6 @@ EXTERN_BITMAP( triangle_right_xpm )
 EXTERN_BITMAP( triangle_down_xpm )
 EXTERN_BITMAP( undelete_xpm )
 EXTERN_BITMAP( undo_xpm )
-EXTERN_BITMAP( ungroup_xpm )
 EXTERN_BITMAP( unit_inch_xpm )
 EXTERN_BITMAP( unit_mil_xpm )
 EXTERN_BITMAP( unit_mm_xpm )
diff --git a/bitmaps_png/sources/badges.svg b/bitmaps_png/sources/badges.svg
index 2635025432..313cf7bb0e 100644
--- a/bitmaps_png/sources/badges.svg
+++ b/bitmaps_png/sources/badges.svg
@@ -13,7 +13,7 @@
    version="1.1"
    id="svg865"
    sodipodi:docname="badges.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <title
      id="title2181">Badges</title>
   <defs
@@ -29,14 +29,14 @@
      inkscape:cx="11.434575"
      inkscape:cy="15.23019"
      inkscape:document-units="px"
-     inkscape:current-layer="layer15"
+     inkscape:current-layer="layer21"
      inkscape:document-rotation="0"
      showgrid="true"
      units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-width="2980"
+     inkscape:window-height="1765"
+     inkscape:window-x="3958"
+     inkscape:window-y="211"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -89,7 +89,7 @@
      style="display:none">
     <polygon
        class="cls-5"
-       points="15.397,15.634 17.666,11.038 19.934,15.634 25.005,16.371 21.336,19.948 22.202,25 17.666,22.615 13.129,25 13.996,19.948 10.326,16.371 "
+       points="21.336,19.948 22.202,25 17.666,22.615 13.129,25 13.996,19.948 10.326,16.371 15.397,15.634 17.666,11.038 19.934,15.634 25.005,16.371 "
        id="polygon43"
        transform="matrix(0.26458333,0,0,0.26458333,0.28204607,0.22912935)"
        style="fill:#bf2641" />
@@ -299,7 +299,7 @@
      inkscape:groupmode="layer"
      id="layer15"
      inkscape:label="open"
-     style="display:inline">
+     style="display:none">
     <path
        class="cls-4"
        d="M 6.8791659,5.0253653 A 1.8520833,1.8520832 0 1 1 5.0270561,3.1750002 1.8512375,1.8512374 0 0 1 6.8791659,5.0253653 Z"
@@ -324,25 +324,25 @@
        r="1.8520833" />
     <polygon
        class="cls-1"
-       points="24.995,13 20.203,8.208 20.203,17.792 "
+       points="20.203,8.208 20.203,17.792 24.995,13 "
        id="polygon8-3"
        style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.59658;stroke-linecap:round;stroke-linejoin:round"
        transform="matrix(0.16564065,0,0,0.16579683,2.4881054,2.8726025)" />
     <polygon
        class="cls-1"
-       points="17.792,5.797 13,1.005 8.208,5.797 "
+       points="13,1.005 8.208,5.797 17.792,5.797 "
        id="polygon10"
        style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.59809;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        transform="matrix(0.16548463,0,0,0.16564065,2.8757833,3.2732439)" />
     <polygon
        class="cls-1"
-       points="17.792,20.203 8.208,20.203 13,24.995 "
+       points="8.208,20.203 13,24.995 17.792,20.203 "
        id="polygon12"
        style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.59809;stroke-linecap:round;stroke-linejoin:round"
        transform="matrix(0.16548463,0,0,0.16564065,2.8757833,2.4745247)" />
     <polygon
        class="cls-1"
-       points="5.797,17.792 5.797,8.208 1.005,13 "
+       points="5.797,8.208 1.005,13 5.797,17.792 "
        id="polygon14"
        style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:1.59658;stroke-linecap:round;stroke-linejoin:round"
        transform="matrix(0.16564065,0,0,0.16579683,3.2731144,2.871854)" />
@@ -508,6 +508,27 @@
        style="display:inline;fill:none;stroke:#f5f5f5;stroke-width:0.529167px;stroke-linecap:round;stroke-linejoin:round"
        d="m 4.3014409,5.2244734 c 0.242446,0.2428875 0.484893,0.485775 0.727339,0.7286625 0.242535,-0.2428875 0.48507,-0.485775 0.727605,-0.7286625" />
   </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer21"
+     inkscape:label="goto">
+    <path
+       class="cls-3"
+       d="M 6.8880303,5.0403126 A 1.8538031,1.8538031 0 1 1 5.0342272,3.1882293 1.85293,1.85293 0 0 1 6.8880303,5.0403126 Z"
+       id="path116542"
+       style="fill:#bf2641;stroke:none;stroke-width:0.396875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="polyline116544"
+       style="fill:none;stroke:#ffffff;stroke-width:0.529167px;stroke-linecap:round;stroke-linejoin:round"
+       d="m 6.0531376,5.5369355 c 0,0 -1.0944719,0.1693765 -1.479251,-0.2154026 C 4.2239686,4.9716149 4.4206585,4.0523585 4.4206585,4.0523585"
+       sodipodi:nodetypes="csc" />
+    <polyline
+       class="cls-4"
+       points="19.473 17.45 21.9 19.877 19.473 22.303"
+       id="polyline116546"
+       transform="matrix(0.26458333,0,0,0.26458333,0.27172728,0.27781268)"
+       style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
diff --git a/bitmaps_png/sources/copy_pad_settings.svg b/bitmaps_png/sources/copy_pad_settings.svg
index bd5f40375e..6161fcaaf0 100755
--- a/bitmaps_png/sources/copy_pad_settings.svg
+++ b/bitmaps_png/sources/copy_pad_settings.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="copy_pad_settings.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <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="1035"
+     inkscape:window-width="2885"
+     inkscape:window-height="1528"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="37.437403"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:cx="1.0533787"
+     inkscape:cy="13.283999"
      inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -97,14 +97,33 @@
      d="M 6.7467,11.7879 A 3.7275,3.7275 0 1 1 11.788,6.7467 9.42,9.42 0 0 1 14.6,6.04 6.5734,6.5734 0 1 0 6.04,14.6 9.4207,9.4207 0 0 1 6.7467,11.7879 Z"
      id="path773"
      style="fill:#545454;fill-opacity:1" />
-  <polyline
-     class="cls-3"
-     points="11.181 21.614 5.01 21.614 5.01 16.004"
-     id="polyline775"
-     transform="translate(-1,-1)" />
-  <polyline
-     class="cls-3"
-     points="8.803 19.188 11.229 21.614 8.803 24.041"
-     id="polyline777"
-     transform="translate(-1,-1)" />
+  <g
+     id="g4083-7"
+     transform="translate(-29.206179,16.069233)"
+     style="stroke:#fffffd;stroke-opacity:1;fill:#ffffff;fill-opacity:1">
+    <path
+       id="polyline777-3-5"
+       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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#fffffd;stroke-width:0.994548;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"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.85359609"
+       inkscape:original="M -6.9882812 11.853516 A 1 1 0 0 0 -7.9960938 12.757812 C -7.9960938 12.757812 -8.0718419 13.537045 -7.9824219 14.478516 C -7.8930009 15.419986 -7.6961706 16.606562 -6.8066406 17.496094 C -5.8322906 18.470443 -4.4900439 18.675692 -3.4042969 18.775391 C -3.3959869 18.776153 -3.3910975 18.774649 -3.3828125 18.775391 L -4.2109375 19.597656 A 1.0054801 0.99454662 0 0 0 -4.2109375 21.003906 A 1.0054801 0.99454662 0 0 0 -2.7890625 21.003906 L -0.36328125 18.601562 A 1.0055806 0.99464603 0 0 0 -0.36328125 17.195312 L -2.7890625 14.796875 A 1.0054801 0.99454662 0 0 0 -3.5527344 14.505859 A 1.0054801 0.99454662 0 0 0 -4.2109375 14.796875 A 1.0054801 0.99454662 0 0 0 -4.2109375 16.203125 L -3.6914062 16.716797 C -4.4274111 16.591476 -5.1268944 16.347715 -5.3925781 16.082031 C -5.6687441 15.805866 -5.9204774 15.023511 -5.9902344 14.289062 C -6.0599924 13.554616 -6.0039062 12.949219 -6.0039062 12.949219 A 1 1 0 0 0 -6.9042969 11.857422 A 1 1 0 0 0 -6.9882812 11.853516 z "
+       d="m -6.9785156,11 c -0.9189538,-0.01139 -1.7793038,0.760969 -1.8671875,1.675781 0,0 -0.084231,0.852032 0.013672,1.882813 0.094186,0.99164 0.3084844,2.427622 1.421875,3.541015 0.7480459,0.748046 1.6129035,1.064278 2.453125,1.259766 -0.4255245,0.705352 -0.4460454,1.665657 0.1464843,2.251953 0.6899964,0.682408 1.9310974,0.682408 2.6210938,0 a 0.85368145,0.85368145 0 0 0 0.00195,0 l 2.42382812,-2.402344 c 0.68961192,-0.682493 0.68961192,-1.9386 0,-2.621093 L -2.1875,14.191406 c -0.36769,-0.364761 -0.8919992,-0.563371 -1.4082031,-0.537109 a 0.85368145,0.85368145 0 0 0 -0.00195,0 c -0.4506818,0.02395 -0.8914264,0.217086 -1.2128907,0.535156 -0.1463801,0.14484 -0.1345018,0.371184 -0.21875,0.556641 -0.041978,-0.180667 -0.093985,-0.354506 -0.1113281,-0.53711 -0.061307,-0.645473 -0.013987,-1.174228 -0.013672,-1.177734 v -0.0039 c 0.091098,-0.965585 -0.7022499,-1.92741 -1.6679687,-2.019532 a 0.85368145,0.85368145 0 0 0 -0.00586,0 C -6.8779478,11.00339 -6.9284984,11.000379 -6.9785156,11 Z"
+       transform="translate(40.029297,-13.815327)" />
+  </g>
+  <g
+     id="g4083"
+     transform="translate(-24.974401,18.714635)">
+    <polyline
+       class="cls-3"
+       points="8.803 19.188 11.229 21.614 8.803 24.041"
+       id="polyline777-3"
+       transform="matrix(1,0,0,0.98912611,23.697,-20.048585)"
+       style="fill:none;stroke:#bf2641;stroke-width:2.01096;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="polyline775-6"
+       style="fill:none;stroke:#bf2641;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 34.5,1.2309959 c 0,0 -3.302434,0.285416 -4.598796,-1.01094597 C 28.735508,-0.94564707 29,-3.7146351 29,-3.7146351"
+       class="cls-3"
+       sodipodi:nodetypes="csc" />
+  </g>
 </svg>
diff --git a/bitmaps_png/sources/directory_browser.svg b/bitmaps_png/sources/directory_browser.svg
index ed19a17a9f..00f97b6bc2 100755
--- a/bitmaps_png/sources/directory_browser.svg
+++ b/bitmaps_png/sources/directory_browser.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="directory_browser.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="715"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="10.725507"
-     inkscape:cx="23.608464"
-     inkscape:cy="20.179538"
+     inkscape:zoom="60.67263"
+     inkscape:cx="18.953894"
+     inkscape:cy="18.381916"
      inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-y="37"
      inkscape:window-maximized="1"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -89,11 +89,11 @@
      d="M 24.0065,17 A 7.0065,7.0065 0 1 1 17,10 a 7.0032,7.0032 0 0 1 7.0065,7 z"
      id="path116542"
      style="stroke:none;stroke-opacity:1;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none" />
-  <polyline
-     class="cls-4"
-     points="21.851 19.877 15.681 19.877 15.681 14.266"
+  <path
      id="polyline116544"
-     transform="translate(-1,-1)" />
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 20.851,18.877 c 0,0 -4.136587,0.640163 -5.59087,-0.81412 C 13.937605,16.740355 14.681,13.266 14.681,13.266"
+     sodipodi:nodetypes="csc" />
   <polyline
      class="cls-4"
      points="19.473 17.45 21.9 19.877 19.473 22.303"
diff --git a/bitmaps_png/sources/find_replace.svg b/bitmaps_png/sources/find_replace.svg
index 9ba0e184cf..dbade0bebf 100755
--- a/bitmaps_png/sources/find_replace.svg
+++ b/bitmaps_png/sources/find_replace.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="find_replace.svg"
-   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="31.505536"
-     inkscape:cx="13.857156"
+     inkscape:cx="13.396919"
      inkscape:cy="19.896218"
      inkscape:window-x="0"
-     inkscape:window-y="23"
+     inkscape:window-y="37"
      inkscape:window-maximized="1"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -185,16 +185,20 @@
        x="13.533438"
        y="22.992874"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#545454;fill-opacity:1">B</tspan></text>
-  <polyline
-     class="cls-3"
-     points="8.803 19.188 11.229 21.614 8.803 24.041"
-     id="polyline777"
-     transform="translate(1,-2.5)"
-     style="fill:none;stroke:#bf2641;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-  <path
-     id="polyline775"
-     style="fill:none;stroke:#bf2641;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
-     d="M 11.5,19 H 6 v -5"
-     class="cls-3"
-     sodipodi:nodetypes="ccc" />
+  <g
+     id="g4083"
+     transform="translate(-22.5,16.269004)">
+    <polyline
+       class="cls-3"
+       points="8.803 19.188 11.229 21.614 8.803 24.041"
+       id="polyline777-3"
+       transform="matrix(1,0,0,0.98912611,23.697,-20.048585)"
+       style="fill:none;stroke:#bf2641;stroke-width:2.01096;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       id="polyline775-6"
+       style="fill:none;stroke:#bf2641;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 34.5,1.2309959 c 0,0 -3.302434,0.285416 -4.598796,-1.01094597 C 28.735508,-0.94564707 29,-3.7146351 29,-3.7146351"
+       class="cls-3"
+       sodipodi:nodetypes="csc" />
+  </g>
 </svg>
diff --git a/bitmaps_png/sources/group.svg b/bitmaps_png/sources/group.svg
index 330f788e52..3224a0cf4b 100755
--- a/bitmaps_png/sources/group.svg
+++ b/bitmaps_png/sources/group.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="group.svg"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
    inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/group.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
@@ -25,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="800"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="30.702139"
-     inkscape:cx="11.517609"
-     inkscape:cy="12.05544"
-     inkscape:window-x="-40"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
+     inkscape:cx="25.708317"
+     inkscape:cy="1.5168099"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
     <inkscape:grid
@@ -44,7 +44,8 @@
        spacingy="0.5"
        color="#9999ff"
        opacity="0.13"
-       empspacing="2" />
+       empspacing="2"
+       visible="true" />
   </sodipodi:namedview>
   <metadata
      id="metadata43">
@@ -56,7 +57,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
+        <dc:title>group</dc:title>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@@ -83,113 +84,157 @@
   <title
      id="title9">group</title>
   <rect
-     class="cls-3"
-     x="1.0000002"
-     y="19"
-     width="4"
-     height="3.9999998"
-     id="rect27"
-     style="stroke-width:1" />
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2613"
+     width="11"
+     height="11"
+     x="3.5"
+     y="3.5" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2613-6"
+     width="11"
+     height="11"
+     x="9.5"
+     y="9.5" />
   <rect
      class="cls-3"
-     x="1"
-     y="1"
-     width="3.9995003"
-     height="4"
+     x="0"
+     y="0"
+     width="3"
+     height="3"
      id="rect29"
      style="stroke-width:1" />
   <rect
      class="cls-3"
-     x="19"
-     y="19"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect31"
-     style="stroke-width:0.999999" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="1"
-     width="3.9999998"
-     height="3.9999998"
+     x="21"
+     y="0"
+     width="3"
+     height="3"
      id="rect33"
      style="stroke-width:1" />
   <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 3,2.5 H 6"
-     id="path14" />
+     style="fill:none;stroke:#ffffff;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 12,8.5 h 3"
+     id="path957"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
   <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,2.5 h 3"
-     id="path14-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,21.5 H 6"
-     id="path14-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,21.5 h 3.5"
-     id="path14-8-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,3 V 6"
-     id="path14-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,18 v 3"
-     id="path14-0-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.5,18 v 3"
-     id="path14-0-3-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 21.5,3 V 6"
-     id="path14-0-3-7-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,21.5 h 3"
-     id="path14-6-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,21.5 h 3"
-     id="path14-6-3-2" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,2.5 h 3"
-     id="path14-6-3-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,2.5 h 3"
-     id="path14-6-3-2-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,8 v 3"
-     id="path14-0-30" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499999,8 v 3"
-     id="path14-0-3-7-7-4" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,13 v 3"
-     id="path14-0-30-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499998,13 v 3"
-     id="path14-0-3-7-7-4-0" />
+     style="fill:none;stroke:#ffffff;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 8.5,15 V 12"
+     id="path959"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
   <rect
-     style="fill:none;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2613"
-     width="8"
-     height="8"
-     x="2.5"
-     y="2.5" />
+     class="cls-3"
+     x="21"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1038"
+     style="stroke-width:1" />
   <rect
-     style="fill:none;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2613-6"
-     width="8"
-     height="8"
-     x="13.5"
-     y="13.5" />
+     class="cls-3"
+     x="0"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1040"
+     style="stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,1.5 H 6"
+     id="path1060"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,1.5 h 3"
+     id="path1062"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,1.5 h 3"
+     id="path1064"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,1.5 h 3"
+     id="path1066"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,22.5 H 6"
+     id="path1068"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,22.5 h 3"
+     id="path1070"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,22.5 h 3"
+     id="path1072"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,22.5 h 3"
+     id="path1074"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,21 V 18"
+     id="path1076"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,16 V 13"
+     id="path1078"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,11 V 7.9999997"
+     id="path1080"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,6 V 3"
+     id="path1082"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,21 V 18"
+     id="path1084"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,16 V 13"
+     id="path1086"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,11 V 7.9999997"
+     id="path1088"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,6 V 3"
+     id="path1090"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
 </svg>
diff --git a/bitmaps_png/sources/group_enter.svg b/bitmaps_png/sources/group_enter.svg
index 0981fff36e..43564f1100 100644
--- a/bitmaps_png/sources/group_enter.svg
+++ b/bitmaps_png/sources/group_enter.svg
@@ -12,7 +12,135 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="group_enter.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <rect
+     class="cls-3"
+     x="0"
+     y="0"
+     width="3"
+     height="3"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="0"
+     width="3"
+     height="3"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1038"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="0"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1040"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,1.5 H 6"
+     id="path1060"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,1.5 h 3"
+     id="path1062"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,1.5 h 3"
+     id="path1064"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,1.5 h 3"
+     id="path1066"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,22.5 H 6"
+     id="path1068"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,22.5 h 3"
+     id="path1070"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,22.5 h 3"
+     id="path1072"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,22.5 h 3"
+     id="path1074"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,21 V 18"
+     id="path1076"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,16 V 13"
+     id="path1078"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,11 V 7.9999997"
+     id="path1080"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,6 V 3"
+     id="path1082"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,21 V 18"
+     id="path1084"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,16 V 13"
+     id="path1086"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,11 V 7.9999997"
+     id="path1088"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,6 V 3"
+     id="path1090"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +150,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1904"
-     inkscape:window-height="1041"
+     inkscape:window-width="3017"
+     inkscape:window-height="1778"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="30.702139"
      inkscape:cx="8.2930777"
      inkscape:cy="12.446293"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,120 +207,20 @@
   </defs>
   <title
      id="title9">group</title>
-  <rect
+  <path
      class="cls-3"
-     x="1"
-     y="19"
-     width="4"
-     height="3.9999998"
-     id="rect27"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="1"
-     y="1"
-     width="3.9995003"
-     height="4"
-     id="rect29"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="19"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect31"
-     style="fill:#545454;stroke-width:0.999999" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="1"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect33"
-     style="fill:#545454;stroke-width:1" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 3.0000004,2.5 h 3"
-     id="path14" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,2.5 h 3"
-     id="path14-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5000004,21.5 h 3.5"
-     id="path14-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,21.5 h 3.5"
-     id="path14-8-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5000004,3 V 6"
-     id="path14-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5000004,18 v 3"
-     id="path14-0-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.5,18 v 3"
-     id="path14-0-3-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 21.5,3 V 6"
-     id="path14-0-3-7-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 8.0000004,21.5 H 11"
-     id="path14-6-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,21.5 h 3"
-     id="path14-6-3-2" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 8.0000004,2.5 H 11"
-     id="path14-6-3-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,2.5 h 3"
-     id="path14-6-3-2-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5000004,8 v 3"
-     id="path14-0-30" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499999,8 v 3"
-     id="path14-0-3-7-7-4" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5000004,13 v 3"
-     id="path14-0-30-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499998,13 v 3"
-     id="path14-0-3-7-7-4-0" />
+     d="M 24.0065,17 A 7.0065,7.0065 0 1 1 17,10 a 7.0032,7.0032 0 0 1 7.0065,7 z"
+     id="path116542"
+     style="fill:#bf2641;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
+     id="polyline116544"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 20.851,18.877 c 0,0 -4.136587,0.640163 -5.59087,-0.81412 C 13.937605,16.740355 14.681,13.266 14.681,13.266"
+     sodipodi:nodetypes="csc" />
+  <polyline
      class="cls-4"
-     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
-     id="path7940"
-     style="fill:#bf2641" />
-  <g
-     id="g9325"
-     transform="translate(-1.694,-0.871)"
-     style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <polyline
-       class="cls-5"
-       points="21.865 19.871 15.694 19.871 15.694 14.26"
-       id="polyline8755"
-       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <polyline
-       class="cls-5"
-       points="19.487 17.444 21.913 19.871 19.487 22.297"
-       id="polyline8757"
-       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+     points="19.473 17.45 21.9 19.877 19.473 22.303"
+     id="polyline116546"
+     transform="translate(-1,-1)"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/group_leave.svg b/bitmaps_png/sources/group_leave.svg
index b2c2d81786..b958b634d4 100644
--- a/bitmaps_png/sources/group_leave.svg
+++ b/bitmaps_png/sources/group_leave.svg
@@ -12,7 +12,135 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="group_leave.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <rect
+     class="cls-3"
+     x="0"
+     y="0"
+     width="3"
+     height="3"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="0"
+     width="3"
+     height="3"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1038"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="0"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1040"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,1.5 H 6"
+     id="path1060"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,1.5 h 3"
+     id="path1062"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,1.5 h 3"
+     id="path1064"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,1.5 h 3"
+     id="path1066"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,22.5 H 6"
+     id="path1068"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,22.5 h 3"
+     id="path1070"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,22.5 h 3"
+     id="path1072"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,22.5 h 3"
+     id="path1074"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,21 V 18"
+     id="path1076"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,16 V 13"
+     id="path1078"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,11 V 7.9999997"
+     id="path1080"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,6 V 3"
+     id="path1082"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,21 V 18"
+     id="path1084"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,16 V 13"
+     id="path1086"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,11 V 7.9999997"
+     id="path1088"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,6 V 3"
+     id="path1090"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +150,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1904"
-     inkscape:window-height="1041"
+     inkscape:window-width="2862"
+     inkscape:window-height="1774"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="43.419381"
      inkscape:cx="11.521801"
-     inkscape:cy="16.268211"
+     inkscape:cy="4.2919924"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,120 +207,20 @@
   </defs>
   <title
      id="title9">group</title>
-  <rect
+  <path
      class="cls-3"
-     x="1"
-     y="19"
-     width="4"
-     height="3.9999998"
-     id="rect27"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="1"
-     y="1"
-     width="3.9995003"
-     height="4"
-     id="rect29"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="19"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect31"
-     style="fill:#545454;stroke-width:0.999999" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="1"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect33"
-     style="fill:#545454;stroke-width:1" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 3,2.5 H 6"
-     id="path14" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,2.5 h 3"
-     id="path14-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,21.5 H 6"
-     id="path14-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,21.5 h 3.5"
-     id="path14-8-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,3 V 6"
-     id="path14-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,18 v 3"
-     id="path14-0-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.5,18 v 3"
-     id="path14-0-3-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 21.5,3 V 6"
-     id="path14-0-3-7-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,21.5 h 3"
-     id="path14-6-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,21.5 h 3"
-     id="path14-6-3-2" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,2.5 h 3"
-     id="path14-6-3-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,2.5 h 3"
-     id="path14-6-3-2-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,7.9999998 V 11"
-     id="path14-0-30" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 21.499999,7.9999998 V 11"
-     id="path14-0-3-7-7-4" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,13 v 3"
-     id="path14-0-30-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499998,13 v 3"
-     id="path14-0-3-7-7-4-0" />
+     d="m 16.95,9.9665001 a 7.0065,7.0065 0 1 0 7,7.0064999 7.0032,7.0032 0 0 0 -7,-7.0064999 z"
+     id="path116542"
+     style="fill:#bf2641;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
+     id="polyline116544"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 15.073,13.122 c 0,0 -0.640163,4.136587 0.81412,5.59087 1.322525,1.322525 4.79688,0.57913 4.79688,0.57913"
+     sodipodi:nodetypes="csc" />
+  <polyline
      class="cls-4"
-     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
-     id="path7940"
-     style="fill:#bf2641" />
-  <g
-     id="g9325"
-     transform="matrix(0,-1,-1,0,34.871,35.693959)"
-     style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <polyline
-       class="cls-5"
-       points="21.865 19.871 15.694 19.871 15.694 14.26"
-       id="polyline8755"
-       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <polyline
-       class="cls-5"
-       points="19.487 17.444 21.913 19.871 19.487 22.297"
-       id="polyline8757"
-       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+     points="19.473 17.45 21.9 19.877 19.473 22.303"
+     id="polyline116546"
+     transform="matrix(0,-1,-1,0,34.95,34.973)"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/group_remove.svg b/bitmaps_png/sources/group_remove.svg
index 76ba327daa..d1fb88b892 100644
--- a/bitmaps_png/sources/group_remove.svg
+++ b/bitmaps_png/sources/group_remove.svg
@@ -12,7 +12,135 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="group_remove.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <rect
+     class="cls-3"
+     x="0"
+     y="0"
+     width="3"
+     height="3"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="0"
+     width="3"
+     height="3"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="21"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1038"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="0"
+     y="21"
+     width="3"
+     height="3"
+     id="rect1040"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,1.5 H 6"
+     id="path1060"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,1.5 h 3"
+     id="path1062"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,1.5 h 3"
+     id="path1064"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,1.5 h 3"
+     id="path1066"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,22.5 H 6"
+     id="path1068"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,22.5 h 3"
+     id="path1070"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,22.5 h 3"
+     id="path1072"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,22.5 h 3"
+     id="path1074"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,21 V 18"
+     id="path1076"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,16 V 13"
+     id="path1078"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,11 V 7.9999997"
+     id="path1080"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5,6 V 3"
+     id="path1082"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,21 V 18"
+     id="path1084"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,16 V 13"
+     id="path1086"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,11 V 7.9999997"
+     id="path1088"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 22.5,6 V 3"
+     id="path1090"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161129" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -28,9 +156,9 @@
      showgrid="true"
      inkscape:zoom="30.702139"
      inkscape:cx="2.5605781"
-     inkscape:cy="11.697159"
+     inkscape:cy="11.755682"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,102 +207,6 @@
   </defs>
   <title
      id="title9">group</title>
-  <rect
-     class="cls-3"
-     x="1"
-     y="19"
-     width="4"
-     height="3.9999998"
-     id="rect27"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="1"
-     y="1"
-     width="3.9995003"
-     height="4"
-     id="rect29"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="19"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect31"
-     style="fill:#545454;stroke-width:0.999999" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="1"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect33"
-     style="fill:#545454;stroke-width:1" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 3,2.5 H 6"
-     id="path14" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,2.5 h 3"
-     id="path14-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,21.5 H 6"
-     id="path14-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,21.5 h 3.5"
-     id="path14-8-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,3 V 6"
-     id="path14-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,18 v 3"
-     id="path14-0-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.5,18 v 3"
-     id="path14-0-3-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 21.5,3 V 6"
-     id="path14-0-3-7-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,21.5 h 3"
-     id="path14-6-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,21.5 h 3"
-     id="path14-6-3-2" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,2.5 h 3"
-     id="path14-6-3-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,2.5 h 3"
-     id="path14-6-3-2-3" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,8 v 3"
-     id="path14-0-30" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499999,8 v 3"
-     id="path14-0-3-7-7-4" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,13 v 3"
-     id="path14-0-30-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499998,13 v 3"
-     id="path14-0-3-7-7-4-0" />
   <path
      class="cls-4"
      d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
diff --git a/bitmaps_png/sources/group_ungroup.svg b/bitmaps_png/sources/group_ungroup.svg
new file mode 100644
index 0000000000..f6b65c9157
--- /dev/null
+++ b/bitmaps_png/sources/group_ungroup.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="group_ungroup.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/group.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="30.702139"
+     inkscape:cx="25.708317"
+     inkscape:cy="1.5168099"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1"
+     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"
+       visible="true" />
+  </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>group</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="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2613"
+     width="11"
+     height="11"
+     x="3.5"
+     y="3.5" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2613-6"
+     width="11"
+     height="11"
+     x="9.5"
+     y="9.5" />
+  <rect
+     class="cls-3"
+     x="2"
+     y="2"
+     width="3"
+     height="3"
+     id="rect29"
+     style="stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="13"
+     y="2"
+     width="3"
+     height="3"
+     id="rect33"
+     style="stroke-width:1" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 12,8.5 h 3"
+     id="path957"
+     inkscape:transform-center-x="-1.0161129"
+     inkscape:transform-center-y="-1.2847622" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 8.5,15 V 12"
+     id="path959"
+     inkscape:transform-center-x="1.2847622"
+     inkscape:transform-center-y="-1.0161132" />
+  <rect
+     class="cls-3"
+     x="8"
+     y="8"
+     width="3"
+     height="3"
+     id="rect1032"
+     style="stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="2"
+     y="13"
+     width="3"
+     height="3"
+     id="rect1034"
+     style="stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="8"
+     width="3"
+     height="3"
+     id="rect1036"
+     style="stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3"
+     height="3"
+     id="rect1038"
+     style="stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="8"
+     y="19"
+     width="3"
+     height="3"
+     id="rect1040"
+     style="stroke-width:1" />
+</svg>
diff --git a/bitmaps_png/sources/options_pad.svg b/bitmaps_png/sources/options_pad.svg
index fdc1746fa2..62b92d1bd7 100755
--- a/bitmaps_png/sources/options_pad.svg
+++ b/bitmaps_png/sources/options_pad.svg
@@ -1,38 +1,101 @@
 <?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="options_pad.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="1609" inkscape:window-height="1286" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" 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="defs158581">
-      <style id="style158579">.cls-1{fill:#f29100;}.cls-2{fill:#fff;}.cls-3{fill:#bf2641;}</style>
-   </defs>
-   <title id="title158583">options_pad</title>
-   <path class="cls-1" d="m 10.5018,-0.0072 a 10.509,10.509 0 1 0 10.5089,10.509 10.5211,10.5211 0 0 0 -10.5089,-10.509 z m 0,20.1423 a 9.6333,9.6333 0 1 1 9.6333,-9.6333 9.6437,9.6437 0 0 1 -9.6333,9.6333 z" id="path158585" />
-   <path class="cls-1" d="m 10.5018,2.3786 a 8.1231,8.1231 0 1 0 8.123,8.1232 8.1322,8.1322 0 0 0 -8.123,-8.1232 z m 0,12.7435 a 4.62,4.62 0 1 1 4.62,-4.62 4.6259,4.6259 0 0 1 -4.62,4.62 z" id="path158587" />
-   <path class="cls-2" d="m 20.5744,17.2043 a 3.062,3.062 0 1 1 -3.0619,-3.0619 3.0619,3.0619 0 0 1 3.0619,3.0619 z" id="path158589" />
-   <path class="cls-3" d="m 23.7541,18.5583 -1.2674,-0.907 -0.015,0.0269 a 5.1976,5.1976 0 0 0 0.0693,-0.6877 5.203,5.203 0 0 0 -0.0738,-0.7314 l 0.0074,0.0127 1.2576,-0.92 A 0.67,0.67 0 0 0 23.917,14.4773 L 22.7843,12.509 a 0.67,0.67 0 0 0 -0.8489,-0.2795 l -1.4277,0.6248 0.0124,0.0215 a 5.2207,5.2207 0 0 0 -1.2774,-0.757 L 19.0733,10.58 A 0.67,0.67 0 0 0 18.4077,9.9836 h -2.271 A 0.67,0.67 0 0 0 15.4709,10.58 l -0.17,1.5453 A 5.2192,5.2192 0 0 0 13.98,12.93 l 0.018,-0.0322 -1.4342,-0.61 a 0.67,0.67 0 0 0 -0.846,0.2886 l -1.1118,1.98 a 0.67,0.67 0 0 0 0.1943,0.8725 l 1.2674,0.907 0.0276,-0.0492 a 5.2141,5.2141 0 0 0 -0.0709,0.7037 5.21,5.21 0 0 0 0.0767,0.7616 l -0.021,-0.0367 -1.2576,0.9205 a 0.67,0.67 0 0 0 -0.1851,0.8744 l 1.1326,1.9685 a 0.67,0.67 0 0 0 0.8489,0.2795 l 1.4279,-0.6249 -0.0293,-0.0507 a 5.22,5.22 0 0 0 1.2933,0.7762 l 0.17,1.5487 a 0.67,0.67 0 0 0 0.6656,0.5964 h 2.271 a 0.67,0.67 0 0 0 0.6656,-0.5964 l 0.17,-1.5484 a 5.2191,5.2191 0 0 0 1.318,-0.7963 l -0.0154,0.0271 1.4344,0.61 a 0.67,0.67 0 0 0 0.8459,-0.2885 l 1.1117,-1.98 a 0.67,0.67 0 0 0 -0.1935,-0.8731 z m -6.4714,0.9334 a 2.5012,2.5012 0 1 1 2.5012,-2.5012 2.5013,2.5013 0 0 1 -2.5012,2.5012 z" id="path158591" />
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="options_pad.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2364"
+     inkscape:window-height="1717"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="27.961538"
+     inkscape:cx="14.714371"
+     inkscape:cy="14.838227"
+     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="defs158581">
+    <style
+       id="style158579">.cls-1{fill:#f29100;}.cls-2{fill:#fff;}.cls-3{fill:#bf2641;}</style>
+  </defs>
+  <title
+     id="title158583">options_pad</title>
+  <path
+     class="cls-1"
+     d="m 10.5018,-0.0072 a 10.509,10.509 0 1 0 10.5089,10.509 10.5211,10.5211 0 0 0 -10.5089,-10.509 z m 0,20.1423 a 9.6333,9.6333 0 1 1 9.6333,-9.6333 9.6437,9.6437 0 0 1 -9.6333,9.6333 z"
+     id="path158585" />
+  <path
+     class="cls-1"
+     d="m 10.5018,2.3786 a 8.1231,8.1231 0 1 0 8.123,8.1232 8.1322,8.1322 0 0 0 -8.123,-8.1232 z m 0,12.7435 a 4.62,4.62 0 1 1 4.62,-4.62 4.6259,4.6259 0 0 1 -4.62,4.62 z"
+     id="path158587" />
+  <path
+     class="cls-2"
+     d="m 20.5744,17.2043 a 3.062,3.062 0 1 1 -3.0619,-3.0619 3.0619,3.0619 0 0 1 3.0619,3.0619 z"
+     id="path158589" />
+  <path
+     class="cls-9"
+     d="m 24.160145,19.21647 -1.2674,-0.907 -0.015,0.027 c 0.03833,-0.2274 0.06148,-0.4572 0.0693,-0.6877 -0.0073,-0.2452 -0.03199,-0.4896 -0.0738,-0.7314 l 0.0074,0.013 1.2576,-0.92 c 0.275446,-0.2018 0.355047,-0.5785 0.1848,-0.8745 l -1.1327,-1.9683 c -0.170254,-0.296 -0.535927,-0.4167 -0.8489,-0.28 l -1.4277,0.6248 0.0124,0.022 c -0.387558,-0.3119 -0.817708,-0.5668 -1.2774,-0.757 l -0.1694,-1.5386 c -0.0375,-0.3393 -0.324184,-0.5962 -0.6656,-0.5964 h -2.271 c -0.341492,10e-5 -0.628287,0.257 -0.6658,0.5964 l -0.17,1.5453 c -0.477874,0.201 -0.923129,0.4721 -1.3211,0.8044 l 0.018,-0.032 -1.4342,-0.61 c -0.31434,-0.1335 -0.678759,-0.01 -0.846,0.2886 l -1.1118,1.98 c -0.167055,0.2979 -0.08336,0.6737 0.1943,0.8725 l 1.2674,0.907 0.0276,-0.049 c -0.03953,0.2327 -0.06322,0.4678 -0.0709,0.7037 0.0069,0.2554 0.03249,0.51 0.0767,0.7616 l -0.021,-0.037 -1.2576,0.9205 c -0.275495,0.2017 -0.355223,0.5783 -0.1851,0.8744 l 1.1327,1.9684 c 0.170418,0.2959 0.536051,0.4162 0.8489,0.2795 l 1.4279,-0.6249 -0.0293,-0.051 c 0.391248,0.32 0.826895,0.5814 1.2933,0.7762 l 0.17,1.5487 c 0.03751,0.3393 0.324184,0.5962 0.6656,0.5964 h 2.271 c 0.341416,-2e-4 0.628095,-0.2571 0.6656,-0.5964 l 0.1705,-1.5484 c 0.47629,-0.1988 0.920456,-0.4672 1.318,-0.7963 l -0.0154,0.027 1.4344,0.61 c 0.314288,0.1334 0.678633,0.01 0.8459,-0.2885 l 1.1117,-1.98 c 0.167077,-0.2977 0.08356,-0.6735 -0.1939,-0.8724 z m -6.4714,0.4685 c -1.656272,0 -2.371671,-2.145 -1.410892,-3.2684 1.001032,-1.1704 3.291346,-0.4321 3.327109,1.1884 0.107235,0.9522 -0.534865,2.0799 -1.916217,2.08 z"
+     id="path158639"
+     style="fill:#bf2641;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2.3;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccscc" />
 </svg>
diff --git a/bitmaps_png/sources/pin_size_to.svg b/bitmaps_png/sources/pin_size_to.svg
index 5f7fe89f0f..87ebc407cb 100755
--- a/bitmaps_png/sources/pin_size_to.svg
+++ b/bitmaps_png/sources/pin_size_to.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="pin_size_to.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
   <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="1041"
+     inkscape:window-width="2575"
+     inkscape:window-height="1651"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="30.702139"
      inkscape:cx="10.589335"
      inkscape:cy="15.833679"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -124,18 +124,19 @@
      id="polygon159113"
      transform="translate(-1,-1)" />
   <path
-     class="cls-5"
-     d="m 23.999997,16.993507 a 7,6.9999996 0 1 1 -7,-6.993506 6.9967031,6.9967026 0 0 1 7,6.993506 z"
-     id="path159115"
-     style="stroke-width:0.999996" />
+     class="cls-3"
+     d="m 24.0335,17.049999 a 7.0064998,7.0064998 0 1 1 -7.0065,-7 7.0031999,7.0031999 0 0 1 7.0065,7 z"
+     id="path116542"
+     style="fill:#bf2641;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="polyline116544"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 20.878,18.926999 c 0,0 -4.136587,0.640163 -5.59087,-0.81412 -1.322525,-1.322525 -0.57913,-4.79688 -0.57913,-4.79688"
+     sodipodi:nodetypes="csc" />
   <polyline
-     class="cls-6"
-     points="21.851 19.877 15.681 19.877 15.681 14.266"
-     id="polyline159117"
-     transform="translate(-1.681,-1)" />
-  <polyline
-     class="cls-6"
+     class="cls-4"
      points="19.473 17.45 21.9 19.877 19.473 22.303"
-     id="polyline159119"
-     transform="translate(-1,-1)" />
+     id="polyline116546"
+     transform="translate(-0.973,-0.95)"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/rotate_ccw.svg b/bitmaps_png/sources/rotate_ccw.svg
index 2bd907372c..eeecc88aeb 100755
--- a/bitmaps_png/sources/rotate_ccw.svg
+++ b/bitmaps_png/sources/rotate_ccw.svg
@@ -12,7 +12,10 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="rotate_ccw.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_24/mirror_h.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,26 +25,24 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="2527"
+     inkscape:window-height="1496"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:cx="8.2642508"
+     inkscape:cy="21.223834"
+     inkscape:window-x="881"
+     inkscape:window-y="327"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
     <inkscape:grid
        type="xygrid"
-       id="grid_kicad"
+       id="grid26"
+       empspacing="2"
        spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
+       spacingy="0.5" />
   </sodipodi:namedview>
   <metadata
      id="metadata43">
@@ -53,7 +54,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
+        <dc:title>mirror_h</dc:title>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@@ -73,25 +74,34 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs26863">
+     id="defs25707">
     <style
-       id="style26861">.cls-1{fill:#b9b9b9;}.cls-2{fill:#545454;}</style>
+       id="style25705">.cls-1{fill:#545454;}.cls-2{fill:#1a81c4;}.cls-3{fill:#b9b9b9;}</style>
   </defs>
   <title
-     id="title26865">rotate_ccw</title>
+     id="title25709">mirror_h</title>
   <path
+     id="polygon25713"
+     style="fill:#1a81c4;stroke-width:0.7926"
+     d="M 9,8 2,22 h 7 z"
      class="cls-2"
-     d="M 12,24 A 11.0125,11.0125 0 0 1 1,13 a 1,1 0 0 1 2,0 9,9 0 1 0 9,-9 1,1 0 0 1 0,-2 11,11 0 0 1 0,22 z"
-     id="path26869" />
-  <polygon
-     class="cls-2"
-     points="15.006,1 15.006,7.241 8.437,4.519 "
-     id="polygon26871"
-     transform="translate(-1,-1)" />
-  <circle
-     class="cls-2"
-     cx="12"
-     cy="13"
-     r="2.0295999"
-     id="circle26873" />
+     sodipodi:nodetypes="cccc" />
+  <path
+     id="polygon25715"
+     style="fill:#606060;fill-opacity:1;stroke-width:0.792599"
+     d="M 24,22 10,15 v 7 z"
+     class="cls-3"
+     sodipodi:nodetypes="cccc" />
+  <polyline
+     class="cls-3"
+     points="8.803 19.188 11.229 21.614 8.803 24.041"
+     id="polyline777"
+     transform="matrix(-1,0,0,-0.98912611,24.303,32.274127)"
+     style="fill:none;stroke:#bf2641;stroke-width:2.01096;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     id="polyline775"
+     style="fill:none;stroke:#bf2641;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 13.5,11.026576 c 0,0 3.302433,-0.285416 4.598796,1.010946 C 19.264492,13.203219 19,15.972207 19,15.972207"
+     class="cls-3"
+     sodipodi:nodetypes="csc" />
 </svg>
diff --git a/bitmaps_png/sources/rotate_cw.svg b/bitmaps_png/sources/rotate_cw.svg
index 3888e3f801..10ed6450fe 100755
--- a/bitmaps_png/sources/rotate_cw.svg
+++ b/bitmaps_png/sources/rotate_cw.svg
@@ -12,7 +12,10 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="rotate_cw.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_24/mirror_h.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,26 +25,24 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="2527"
+     inkscape:window-height="1496"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="27.961538"
-     inkscape:cx="9.4423029"
-     inkscape:cy="13.302913"
-     inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:cx="8.2642508"
+     inkscape:cy="21.223834"
+     inkscape:window-x="881"
+     inkscape:window-y="327"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
     <inkscape:grid
        type="xygrid"
-       id="grid_kicad"
+       id="grid26"
+       empspacing="2"
        spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
+       spacingy="0.5" />
   </sodipodi:namedview>
   <metadata
      id="metadata43">
@@ -53,7 +54,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
+        <dc:title>mirror_h</dc:title>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@@ -73,25 +74,34 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs159547">
+     id="defs25707">
     <style
-       id="style159545">.cls-1{fill:#b9b9b9;}.cls-2{fill:#545454;}</style>
+       id="style25705">.cls-1{fill:#545454;}.cls-2{fill:#1a81c4;}.cls-3{fill:#b9b9b9;}</style>
   </defs>
   <title
-     id="title159549">rotate_cw</title>
+     id="title25709">mirror_h</title>
   <path
+     id="polygon25713"
+     style="fill:#1a81c4;stroke-width:0.7926"
+     d="m 15,8 7,14 h -7 z"
      class="cls-2"
-     d="M 12,24 A 11.0125,11.0125 0 0 0 23,13 1,1 0 0 0 21,13 9,9 0 1 1 12,4 1,1 0 0 0 12,2 11,11 0 0 0 12,24 Z"
-     id="path159553" />
-  <polygon
-     class="cls-2"
-     points="10.994,1 10.994,7.241 17.563,4.519 "
-     id="polygon159555"
-     transform="translate(-1,-1)" />
-  <circle
-     class="cls-2"
-     cx="12"
-     cy="13"
-     r="2.0295999"
-     id="circle159557" />
+     sodipodi:nodetypes="cccc" />
+  <path
+     id="polygon25715"
+     style="fill:#606060;fill-opacity:1;stroke-width:0.792599"
+     d="m 0,22 14,-7 v 7 z"
+     class="cls-3"
+     sodipodi:nodetypes="cccc" />
+  <polyline
+     class="cls-3"
+     points="8.803 19.188 11.229 21.614 8.803 24.041"
+     id="polyline777"
+     transform="matrix(1,0,0,-0.98912611,-0.303,32.279581)"
+     style="fill:none;stroke:#bf2641;stroke-width:2.01096;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     id="polyline775"
+     style="fill:none;stroke:#bf2641;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 10.5,11 c 0,0 -3.3024335,-0.285416 -4.5987959,1.010946 C 4.7355077,13.176643 5,15.945631 5,15.945631"
+     class="cls-3"
+     sodipodi:nodetypes="csc" />
 </svg>
diff --git a/bitmaps_png/sources/save_as.svg b/bitmaps_png/sources/save_as.svg
index 0d8b04571b..8839ab4776 100755
--- a/bitmaps_png/sources/save_as.svg
+++ b/bitmaps_png/sources/save_as.svg
@@ -12,7 +12,7 @@
    inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_26/save.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
    sodipodi:docname="save_as.svg"
    x="0px"
    y="0px"
@@ -52,16 +52,16 @@
    guidetolerance="10"
    id="namedview27"
    inkscape:current-layer="g2083"
-   inkscape:cx="14.166338"
+   inkscape:cx="13.742818"
    inkscape:cy="14.353898"
    inkscape:document-rotation="0"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-height="1017"
+   inkscape:window-height="2099"
    inkscape:window-maximized="1"
-   inkscape:window-width="1920"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
+   inkscape:window-width="3840"
+   inkscape:window-x="0"
+   inkscape:window-y="37"
    inkscape:zoom="34.23691"
    objecttolerance="10"
    pagecolor="#ffffff"
@@ -109,17 +109,16 @@
 <g
    id="g2083"
    transform="matrix(1.0000162,0,0,0.99999938,-0.84473006,3.5560085)"><path
-     class="cls-5"
-     d="m 24.844326,13.455413 a 6.9998904,7.0000044 0 1 1 -6.99999,-7.0114175 7.0055964,7.0057105 0 0 1 6.99999,7.0114175 z"
-     id="path20"
-     style="fill:#bf2641;stroke:none;stroke-width:1.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><polyline
-     class="cls-6"
-     points="21.865 19.871 15.694 19.871 15.694 14.26"
-     id="polyline22"
-     transform="matrix(1.0010569,0,0,1.0010732,-0.17819253,-4.5607021)"
-     style="fill:none;stroke:#ffffff;stroke-width:1.99787px;stroke-linecap:round;stroke-linejoin:round" /><polyline
-     class="cls-6"
-     points="19.487 17.444 21.913 19.871 19.487 22.297"
-     id="polyline24"
-     transform="matrix(1.0010569,0,0,1.0010732,-0.17819253,-4.5607021)"
-     style="fill:none;stroke:#ffffff;stroke-width:1.99787px;stroke-linecap:round;stroke-linejoin:round" /></g></svg>
+     class="cls-3"
+     d="M 24.877827,13.494 A 7.0063863,7.0065041 0 1 1 17.87144,6.4939954 7.0030865,7.0032042 0 0 1 24.877827,13.494 Z"
+     id="path116542"
+     style="fill:#bf2641;stroke:none;stroke-width:1.49999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     id="polyline116544"
+     style="fill:none;stroke:#ffffff;stroke-width:1.99999px;stroke-linecap:round;stroke-linejoin:round"
+     d="m 21.722378,15.371001 c 0,0 -4.13652,0.640163 -5.590779,-0.814121 -1.322504,-1.322525 -0.579121,-4.7968822 -0.579121,-4.7968822"
+     sodipodi:nodetypes="csc" /><polyline
+     class="cls-4"
+     points="19.473 17.45 21.9 19.877 19.473 22.303"
+     id="polyline116546"
+     transform="matrix(0.99998378,0,0,1.0000006,-0.12826747,-4.5060109)"
+     style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" /></g></svg>
diff --git a/bitmaps_png/sources/ungroup.svg b/bitmaps_png/sources/ungroup.svg
deleted file mode 100644
index 094ecacccb..0000000000
--- a/bitmaps_png/sources/ungroup.svg
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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="ungroup.svg"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
-   inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/sources/ungroup.png"
-   inkscape:export-xdpi="60"
-   inkscape:export-ydpi="60">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1285"
-     inkscape:window-height="800"
-     id="namedview30"
-     showgrid="true"
-     inkscape:zoom="19.147172"
-     inkscape:cx="10.672684"
-     inkscape:cy="11.842059"
-     inkscape:window-x="108"
-     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>group</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="defs7">
-    <style
-       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-  </defs>
-  <title
-     id="title9">group</title>
-  <rect
-     class="cls-3"
-     x="1"
-     y="1"
-     width="3.9995003"
-     height="4"
-     id="rect29"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="19"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect31"
-     style="fill:#545454;stroke-width:0.999999" />
-  <rect
-     class="cls-3"
-     x="8"
-     y="1"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect33"
-     style="fill:#545454;stroke-width:1" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 3,2.5000002 H 6"
-     id="path14" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 18,21.5 h 3.5"
-     id="path14-8-6" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 2.5,3.0000002 v 3"
-     id="path14-0" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.5,18 v 3"
-     id="path14-0-3-7" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 13,21.5 h 3"
-     id="path14-6-3-2" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 8,2.5000002 h 3"
-     id="path14-6-3-8" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 2.5,8.0000002 V 11"
-     id="path14-0-30" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 21.499998,13 v 3"
-     id="path14-0-3-7-7-4-0" />
-  <rect
-     style="fill:none;fill-rule:evenodd;stroke:#545454;stroke-width:0.970142;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2613"
-     width="8"
-     height="8"
-     x="2.5"
-     y="2.5" />
-  <rect
-     style="fill:none;fill-rule:evenodd;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect2615"
-     width="7"
-     height="8"
-     x="14.5"
-     y="13.5" />
-  <rect
-     class="cls-3"
-     x="13"
-     y="12"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect2635"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="19"
-     y="12"
-     width="4"
-     height="3.9999998"
-     id="rect2637"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="1"
-     y="8"
-     width="4"
-     height="3.9999998"
-     id="rect2639"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="8"
-     y="8"
-     width="3.9999998"
-     height="3.9999998"
-     id="rect2641"
-     style="fill:#545454;stroke-width:1" />
-  <rect
-     class="cls-3"
-     x="13"
-     y="19"
-     width="4"
-     height="3.9999998"
-     id="rect2645"
-     style="fill:#545454;stroke-width:1" />
-</svg>
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 556deba174..53097c1b5b 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -656,7 +656,7 @@ TOOL_ACTION PCB_ACTIONS::group( "pcbnew.EditorControl.group",
 TOOL_ACTION PCB_ACTIONS::ungroup( "pcbnew.EditorControl.ungroup",
         AS_GLOBAL, 0, "",
         _( "Ungroup" ), "",
-        ungroup_xpm );
+        group_ungroup_xpm );
 
 TOOL_ACTION PCB_ACTIONS::removeFromGroup( "pcbnew.EditorControl.removeFromGroup",
         AS_GLOBAL, 0, "",