diff --git a/bitmaps_png/cpp_24/unit_inch.cpp b/bitmaps_png/cpp_24/unit_inch.cpp
index 2830bfb996..735f4f5bd7 100644
--- a/bitmaps_png/cpp_24/unit_inch.cpp
+++ b/bitmaps_png/cpp_24/unit_inch.cpp
@@ -8,23 +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, 0xec, 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, 0xc4, 0x01, 0x4b, 0x14, 0xa1, 0x9c, 0x61, 0x79, 0xa1, 0x07, 0x43, 0x3c, 0x31, 0xe2, 0xde,
- 0x2f, 0xf4, 0x48, 0x70, 0x51, 0x28, 0x0f, 0xb2, 0x18, 0x63, 0x58, 0x64, 0xc8, 0x89, 0x90, 0x57,
- 0xc0, 0xa0, 0xbc, 0x17, 0x9a, 0x86, 0x05, 0xde, 0x07, 0x06, 0xc1, 0x9b, 0xd0, 0x53, 0x21, 0x71,
- 0xe0, 0x54, 0x16, 0x68, 0x13, 0x72, 0x2b, 0xe4, 0x0f, 0x50, 0x31, 0x61, 0xf8, 0x37, 0xf8, 0x4e,
- 0x90, 0x35, 0x03, 0x28, 0x10, 0x43, 0x17, 0x85, 0xbc, 0x04, 0x69, 0x0a, 0x7e, 0x16, 0x3c, 0x13,
- 0x13, 0x86, 0x3c, 0x03, 0xca, 0xfc, 0x0e, 0x7d, 0x11, 0x32, 0x37, 0x42, 0x16, 0x39, 0x40, 0x9d,
- 0x43, 0x16, 0x06, 0xdf, 0x0d, 0xb1, 0xc2, 0x08, 0x68, 0xdb, 0x90, 0xdb, 0x61, 0xf3, 0x42, 0x6d,
- 0xb0, 0x7a, 0xdc, 0x93, 0x3d, 0x54, 0x08, 0x5d, 0x2c, 0x4a, 0x30, 0x8d, 0x75, 0x90, 0x67, 0x62,
- 0x00, 0x5a, 0x87, 0x89, 0x71, 0xc9, 0xf2, 0x17, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
- 0x44, 0xae, 0x42, 0x60, 0x82,
+ 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,
 };
 
 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 ff6db30b6c..21f137a299 100644
--- a/bitmaps_png/cpp_24/unit_mil.cpp
+++ b/bitmaps_png/cpp_24/unit_mil.cpp
@@ -8,26 +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, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x01, 0x25, 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, 0x20, 0x50, 0x2c, 0xa4,
- 0x2d, 0x2c, 0x03, 0x23, 0xea, 0xb2, 0x42, 0xbb, 0x42, 0xa5, 0xd1, 0x04, 0x3d, 0xd9, 0x83, 0x2b,
- 0x42, 0xf7, 0x84, 0xbc, 0x0e, 0x7e, 0x13, 0x62, 0x15, 0xac, 0x84, 0x0a, 0x81, 0x22, 0x6f, 0x80,
- 0xe2, 0xfb, 0x81, 0x71, 0xce, 0x09, 0x56, 0x1c, 0x2d, 0x13, 0xb2, 0x2a, 0xe4, 0x29, 0x30, 0x16,
- 0x08, 0xc2, 0xd0, 0xe7, 0xc1, 0xeb, 0x23, 0x64, 0x19, 0x1a, 0x98, 0x80, 0x21, 0xb3, 0x33, 0xf4,
- 0x27, 0x58, 0xe8, 0x67, 0xc8, 0x5d, 0x4c, 0x08, 0x91, 0x0b, 0xf9, 0x15, 0xb2, 0x27, 0x3c, 0xda,
- 0x81, 0x05, 0x16, 0x4a, 0xfc, 0x41, 0x95, 0x21, 0x7b, 0x42, 0x5f, 0x87, 0xb9, 0xa3, 0xfb, 0x21,
- 0xd8, 0x2b, 0xf4, 0x55, 0xe8, 0xce, 0x90, 0x12, 0x3f, 0x5e, 0x6c, 0xe9, 0x5e, 0x25, 0xc8, 0x11,
- 0x5d, 0x2c, 0xc8, 0x0e, 0x14, 0x3f, 0xc3, 0x0b, 0x00, 0x00, 0xf3, 0xe1, 0xb1, 0x2a, 0x48, 0x50,
- 0x47, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 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,
 };
 
 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 80f317b1d9..53a893b548 100644
