diff --git a/bitmaps_png/cpp_24/annotate.cpp b/bitmaps_png/cpp_24/annotate.cpp
index fcd19a1fa3..d7a0ab1e97 100644
--- a/bitmaps_png/cpp_24/annotate.cpp
+++ b/bitmaps_png/cpp_24/annotate.cpp
@@ -8,19 +8,51 @@
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, 0xb5, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x64, 0x40, 0x02, 0x3b,
- 0x77, 0xee, 0xfc, 0xcf, 0x40, 0x05, 0xe0, 0xee, 0xee, 0xce, 0x08, 0x63, 0x33, 0x8e, 0x5a, 0x30,
- 0x6a, 0xc1, 0xa8, 0x05, 0x74, 0xb6, 0x80, 0x10, 0xd8, 0xaf, 0xe6, 0xf8, 0x9f, 0x81, 0x81, 0x81,
- 0xc1, 0xf1, 0xd6, 0x7e, 0xa2, 0xf5, 0x0d, 0x0e, 0x0b, 0xf6, 0xa8, 0x3b, 0xeb, 0xb1, 0xfc, 0xfb,
- 0xb7, 0xfb, 0x3f, 0x23, 0x83, 0x18, 0x03, 0x03, 0x03, 0x03, 0xe3, 0x7f, 0x86, 0x57, 0x7f, 0x98,
- 0x98, 0x5c, 0x5d, 0x6e, 0xee, 0xbd, 0x44, 0x35, 0x1f, 0x1c, 0x54, 0x73, 0x5c, 0xf1, 0x8f, 0x81,
- 0x21, 0x1c, 0xca, 0x5d, 0xe9, 0x78, 0x6b, 0x7f, 0x04, 0xc9, 0x3e, 0x90, 0x6a, 0x3c, 0x82, 0x33,
- 0x92, 0xb9, 0x7f, 0x7d, 0x67, 0xe8, 0xd8, 0x3a, 0x85, 0x81, 0x81, 0x91, 0x81, 0xa1, 0xca, 0x33,
- 0x9b, 0xe1, 0x33, 0x3b, 0x17, 0x4e, 0x43, 0x9f, 0xd5, 0xdb, 0x30, 0x92, 0x6c, 0x01, 0x03, 0x03,
- 0x03, 0x43, 0xc8, 0xa5, 0x7d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x6b, 0xf4, 0x9c, 0xf0, 0xba, 0x9a,
- 0x6c, 0x0b, 0x98, 0xff, 0xfd, 0x65, 0x60, 0x60, 0x60, 0x60, 0xf8, 0xcb, 0xc4, 0x4c, 0x1b, 0x0b,
- 0x88, 0x05, 0xa3, 0x16, 0x8c, 0x5a, 0x40, 0x5d, 0x0b, 0x00, 0xce, 0x2a, 0x75, 0x19, 0x0d, 0x06,
- 0x77, 0x92, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x02, 0xac, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x94, 0xdf, 0x4b, 0x53,
+ 0x61, 0x18, 0xc7, 0x0f, 0xf5, 0x5f, 0xf4, 0xf3, 0x26, 0x37, 0x43, 0xa8, 0x8b, 0x2e, 0x2a, 0x24,
+ 0xe4, 0x8c, 0x20, 0x6f, 0x82, 0x74, 0xb3, 0x8b, 0xe6, 0x8f, 0xab, 0x66, 0x63, 0x10, 0xd4, 0x85,
+ 0x83, 0x92, 0x61, 0x5a, 0xa4, 0x92, 0x4a, 0x6b, 0xa9, 0x08, 0x49, 0x79, 0x61, 0xac, 0x1f, 0x48,
+ 0x60, 0x1a, 0xb5, 0xf6, 0x03, 0x36, 0x9c, 0xe5, 0xaf, 0xb2, 0x69, 0x5a, 0xa6, 0x1d, 0x35, 0x74,
+ 0xe5, 0x74, 0x47, 0xdd, 0x59, 0x3b, 0xcd, 0x6f, 0xe7, 0x7d, 0x65, 0x32, 0x57, 0xdb, 0x28, 0x8f,
+ 0x0f, 0x7c, 0xd9, 0xfb, 0x3c, 0xef, 0xf3, 0x3e, 0x9f, 0xf3, 0x3e, 0xcf, 0xcb, 0x18, 0x46, 0x32,
+ 0x8d, 0x46, 0x83, 0xed, 0x10, 0x13, 0xb3, 0x54, 0x49, 0x25, 0x25, 0x25, 0x88, 0x59, 0x24, 0x12,
+ 0x01, 0xc7, 0x71, 0x30, 0x9b, 0xcd, 0xf2, 0x03, 0xac, 0x56, 0x2b, 0xca, 0xcb, 0xcb, 0xe1, 0x72,
+ 0xb9, 0x10, 0x8d, 0x46, 0xa1, 0xd7, 0xeb, 0xe5, 0x05, 0x58, 0x2c, 0x16, 0xea, 0x1b, 0x8d, 0x46,
+ 0xea, 0x9b, 0x4c, 0x26, 0x79, 0x01, 0xdd, 0xdd, 0xdd, 0x14, 0xe2, 0xf3, 0xf9, 0xe0, 0xf7, 0xfb,
+ 0xa1, 0xd5, 0x6a, 0xe5, 0x05, 0x04, 0x83, 0x41, 0xf0, 0x3c, 0x8f, 0x50, 0x28, 0x04, 0x9d, 0x4e,
+ 0x27, 0xff, 0x0c, 0xc8, 0xd7, 0x97, 0x96, 0x96, 0x42, 0x10, 0x04, 0xb4, 0xb6, 0xb6, 0x6e, 0x0f,
+ 0x80, 0xf8, 0x6d, 0x6d, 0x6d, 0x08, 0x87, 0xc3, 0x30, 0x18, 0x0c, 0x5b, 0x07, 0x9c, 0x55, 0xab,
+ 0xa1, 0x2b, 0x2c, 0x82, 0x18, 0xe4, 0xd1, 0x54, 0x57, 0x0f, 0x6d, 0x5e, 0x3e, 0x8a, 0x35, 0x05,
+ 0xf8, 0xf2, 0xc1, 0x87, 0xf7, 0xde, 0x5e, 0x14, 0xe6, 0xab, 0x69, 0xce, 0x7f, 0x03, 0xce, 0xe5,
+ 0xa9, 0xf1, 0xe2, 0xa0, 0x0a, 0xb6, 0x4c, 0x16, 0x2f, 0x33, 0x55, 0x78, 0xad, 0x64, 0xa9, 0xc8,
+ 0x9a, 0xc4, 0xc8, 0x1e, 0xc9, 0x49, 0x0b, 0x48, 0x65, 0x0e, 0xa5, 0xea, 0x82, 0x5d, 0xa1, 0x0a,
+ 0x3a, 0x14, 0x2c, 0x12, 0xc4, 0x93, 0x3d, 0x66, 0xab, 0x56, 0xc1, 0x54, 0xec, 0xb0, 0x2b, 0xd8,
+ 0xb1, 0x44, 0x80, 0x14, 0x9b, 0x78, 0xc4, 0x14, 0xec, 0x64, 0xe4, 0x30, 0xbb, 0x92, 0xcd, 0x76,
+ 0x64, 0xb0, 0xa1, 0x58, 0x71, 0xa7, 0x92, 0x5d, 0xb5, 0x1f, 0x60, 0x73, 0x18, 0x39, 0xcd, 0xa9,
+ 0x60, 0x9f, 0x3b, 0x94, 0xac, 0x48, 0x44, 0xd6, 0xff, 0x74, 0x78, 0xd7, 0x35, 0x37, 0xd2, 0xe9,
+ 0x50, 0x59, 0x27, 0xba, 0xb2, 0x72, 0xa9, 0xc8, 0x3a, 0x71, 0x5f, 0x59, 0xdd, 0x83, 0xfd, 0xd7,
+ 0x3d, 0x9b, 0x62, 0x9b, 0x00, 0xfb, 0xaa, 0x3c, 0x1b, 0xff, 0x9a, 0x2b, 0x3f, 0x7f, 0x61, 0x64,
+ 0x6e, 0x05, 0x17, 0x3b, 0xc6, 0x37, 0x1d, 0xb8, 0x7c, 0xc6, 0x84, 0xe6, 0xf3, 0xd5, 0x34, 0x47,
+ 0xff, 0xe4, 0x23, 0x8d, 0x15, 0x3f, 0x1c, 0xc1, 0xe4, 0x82, 0x40, 0x63, 0x82, 0x18, 0x45, 0x83,
+ 0x8b, 0x4b, 0x0d, 0xb0, 0xb8, 0xa7, 0xa1, 0x7e, 0x30, 0x0c, 0xeb, 0xd0, 0x3c, 0xa2, 0x6b, 0x40,
+ 0xce, 0xdd, 0xfe, 0x8d, 0x03, 0x47, 0x6b, 0xdd, 0x98, 0x9e, 0x5f, 0xc2, 0x5a, 0x1c, 0xa0, 0xea,
+ 0xd5, 0x24, 0x2d, 0xaa, 0x6a, 0x1a, 0x40, 0x8d, 0xfd, 0x2b, 0xad, 0xc1, 0x36, 0x0e, 0x24, 0x07,
+ 0x5c, 0xe9, 0x9a, 0xa0, 0x9b, 0x27, 0x2c, 0xfd, 0xd4, 0x2f, 0x6a, 0xf7, 0x51, 0x7f, 0xb7, 0x24,
+ 0xfb, 0xa7, 0x00, 0xea, 0xa5, 0x62, 0xf1, 0x37, 0x88, 0xd7, 0xe9, 0x7b, 0xef, 0xe8, 0xde, 0xc9,
+ 0xe6, 0xc1, 0xe4, 0x80, 0xf6, 0x81, 0x39, 0x18, 0x9e, 0x8e, 0xc1, 0x36, 0x1e, 0x80, 0x7f, 0x25,
+ 0x82, 0xac, 0x5a, 0x2f, 0x4d, 0x2e, 0xeb, 0xfc, 0x8c, 0xc1, 0xd9, 0x65, 0x64, 0xd6, 0x78, 0x93,
+ 0x02, 0x3a, 0x86, 0xfd, 0x18, 0x9d, 0x5f, 0xc5, 0xde, 0x4a, 0x4f, 0x72, 0xc0, 0xc2, 0x6a, 0x04,
+ 0x3f, 0x24, 0x91, 0x7e, 0x66, 0xdf, 0x59, 0x6f, 0xcf, 0x71, 0x73, 0x1f, 0x8d, 0x91, 0x76, 0x65,
+ 0xdc, 0xec, 0xf9, 0x2b, 0xa0, 0xce, 0xc9, 0x61, 0x31, 0x24, 0xd2, 0x56, 0xa5, 0x9c, 0x01, 0x69,
+ 0xd1, 0xe1, 0x5b, 0xbd, 0x08, 0x0a, 0x22, 0x6e, 0xd8, 0xa6, 0x68, 0xe2, 0xfd, 0xb7, 0xdf, 0x28,
+ 0x70, 0x2a, 0x20, 0x80, 0x5b, 0x0c, 0xd3, 0xbc, 0xef, 0xd2, 0xed, 0x74, 0x8f, 0xd7, 0x21, 0x24,
+ 0x2f, 0x20, 0x15, 0x3f, 0xd5, 0x32, 0x94, 0xfe, 0x15, 0xc5, 0x66, 0x70, 0x55, 0xfa, 0x0d, 0x4b,
+ 0x45, 0xc9, 0x2c, 0x72, 0xa5, 0x83, 0xa4, 0x18, 0x11, 0x79, 0x59, 0xc4, 0x5a, 0xbc, 0xb3, 0x38,
+ 0x76, 0xbb, 0x8f, 0x0e, 0x59, 0x94, 0x5e, 0xc3, 0xa5, 0x67, 0xe3, 0x34, 0x8f, 0xe8, 0x48, 0xc3,
+ 0x9b, 0xf4, 0x80, 0x3d, 0x95, 0x6e, 0x0c, 0xce, 0x2c, 0xa3, 0x6f, 0x9a, 0xa7, 0xeb, 0xd8, 0x57,
+ 0x25, 0xb6, 0x68, 0x49, 0xba, 0x69, 0xa2, 0x35, 0x7a, 0x66, 0xfe, 0x04, 0x6c, 0x87, 0x48, 0xed,
+ 0xdf, 0x19, 0xbb, 0x94, 0xea, 0xd1, 0xc1, 0x23, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+ 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE annotate_xpm[1] = {{ png, sizeof( png ), "annotate_xpm" }};
diff --git a/bitmaps_png/cpp_24/image.cpp b/bitmaps_png/cpp_24/image.cpp
index 3fd0d8eea5..f255b209ff 100644
--- a/bitmaps_png/cpp_24/image.cpp
+++ b/bitmaps_png/cpp_24/image.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, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x01, 0x12, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x94, 0xc1, 0x4e, 0xc2,
- 0x40, 0x10, 0x86, 0xe7, 0x41, 0x3c, 0x5b, 0x1e, 0x68, 0x22, 0x25, 0x08, 0x98, 0x78, 0xf4, 0xe0,
- 0xd5, 0x84, 0xc4, 0x60, 0x3c, 0x7a, 0x52, 0x8f, 0x86, 0x90, 0xa0, 0x07, 0x2d, 0x42, 0x31, 0x51,
- 0xdb, 0x31, 0x3e, 0x93, 0xd8, 0xbe, 0xc0, 0xe7, 0xc1, 0x95, 0xb4, 0x15, 0xda, 0x25, 0xff, 0xa5,
- 0x3b, 0xf9, 0xbe, 0xe9, 0xee, 0x34, 0x5d, 0x11, 0xb1, 0x96, 0x2d, 0x2d, 0x37, 0x1a, 0x92, 0x5b,
- 0x9c, 0x04, 0x22, 0x62, 0x2d, 0x5b, 0x35, 0xc2, 0x7f, 0x59, 0x25, 0x81, 0xd8, 0xd2, 0x1b, 0xc7,
- 0xf8, 0x98, 0x4b, 0xdd, 0x66, 0x52, 0xe2, 0x6a, 0x2d, 0x93, 0xed, 0xf8, 0x94, 0x01, 0x4a, 0x9f,
- 0x49, 0xa9, 0x2a, 0xdb, 0xbb, 0x0f, 0x50, 0x14, 0xa5, 0x47, 0xe2, 0x23, 0xc4, 0x0e, 0x57, 0x94,
- 0xc8, 0x47, 0x30, 0x7a, 0x0e, 0xef, 0xfa, 0xbd, 0xc1, 0x98, 0x70, 0x88, 0xd2, 0xe5, 0xae, 0xee,
- 0x0c, 0x63, 0xae, 0x48, 0xd7, 0xab, 0x84, 0xa7, 0x52, 0xf7, 0x7f, 0xc2, 0x0b, 0x1d, 0x94, 0xcb,
- 0xda, 0x2f, 0x51, 0x12, 0x2e, 0xdc, 0xae, 0x6f, 0xfd, 0x84, 0x98, 0xd0, 0x09, 0x6d, 0x1e, 0x7c,
- 0x84, 0xf3, 0xc2, 0x20, 0xfb, 0x2c, 0x9a, 0x84, 0x39, 0x07, 0x05, 0x41, 0x39, 0x71, 0xc7, 0x1d,
- 0x73, 0xc4, 0xcd, 0x26, 0x61, 0x58, 0xc2, 0x15, 0x65, 0x48, 0xca, 0x3d, 0x21, 0x4a, 0xc8, 0xac,
- 0x2a, 0x44, 0x95, 0xfe, 0xbf, 0x39, 0xa6, 0xed, 0x9e, 0x4e, 0xd7, 0xc3, 0x76, 0xc2, 0xd9, 0x06,
- 0xbc, 0x9c, 0xeb, 0xa2, 0xf0, 0xd8, 0x88, 0x2b, 0x1d, 0x37, 0x06, 0x31, 0x8c, 0x91, 0x87, 0xa0,
- 0x8c, 0x9c, 0x90, 0x1b, 0x6f, 0xcc, 0x3c, 0xf2, 0x8a, 0x61, 0xdf, 0x62, 0xf1, 0x2e, 0xbf, 0xa8,
- 0x3d, 0x4b, 0x12, 0xec, 0x70, 0x09, 0x7c, 0x7d, 0xee, 0x8b, 0x48, 0x12, 0xd8, 0xc2, 0xb2, 0x46,
- 0x38, 0xb3, 0xe8, 0x7d, 0x4f, 0xe4, 0x07, 0xb4, 0xc1, 0x97, 0xc4, 0xe8, 0xed, 0x6e, 0xca, 0x00,
- 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x01, 0x11, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x94, 0xbd, 0x4a, 0x03,
+ 0x41, 0x14, 0x46, 0xef, 0x83, 0x58, 0xbb, 0x79, 0x1e, 0x73, 0xc7, 0x15, 0xc4, 0xc2, 0x62, 0x15,
+ 0x09, 0x41, 0xec, 0x14, 0x9b, 0x14, 0xc1, 0x37, 0xd0, 0xf4, 0x96, 0xa2, 0x66, 0x41, 0x05, 0x9b,
+ 0x34, 0x3e, 0x82, 0x95, 0x4f, 0x60, 0x21, 0x61, 0x37, 0xbb, 0x81, 0xb0, 0x44, 0xf1, 0x58, 0x38,
+ 0x26, 0xbb, 0x89, 0xd9, 0x99, 0x7c, 0xb7, 0x99, 0xb9, 0x7c, 0xe7, 0xce, 0xff, 0x88, 0x48, 0xb3,
+ 0xa1, 0xb1, 0xe6, 0x8a, 0x23, 0x72, 0xd3, 0x37, 0x81, 0x88, 0x34, 0x1b, 0x9a, 0x3a, 0xcd, 0x7f,
+ 0x91, 0x9a, 0x40, 0x34, 0xf6, 0xb6, 0xa3, 0xe8, 0x9d, 0xd4, 0x4d, 0xc6, 0x10, 0x61, 0xaa, 0xb9,
+ 0x4c, 0x56, 0xdb, 0xcf, 0x19, 0x02, 0x09, 0x9d, 0x4a, 0x56, 0x56, 0x57, 0x1f, 0xf2, 0xab, 0x11,
+ 0xa1, 0x0f, 0x10, 0x31, 0x57, 0xdb, 0x6f, 0x84, 0xd4, 0xda, 0xc7, 0xec, 0xf8, 0x00, 0x4a, 0x87,
+ 0x0c, 0x18, 0x73, 0x51, 0xb7, 0x86, 0x2e, 0xd7, 0x6c, 0xcf, 0x7a, 0x21, 0xc7, 0x95, 0xea, 0x4b,
+ 0xc0, 0x3e, 0x13, 0x20, 0xae, 0x3d, 0x89, 0x0a, 0xf0, 0x60, 0x67, 0x7d, 0xe9, 0x07, 0x44, 0x14,
+ 0x16, 0x98, 0x72, 0xea, 0x03, 0x3c, 0x97, 0x36, 0x32, 0xe1, 0xc0, 0x05, 0x1c, 0xf1, 0x49, 0x59,
+ 0x6f, 0x76, 0xb9, 0x5d, 0x3e, 0xb8, 0xfa, 0x0f, 0x18, 0xb0, 0xa8, 0x01, 0x86, 0x33, 0x0a, 0xa0,
+ 0xa0, 0xb5, 0x08, 0xb4, 0xf9, 0x62, 0x59, 0xef, 0x4c, 0x6d, 0xeb, 0x75, 0x76, 0x09, 0x2d, 0xf0,
+ 0x82, 0x4b, 0xbd, 0x32, 0x70, 0xc2, 0xb7, 0x13, 0x98, 0x70, 0x38, 0x07, 0x1e, 0xf1, 0xd1, 0x93,
+ 0x05, 0x72, 0x65, 0x97, 0x96, 0x47, 0xec, 0xa1, 0xe8, 0x48, 0x4c, 0x7f, 0x9d, 0x27, 0x6a, 0x6e,
+ 0xc5, 0x04, 0x6b, 0x7c, 0x02, 0x49, 0xb8, 0x29, 0x22, 0x26, 0xd0, 0x7b, 0xcd, 0x9c, 0xe6, 0x4c,
+ 0x6f, 0xb6, 0x36, 0x44, 0x7e, 0x00, 0xe3, 0xb4, 0x46, 0x2f, 0x95, 0x59, 0x4d, 0xf4, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE image_xpm[1] = {{ png, sizeof( png ), "image_xpm" }};
diff --git a/bitmaps_png/sources/annotate.svg b/bitmaps_png/sources/annotate.svg
index ddabf2d03c..0e10a7ac50 100755
--- a/bitmaps_png/sources/annotate.svg
+++ b/bitmaps_png/sources/annotate.svg
@@ -1,56 +1,170 @@
-
diff --git a/bitmaps_png/sources/image.svg b/bitmaps_png/sources/image.svg
index 04e9492b02..1235d165b8 100755
--- a/bitmaps_png/sources/image.svg
+++ b/bitmaps_png/sources/image.svg
@@ -12,7 +12,7 @@
viewBox="0 0 24 24"
version="1.1"
sodipodi:docname="image.svg"
- inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+ inkscape:version="1.0.1 (1.0.1+r74)">
+ id="rect157781"
+ style="fill:#545454;fill-opacity:1" />
+ id="path157783"
+ style="fill:#ffffff;fill-opacity:1" />
+ id="circle157785"
+ style="fill:#ffffff;fill-opacity:1" />