--- a/bitmaps_png/cpp_24/unit_mm.cpp
+++ b/bitmaps_png/cpp_24/unit_mm.cpp
@@ -8,29 +8,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, 0x4f, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0xed, 0x93, 0x4d, 0x2b, 0x44,
- 0x71, 0x18, 0xc5, 0x4f, 0xa8, 0xcb, 0x42, 0xd7, 0x06, 0x79, 0x4b, 0x64, 0x3b, 0x6b, 0x65, 0xe1,
- 0x25, 0x0b, 0x5d, 0x45, 0xdc, 0xff, 0x39, 0x63, 0x34, 0x0b, 0x36, 0x26, 0x59, 0xa0, 0x28, 0x2c,
- 0x4c, 0x77, 0x63, 0x0a, 0xdf, 0x04, 0x65, 0x63, 0x33, 0x99, 0xf2, 0x0d, 0x2c, 0xd8, 0x7a, 0xd9,
- 0x8c, 0x94, 0x99, 0x26, 0x85, 0xc5, 0x28, 0xfd, 0x2d, 0xe6, 0x22, 0x43, 0x11, 0x3b, 0x39, 0x67,
- 0x77, 0x9e, 0x7e, 0xf5, 0x9c, 0x7a, 0x1e, 0xe0, 0x5f, 0xdf, 0x92, 0xe9, 0x66, 0x4c, 0x11, 0x06,
- 0x5c, 0x8a, 0x35, 0x2b, 0xc2, 0x40, 0x49, 0xb5, 0x00, 0xaa, 0xe4, 0x8a, 0xdf, 0xae, 0x04, 0x53,
- 0x66, 0x48, 0x35, 0x66, 0x86, 0xdb, 0x66, 0x24, 0x04, 0xb8, 0xc2, 0x5b, 0x73, 0xa6, 0x3d, 0x3e,
- 0xf0, 0xc2, 0x5c, 0x72, 0x97, 0x77, 0x3c, 0x01, 0x3c, 0x87, 0x96, 0x59, 0xa6, 0x79, 0x42, 0xab,
- 0x53, 0x1d, 0xf2, 0x98, 0x96, 0x83, 0x2f, 0x80, 0x55, 0x1f, 0xc0, 0x54, 0x29, 0x52, 0x92, 0x56,
- 0xae, 0xe7, 0xd0, 0x6a, 0x1f, 0x18, 0x6f, 0xa0, 0xe5, 0x01, 0x20, 0x97, 0x4f, 0x0c, 0xde, 0x00,
- 0x17, 0x30, 0xf3, 0xb4, 0xaa, 0x07, 0x94, 0xa0, 0xf5, 0x9b, 0x3c, 0x87, 0x56, 0x49, 0x00, 0xe0,
- 0x13, 0x37, 0x00, 0x80, 0xf7, 0xdc, 0x7c, 0x05, 0xa6, 0xab, 0x4b, 0xc0, 0x58, 0xdd, 0x3b, 0x60,
- 0x35, 0x04, 0x82, 0xdf, 0x01, 0x5a, 0x60, 0xc1, 0x73, 0x00, 0x25, 0x58, 0x90, 0x0b, 0x98, 0x29,
- 0x16, 0x26, 0x1b, 0x3d, 0x87, 0x05, 0x2e, 0x02, 0x00, 0xf3, 0x21, 0x98, 0x0d, 0x3b, 0xfc, 0x58,
- 0xe3, 0x0d, 0x4c, 0x45, 0x67, 0xcb, 0x53, 0xce, 0x69, 0x4b, 0x2d, 0x65, 0xa1, 0xe7, 0x98, 0x55,
- 0x65, 0x98, 0x33, 0x79, 0xf6, 0x98, 0xce, 0xf7, 0x66, 0x8f, 0xc9, 0x9b, 0x3c, 0x8f, 0xb8, 0xae,
- 0x1a, 0x00, 0x40, 0xbc, 0x95, 0x3b, 0xbc, 0xa2, 0xfd, 0xda, 0xba, 0x36, 0xfb, 0xb1, 0x36, 0x04,
- 0x15, 0x14, 0xd3, 0x2a, 0xd2, 0xd2, 0xaa, 0xc8, 0xf3, 0x8f, 0x2e, 0xcd, 0xf8, 0xc8, 0xcc, 0x44,
- 0xbc, 0xbf, 0x2a, 0x5c, 0x4a, 0xae, 0xbf, 0xc6, 0x8c, 0x72, 0xd1, 0xa1, 0x0f, 0x97, 0x36, 0xac,
- 0x1b, 0xa5, 0xb9, 0x3c, 0x5a, 0xfb, 0x49, 0x6d, 0x75, 0xf9, 0x03, 0xe5, 0x99, 0xdf, 0xab, 0x8e,
- 0xbf, 0xf6, 0x6e, 0xcf, 0x7c, 0x3a, 0xc0, 0x20, 0xd4, 0x9b, 0x51, 0x4c, 0x00, 0x00, 0x00, 0x00,
- 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 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,
 };
 
 const BITMAP_OPAQUE unit_mm_xpm[1] = {{ png, sizeof( png ), "unit_mm_xpm" }};
diff --git a/bitmaps_png/sources/unit_inch.svg b/bitmaps_png/sources/unit_inch.svg
index 89165bd357..b64d2070f1 100755
--- a/bitmaps_png/sources/unit_inch.svg
+++ b/bitmaps_png/sources/unit_inch.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="unit_inch.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,21 +22,22 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1770"
-     inkscape:window-height="1181"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview22"
      showgrid="true"
-     inkscape:zoom="39.543586"
-     inkscape:cx="10.028061"
-     inkscape:cy="18.84796"
-     inkscape:window-x="1476"
-     inkscape:window-y="293"
-     inkscape:window-maximized="0"
+     inkscape:zoom="24.044477"
+     inkscape:cx="11.963909"
+     inkscape:cy="11.944994"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="1"
      inkscape:current-layer="Слой_1"
      inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
-       id="grid851" />
+       id="grid851"
+       empspacing="2" />
   </sodipodi:namedview>
   <metadata
      id="metadata43">
@@ -174,7 +175,7 @@
      id="title7">unit_mils</title>
   <text
      xml:space="preserve"
-     style="font-size:11.8667px;line-height:1.25;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans';letter-spacing:0px;word-spacing:0px;opacity:1"
+     style="font-size:11.8667px;line-height:1.25;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1"
      x="12.01238"
      y="12.963709"
      id="text849"><tspan
@@ -183,12 +184,16 @@
        x="12.01238"
        y="12.963709"
        style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.8667px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold';text-align:center;text-anchor:middle;fill:#545454;fill-opacity:1">in</tspan></text>
-  <line
-     class="cls-1"
-     x1="20.603107"
-     y1="17.607721"
-     x2="3.3918381"
-     y2="17.607721"
-     id="line9"
-     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1,17 6,-2.5 v 5 L 1,17"
+     id="path911" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 23,17 -6,-2.5 v 5 L 23,17"
+     id="path911-5" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2.00001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 18,17 H 6"
+     id="path928" />
 </svg>
diff --git a/bitmaps_png/sources/unit_mil.svg b/bitmaps_png/sources/unit_mil.svg
index 239a4fd2e0..a31f8038bc 100755
--- a/bitmaps_png/sources/unit_mil.svg
+++ b/bitmaps_png/sources/unit_mil.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="unit_mil.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1770"
-     inkscape:window-height="1181"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview22"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="12.758468"
-     inkscape:cy="12.763801"
-     inkscape:window-x="1476"
-     inkscape:window-y="293"
+     inkscape:zoom="22.713636"
+     inkscape:cx="10.8646"
+     inkscape:cy="10.221992"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="Слой_1"
      inkscape:document-rotation="0">
@@ -183,12 +183,16 @@
        x="11.797802"
        y="12.963709"
        style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.8667px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold';text-align:center;text-anchor:middle;fill:#545454;fill-opacity:1">mil</tspan></text>
-  <line
-     class="cls-1"
-     x1="20.452101"
-     y1="16.8393"
-     x2="3.5479002"
-     y2="16.8393"
-     id="line9"
-     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1,17 6,-2.5 v 5 L 1,17"
+     id="path911" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 23,17 -6,-2.5 v 5 L 23,17"
+     id="path911-5" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2.00001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 18,17 H 6"
+     id="path928" />
 </svg>
diff --git a/bitmaps_png/sources/unit_mm.svg b/bitmaps_png/sources/unit_mm.svg
index e8d04be27f..b25cb90d8f 100755
--- a/bitmaps_png/sources/unit_mm.svg
+++ b/bitmaps_png/sources/unit_mm.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="unit_mm.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1770"
-     inkscape:window-height="1181"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview22"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="16.162"
-     inkscape:cy="12.466183"
-     inkscape:window-x="1900"
-     inkscape:window-y="256"
+     inkscape:zoom="17.481903"
+     inkscape:cx="8.263918"
+     inkscape:cy="11.671524"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="Слой_1"
      inkscape:document-rotation="0">
@@ -183,12 +183,16 @@
    x="13.55504"
    y="12.963709"
    style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.8667px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold';text-align:center;text-anchor:middle;fill:#545454;fill-opacity:1">mm</tspan> </text>
-  <line
-     class="cls-1"
-     x1="20.452101"
-     y1="16.8393"
-     x2="3.5479002"
-     y2="16.8393"
-     id="line9"
-     style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#Arrow2Sstart);marker-end:url(#Arrow2Send)" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1,17 6,-2.5 v 5 L 1,17"
+     id="path911" />
+  <path
+     style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 23,17 -6,-2.5 v 5 L 23,17"
+     id="path911-5" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:2.00001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 18,17 H 6"
+     id="path928" />
 </svg>