diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 229008e941..c6259f5693 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -233,6 +233,7 @@ set( BMAPS_MID
     find
     find_replace
     flag
+    flag_remove
     flip_board
     fonts
     footprint_text
@@ -475,6 +476,7 @@ set( BMAPS_MID
     spreadsheet
     svg_file
     swap_layer
+    switch_corner_rounding_shape
     text
     text_sketch
     three_d
diff --git a/bitmaps_png/cpp_16/question_mark.cpp b/bitmaps_png/cpp_16/question_mark.cpp
index ec20e250c7..fc3c17556f 100644
--- a/bitmaps_png/cpp_16/question_mark.cpp
+++ b/bitmaps_png/cpp_16/question_mark.cpp
@@ -7,14 +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, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0xb5, 0xfa, 0x37,
- 0xea, 0x00, 0x00, 0x00, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x63, 0x60, 0x18, 0x6c, 0xc0,
- 0x83, 0x21, 0x8c, 0xa1, 0x8c, 0x21, 0x88, 0x81, 0x11, 0xbb, 0xb4, 0x09, 0x43, 0x1b, 0x90, 0x94,
- 0x63, 0xf8, 0xc1, 0x60, 0x83, 0x5d, 0x01, 0x3b, 0x83, 0x0b, 0x90, 0x14, 0x66, 0xf8, 0xce, 0xa0,
- 0x80, 0xcf, 0x9a, 0x44, 0x86, 0x6e, 0xfc, 0xee, 0x98, 0xc6, 0xc0, 0x8c, 0x4f, 0x5a, 0x98, 0xc1,
- 0x02, 0xbf, 0x7e, 0x0d, 0x06, 0x69, 0xfc, 0x0a, 0x9a, 0x18, 0xf2, 0x06, 0x5d, 0xe0, 0x33, 0x00,
- 0x00, 0x29, 0xbc, 0x07, 0xec, 0x3c, 0xd3, 0xa9, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
- 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
+ 0x61, 0x00, 0x00, 0x00, 0x5b, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0xb8,
+ 0x00, 0x33, 0x10, 0x87, 0x02, 0x71, 0x04, 0x10, 0xf7, 0x02, 0x71, 0x16, 0x10, 0x33, 0x92, 0x62,
+ 0x40, 0x08, 0x10, 0xb7, 0x43, 0xd9, 0xec, 0x40, 0xfc, 0x11, 0x88, 0x03, 0x48, 0x31, 0x40, 0x1a,
+ 0x88, 0x83, 0xa0, 0x6c, 0x56, 0x20, 0xfe, 0x0a, 0xc4, 0x36, 0xe4, 0x7a, 0x27, 0x0a, 0x88, 0xa7,
+ 0x91, 0xab, 0x19, 0xe4, 0xef, 0x2e, 0x20, 0x66, 0x22, 0xd7, 0x00, 0x79, 0x20, 0xd6, 0xa1, 0x24,
+ 0x36, 0xf4, 0x81, 0x58, 0x85, 0x12, 0x03, 0x26, 0x01, 0x71, 0xe5, 0x68, 0xaa, 0xc6, 0x0f, 0x00,
+ 0x99, 0x0e, 0x08, 0x95, 0x88, 0xbc, 0x99, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
+ 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE question_mark_xpm[1] = {{ png, sizeof( png ), "question_mark_xpm" }};
diff --git a/bitmaps_png/cpp_26/flag.cpp b/bitmaps_png/cpp_26/flag.cpp
index ebab46b00a..227a64f8db 100644
--- a/bitmaps_png/cpp_26/flag.cpp
+++ b/bitmaps_png/cpp_26/flag.cpp
@@ -8,46 +8,54 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
- 0xce, 0x00, 0x00, 0x02, 0x67, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x95, 0x3d, 0x68, 0x54,
- 0x41, 0x10, 0xc7, 0x7f, 0xf3, 0xde, 0xbb, 0x7b, 0xe7, 0xbd, 0x5c, 0x2e, 0xa7, 0x82, 0xb1, 0x30,
- 0xd8, 0x24, 0x22, 0x16, 0x8a, 0x11, 0x04, 0xbf, 0x82, 0xbd, 0x95, 0x8d, 0x20, 0x82, 0x85, 0xd5,
- 0x15, 0x76, 0xda, 0xd9, 0xda, 0xa4, 0x4a, 0xa5, 0x85, 0x5d, 0x6c, 0xa3, 0x8d, 0x85, 0x44, 0x09,
- 0x88, 0x10, 0xd0, 0xa0, 0x42, 0x20, 0x24, 0x48, 0x04, 0x13, 0xc5, 0x8f, 0x9c, 0x51, 0x63, 0x2e,
- 0xe6, 0xde, 0xd7, 0xee, 0x58, 0x9c, 0x9a, 0x13, 0x62, 0x12, 0xcf, 0x1c, 0x3a, 0x30, 0x0c, 0xbb,
- 0xc3, 0xee, 0x9f, 0xff, 0x7f, 0x66, 0x77, 0xe0, 0x3f, 0xb0, 0x42, 0xb9, 0x5c, 0x1e, 0x04, 0x82,
- 0xcd, 0xb8, 0xcc, 0x59, 0x23, 0xd7, 0xd5, 0xd9, 0xd9, 0x79, 0x16, 0xd8, 0xd5, 0x72, 0x4a, 0xa5,
- 0x52, 0xe9, 0x21, 0x20, 0x2d, 0xc7, 0xe9, 0xe9, 0xe9, 0xd1, 0xf2, 0x19, 0xbf, 0x7f, 0xf0, 0xd2,
- 0xdf, 0xcb, 0xf7, 0x5b, 0xe9, 0x82, 0x20, 0xf0, 0x7d, 0xdf, 0x67, 0xfe, 0x93, 0xb9, 0xfc, 0x3e,
- 0x61, 0xee, 0xce, 0x00, 0x77, 0xa6, 0x86, 0x38, 0xbf, 0xf4, 0x88, 0x1d, 0xcd, 0x00, 0x79, 0x6b,
- 0x25, 0x33, 0x99, 0x0c, 0xaa, 0x8a, 0xb1, 0x04, 0x49, 0xca, 0x29, 0x71, 0xf3, 0xa7, 0x20, 0x60,
- 0x69, 0x2c, 0xfb, 0x4e, 0xf0, 0xc6, 0xad, 0xb8, 0x33, 0x9e, 0x78, 0xaf, 0x0c, 0xf1, 0x5b, 0xd1,
- 0xf0, 0x03, 0xa0, 0xe2, 0x75, 0x7c, 0x51, 0x6b, 0xb6, 0x52, 0x9b, 0xb6, 0xd6, 0xf0, 0xb2, 0xd0,
- 0xc7, 0xd4, 0xba, 0x40, 0xd9, 0x6c, 0x16, 0x50, 0x00, 0x44, 0x1c, 0xc4, 0xf5, 0x11, 0x37, 0x00,
- 0xb7, 0x63, 0xa7, 0x78, 0xc5, 0x9d, 0x9e, 0x5b, 0x04, 0xaf, 0x88, 0xe7, 0xb6, 0x23, 0x6e, 0x3b,
- 0x78, 0x05, 0xc4, 0x09, 0xb0, 0xd1, 0xeb, 0xd0, 0xc8, 0xfd, 0xab, 0x6d, 0x2f, 0xc6, 0x87, 0x37,
- 0xcc, 0xe8, 0x67, 0x2f, 0x88, 0x03, 0xe2, 0xd6, 0x8f, 0xc8, 0x8a, 0x8b, 0x64, 0xc0, 0xf1, 0xc1,
- 0xc9, 0x81, 0x0d, 0xd5, 0x2c, 0x3c, 0xb8, 0x6b, 0xe6, 0xef, 0x5d, 0x68, 0x3b, 0xc9, 0xfb, 0x0d,
- 0x4b, 0x27, 0x22, 0x88, 0xac, 0xd6, 0x74, 0xfa, 0x93, 0x69, 0x7d, 0x69, 0x88, 0x16, 0x9e, 0x7e,
- 0x31, 0x8b, 0xa3, 0x17, 0x4b, 0xc7, 0x3f, 0xde, 0xfc, 0xa3, 0x1a, 0xa9, 0xaa, 0x44, 0x51, 0x04,
- 0xfe, 0xf7, 0xb5, 0x35, 0xa0, 0x06, 0x48, 0xeb, 0x51, 0x0d, 0x60, 0x48, 0xc3, 0x37, 0x3c, 0x9d,
- 0xa8, 0x92, 0x6b, 0xdf, 0x57, 0xdc, 0xbf, 0xe7, 0xf4, 0x60, 0x38, 0xad, 0x37, 0x34, 0x7e, 0x37,
- 0x67, 0x16, 0x47, 0x6f, 0xb9, 0x66, 0x61, 0x60, 0xcb, 0x31, 0x5e, 0xad, 0x07, 0xe4, 0xd4, 0x6a,
- 0x35, 0xb4, 0xb0, 0xc2, 0x42, 0x6d, 0x8c, 0xda, 0x04, 0x71, 0x62, 0x6c, 0xf2, 0x99, 0xc9, 0xe7,
- 0x15, 0x12, 0xa7, 0x8b, 0xc3, 0x87, 0xf6, 0x02, 0x09, 0x36, 0xaa, 0xcc, 0x92, 0x56, 0x6e, 0x27,
- 0xcb, 0x4f, 0xae, 0x15, 0x8f, 0xf0, 0x62, 0xa3, 0xd2, 0x49, 0x18, 0x86, 0xe8, 0x2f, 0x0a, 0x45,
- 0xc4, 0x51, 0x95, 0xb1, 0x67, 0x09, 0x92, 0x29, 0x70, 0xac, 0x37, 0xff, 0x09, 0x7d, 0xfb, 0xd8,
- 0x2e, 0x4e, 0x8e, 0x48, 0xf4, 0x7a, 0x28, 0x7f, 0x94, 0xd9, 0x66, 0xda, 0x5b, 0xac, 0xb5, 0x28,
- 0x20, 0x8a, 0x2e, 0x87, 0x84, 0x63, 0x13, 0x69, 0x65, 0x5b, 0xe9, 0xeb, 0x48, 0xdf, 0xc1, 0x70,
- 0x18, 0x5b, 0x99, 0xc8, 0x1f, 0x60, 0x4a, 0xa4, 0xb1, 0x58, 0xcd, 0xbd, 0x23, 0x11, 0x11, 0x0a,
- 0x81, 0x5c, 0xdf, 0xb1, 0x9d, 0xfe, 0x73, 0x57, 0x98, 0xa9, 0x6f, 0x9b, 0xef, 0xbe, 0x49, 0x96,
- 0xcb, 0xe5, 0x76, 0x77, 0x77, 0x77, 0x6b, 0xb1, 0x58, 0xec, 0x6d, 0xf5, 0xef, 0x5d, 0x97, 0x4e,
- 0xd5, 0x69, 0x29, 0x90, 0xaa, 0x3a, 0x71, 0x1c, 0x93, 0xc9, 0x64, 0x5a, 0x0b, 0x14, 0x45, 0x91,
- 0x24, 0x49, 0x82, 0xaa, 0xba, 0x9b, 0x01, 0xf4, 0xdb, 0x66, 0xf0, 0x7d, 0xdf, 0x89, 0xa2, 0x88,
- 0xcd, 0x9a, 0x47, 0x6b, 0xd6, 0x28, 0x4d, 0xd3, 0xd6, 0x33, 0x52, 0x55, 0x49, 0xd3, 0x94, 0x6a,
- 0xb5, 0xaa, 0x2d, 0x05, 0x8a, 0xe3, 0xf8, 0x87, 0x64, 0xad, 0x65, 0x04, 0x74, 0x01, 0x35, 0xe0,
- 0x04, 0xd0, 0x06, 0xd8, 0xfa, 0x8f, 0x4a, 0x0a, 0x24, 0x0d, 0xb1, 0xd1, 0x57, 0xdb, 0x4b, 0x80,
- 0xa4, 0xd9, 0x42, 0x4b, 0x83, 0x37, 0xce, 0x0d, 0xe5, 0x5f, 0xdb, 0x37, 0xfd, 0x78, 0x11, 0x32,
- 0xa3, 0xe2, 0x32, 0x37, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xce, 0x00, 0x00, 0x02, 0xe4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xdf, 0x6b, 0x1c,
+ 0x55, 0x14, 0xc7, 0x3f, 0xe7, 0xde, 0xd9, 0x49, 0xb2, 0xdd, 0xd9, 0x8e, 0xda, 0x22, 0x44, 0xc2,
+ 0xda, 0xa7, 0x20, 0x86, 0x80, 0x52, 0x82, 0x8a, 0x0a, 0x45, 0xb0, 0xcf, 0x29, 0xd2, 0x37, 0x5f,
+ 0x2c, 0xf8, 0x20, 0xbe, 0xf4, 0x0f, 0xe8, 0xab, 0xe0, 0x1f, 0x20, 0xe2, 0x93, 0xe8, 0x83, 0x3e,
+ 0xa8, 0x6f, 0x42, 0x04, 0x51, 0xab, 0xb4, 0x10, 0x6a, 0x7f, 0xf8, 0x2b, 0x46, 0x13, 0xa5, 0x4d,
+ 0x1b, 0xa2, 0x4d, 0x42, 0xec, 0xee, 0xce, 0xec, 0xec, 0xce, 0xcc, 0x9d, 0xe3, 0xc3, 0x6e, 0xea,
+ 0x76, 0xd3, 0x5a, 0x2c, 0x1d, 0x0f, 0x7c, 0x19, 0x66, 0x0e, 0xdc, 0xcf, 0x9c, 0x73, 0xee, 0xb9,
+ 0xe7, 0x02, 0x30, 0x39, 0x39, 0x79, 0x62, 0x7e, 0x7e, 0xfe, 0x0a, 0x50, 0xa3, 0x24, 0x33, 0x00,
+ 0x1b, 0x1b, 0x1b, 0x36, 0x0c, 0xc3, 0x03, 0x80, 0x47, 0x99, 0x36, 0x3b, 0x3b, 0x3b, 0x2d, 0x22,
+ 0x8b, 0x65, 0x32, 0x0c, 0x40, 0xa5, 0x52, 0x39, 0xda, 0x68, 0x34, 0xe6, 0x4e, 0x9d, 0xe0, 0xb5,
+ 0x77, 0x5e, 0xa5, 0x52, 0x1a, 0x28, 0x4d, 0x53, 0x2f, 0xcf, 0x73, 0xb9, 0xfc, 0x07, 0x6f, 0x6d,
+ 0x55, 0xd8, 0xfe, 0xe8, 0x4d, 0x3e, 0x59, 0x7c, 0x9f, 0x97, 0xd7, 0x3e, 0xe5, 0x81, 0xfb, 0x05,
+ 0xf2, 0x00, 0x8c, 0x31, 0x52, 0xab, 0xf5, 0xf7, 0x81, 0x16, 0xd4, 0x7b, 0x19, 0xc7, 0xb4, 0xb0,
+ 0xc7, 0xc6, 0x27, 0xc6, 0x5c, 0xb4, 0x38, 0xfe, 0x9b, 0x22, 0x3f, 0xaa, 0x16, 0x97, 0x24, 0xef,
+ 0xae, 0xaa, 0x49, 0xd6, 0x3d, 0xe1, 0xea, 0x04, 0xec, 0xc8, 0x33, 0x24, 0xa3, 0x0b, 0x6e, 0x7e,
+ 0x45, 0xed, 0x60, 0x40, 0x4f, 0x0e, 0x93, 0xed, 0x01, 0xc5, 0x71, 0xec, 0x76, 0x41, 0xbb, 0x26,
+ 0xc6, 0x47, 0x6c, 0xcd, 0x8a, 0x0d, 0xa6, 0xfb, 0xaa, 0xbd, 0x84, 0x0d, 0x10, 0x33, 0x01, 0x52,
+ 0xa1, 0x2b, 0x42, 0xb2, 0xac, 0x88, 0x17, 0xe6, 0x62, 0xab, 0x29, 0xaa, 0x95, 0xa2, 0xf3, 0x43,
+ 0x92, 0xdf, 0xf8, 0xf2, 0x14, 0xf0, 0xf6, 0x6d, 0x23, 0xea, 0x74, 0x3a, 0xce, 0xf7, 0xfd, 0x11,
+ 0x90, 0x07, 0x32, 0x24, 0xe3, 0x23, 0xc6, 0x07, 0x5b, 0x45, 0x6c, 0x80, 0xd8, 0x00, 0x6c, 0x0d,
+ 0xb1, 0x81, 0xa7, 0xd9, 0xb6, 0x71, 0x37, 0x4e, 0x7f, 0xec, 0x5a, 0x67, 0x5f, 0x0f, 0x9e, 0x67,
+ 0xeb, 0x8e, 0xa9, 0xf3, 0x7d, 0x5f, 0xda, 0xed, 0xf6, 0x88, 0x4b, 0x6e, 0x4a, 0xc4, 0x0c, 0xbd,
+ 0x1b, 0xc0, 0xf6, 0xe5, 0x62, 0xf2, 0xe6, 0xe9, 0x73, 0xae, 0x79, 0xe6, 0x95, 0xe0, 0xd9, 0x74,
+ 0xe9, 0xae, 0x35, 0xaa, 0xd7, 0xeb, 0x7e, 0xab, 0xd5, 0x1a, 0x71, 0x15, 0x03, 0x29, 0xaa, 0x05,
+ 0x82, 0x02, 0xda, 0xff, 0xa6, 0x29, 0xcd, 0xcd, 0x73, 0x7a, 0xe1, 0xe2, 0xf2, 0x1a, 0xc6, 0x9e,
+ 0x7d, 0x7a, 0x66, 0xe2, 0xb1, 0xd6, 0xd7, 0xe9, 0x7e, 0x57, 0xb0, 0x11, 0xc2, 0x9f, 0x72, 0x84,
+ 0xee, 0x6d, 0x41, 0x59, 0x96, 0x99, 0x6a, 0xb5, 0x7a, 0x8b, 0x43, 0x0b, 0x07, 0xea, 0x40, 0xf3,
+ 0xbe, 0x8a, 0x0c, 0x95, 0x94, 0x34, 0xb9, 0xcc, 0xa5, 0xe5, 0x9c, 0xb1, 0xfd, 0x33, 0x72, 0xe4,
+ 0xe8, 0x13, 0x8f, 0x8a, 0x0d, 0x4e, 0x22, 0xe6, 0xa4, 0x76, 0x7f, 0x6f, 0x15, 0xed, 0xf3, 0x0b,
+ 0xed, 0xf8, 0xa7, 0x0f, 0x75, 0x89, 0x05, 0x79, 0x9c, 0x74, 0x0f, 0xa8, 0xd9, 0x6c, 0x6a, 0x18,
+ 0x86, 0xb7, 0x82, 0x34, 0x03, 0xcd, 0x50, 0xcd, 0x10, 0x4d, 0xe9, 0x75, 0x36, 0xf9, 0x6e, 0xe5,
+ 0x3a, 0x63, 0xb5, 0x43, 0x3c, 0x75, 0xf8, 0x00, 0xd0, 0xa5, 0xe8, 0xfc, 0xba, 0xa9, 0xae, 0xb9,
+ 0x50, 0xc4, 0x17, 0xdf, 0xad, 0xad, 0x47, 0x67, 0xe4, 0x38, 0xee, 0x5f, 0x53, 0xd7, 0xeb, 0xf5,
+ 0x4c, 0x14, 0x45, 0xa8, 0x0e, 0x47, 0x94, 0xa3, 0xae, 0xcb, 0xd6, 0x76, 0xce, 0xf7, 0xab, 0x1d,
+ 0xea, 0x61, 0xc8, 0xdc, 0x8c, 0xf7, 0x97, 0xb0, 0xf6, 0x6d, 0xd1, 0xfc, 0xf9, 0x1b, 0xd2, 0x6b,
+ 0x9f, 0xed, 0x7b, 0x8e, 0x0b, 0xff, 0xa9, 0x8f, 0x82, 0x20, 0x18, 0x8f, 0xe3, 0xf8, 0x9f, 0xea,
+ 0x28, 0xd9, 0xca, 0x15, 0x7a, 0xab, 0xeb, 0xc9, 0x2f, 0x87, 0x1e, 0xf6, 0x3e, 0x7f, 0x61, 0xae,
+ 0x77, 0x5e, 0xdd, 0xf6, 0xd2, 0xbe, 0x27, 0x59, 0x91, 0x7e, 0xb1, 0xee, 0xad, 0x61, 0xad, 0xb5,
+ 0xbe, 0xef, 0xfb, 0x3c, 0x72, 0x90, 0xf7, 0x26, 0x1f, 0xe2, 0x83, 0xf1, 0x69, 0xbe, 0x38, 0x7e,
+ 0x33, 0x0d, 0xf9, 0xfd, 0x3b, 0x87, 0xa6, 0xa6, 0xa6, 0xde, 0x68, 0x34, 0x1a, 0x0a, 0x3c, 0x58,
+ 0xea, 0xa1, 0x1a, 0x45, 0x11, 0x59, 0x96, 0x51, 0xfa, 0xe9, 0x2d, 0x22, 0x5e, 0x92, 0x24, 0xbb,
+ 0x5d, 0x5a, 0x1e, 0xa8, 0x5a, 0xad, 0x8e, 0x39, 0xe7, 0xca, 0x07, 0x15, 0x45, 0x61, 0xad, 0xb5,
+ 0xe5, 0x83, 0x92, 0x24, 0x11, 0x4a, 0x36, 0x0f, 0xc0, 0x39, 0x67, 0xfe, 0x97, 0xd4, 0x79, 0x9e,
+ 0xe7, 0x0f, 0x36, 0x43, 0xb9, 0x11, 0xed, 0xec, 0xec, 0xb8, 0xa1, 0xd9, 0x50, 0x1e, 0x68, 0x70,
+ 0x9f, 0x8b, 0x80, 0x17, 0x81, 0xf5, 0x41, 0xa4, 0x83, 0x99, 0x80, 0x1b, 0x28, 0x1f, 0x7a, 0xde,
+ 0x4d, 0xd9, 0x40, 0x6e, 0xb0, 0xc6, 0x1d, 0x23, 0xf0, 0x86, 0x64, 0x77, 0x53, 0x3c, 0x32, 0xac,
+ 0xdc, 0xc8, 0xcf, 0x14, 0x43, 0xda, 0x63, 0x7f, 0x03, 0x12, 0xc8, 0x45, 0x50, 0xd6, 0x68, 0xd7,
+ 0xc9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE flag_xpm[1] = {{ png, sizeof( png ), "flag_xpm" }};
diff --git a/bitmaps_png/cpp_26/flag_remove.cpp b/bitmaps_png/cpp_26/flag_remove.cpp
new file mode 100644
index 0000000000..e81d3ac9c8
--- /dev/null
+++ b/bitmaps_png/cpp_26/flag_remove.cpp
@@ -0,0 +1,91 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x04, 0xa1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x6d, 0x4c, 0x5b,
+ 0x65, 0x14, 0xc7, 0x2f, 0x2f, 0x96, 0x16, 0x5a, 0xde, 0xa1, 0xe5, 0xa5, 0xa5, 0xbc, 0x14, 0x18,
+ 0xa1, 0x92, 0xad, 0x16, 0x8a, 0x68, 0x6a, 0x36, 0x12, 0x37, 0x30, 0x29, 0xd9, 0x26, 0x31, 0x8b,
+ 0x08, 0x51, 0xb7, 0x64, 0x64, 0x9b, 0x1a, 0x13, 0x3f, 0x21, 0x1f, 0xe6, 0x92, 0x29, 0x59, 0x82,
+ 0x68, 0xc2, 0x10, 0xd9, 0x92, 0x99, 0xa1, 0x4c, 0xf4, 0x0b, 0x66, 0x41, 0x0d, 0x31, 0x41, 0x90,
+ 0xd6, 0x51, 0x5a, 0x2c, 0x03, 0x2d, 0x63, 0x1b, 0x52, 0x5a, 0xde, 0x97, 0x42, 0x7b, 0xdb, 0xdb,
+ 0x42, 0x76, 0x3c, 0x4f, 0xbd, 0x74, 0x6d, 0xd8, 0x5c, 0x13, 0xd3, 0x27, 0xf9, 0xe7, 0x3e, 0x37,
+ 0xb7, 0xcf, 0xf9, 0x3d, 0xe7, 0x9c, 0xff, 0x7d, 0x6e, 0x29, 0x0a, 0x47, 0x63, 0x63, 0xa3, 0xa2,
+ 0xa1, 0xa1, 0x61, 0x1f, 0x15, 0xee, 0xa1, 0x56, 0xab, 0xd7, 0xe4, 0x72, 0xf9, 0xfd, 0xb0, 0x83,
+ 0x24, 0x12, 0xc9, 0xa7, 0x78, 0xb9, 0x10, 0x76, 0x50, 0x65, 0x65, 0xe5, 0xf7, 0x51, 0x51, 0x91,
+ 0x57, 0xc2, 0x0e, 0xaa, 0xa9, 0xa9, 0x99, 0x94, 0x49, 0x05, 0x4c, 0xcb, 0x5b, 0x94, 0xb6, 0xe7,
+ 0x43, 0xaa, 0xb9, 0xf7, 0x22, 0x95, 0x14, 0x16, 0x90, 0x52, 0xa9, 0xd4, 0x23, 0xc8, 0xdb, 0xfc,
+ 0x2a, 0x05, 0x6d, 0xef, 0x50, 0xd0, 0xdf, 0x46, 0xed, 0x8c, 0x7f, 0x45, 0x19, 0x1e, 0xfc, 0xc2,
+ 0x69, 0x73, 0x8c, 0x46, 0xd5, 0x6f, 0x8d, 0x51, 0xc5, 0xf0, 0x2d, 0x15, 0xf5, 0xbf, 0x41, 0x65,
+ 0x65, 0x65, 0xb7, 0xf2, 0xc4, 0xb1, 0x8f, 0x40, 0x9f, 0x50, 0x30, 0xf1, 0x35, 0x17, 0x36, 0x7e,
+ 0x4d, 0x05, 0x7a, 0x5c, 0x0a, 0xb4, 0xbe, 0x10, 0xe8, 0x89, 0x22, 0x0f, 0xad, 0x2f, 0xbd, 0x47,
+ 0x1b, 0xf7, 0xdf, 0xa2, 0x0d, 0xe5, 0x03, 0xce, 0x49, 0xd5, 0x55, 0xb7, 0x51, 0xd1, 0xe9, 0xfa,
+ 0xe3, 0xf9, 0x0e, 0xd7, 0xf4, 0x91, 0x4b, 0xae, 0xa9, 0x97, 0x2f, 0xd1, 0x93, 0xaa, 0xcb, 0x8e,
+ 0x11, 0xea, 0x02, 0x3d, 0x42, 0x29, 0x1e, 0x0b, 0xaa, 0xae, 0xae, 0x36, 0x4a, 0xb3, 0x62, 0x02,
+ 0x40, 0x11, 0x60, 0xe8, 0x13, 0xc0, 0xc6, 0x68, 0xe6, 0xbf, 0x10, 0xa3, 0x02, 0x5c, 0xa6, 0x97,
+ 0xc0, 0x3d, 0xfd, 0x0a, 0xb8, 0xff, 0x7a, 0x0d, 0x98, 0x3b, 0x27, 0x81, 0xb9, 0xfb, 0x2e, 0x78,
+ 0xe6, 0x5b, 0xc0, 0x63, 0xb9, 0x08, 0x5e, 0x6b, 0x07, 0x78, 0x16, 0xce, 0x83, 0x6b, 0xea, 0xd0,
+ 0xef, 0xce, 0x31, 0x8e, 0xfc, 0x89, 0x19, 0x69, 0x34, 0x1a, 0x53, 0x6e, 0x36, 0xcf, 0x0f, 0xfa,
+ 0xae, 0x2d, 0x0a, 0x0c, 0x37, 0x12, 0x11, 0x94, 0x8d, 0x99, 0xec, 0x03, 0xd7, 0x64, 0x39, 0x06,
+ 0x39, 0x08, 0xee, 0x99, 0x3a, 0x70, 0x9b, 0x5f, 0x07, 0x66, 0xee, 0x34, 0x78, 0xee, 0x7f, 0xe0,
+ 0x0b, 0xee, 0xf9, 0xbb, 0x15, 0x9f, 0x1d, 0x99, 0x70, 0x69, 0x79, 0x15, 0xa1, 0x9a, 0x21, 0x18,
+ 0xd4, 0x97, 0xe0, 0x07, 0xd1, 0x46, 0x65, 0x10, 0x68, 0x7b, 0xb5, 0x17, 0xc6, 0x7e, 0x1b, 0x01,
+ 0x7a, 0xf9, 0x47, 0xe6, 0x81, 0x2e, 0xbd, 0x79, 0x37, 0x0e, 0x00, 0xa4, 0x5b, 0xad, 0xd6, 0x49,
+ 0x93, 0xc9, 0xb4, 0x8e, 0xf3, 0xbd, 0x60, 0x85, 0x42, 0x61, 0x28, 0xc8, 0x11, 0x04, 0xf7, 0xe8,
+ 0x1b, 0x3e, 0x6c, 0x8c, 0x64, 0x04, 0x94, 0x4e, 0xed, 0x2b, 0x9d, 0x77, 0xa9, 0x07, 0x3a, 0xda,
+ 0xdb, 0x21, 0x32, 0x22, 0x02, 0x8e, 0xd6, 0xd6, 0x82, 0x7b, 0x63, 0x14, 0x4b, 0xf9, 0x26, 0xc3,
+ 0xcc, 0x9d, 0x5b, 0xb5, 0xce, 0x4f, 0x30, 0xc5, 0x52, 0x29, 0xc4, 0xf3, 0x78, 0x30, 0x3c, 0x3c,
+ 0xec, 0xd8, 0x03, 0x2b, 0x29, 0x29, 0x31, 0x48, 0xb3, 0x78, 0x4f, 0x30, 0x43, 0x2e, 0xd0, 0x06,
+ 0x39, 0x96, 0xaf, 0x02, 0xec, 0xb3, 0xe7, 0xa1, 0xab, 0xb3, 0x13, 0xd2, 0x63, 0x63, 0x61, 0x38,
+ 0x27, 0x07, 0xd4, 0xc9, 0xc9, 0x3e, 0x18, 0x63, 0xd7, 0xaf, 0x59, 0x2d, 0x7f, 0xae, 0x94, 0xe4,
+ 0xe5, 0xc1, 0xd9, 0xb4, 0x34, 0xb8, 0x9e, 0x99, 0x09, 0x09, 0x08, 0x1b, 0x1a, 0x1a, 0x72, 0x06,
+ 0xc1, 0x54, 0x2a, 0xd5, 0x74, 0x96, 0x90, 0xb3, 0x1d, 0x08, 0x1a, 0xbf, 0x1e, 0x09, 0xeb, 0xc3,
+ 0xf1, 0xe0, 0xd4, 0xa5, 0x81, 0xb1, 0x5f, 0x08, 0x3f, 0x5d, 0x3d, 0x00, 0x03, 0x03, 0x03, 0xc0,
+ 0x8d, 0x8e, 0x86, 0x89, 0x5c, 0x84, 0x17, 0x16, 0xc2, 0x0a, 0xee, 0xbe, 0x2a, 0x31, 0x11, 0x34,
+ 0x87, 0x0f, 0x03, 0xc9, 0xe4, 0x2c, 0x82, 0x1d, 0x78, 0x75, 0xe6, 0xe7, 0xc3, 0xe5, 0x8c, 0x0c,
+ 0x10, 0x20, 0x6c, 0x61, 0x61, 0xe1, 0x76, 0xe0, 0x59, 0x37, 0x9b, 0x25, 0xe4, 0x06, 0x81, 0x6e,
+ 0x76, 0x50, 0x70, 0xed, 0xa3, 0x48, 0xef, 0x8d, 0x8f, 0x63, 0xee, 0xcd, 0xdd, 0x4c, 0xe8, 0x73,
+ 0xe8, 0x44, 0xad, 0x4b, 0x16, 0xf3, 0x9c, 0x5c, 0x26, 0x83, 0x93, 0xb8, 0x6b, 0x07, 0xee, 0xde,
+ 0x21, 0x91, 0xc0, 0x12, 0x06, 0x3c, 0x98, 0x90, 0x00, 0xef, 0x21, 0x70, 0x0b, 0xe7, 0x8e, 0xec,
+ 0x6c, 0xb0, 0x61, 0xb6, 0x4a, 0xbc, 0x3f, 0x71, 0xfc, 0x38, 0xec, 0xec, 0xec, 0x7c, 0xe6, 0x07,
+ 0x55, 0x54, 0x54, 0xcc, 0x4a, 0x32, 0x63, 0x99, 0x96, 0xb7, 0xa9, 0xf1, 0x2b, 0xad, 0x54, 0xdb,
+ 0x0f, 0xed, 0x54, 0xe5, 0xe3, 0x4c, 0x83, 0x65, 0x48, 0xb1, 0xd9, 0x6c, 0x53, 0x04, 0xd6, 0x84,
+ 0xbb, 0xb7, 0x63, 0x89, 0x36, 0x11, 0xba, 0x89, 0x73, 0x9f, 0xd2, 0xd3, 0x61, 0x51, 0x24, 0x82,
+ 0xf2, 0xf8, 0x78, 0xa8, 0xd7, 0x68, 0xc0, 0xe3, 0xf1, 0x5c, 0xc3, 0x35, 0x91, 0xfe, 0x00, 0x05,
+ 0x05, 0x05, 0xb3, 0x7c, 0x3e, 0xdf, 0x14, 0xca, 0xcb, 0x1d, 0x08, 0x3b, 0x93, 0x94, 0xe4, 0x03,
+ 0xd8, 0x05, 0x02, 0xb0, 0x63, 0x56, 0xeb, 0xa9, 0xa9, 0x50, 0x8e, 0xf3, 0x13, 0xc7, 0x8e, 0x81,
+ 0xd7, 0xeb, 0x0d, 0x86, 0x90, 0x21, 0x16, 0x8b, 0xef, 0x70, 0xb9, 0xdc, 0xdb, 0x21, 0x82, 0x84,
+ 0x58, 0x77, 0x73, 0x11, 0x96, 0xe7, 0xfd, 0x5d, 0x10, 0x42, 0xec, 0x38, 0xdf, 0xc0, 0xec, 0xaa,
+ 0x30, 0x9b, 0xa3, 0x35, 0x35, 0xc0, 0x30, 0x4c, 0x3f, 0xfe, 0x36, 0x3a, 0x68, 0x71, 0x71, 0x71,
+ 0xf1, 0x3c, 0x87, 0xc3, 0x99, 0x09, 0x05, 0xb2, 0xb8, 0xb8, 0x68, 0x26, 0xee, 0x3a, 0x83, 0x00,
+ 0xd2, 0x13, 0x5f, 0xe9, 0x30, 0x13, 0x72, 0x25, 0xf7, 0x2b, 0xd8, 0x23, 0x35, 0x42, 0x6b, 0xab,
+ 0xab, 0x81, 0xa6, 0xe9, 0x60, 0x58, 0x69, 0x69, 0xe9, 0x22, 0x82, 0xcc, 0x4f, 0x81, 0x3c, 0x83,
+ 0x99, 0xcc, 0x90, 0x4c, 0xce, 0x11, 0x33, 0xa0, 0xbb, 0x48, 0xe3, 0x49, 0x4f, 0x54, 0x98, 0xc5,
+ 0x69, 0x0c, 0xbe, 0x25, 0x16, 0x83, 0x13, 0x1d, 0xb9, 0x8a, 0xae, 0x7b, 0x61, 0xd7, 0xfa, 0x0c,
+ 0xd3, 0xed, 0x0f, 0x22, 0x93, 0xc9, 0xac, 0x58, 0xba, 0xbb, 0x4f, 0x01, 0x25, 0x0f, 0x0e, 0x0e,
+ 0x6e, 0xf3, 0xd0, 0xde, 0x3a, 0x84, 0x11, 0x0b, 0xdb, 0xd0, 0x75, 0x4a, 0x2c, 0x5b, 0x7d, 0x5d,
+ 0x1d, 0x94, 0x62, 0xcf, 0x4e, 0x61, 0x66, 0x4e, 0xbc, 0xd2, 0x45, 0x45, 0xf0, 0x39, 0x6e, 0x20,
+ 0x31, 0x2e, 0x0e, 0x2c, 0x16, 0xcb, 0xa3, 0xde, 0x0b, 0x85, 0x42, 0x1b, 0x82, 0xe6, 0x43, 0x28,
+ 0x5d, 0xd3, 0x97, 0xdd, 0xdd, 0x0f, 0xd3, 0xf0, 0x85, 0xfd, 0x99, 0x85, 0xb0, 0x8d, 0xef, 0xdd,
+ 0x35, 0xc8, 0x29, 0x74, 0x5e, 0x0f, 0x96, 0x30, 0x85, 0xcf, 0x07, 0x9d, 0x4e, 0xb7, 0x89, 0x6b,
+ 0xf6, 0xfb, 0x03, 0xa4, 0xa4, 0xa4, 0x2c, 0x61, 0xe9, 0x2c, 0x21, 0x9a, 0xa1, 0xa9, 0xbb, 0xab,
+ 0xeb, 0x61, 0x04, 0x1e, 0x41, 0xe4, 0x3d, 0xd9, 0x75, 0x57, 0xa0, 0x1b, 0x49, 0x26, 0x5a, 0xad,
+ 0x96, 0x40, 0x0e, 0x04, 0x2d, 0x16, 0x89, 0x44, 0x6b, 0xb8, 0xd0, 0x1a, 0xea, 0xf7, 0x0b, 0x03,
+ 0xbc, 0xa1, 0xd7, 0xeb, 0x1d, 0x08, 0xf9, 0x22, 0xd0, 0xc2, 0x04, 0xb6, 0xbc, 0xbc, 0xac, 0x35,
+ 0x9b, 0xcd, 0xd6, 0x3d, 0x10, 0x76, 0xac, 0xa0, 0x96, 0xc2, 0xfd, 0x97, 0x21, 0x16, 0x35, 0xcf,
+ 0x8a, 0xec, 0xa2, 0x8a, 0x9c, 0x4a, 0xac, 0x5e, 0x64, 0xef, 0x55, 0xa8, 0xe7, 0x50, 0xa4, 0xde,
+ 0xcf, 0x92, 0x73, 0x18, 0x55, 0x88, 0xca, 0x47, 0xe5, 0xa0, 0xb2, 0x48, 0xab, 0x51, 0xa9, 0xa8,
+ 0x44, 0x54, 0x1c, 0x8a, 0x83, 0xfa, 0xcf, 0xcf, 0x3f, 0x29, 0x45, 0x0c, 0x8a, 0xcf, 0x2e, 0x4a,
+ 0x26, 0x6d, 0x64, 0x83, 0xa4, 0xb2, 0xf3, 0x24, 0xf6, 0x99, 0x80, 0x0d, 0xca, 0x65, 0x03, 0x47,
+ 0xb3, 0xeb, 0xf7, 0x8c, 0x7f, 0x00, 0x5e, 0xe9, 0xf4, 0xf9, 0x31, 0x07, 0x79, 0x54, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE flag_remove_xpm[1] = {{ png, sizeof( png ), "flag_remove_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp b/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp
new file mode 100644
index 0000000000..df191d07a2
--- /dev/null
+++ b/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp
@@ -0,0 +1,82 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x04, 0x0f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x0d, 0x4c, 0x94,
+ 0x75, 0x1c, 0xc7, 0x1f, 0x08, 0xee, 0xed, 0xb9, 0xe3, 0x4e, 0x3a, 0x5e, 0xf4, 0x9e, 0x3b, 0xe0,
+ 0xd0, 0x0b, 0xba, 0xb0, 0x04, 0x93, 0x76, 0xb3, 0xe4, 0x70, 0x2a, 0xe8, 0x9c, 0x9b, 0xcc, 0x1c,
+ 0x15, 0xd5, 0x5a, 0x63, 0x8a, 0xa4, 0x2d, 0xd6, 0x10, 0x23, 0xe7, 0xcb, 0xe8, 0x62, 0x91, 0xe5,
+ 0x38, 0x24, 0xdb, 0x11, 0xf7, 0x32, 0x60, 0x39, 0x0f, 0x44, 0x64, 0x20, 0x19, 0x57, 0x2c, 0x9b,
+ 0x2b, 0xbd, 0x31, 0xa2, 0xc4, 0x68, 0x6b, 0x6b, 0x2d, 0x6c, 0x34, 0x45, 0x06, 0x8c, 0xeb, 0xe4,
+ 0xbe, 0xfd, 0x1e, 0x88, 0xdb, 0x1d, 0x43, 0x39, 0x84, 0xff, 0xf6, 0xd9, 0xed, 0xd9, 0x73, 0xff,
+ 0xdf, 0xe7, 0xff, 0xf2, 0xfb, 0xfd, 0xff, 0x0f, 0xc3, 0x2c, 0x53, 0x6b, 0x92, 0xa8, 0x57, 0xd9,
+ 0x85, 0xea, 0x3f, 0x08, 0xcc, 0xc7, 0xb2, 0x48, 0xea, 0x18, 0xa5, 0x8c, 0x82, 0xf5, 0x3e, 0x48,
+ 0x12, 0xb2, 0x08, 0x80, 0x8c, 0x78, 0x8a, 0xd8, 0x40, 0x24, 0x10, 0xe1, 0xb3, 0xef, 0x5c, 0x0c,
+ 0x13, 0x41, 0x81, 0x3a, 0x1e, 0x26, 0x79, 0xa8, 0x88, 0x0f, 0x46, 0xe4, 0x13, 0x57, 0x09, 0x2f,
+ 0x81, 0xf1, 0xf1, 0x71, 0xfc, 0xdf, 0x46, 0x09, 0x2b, 0x91, 0x69, 0x17, 0x72, 0x67, 0x03, 0x03,
+ 0x3a, 0x84, 0xea, 0x9a, 0x06, 0x91, 0x46, 0x3b, 0x97, 0x07, 0x49, 0xd2, 0x88, 0xbe, 0xe1, 0xe1,
+ 0x61, 0x94, 0x94, 0x95, 0x21, 0x51, 0xaf, 0x47, 0x78, 0x44, 0x04, 0x84, 0x32, 0x29, 0x24, 0x2b,
+ 0x14, 0xd8, 0x90, 0x9d, 0x0d, 0x9b, 0xcd, 0x86, 0xbe, 0x4a, 0xb3, 0x2f, 0x78, 0xe4, 0x9a, 0x76,
+ 0x7e, 0x86, 0xa1, 0x2e, 0xd3, 0xf3, 0xc4, 0xdd, 0xd3, 0x66, 0x33, 0x58, 0xa5, 0x12, 0xa2, 0xd7,
+ 0x0b, 0xc0, 0x9c, 0x73, 0x80, 0xe9, 0xbd, 0x06, 0xa6, 0xef, 0x07, 0x30, 0xdf, 0xbb, 0xc0, 0x54,
+ 0x7f, 0x8c, 0x17, 0xd2, 0x32, 0x60, 0x0b, 0x9c, 0x09, 0x9b, 0xd8, 0x7b, 0x8e, 0x89, 0x91, 0x86,
+ 0x2a, 0xe1, 0x88, 0x91, 0x77, 0x8f, 0x1c, 0x81, 0x2c, 0x35, 0x05, 0x4c, 0x57, 0xdb, 0x4c, 0xf0,
+ 0x39, 0x68, 0x9b, 0x1a, 0x61, 0x91, 0xaf, 0xf6, 0x4b, 0x1a, 0x55, 0x4f, 0x63, 0xe4, 0xe6, 0xaf,
+ 0xe7, 0x43, 0xce, 0x1e, 0x92, 0xb4, 0x5f, 0x68, 0x6d, 0x85, 0x54, 0xb7, 0x86, 0x46, 0xde, 0x3d,
+ 0x13, 0xf8, 0xc7, 0xef, 0x10, 0x5e, 0x5e, 0x0a, 0xf9, 0xb6, 0x2d, 0x50, 0x3c, 0xbb, 0x1e, 0x09,
+ 0xb9, 0x3b, 0x60, 0x56, 0xa6, 0xf8, 0x25, 0x9f, 0x8b, 0x39, 0x9c, 0x29, 0x3f, 0xc6, 0xef, 0x5b,
+ 0x6f, 0xa8, 0x92, 0x4d, 0x1e, 0x8f, 0x07, 0xd1, 0x2a, 0x15, 0x98, 0x46, 0xeb, 0x8c, 0xe4, 0xeb,
+ 0x76, 0x48, 0x9f, 0xd0, 0x61, 0x7b, 0x5e, 0x1e, 0x5a, 0x5a, 0x5a, 0xd0, 0xd3, 0x71, 0x19, 0x56,
+ 0xf5, 0x33, 0x7e, 0x49, 0xbd, 0x90, 0x83, 0xe5, 0x9d, 0xc3, 0xa8, 0x39, 0x53, 0xc3, 0x8b, 0xc6,
+ 0x88, 0xf8, 0x85, 0x24, 0xa5, 0x84, 0xaf, 0xad, 0xad, 0x0d, 0xf2, 0x8d, 0x06, 0xff, 0x12, 0x49,
+ 0xd7, 0x67, 0xe0, 0x83, 0xca, 0x4a, 0x3e, 0x88, 0xc7, 0x3b, 0x36, 0xf1, 0x51, 0xb3, 0xce, 0x70,
+ 0x2b, 0x70, 0xf3, 0x3b, 0x0e, 0x1f, 0xc7, 0xfe, 0x43, 0x45, 0x08, 0x0b, 0x0f, 0x83, 0xcb, 0xe5,
+ 0xe2, 0xff, 0x57, 0xb7, 0x90, 0xe8, 0xa7, 0xfd, 0xc5, 0xc5, 0x7c, 0xae, 0x23, 0xcc, 0x74, 0x62,
+ 0x46, 0xd4, 0xde, 0x4c, 0x01, 0xc2, 0x91, 0xb5, 0x75, 0x2b, 0x0d, 0xc1, 0xe7, 0x75, 0x88, 0x34,
+ 0x8e, 0x40, 0x89, 0xfb, 0x3d, 0xd3, 0xe4, 0xe0, 0xe0, 0x20, 0x24, 0x31, 0x2c, 0x98, 0xf7, 0x05,
+ 0x58, 0xad, 0x4f, 0xc6, 0xf0, 0x8d, 0xbe, 0xa9, 0x9e, 0x97, 0xf6, 0x15, 0xdb, 0x05, 0x9a, 0x3d,
+ 0x73, 0x61, 0x28, 0x40, 0xe1, 0xf5, 0xd2, 0x93, 0x97, 0xaf, 0x1c, 0x35, 0x21, 0xe7, 0x71, 0x15,
+ 0x8c, 0xb4, 0xde, 0xc6, 0xe3, 0x15, 0x30, 0x1e, 0xab, 0x40, 0xae, 0x36, 0x15, 0x8e, 0xc2, 0x43,
+ 0x70, 0xed, 0x79, 0x33, 0xe8, 0x68, 0x69, 0x8a, 0x7d, 0xf2, 0x02, 0xc9, 0xc7, 0x36, 0xe5, 0x64,
+ 0x21, 0xfa, 0x00, 0x8b, 0xfc, 0x57, 0x63, 0x50, 0x2b, 0xe1, 0xa6, 0xdf, 0x35, 0x28, 0xd6, 0xdc,
+ 0x9f, 0xb7, 0x60, 0x17, 0xaa, 0xe8, 0x79, 0xe8, 0xf9, 0x77, 0x6c, 0xa2, 0xb1, 0xb3, 0xb3, 0x13,
+ 0x06, 0x55, 0x34, 0x6a, 0x63, 0xb8, 0x90, 0xfa, 0x2d, 0x56, 0x74, 0xeb, 0xea, 0x81, 0x12, 0xfe,
+ 0x08, 0x9a, 0x7a, 0x39, 0x49, 0x17, 0x54, 0x47, 0x3c, 0x56, 0xa2, 0x2e, 0x5e, 0x8f, 0xd6, 0xb5,
+ 0x59, 0xa3, 0x0e, 0x91, 0xfa, 0x7a, 0x20, 0x8c, 0xff, 0x41, 0xac, 0xb9, 0x71, 0x31, 0x7d, 0xf3,
+ 0x44, 0x5d, 0x52, 0x3a, 0x4e, 0x8a, 0x57, 0xa1, 0x3a, 0x3e, 0x15, 0xcd, 0xe9, 0x9b, 0x61, 0xd7,
+ 0x65, 0xe2, 0x52, 0x66, 0xce, 0x7d, 0xa7, 0x36, 0xf3, 0xf7, 0x9f, 0x4f, 0x7d, 0xb6, 0x8b, 0x24,
+ 0x05, 0x7f, 0x5d, 0xe9, 0xf1, 0xd9, 0xc4, 0x1a, 0xbf, 0xc0, 0x12, 0xc5, 0xe1, 0xc5, 0x84, 0x38,
+ 0x7c, 0x5a, 0x61, 0xc2, 0xd0, 0xd0, 0x10, 0x9f, 0x14, 0xa7, 0x17, 0x4a, 0x8a, 0xac, 0xc9, 0xc9,
+ 0x49, 0xe4, 0xee, 0xdc, 0x09, 0xa7, 0xd3, 0x09, 0x79, 0x9c, 0x1c, 0x92, 0x64, 0x16, 0xbb, 0xf3,
+ 0x77, 0xa3, 0xbf, 0xbf, 0x1f, 0x5e, 0xaf, 0x17, 0xfd, 0x5d, 0xdd, 0xa8, 0x8f, 0xd2, 0xfa, 0x25,
+ 0x35, 0xb1, 0x1c, 0xd4, 0x1f, 0x4a, 0xa1, 0x88, 0x57, 0x4c, 0xbf, 0xa7, 0x56, 0x48, 0x44, 0x86,
+ 0x52, 0x4f, 0x7f, 0x36, 0x34, 0x36, 0x80, 0x8d, 0xa5, 0x6c, 0xaa, 0x15, 0x81, 0xf9, 0x46, 0x82,
+ 0x88, 0x22, 0x31, 0x64, 0x5a, 0x39, 0x56, 0x08, 0x05, 0x38, 0x25, 0x51, 0xf9, 0x25, 0x5f, 0x48,
+ 0x39, 0xa4, 0x9a, 0xa3, 0x20, 0xd5, 0x47, 0x81, 0xef, 0x43, 0xad, 0x7b, 0x31, 0xa7, 0x83, 0xdb,
+ 0x54, 0x65, 0x02, 0xab, 0x93, 0x81, 0xb9, 0x28, 0x06, 0x73, 0x4d, 0x32, 0x8d, 0xe0, 0x5b, 0x16,
+ 0x47, 0xd7, 0xad, 0xf4, 0x4b, 0x6c, 0x22, 0x35, 0x0c, 0xe5, 0x0a, 0xb0, 0xcf, 0x45, 0x61, 0xef,
+ 0x6b, 0x7b, 0x67, 0x0b, 0x36, 0x79, 0x31, 0x22, 0xfe, 0xce, 0xb9, 0x57, 0xf5, 0x49, 0x15, 0x58,
+ 0xaa, 0x91, 0xc7, 0xde, 0x16, 0x21, 0xac, 0x4b, 0x8c, 0x83, 0x5b, 0xe2, 0x82, 0x36, 0x7e, 0x57,
+ 0x76, 0x34, 0xa4, 0x9c, 0x14, 0x6f, 0x95, 0x1c, 0xa4, 0x4c, 0xf7, 0x4d, 0x52, 0x9f, 0xbc, 0x45,
+ 0xdf, 0x98, 0xd4, 0x69, 0x1d, 0x31, 0x38, 0x30, 0x30, 0x80, 0xbc, 0x57, 0xf2, 0x50, 0xc0, 0x2a,
+ 0x83, 0x24, 0xfb, 0xc4, 0x31, 0x30, 0xee, 0xc8, 0x86, 0xdb, 0xed, 0xe6, 0x67, 0xf2, 0x0f, 0x61,
+ 0x7c, 0xe4, 0xeb, 0x99, 0x3a, 0x4b, 0x88, 0xb2, 0x5f, 0xaa, 0x2d, 0x77, 0x02, 0x25, 0x4e, 0xc3,
+ 0x76, 0x8c, 0xde, 0xb9, 0xcb, 0x0b, 0x46, 0x88, 0x13, 0x84, 0x7c, 0xc9, 0xdf, 0x02, 0xb4, 0x0f,
+ 0x6f, 0x50, 0xf0, 0xa9, 0x59, 0xc9, 0x97, 0x2b, 0xd3, 0x6e, 0xdf, 0xbb, 0xf9, 0x5b, 0x31, 0x05,
+ 0xdf, 0x18, 0x52, 0x66, 0x05, 0x36, 0x6b, 0xa4, 0x26, 0x63, 0x2e, 0x14, 0x74, 0x1b, 0x61, 0x21,
+ 0x02, 0x6f, 0xd0, 0xdb, 0x76, 0x51, 0x42, 0xd2, 0x23, 0x8f, 0x3a, 0xb4, 0x13, 0x81, 0xfb, 0xdb,
+ 0x26, 0xe0, 0xd6, 0x2e, 0x69, 0x79, 0x42, 0x10, 0xf5, 0xd7, 0x0b, 0x12, 0x53, 0x96, 0xbc, 0x0f,
+ 0xf3, 0x04, 0xf6, 0xf0, 0x33, 0xa0, 0xdf, 0xaf, 0xe8, 0x2c, 0x2b, 0x3a, 0xcb, 0x64, 0x44, 0x2e,
+ 0xc7, 0xb7, 0xdf, 0x7f, 0x4f, 0x67, 0x73, 0x0b, 0xa6, 0x2f, 0x30, 0x9e, 0x00, 0x00, 0x00, 0x00,
+ 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE switch_corner_rounding_shape_xpm[1] = {{ png, sizeof( png ), "switch_corner_rounding_shape_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 9784b36c49..4d3bca6354 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -160,6 +160,7 @@ EXTERN_BITMAP( fill_zone_xpm )
 EXTERN_BITMAP( find_xpm )
 EXTERN_BITMAP( find_replace_xpm )
 EXTERN_BITMAP( flag_xpm )
+EXTERN_BITMAP( flag_remove_xpm )
 EXTERN_BITMAP( flip_board_xpm )
 EXTERN_BITMAP( folder_xpm )
 EXTERN_BITMAP( fonts_xpm )
@@ -444,6 +445,7 @@ EXTERN_BITMAP( stroke_dot_xpm )
 EXTERN_BITMAP( stroke_solid_xpm )
 EXTERN_BITMAP( svg_file_xpm )
 EXTERN_BITMAP( swap_layer_xpm )
+EXTERN_BITMAP( switch_corner_rounding_shape_xpm )
 EXTERN_BITMAP( text_xpm )
 EXTERN_BITMAP( text_sketch_xpm )
 EXTERN_BITMAP( three_d_xpm )
diff --git a/bitmaps_png/sources/flag.svg b/bitmaps_png/sources/flag.svg
index 549acaba1c..5690aacf8c 100644
--- a/bitmaps_png/sources/flag.svg
+++ b/bitmaps_png/sources/flag.svg
@@ -1,96 +1,557 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="a">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="az" y2="75.528" gradientUnits="userSpaceOnUse" x2="63.463" gradientTransform="translate(.16998 .016232)" y1="70.11" x1="61.45">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="as" fx="-367.64" fy="231.25" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="413.23" cx="-416.23" gradientTransform="matrix(.17293 .14046 -.15516 .072109 222.64 105.16)" r="170.92"/>
-  <linearGradient id="ba" y2="52.226" gradientUnits="userSpaceOnUse" x2="46.833" gradientTransform="translate(1.001,-7.4588)" y1="52.226" x1="11.044">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="at" fx="-309.6" fy="160.81" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="396" cx="-419.35" gradientTransform="matrix(.22254 .17374 -.14185 .1469 230.68 67.804)" r="170.92"/>
-  <linearGradient id="bb" y2="217.92" gradientUnits="userSpaceOnUse" x2="-739.79" y1="195.61" x1="-742.43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="au" fx="-634.81" fy="578.65" gradientUnits="userSpaceOnUse" cy="565.85" cx="-633.64" gradientTransform="matrix(1 0 0 .92857 0 40.418)" r="18.909">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="bc" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -64.016)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ac" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -57.677)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ad" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -70.355)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ae" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -51.338)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="af" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -45)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ag" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -38.661)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ah" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -32.322)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ai" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -25.983)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="aj" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -19.644)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ak" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -13.305)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="al" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -6.9659)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="am" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 -.62693)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="an" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 12.051)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ao" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 18.39)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="ap" y2="296.42" xlink:href="#a" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="-728.62" gradientTransform="matrix(.3253 0 0 .30413 260.86 5.7121)" y1="296.54" x1="-744.58"/>
-  <linearGradient id="aq" y2="356.51" gradientUnits="userSpaceOnUse" x2="-714.75" gradientTransform="matrix(.3253 0 0 .30413 260.86 -60.319)" y1="620.91" x1="-757.66">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="ar" y2="242.5" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="-736.93" gradientTransform="matrix(.3253 0 0 .30413 260.86 -60.319)" y1="238.11" x1="-751.6"/>
-  <radialGradient id="av" fx="-745.35" fy="255.14" gradientUnits="userSpaceOnUse" cy="254.22" cx="-742.32" gradientTransform="matrix(1 0 0 .058201 0 239.42)" r="5.1053">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="aw" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="253.47" cx="-749.72" gradientTransform="matrix(.83165 -.0077606 .00267 .2501 639.54 -52.241)" r="4.2344"/>
-  <radialGradient id="ax" gradientUnits="userSpaceOnUse" cy="801.52" cx="78.621" gradientTransform="matrix(1 0 0 .35714 0 515.26)" r="5.7931">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="ay" fx="83.91" gradientUnits="userSpaceOnUse" cy="801.88" cx="114.59" gradientTransform="matrix(1 0 0 .09009 0 729.64)" r="39.873">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <g transform="matrix(.68229 0 0 .8991 11.021 -69.513)">
-  <g transform="matrix(.46583 0 0 .37326 -5.341 80.044)">
-   <g fill-rule="evenodd" transform="matrix(.9979 -.09397 .092663 .98403 -10.677 -4.0926)">
-    <path fill="#f3c300" d="m39.441 76.988 4.384-34.932c20.429 10.837 44.038 19.133 75.645 24.09-24.589 4.31-43.419 12.754-80.029 10.842z"/>
-    <path fill="url(#az)" d="m39.611 77.004 4.3838-34.932c20.429 10.837 40.554 18.8 72.159 23.757-24.588 4.3093-39.933 13.086-76.543 11.174z"/>
-    <path opacity=".77209" fill="url(#as)" d="m39.917 75.71 3.9163-31.206c18.25 9.681 40.494 17.218 68.727 21.647-21.964 3.849-39.938 11.267-72.643 9.559z"/>
-   </g>
-   <path fill-rule="evenodd" fill="#f3c300" d="m21.281 72.869v-56.204c8.3336 3.2796 17.019 6.0383 26.243 8.1814 19.467 4.5231 41.331 6.3046 67.345 4.4551-28.609 14.92-49.75 34.407-93.589 43.568z"/>
-   <path fill-rule="evenodd" fill="url(#ba)" d="m21.668 72.869v-56.204c8.3336 3.2796 17.019 6.0383 26.243 8.1814 19.467 4.5231 36.37 7.3936 62.384 5.5441-28.612 14.919-44.792 33.317-88.632 42.478z"/>
-   <path opacity=".87442" d="m21.656 71.012v-52.187c24.069 9.472 52.744 14.073 88.344 11.542-26.563 13.852-47.638 32.139-88.344 40.645z" fill-rule="evenodd" fill="url(#at)"/>
-   <path d="m16.923 16.925 3.5868-12.501 3.5868 12.501v105.29h-7.174v-105.3z"/>
-   <path d="m-614.73 565.85a18.909 17.558 0 1 1 -37.818 0 18.909 17.558 0 1 1 37.818 0z" transform="matrix(.24138 0 0 .27081 173.28 -148.21)"/>
-   <path fill="url(#bb)" d="m-730.1 207.94a7.3392 6.6053 0 1 1 -14.678 0 7.3392 6.6053 0 1 1 14.678 0z" transform="matrix(.35659 0 0 .26464 283.35 -52.464)"/>
-   <path opacity=".70233" d="m-614.73 565.85a18.909 17.558 0 1 1 -37.818 0 18.909 17.558 0 1 1 37.818 0z" transform="matrix(.21871 0 0 .2403 158.92 -130.95)" fill="url(#au)"/>
-   <path opacity=".70233" fill="url(#bc)" d="m17.211 26.467c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ac)" d="m17.211 32.806c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ad)" d="m17.211 20.128c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ae)" d="m17.211 39.145c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#af)" d="m17.211 45.484c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ag)" d="m17.211 51.823c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ah)" d="m17.211 58.162c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2064-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ai)" d="m17.211 64.501c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2064-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#aj)" d="m17.211 70.84c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2064-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#ak)" d="m17.211 77.179c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2064-4.415 1.3309-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#al)" d="m17.211 83.518c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#am)" d="m17.211 89.857c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path opacity=".70233" fill="url(#an)" d="m17.211 102.53c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2064-4.415 1.331-6.6225 3.6496v-2.98z"/>
-   <path opacity=".70233" fill="url(#ao)" d="m17.211 108.87c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.98z"/>
-   <path opacity=".70233" fill="url(#ap)" d="m17.211 96.196c2.3803-1.895 4.6531-1.7704 6.6225-3.6496v2.9811c-2.2075 2.2065-4.415 1.331-6.6225 3.6496v-2.981z"/>
-   <path fill="url(#aq)" d="m16.923 16.925 3.5868-12.501 3.5868 12.501v105.29h-7.174v-105.3z"/>
-   <path opacity=".69767" d="m19.41 9.937-1.7218 6.9909 2.7549-0.046 0.68872-6.8529-1.7218-0.091978z" fill-rule="evenodd" fill="url(#ar)"/>
-   <path opacity=".69767" d="m-737.22 254.22a5.1055 0.29715 0 1 1 -10.211 0 5.1055 0.29715 0 1 1 10.211 0z" transform="matrix(.3253 0 0 .58061 260.56 -130.7)" fill="url(#av)"/>
-   <path opacity=".69767" d="m17.705 18.908-0.0171-1.9802 2.7549-0.046-1.016 2.118-1.722-0.092z" fill-rule="evenodd" fill="url(#aw)"/>
-   <path fill="url(#ax)" d="m84.414 801.52a5.7931 2.069 0 1 1 -11.586 0 5.7931 2.069 0 1 1 11.586 0z" transform="matrix(1.4524,0,0,1.4524,-93.826,-1041.8)"/>
-   <path opacity=".33953" d="m154.46 801.88a39.873 3.5921 0 1 1 -79.745 0 39.873 3.5921 0 1 1 79.745 0z" transform="matrix(1.4524,0,0,1.4524,-94.82,-1042.1)" fill="url(#ay)"/>
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.0"
+   id="svg374"
+   sodipodi:docname="flag.svg"
+   inkscape:version="0.92.0 r15299">
+  <metadata
+     id="metadata378">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1635"
+     inkscape:window-height="752"
+     id="namedview376"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg374" />
+  <defs
+     id="defs304">
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop240" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop242" />
+    </linearGradient>
+    <linearGradient
+       id="az"
+       y2="75.528"
+       gradientUnits="userSpaceOnUse"
+       x2="63.463001"
+       gradientTransform="translate(0.16998,0.016232)"
+       y1="70.110001"
+       x1="61.450001">
+      <stop
+         offset="0"
+         id="stop245" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop247" />
+    </linearGradient>
+    <radialGradient
+       id="as"
+       fx="-367.64001"
+       fy="231.25"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="413.23001"
+       cx="-416.23001"
+       gradientTransform="matrix(0.17293,0.14046,-0.15516,0.072109,222.64,105.16)"
+       r="170.92" />
+    <linearGradient
+       id="ba"
+       y2="52.226002"
+       gradientUnits="userSpaceOnUse"
+       x2="46.833"
+       gradientTransform="translate(1.001,-7.4588)"
+       y1="52.226002"
+       x1="11.044">
+      <stop
+         offset="0"
+         id="stop251" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop253" />
+    </linearGradient>
+    <radialGradient
+       id="at"
+       fx="-309.60001"
+       fy="160.81"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="396"
+       cx="-419.35001"
+       gradientTransform="matrix(0.22254,0.17374,-0.14185,0.1469,230.68,67.804)"
+       r="170.92" />
+    <linearGradient
+       id="bb"
+       y2="217.92"
+       gradientUnits="userSpaceOnUse"
+       x2="-739.78998"
+       y1="195.61"
+       x1="-742.42999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop257" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop259" />
+    </linearGradient>
+    <radialGradient
+       id="au"
+       fx="-634.81"
+       fy="578.65002"
+       gradientUnits="userSpaceOnUse"
+       cy="565.84998"
+       cx="-633.64001"
+       gradientTransform="matrix(1,0,0,0.92857,0,40.418)"
+       r="18.909">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop262" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop264" />
+    </radialGradient>
+    <linearGradient
+       id="bc"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-64.016)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ac"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-57.677)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ad"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-70.355)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ae"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-51.338)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="af"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-45)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ag"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-38.661)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ah"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-32.322)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ai"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-25.983)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="aj"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-19.644)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ak"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-13.305)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="al"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-6.9659)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="am"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-0.62693)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="an"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,12.051)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ao"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,18.39)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ap"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,5.7121)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="aq"
+       y2="356.51001"
+       gradientUnits="userSpaceOnUse"
+       x2="-714.75"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-60.319)"
+       y1="620.90997"
+       x1="-757.65997">
+      <stop
+         offset="0"
+         id="stop282" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop284" />
+    </linearGradient>
+    <linearGradient
+       id="ar"
+       y2="242.5"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="-736.92999"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-60.319)"
+       y1="238.11"
+       x1="-751.59998" />
+    <radialGradient
+       id="av"
+       fx="-745.34998"
+       fy="255.14"
+       gradientUnits="userSpaceOnUse"
+       cy="254.22"
+       cx="-742.32001"
+       gradientTransform="matrix(1,0,0,0.058201,0,239.42)"
+       r="5.1052999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop288" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop290" />
+    </radialGradient>
+    <radialGradient
+       id="aw"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="253.47"
+       cx="-749.71997"
+       gradientTransform="matrix(0.83165,-0.0077606,0.00267,0.2501,639.54,-52.241)"
+       r="4.2343998" />
+    <radialGradient
+       id="ax"
+       gradientUnits="userSpaceOnUse"
+       cy="801.52002"
+       cx="78.621002"
+       gradientTransform="matrix(1,0,0,0.35714,0,515.26)"
+       r="5.7930999">
+      <stop
+         offset="0"
+         id="stop294" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop296" />
+    </radialGradient>
+    <radialGradient
+       id="ay"
+       fx="83.910004"
+       gradientUnits="userSpaceOnUse"
+       cy="801.88"
+       cx="114.59"
+       gradientTransform="matrix(1,0,0,0.09009,0,729.64)"
+       r="39.873001">
+      <stop
+         offset="0"
+         id="stop299" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop301" />
+    </radialGradient>
+  </defs>
+  <g
+     transform="matrix(0.43347127,0,0,0.54016495,0.5007915,-43.220409)"
+     id="g372">
+    <g
+       transform="matrix(0.46583,0,0,0.37326,-5.341,80.044)"
+       id="g370">
+      <g
+         transform="matrix(0.9979,-0.09397,0.092663,0.98403,-10.677,-4.0926)"
+         id="g312"
+         style="fill-rule:evenodd">
+        <path
+           d="M 39.441,76.988 43.825,42.056 C 64.254,52.893 87.863,61.189 119.47,66.146 94.881,70.456 76.051,78.9 39.441,76.988 Z"
+           id="path306"
+           inkscape:connector-curvature="0"
+           style="fill:#f3c300" />
+        <path
+           d="m 39.611,77.004 4.3838,-34.932 c 20.429,10.837 40.554,18.8 72.159,23.757 -24.588,4.3093 -39.933,13.086 -76.543,11.174 z"
+           id="path308"
+           inkscape:connector-curvature="0"
+           style="fill:url(#az)" />
+        <path
+           d="m 39.917,75.71 3.9163,-31.206 c 18.25,9.681 40.494,17.218 68.727,21.647 C 90.5963,70 72.6223,77.418 39.9173,75.71 Z"
+           id="path310"
+           inkscape:connector-curvature="0"
+           style="opacity:0.77209;fill:url(#as)" />
+      </g>
+      <path
+         d="M 21.281,72.869 V 16.665 c 8.3336,3.2796 17.019,6.0383 26.243,8.1814 19.467,4.5231 41.331,6.3046 67.345,4.4551 -28.609,14.92 -49.75,34.407 -93.589,43.568 z"
+         id="path314"
+         inkscape:connector-curvature="0"
+         style="fill:#f3c300;fill-rule:evenodd" />
+      <path
+         d="M 21.668,72.869 V 16.665 c 8.3336,3.2796 17.019,6.0383 26.243,8.1814 19.467,4.5231 36.37,7.3936 62.384,5.5441 -28.612,14.919 -44.792,33.317 -88.632,42.478 z"
+         id="path316"
+         inkscape:connector-curvature="0"
+         style="fill:url(#ba);fill-rule:evenodd" />
+      <path
+         d="M 21.656,71.012 V 18.825 C 45.725,28.297 74.4,32.898 110,30.367 83.437,44.219 62.362,62.506 21.656,71.012 Z"
+         id="path318"
+         inkscape:connector-curvature="0"
+         style="opacity:0.87441999;fill:url(#at);fill-rule:evenodd" />
+      <path
+         d="m 16.923,16.925 3.5868,-12.501 3.5868,12.501 v 105.29 h -7.174 v -105.3 z"
+         id="path320"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -614.73,565.85 a 18.909,17.558 0 1 1 -37.818,0 18.909,17.558 0 1 1 37.818,0 z"
+         transform="matrix(0.24138,0,0,0.27081,173.28,-148.21)"
+         id="path322"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -730.1,207.94 a 7.3392,6.6053 0 1 1 -14.678,0 7.3392,6.6053 0 1 1 14.678,0 z"
+         transform="matrix(0.35659,0,0,0.26464,283.35,-52.464)"
+         id="path324"
+         inkscape:connector-curvature="0"
+         style="fill:url(#bb)" />
+      <path
+         d="m -614.73,565.85 a 18.909,17.558 0 1 1 -37.818,0 18.909,17.558 0 1 1 37.818,0 z"
+         transform="matrix(0.21871,0,0,0.2403,158.92,-130.95)"
+         id="path326"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#au)" />
+      <path
+         d="m 17.211,26.467 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path328"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#bc)" />
+      <path
+         d="m 17.211,32.806 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path330"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ac)" />
+      <path
+         d="m 17.211,20.128 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path332"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ad)" />
+      <path
+         d="m 17.211,39.145 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path334"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ae)" />
+      <path
+         d="m 17.211,45.484 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path336"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#af)" />
+      <path
+         d="m 17.211,51.823 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path338"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ag)" />
+      <path
+         d="m 17.211,58.162 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path340"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ah)" />
+      <path
+         d="m 17.211,64.501 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path342"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ai)" />
+      <path
+         d="m 17.211,70.84 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path344"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#aj)" />
+      <path
+         d="m 17.211,77.179 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path346"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ak)" />
+      <path
+         d="m 17.211,83.518 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path348"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#al)" />
+      <path
+         d="m 17.211,89.857 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path350"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#am)" />
+      <path
+         d="m 17.211,102.53 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.331 -6.6225,3.6496 v -2.98 z"
+         id="path352"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#an)" />
+      <path
+         d="m 17.211,108.87 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.98 z"
+         id="path354"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ao)" />
+      <path
+         d="m 17.211,96.196 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path356"
+         inkscape:connector-curvature="0"
+         style="opacity:0.70232999;fill:url(#ap)" />
+      <path
+         d="m 16.923,16.925 3.5868,-12.501 3.5868,12.501 v 105.29 h -7.174 v -105.3 z"
+         id="path358"
+         inkscape:connector-curvature="0"
+         style="fill:url(#aq)" />
+      <path
+         d="m 19.41,9.937 -1.7218,6.9909 2.7549,-0.046 0.68872,-6.8529 -1.7218,-0.091978 z"
+         id="path360"
+         inkscape:connector-curvature="0"
+         style="opacity:0.69767001;fill:url(#ar);fill-rule:evenodd" />
+      <path
+         d="m -737.22,254.22 a 5.1055,0.29715 0 1 1 -10.211,0 5.1055,0.29715 0 1 1 10.211,0 z"
+         transform="matrix(0.3253,0,0,0.58061,260.56,-130.7)"
+         id="path362"
+         inkscape:connector-curvature="0"
+         style="opacity:0.69767001;fill:url(#av)" />
+      <path
+         d="m 17.705,18.908 -0.0171,-1.9802 2.7549,-0.046 -1.016,2.118 -1.722,-0.092 z"
+         id="path364"
+         inkscape:connector-curvature="0"
+         style="opacity:0.69767001;fill:url(#aw);fill-rule:evenodd" />
+      <path
+         d="m 84.414,801.52 a 5.7931,2.069 0 1 1 -11.586,0 5.7931,2.069 0 1 1 11.586,0 z"
+         transform="matrix(1.4524,0,0,1.4524,-93.826,-1041.8)"
+         id="path366"
+         inkscape:connector-curvature="0"
+         style="fill:url(#ax)" />
+      <path
+         d="m 154.46,801.88 a 39.873,3.5921 0 1 1 -79.745,0 39.873,3.5921 0 1 1 79.745,0 z"
+         transform="matrix(1.4524,0,0,1.4524,-94.82,-1042.1)"
+         id="path368"
+         inkscape:connector-curvature="0"
+         style="opacity:0.33953002;fill:url(#ay)" />
+    </g>
   </g>
- </g>
 </svg>
diff --git a/bitmaps_png/sources/flag_remove.svg b/bitmaps_png/sources/flag_remove.svg
new file mode 100644
index 0000000000..dcf6070673
--- /dev/null
+++ b/bitmaps_png/sources/flag_remove.svg
@@ -0,0 +1,629 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.0"
+   id="svg136"
+   sodipodi:docname="flag_remove.svg"
+   inkscape:version="0.92.0 r15299">
+  <metadata
+     id="metadata140">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1267"
+     inkscape:window-height="759"
+     id="namedview138"
+     showgrid="false"
+     inkscape:zoom="20.461538"
+     inkscape:cx="13"
+     inkscape:cy="13"
+     inkscape:window-x="315"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg136" />
+  <defs
+     id="defs66">
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="az"
+       y2="75.528"
+       gradientUnits="userSpaceOnUse"
+       x2="63.463001"
+       gradientTransform="translate(0.16998,0.016232)"
+       y1="70.110001"
+       x1="61.450001">
+      <stop
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       id="as"
+       fx="-367.64001"
+       fy="231.25"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="413.23001"
+       cx="-416.23001"
+       gradientTransform="matrix(0.17293,0.14046,-0.15516,0.072109,222.64,105.16)"
+       r="170.92" />
+    <linearGradient
+       id="ba"
+       y2="52.226002"
+       gradientUnits="userSpaceOnUse"
+       x2="46.833"
+       gradientTransform="translate(1.001,-7.4588)"
+       y1="52.226002"
+       x1="11.044">
+      <stop
+         offset="0"
+         id="stop13" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop15" />
+    </linearGradient>
+    <radialGradient
+       id="at"
+       fx="-309.60001"
+       fy="160.81"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="396"
+       cx="-419.35001"
+       gradientTransform="matrix(0.22254,0.17374,-0.14185,0.1469,230.68,67.804)"
+       r="170.92" />
+    <linearGradient
+       id="bb"
+       y2="217.92"
+       gradientUnits="userSpaceOnUse"
+       x2="-739.78998"
+       y1="195.61"
+       x1="-742.42999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </linearGradient>
+    <radialGradient
+       id="au"
+       fx="-634.81"
+       fy="578.65002"
+       gradientUnits="userSpaceOnUse"
+       cy="565.84998"
+       cx="-633.64001"
+       gradientTransform="matrix(1,0,0,0.92857,0,40.418)"
+       r="18.909">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop24" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop26" />
+    </radialGradient>
+    <linearGradient
+       id="bc"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-64.016)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ac"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-57.677)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ad"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-70.355)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ae"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-51.338)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="af"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-45)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ag"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-38.661)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ah"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-32.322)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ai"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-25.983)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="aj"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-19.644)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ak"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-13.305)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="al"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-6.9659)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="am"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-0.62693)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="an"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,12.051)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ao"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,18.39)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="ap"
+       y2="296.42001"
+       xlink:href="#a"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       x2="-728.62"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,5.7121)"
+       y1="296.54001"
+       x1="-744.58002" />
+    <linearGradient
+       id="aq"
+       y2="356.51001"
+       gradientUnits="userSpaceOnUse"
+       x2="-714.75"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-60.319)"
+       y1="620.90997"
+       x1="-757.65997">
+      <stop
+         offset="0"
+         id="stop44" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop46" />
+    </linearGradient>
+    <linearGradient
+       id="ar"
+       y2="242.5"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="-736.92999"
+       gradientTransform="matrix(0.3253,0,0,0.30413,260.86,-60.319)"
+       y1="238.11"
+       x1="-751.59998" />
+    <radialGradient
+       id="av"
+       fx="-745.34998"
+       fy="255.14"
+       gradientUnits="userSpaceOnUse"
+       cy="254.22"
+       cx="-742.32001"
+       gradientTransform="matrix(1,0,0,0.058201,0,239.42)"
+       r="5.1052999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop50" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop52" />
+    </radialGradient>
+    <radialGradient
+       id="aw"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="253.47"
+       cx="-749.71997"
+       gradientTransform="matrix(0.83165,-0.0077606,0.00267,0.2501,639.54,-52.241)"
+       r="4.2343998" />
+    <radialGradient
+       id="ax"
+       gradientUnits="userSpaceOnUse"
+       cy="801.52002"
+       cx="78.621002"
+       gradientTransform="matrix(1,0,0,0.35714,0,515.26)"
+       r="5.7930999">
+      <stop
+         offset="0"
+         id="stop56" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop58" />
+    </radialGradient>
+    <radialGradient
+       id="ay"
+       fx="83.910004"
+       gradientUnits="userSpaceOnUse"
+       cy="801.88"
+       cx="114.59"
+       gradientTransform="matrix(1,0,0,0.09009,0,729.64)"
+       r="39.873001">
+      <stop
+         offset="0"
+         id="stop61" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop63" />
+    </radialGradient>
+    <radialGradient
+       r="16.955999"
+       fy="-18.924658"
+       fx="18.496571"
+       cy="-18.924658"
+       cx="18.496571"
+       gradientTransform="matrix(0.33544035,0.33544035,0.39413145,-0.39413145,19.911706,959.26466)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4324"
+       xlink:href="#radialGradient5050-3"
+       inkscape:collect="always" />
+    <radialGradient
+       id="radialGradient5050-3"
+       gradientUnits="userSpaceOnUse"
+       cy="20.493999"
+       cx="35.292999"
+       gradientTransform="matrix(0,-0.84302,1.0202,0,-4.8963249,41.059418)"
+       r="16.955999">
+      <stop
+         stop-color="#73d216"
+         offset="0"
+         id="stop5052-6"
+         style="stop-color:#ef0b0b;stop-opacity:1" />
+      <stop
+         stop-color="#4e9a06"
+         offset="1"
+         id="stop5054-7"
+         style="stop-color:#f52727;stop-opacity:1" />
+    </radialGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient5050-3"
+       id="radialGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33544035,0.33544035,0.39413145,-0.39413145,19.911706,959.26466)"
+       cx="18.496571"
+       cy="-18.924658"
+       fx="18.496571"
+       fy="-18.924658"
+       r="16.955999" />
+    <radialGradient
+       id="radialGradient209"
+       gradientUnits="userSpaceOnUse"
+       cy="20.493999"
+       cx="35.292999"
+       gradientTransform="matrix(0,-0.84302,1.0202,0,-4.8963249,41.059418)"
+       r="16.955999">
+      <stop
+         stop-color="#73d216"
+         offset="0"
+         id="stop205"
+         style="stop-color:#ef0b0b;stop-opacity:1" />
+      <stop
+         stop-color="#4e9a06"
+         offset="1"
+         id="stop207"
+         style="stop-color:#f52727;stop-opacity:1" />
+    </radialGradient>
+  </defs>
+  <g
+     transform="matrix(0.45203983,0,0,0.52787461,0.08982806,-41.625221)"
+     id="g134">
+    <g
+       transform="matrix(0.46583,0,0,0.37326,-5.341,80.044)"
+       id="g132">
+      <g
+         transform="matrix(0.9979,-0.09397,0.092663,0.98403,-10.677,-4.0926)"
+         id="g74"
+         style="fill-rule:evenodd">
+        <path
+           d="M 39.441,76.988 43.825,42.056 C 64.254,52.893 87.863,61.189 119.47,66.146 94.881,70.456 76.051,78.9 39.441,76.988 Z"
+           id="path68"
+           inkscape:connector-curvature="0"
+           style="fill:#f3c300" />
+        <path
+           d="m 39.611,77.004 4.3838,-34.932 c 20.429,10.837 40.554,18.8 72.159,23.757 -24.588,4.3093 -39.933,13.086 -76.543,11.174 z"
+           id="path70"
+           style="fill:url(#az)"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 39.917,75.71 3.9163,-31.206 c 18.25,9.681 40.494,17.218 68.727,21.647 C 90.5963,70 72.6223,77.418 39.9173,75.71 Z"
+           id="path72"
+           style="opacity:0.77209;fill:url(#as)"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         d="M 21.281,72.869 V 16.665 c 8.3336,3.2796 17.019,6.0383 26.243,8.1814 19.467,4.5231 41.331,6.3046 67.345,4.4551 -28.609,14.92 -49.75,34.407 -93.589,43.568 z"
+         id="path76"
+         inkscape:connector-curvature="0"
+         style="fill:#f3c300;fill-rule:evenodd" />
+      <path
+         d="M 21.668,72.869 V 16.665 c 8.3336,3.2796 17.019,6.0383 26.243,8.1814 19.467,4.5231 36.37,7.3936 62.384,5.5441 -28.612,14.919 -44.792,33.317 -88.632,42.478 z"
+         id="path78"
+         style="fill:url(#ba);fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 21.656,71.012 V 18.825 C 45.725,28.297 74.4,32.898 110,30.367 83.437,44.219 62.362,62.506 21.656,71.012 Z"
+         id="path80"
+         style="opacity:0.87441999;fill:url(#at);fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.923,16.925 3.5868,-12.501 3.5868,12.501 v 105.29 h -7.174 v -105.3 z"
+         id="path82"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -614.73,565.85 a 18.909,17.558 0 1 1 -37.818,0 18.909,17.558 0 1 1 37.818,0 z"
+         transform="matrix(0.24138,0,0,0.27081,173.28,-148.21)"
+         id="path84"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -730.1,207.94 a 7.3392,6.6053 0 1 1 -14.678,0 7.3392,6.6053 0 1 1 14.678,0 z"
+         transform="matrix(0.35659,0,0,0.26464,283.35,-52.464)"
+         id="path86"
+         style="fill:url(#bb)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -614.73,565.85 a 18.909,17.558 0 1 1 -37.818,0 18.909,17.558 0 1 1 37.818,0 z"
+         transform="matrix(0.21871,0,0,0.2403,158.92,-130.95)"
+         id="path88"
+         style="opacity:0.70232999;fill:url(#au)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,26.467 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path90"
+         style="opacity:0.70232999;fill:url(#bc)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,32.806 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path92"
+         style="opacity:0.70232999;fill:url(#ac)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,20.128 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path94"
+         style="opacity:0.70232999;fill:url(#ad)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,39.145 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path96"
+         style="opacity:0.70232999;fill:url(#ae)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,45.484 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path98"
+         style="opacity:0.70232999;fill:url(#af)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,51.823 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path100"
+         style="opacity:0.70232999;fill:url(#ag)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,58.162 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path102"
+         style="opacity:0.70232999;fill:url(#ah)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,64.501 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path104"
+         style="opacity:0.70232999;fill:url(#ai)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,70.84 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path106"
+         style="opacity:0.70232999;fill:url(#aj)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,77.179 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.3309 -6.6225,3.6496 v -2.981 z"
+         id="path108"
+         style="opacity:0.70232999;fill:url(#ak)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,83.518 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path110"
+         style="opacity:0.70232999;fill:url(#al)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,89.857 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path112"
+         style="opacity:0.70232999;fill:url(#am)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,102.53 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2064 -4.415,1.331 -6.6225,3.6496 v -2.98 z"
+         id="path114"
+         style="opacity:0.70232999;fill:url(#an)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,108.87 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.98 z"
+         id="path116"
+         style="opacity:0.70232999;fill:url(#ao)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.211,96.196 c 2.3803,-1.895 4.6531,-1.7704 6.6225,-3.6496 v 2.9811 c -2.2075,2.2065 -4.415,1.331 -6.6225,3.6496 v -2.981 z"
+         id="path118"
+         style="opacity:0.70232999;fill:url(#ap)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 16.923,16.925 3.5868,-12.501 3.5868,12.501 v 105.29 h -7.174 v -105.3 z"
+         id="path120"
+         style="fill:url(#aq)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 19.41,9.937 -1.7218,6.9909 2.7549,-0.046 0.68872,-6.8529 -1.7218,-0.091978 z"
+         id="path122"
+         style="opacity:0.69767001;fill:url(#ar);fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -737.22,254.22 a 5.1055,0.29715 0 1 1 -10.211,0 5.1055,0.29715 0 1 1 10.211,0 z"
+         transform="matrix(0.3253,0,0,0.58061,260.56,-130.7)"
+         id="path124"
+         style="opacity:0.69767001;fill:url(#av)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 17.705,18.908 -0.0171,-1.9802 2.7549,-0.046 -1.016,2.118 -1.722,-0.092 z"
+         id="path126"
+         style="opacity:0.69767001;fill:url(#aw);fill-rule:evenodd"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 84.414,801.52 a 5.7931,2.069 0 1 1 -11.586,0 5.7931,2.069 0 1 1 11.586,0 z"
+         transform="matrix(1.4524,0,0,1.4524,-93.826,-1041.8)"
+         id="path128"
+         style="fill:url(#ax)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 154.46,801.88 a 39.873,3.5921 0 1 1 -79.745,0 39.873,3.5921 0 1 1 79.745,0 z"
+         transform="matrix(1.4524,0,0,1.4524,-94.82,-1042.1)"
+         id="path130"
+         style="opacity:0.33953002;fill:url(#ay)"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.6102192,0,0,0.6102192,6.3851898,-577.87275)"
+     id="g5102">
+    <path
+       inkscape:connector-curvature="0"
+       id="path5100"
+       d="m 24.145508,963.6874 -5.313766,5.31377 -5.313816,-5.31382 -4.1814755,4.18148 5.3138155,5.31381 -5.3137447,5.31375 4.1814407,4.18144 5.313745,-5.31375 5.313815,5.31382 4.181476,-4.18148 -5.313815,-5.31381 5.313766,-5.31377 z"
+       style="color:#000000;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;fill:url(#radialGradient4324);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="color:#000000;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;fill:url(#radialGradient5048);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.72931588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 24.145508,963.6874 -5.313766,5.31377 -5.313816,-5.31382 -4.1814755,4.18148 5.3138155,5.31381 -5.3137447,5.31375 4.1814407,4.18144 5.313745,-5.31375 5.313815,5.31382 4.181476,-4.18148 -5.313815,-5.31381 5.313766,-5.31377 z"
+       id="path5046"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/switch_corner_rounding_shape.svg b/bitmaps_png/sources/switch_corner_rounding_shape.svg
new file mode 100644
index 0000000000..7d462c07dc
--- /dev/null
+++ b/bitmaps_png/sources/switch_corner_rounding_shape.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg2"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="switch_corner_rounding_shape.svg"
+   viewBox="0 0 24.375 24.374999">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1364"
+     inkscape:window-height="733"
+     id="namedview17"
+     showgrid="true"
+     inkscape:zoom="20.186132"
+     inkscape:cx="12.8"
+     inkscape:cy="11.085191"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4169"
+       spacingx="0.5"
+       spacingy="0.5"
+       empspacing="2"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         id="path3806"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         id="path3803"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="h"
+       style="overflow:visible">
+      <path
+         d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 0,8.0354 z"
+         transform="scale(0.6)"
+         id="path10"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="g"
+       style="overflow:visible">
+      <path
+         d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 0,8.0354 z"
+         transform="scale(-0.6)"
+         id="path13"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <filter
+       x="-0.10484"
+       y="-0.18257"
+       width="1.2097"
+       height="1.3651"
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur7"
+         stdDeviation="1.5978799" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient4831-3"
+       id="radialGradient4569"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.27158002,0.31909764,0,16.447361,556.24201)"
+       cx="34.857384"
+       cy="28.374384"
+       fx="34.857384"
+       fy="28.374384"
+       r="16.955999" />
+    <radialGradient
+       r="16.955999"
+       gradientTransform="matrix(0,-0.84302,1.0202,0,-4.8963249,41.059418)"
+       cx="35.292999"
+       cy="20.493999"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4831-3">
+      <stop
+         style="stop-color:#1772d9;stop-opacity:1"
+         id="stop4833-5"
+         offset="0"
+         stop-color="#73d216" />
+      <stop
+         style="stop-color:#085ab6;stop-opacity:1"
+         id="stop4835-6"
+         offset="1"
+         stop-color="#4e9a06" />
+    </radialGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient4831-3"
+       id="radialGradient4567"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-0.27158002,-0.31909764,0,-42.451933,-547.52542)"
+       cx="34.857384"
+       cy="28.374384"
+       fx="34.857384"
+       fy="28.374384"
+       r="16.955999" />
+    <radialGradient
+       r="16.955999"
+       gradientTransform="matrix(0,-0.84302,1.0202,0,-4.8963249,41.059418)"
+       cx="35.292999"
+       cy="20.493999"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4605">
+      <stop
+         style="stop-color:#1772d9;stop-opacity:1"
+         id="stop4601"
+         offset="0"
+         stop-color="#73d216" />
+      <stop
+         style="stop-color:#085ab6;stop-opacity:1"
+         id="stop4603"
+         offset="1"
+         stop-color="#4e9a06" />
+    </radialGradient>
+  </defs>
+  <g
+     transform="matrix(0.99181105,0,0,0.99611359,23.634223,7.0078104)"
+     id="g4586">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4559"
+       d="m -12.874026,-2.8609817 c -0.907378,-0.032543 -1.82981,0.1064328 -2.718465,0.4298809 -2.368239,0.8619859 -4.072019,2.88155238 -4.577167,5.2804799 h -1.01126 l 0.852367,1.475664 c -7e-6,0 0,0.00711 0,0.00782 h 0.005 l 0.458209,0.7931837 1.314277,2.2775163 1.31427,-2.2775163 1.314277,-2.2762374 h -1.048217 c 0.421472,-1.0895528 1.286572,-1.97993213 2.429002,-2.39575845 1.63077,-0.59356965 3.457945,-0.10381092 4.5734715,1.22562965 l 2.3526354,-1.97329563 C -8.9528963,-1.8873547 -10.877665,-2.7889678 -12.873906,-2.8605767 Z"
+       style="color:#000000;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;fill:url(#radialGradient4569);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.15326977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <g
+       id="g4566">
+      <path
+         style="color:#000000;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;fill:url(#radialGradient4567);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.15326977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -7.4321686,1.3503381 -1.3155068,2.2775163 -1.3142706,2.2763084 h 1.0124899 c -0.4268014,1.0726418 -1.2834309,1.9476093 -2.4129889,2.3587318 -1.63077,0.593591 -3.459175,0.103811 -4.574702,-1.2256225 l -2.351406,1.9733312 c 1.94519,2.3181597 5.133114,3.1720947 7.97679,2.1370407 2.3561107,-0.857559 4.0549668,-2.8608039 4.5697758,-5.2434812 h 1.038365 L -5.6757028,4.3927582 c 6.4e-6,0 0,-0.00711 0,-0.00853 h -0.00504 L -6.1180176,3.6279254 -7.432288,1.3504802 Z"
+         id="path4557"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4495"
+         d="m -7.4321686,1.3503381 -1.3155068,2.2775163 -1.3142706,2.2763084 h 1.0124899 c -0.4268014,1.0726418 -1.2834309,1.9476093 -2.4129889,2.3587318 -1.63077,0.593591 -3.459175,0.103811 -4.574702,-1.2256225 l -2.351406,1.9733312 c 1.94519,2.3181597 5.133114,3.1720947 7.97679,2.1370407 2.3561107,-0.857559 4.0549668,-2.8608039 4.5697758,-5.2434812 h 1.038365 L -5.6757028,4.3927582 c 6.4e-6,0 0,-0.00711 0,-0.00853 h -0.00504 L -6.1180176,3.6279254 -7.432288,1.3504802 Z"
+         style="color:#000000;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;fill:#00c80a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.92401415;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4541"
+         d="m -12.874026,-2.8609817 c -0.907378,-0.032543 -1.82981,0.1064328 -2.718465,0.4298809 -2.368239,0.8619859 -4.072019,2.88155238 -4.577167,5.2804799 h -1.01126 l 0.852367,1.475664 c -7e-6,0 0,0.00711 0,0.00782 h 0.005 l 0.458209,0.7931837 1.314277,2.2775163 1.31427,-2.2775163 1.314277,-2.2762374 h -1.048217 c 0.421472,-1.0895528 1.286572,-1.97993213 2.429002,-2.39575845 1.63077,-0.59356965 3.457945,-0.10381092 4.5734715,1.22562965 l 2.3526354,-1.97329563 C -8.9528963,-1.8873547 -10.877665,-2.7889678 -12.873906,-2.8605767 Z"
+         style="color:#000000;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;fill:#00d2ca;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.92401415;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     d="M 24.5,1.4324308 H 18.931818 L 9.4659089,12.374999 H 0"
+     id="path3002"
+     style="fill:none;stroke:#a2071d;stroke-width:2.96024418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 24.5,11.474998 H 19.488637 M 8.9090908,20.5 15.034092,13.374999 c 1.769149,-1.530118 3.144004,-1.816492 4.454545,-1.900001 M 0,22.875 l 4.4545456,-1e-6 C 5.6953103,22.765727 6.85712,22.877199 8.9090908,20.5"
+     id="path3798"
+     style="fill:none;stroke:#a2071d;stroke-width:2.96828938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     sodipodi:nodetypes="cccccccc" />
+</svg>
diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp
index e7ec6723c7..7b9d69bd97 100644
--- a/common/tool/actions.cpp
+++ b/common/tool/actions.cpp
@@ -36,86 +36,86 @@
 #define _(s) s
 
 TOOL_ACTION ACTIONS::doNew( "common.Control.new",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'N', LEGACY_HK_NAME( "New" ),
         _( "New..." ), _( "Create a new document in the editor" ),
         new_generic_xpm );
 
 TOOL_ACTION ACTIONS::newLibrary( "common.Control.newLibrary",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "New Library..." ), _( "Create a new library folder" ),
         new_generic_xpm );
 
 TOOL_ACTION ACTIONS::addLibrary( "common.Control.addLibrary",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Add Library..." ), _( "Add an existing library folder" ),
         add_library_xpm );
 
 TOOL_ACTION ACTIONS::open( "common.Control.open",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'O', LEGACY_HK_NAME( "Open" ),
         _( "Open..." ), _( "Open existing document" ),
         directory_xpm );
 
 TOOL_ACTION ACTIONS::save( "common.Control.save",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ),
         _( "Save" ), _( "Save changes" ),
         save_xpm );
 
 TOOL_ACTION ACTIONS::saveAs( "common.Control.saveAs",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + MD_CTRL + 'S', LEGACY_HK_NAME( "Save As" ),
         _( "Save As..." ), _( "Save current document to another location" ),
         save_as_xpm );
 
 TOOL_ACTION ACTIONS::saveCopyAs( "common.Control.saveCopyAs",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Save Copy As..." ), _( "Save a copy of the current document to another location" ),
         save_as_xpm );
 
 TOOL_ACTION ACTIONS::saveAll( "common.Control.saveAll",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Save All" ), _( "Save all changes" ),
         save_xpm );
 
 TOOL_ACTION ACTIONS::revert( "common.Control.revert",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Revert" ), _( "Throw away changes" ),
         undo_xpm );
 
 TOOL_ACTION ACTIONS::pageSettings( "common.Control.pageSettings",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Page Settings..." ), _( "Settings for paper size and title block info" ),
         sheetset_xpm );
 
 TOOL_ACTION ACTIONS::print( "common.Control.print",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'P', LEGACY_HK_NAME( "Print" ),
         _( "Print..." ), _( "Print" ),
         print_button_xpm );
 
 TOOL_ACTION ACTIONS::plot( "common.Control.plot",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Plot..." ), _( "Plot" ),
         plot_xpm );
 
 TOOL_ACTION ACTIONS::quit( "common.Control.quit",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",   // Not currently in use due to wxWidgets crankiness
         _( "Quit" ), _( "Close the current editor" ),
         exit_xpm );
 
 // Generic Edit Actions
 TOOL_ACTION ACTIONS::cancelInteractive( "common.Interactive.cancel",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",   // ESC key is handled in the dispatcher
         _( "Cancel" ), _( "Cancel current tool" ),
         cancel_xpm, AF_NONE );
@@ -130,7 +130,7 @@ TOOL_ACTION ACTIONS::updateMenu( "common.Interactive.updateMenu",
         AS_GLOBAL );
 
 TOOL_ACTION ACTIONS::undo( "common.Interactive.undo",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'Z', LEGACY_HK_NAME( "Undo" ),
         _( "Undo" ), _( "Undo last edit" ),
         undo_xpm );
@@ -147,19 +147,19 @@ TOOL_ACTION ACTIONS::redo( "common.Interactive.redo",
         redo_xpm );
 
 TOOL_ACTION ACTIONS::cut( "common.Interactive.cut",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'X', LEGACY_HK_NAME( "Cut" ),
         _( "Cut" ), _( "Cut selected item(s) to clipboard" ),
         cut_xpm );
 
 TOOL_ACTION ACTIONS::copy( "common.Interactive.copy",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'C', LEGACY_HK_NAME( "Copy" ),
         _( "Copy" ), _( "Copy selected item(s) to clipboard" ),
         copy_xpm );
 
 TOOL_ACTION ACTIONS::paste( "common.Interactive.paste",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'V', LEGACY_HK_NAME( "Paste" ),
         _( "Paste" ), _( "Paste clipboard into schematic" ),
         paste_xpm );
@@ -170,13 +170,13 @@ TOOL_ACTION ACTIONS::pasteSpecial( "common.Interactive.pasteSpecial",
         paste_xpm );
 
 TOOL_ACTION ACTIONS::duplicate( "common.Interactive.duplicate",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'D', LEGACY_HK_NAME( "Duplicate" ),
         _( "Duplicate" ), _( "Duplicates the selected item(s)" ),
         duplicate_xpm );
 
 TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_DELETE, LEGACY_HK_NAME( "Delete Item" ),
         _( "Delete" ), _( "Deletes selected item(s)" ),
         delete_xpm );
@@ -190,37 +190,37 @@ TOOL_ACTION ACTIONS::activatePointEditor( "common.Control.activatePointEditor",
         AS_GLOBAL );
 
 TOOL_ACTION ACTIONS::find( "common.Interactive.find",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'F', LEGACY_HK_NAME( "Find" ),
         _( "Find" ), _( "Find text" ),
         find_xpm );
 
 TOOL_ACTION ACTIONS::findAndReplace( "common.Interactive.findAndReplace",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + MD_ALT + 'F', LEGACY_HK_NAME( "Find and Replace" ),
         _( "Find and Replace" ), _( "Find and replace text" ),
         find_replace_xpm );
 
 TOOL_ACTION ACTIONS::findNext( "common.Interactive.findNext",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_F5, LEGACY_HK_NAME( "Find Next" ),
         _( "Find Next" ), _( "Find next match" ),
         find_xpm );
 
 TOOL_ACTION ACTIONS::findNextMarker( "common.Interactive.findNextMarker",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + WXK_F5, LEGACY_HK_NAME( "Find Next Marker" ),
         _( "Find Next Marker" ), "",
         find_xpm );
 
 TOOL_ACTION ACTIONS::replaceAndFindNext( "common.Interactive.replaceAndFindNext",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Replace and Find Next" ), _( "Replace current match and find next" ),
         find_replace_xpm );
 
 TOOL_ACTION ACTIONS::replaceAll( "common.Interactive.replaceAll",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Replace All" ), _( "Replace all matches" ),
         find_replace_xpm );
@@ -256,7 +256,7 @@ TOOL_ACTION ACTIONS::zoomIn( "common.Control.zoomIn",
 #if defined( __WXMAC__ )
         MD_CTRL + '+',
 #else
-        WXK_F1, 
+        WXK_F1,
 #endif
         LEGACY_HK_NAME( "Zoom In" ),
         _( "Zoom In at Cursor" ), _( "Zoom In at Cursor" ),
@@ -274,25 +274,25 @@ TOOL_ACTION ACTIONS::zoomOut( "common.Control.zoomOut",
         zoom_out_xpm );
 
 TOOL_ACTION ACTIONS::zoomInCenter( "common.Control.zoomInCenter",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Zoom In" ), _( "Zoom In" ),
         zoom_in_xpm );
 
 TOOL_ACTION ACTIONS::zoomOutCenter( "common.Control.zoomOutCenter",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         0, "",
         _( "Zoom Out" ), _( "Zoom Out" ),
         zoom_out_xpm );
 
 TOOL_ACTION ACTIONS::zoomCenter( "common.Control.zoomCenter",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_F4, LEGACY_HK_NAME( "Zoom Center" ),
         _( "Center" ), _( "Center" ),
         zoom_center_on_screen_xpm );
 
 TOOL_ACTION ACTIONS::zoomTool( "common.Control.zoomTool",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + WXK_F5, LEGACY_HK_NAME( "Zoom to Selection" ),
         _( "Zoom to Selection" ), _( "Zoom to Selection" ),
         zoom_area_xpm, AF_ACTIVATE );
@@ -305,62 +305,62 @@ TOOL_ACTION ACTIONS::centerContents( "common.Control.centerContents",
 
 // Cursor control
 TOOL_ACTION ACTIONS::cursorUp( "common.Control.cursorUp",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_UP, "",
         _( "Cursor Up" ), "",
         nullptr, AF_NONE, (void*) CURSOR_UP );
 
 TOOL_ACTION ACTIONS::cursorDown( "common.Control.cursorDown",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_DOWN, "",
         _( "Cursor Down" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_DOWN );
 
 TOOL_ACTION ACTIONS::cursorLeft( "common.Control.cursorLeft",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_LEFT, "",
         _( "Cursor Left" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_LEFT );
 
 TOOL_ACTION ACTIONS::cursorRight( "common.Control.cursorRight",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_RIGHT, "",
         _( "Cursor Right" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_RIGHT );
 
 
 TOOL_ACTION ACTIONS::cursorUpFast( "common.Control.cursorUpFast",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + WXK_UP, "",
         _( "Cursor Up Fast" ), "",
         nullptr, AF_NONE, (void*) ( CURSOR_UP | CURSOR_FAST_MOVE ) );
 
 TOOL_ACTION ACTIONS::cursorDownFast( "common.Control.cursorDownFast",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + WXK_DOWN, "",
         _( "Cursor Down Fast" ), "" ,
         nullptr, AF_NONE, (void*) ( CURSOR_DOWN | CURSOR_FAST_MOVE ) );
 
 TOOL_ACTION ACTIONS::cursorLeftFast( "common.Control.cursorLeftFast",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + WXK_LEFT, "",
         _( "Cursor Left Fast" ), "" ,
         nullptr, AF_NONE, (void*) ( CURSOR_LEFT | CURSOR_FAST_MOVE ) );
 
 TOOL_ACTION ACTIONS::cursorRightFast( "common.Control.cursorRightFast",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + WXK_RIGHT, "",
         _( "Cursor Right Fast" ), "" ,
         nullptr, AF_NONE, (void*) ( CURSOR_RIGHT | CURSOR_FAST_MOVE ) );
 
 TOOL_ACTION ACTIONS::cursorClick( "common.Control.cursorClick",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_RETURN, LEGACY_HK_NAME( "Mouse Left Click" ),
         _( "Click" ), _( "Performs left mouse button click" ),
         nullptr, AF_NONE, (void*) CURSOR_CLICK );
 
 TOOL_ACTION ACTIONS::cursorDblClick( "common.Control.cursorDblClick",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         WXK_END, LEGACY_HK_NAME( "Mouse Left Double Click" ),
         _( "Double-click" ), _( "Performs left mouse button double-click" ),
         nullptr, AF_NONE, (void*) CURSOR_DBL_CLICK );
@@ -370,49 +370,51 @@ TOOL_ACTION ACTIONS::refreshPreview( "common.Control.refreshPreview",
 
 TOOL_ACTION ACTIONS::pinLibrary( "common.Control.pinLibrary",
          AS_GLOBAL, 0, "",
-         _( "Pin Library" ), "Keep the library at the top of the list" );
+         _( "Pin Library" ), "Keep the library at the top of the list",
+         flag_xpm );
 
 TOOL_ACTION ACTIONS::unpinLibrary( "common.Control.unpinLibrary",
          AS_GLOBAL, 0, "",
-         _( "Unpin Library" ), "No longer keep the library at the top of the list" );
+         _( "Unpin Library" ), "No longer keep the library at the top of the list",
+         flag_remove_xpm );
 
 TOOL_ACTION ACTIONS::panUp( "common.Control.panUp",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + WXK_UP, "",
         _( "Pan Up" ), "",
         nullptr, AF_NONE, (void*) CURSOR_UP );
 
 TOOL_ACTION ACTIONS::panDown( "common.Control.panDown",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + WXK_DOWN, "",
         _( "Pan Down" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_DOWN );
 
 TOOL_ACTION ACTIONS::panLeft( "common.Control.panLeft",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + WXK_LEFT, "",
         _( "Pan Left" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_LEFT );
 
 TOOL_ACTION ACTIONS::panRight( "common.Control.panRight",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_SHIFT + WXK_RIGHT, "",
         _( "Pan Right" ), "" ,
         nullptr, AF_NONE, (void*) CURSOR_RIGHT );
 
 // Grid control
 TOOL_ACTION ACTIONS::gridFast1( "common.Control.gridFast1",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_ALT + '1', LEGACY_HK_NAME( "Switch Grid To Fast Grid1" ),
         _( "Switch to Fast Grid 1" ), "" );
 
 TOOL_ACTION ACTIONS::gridFast2( "common.Control.gridFast2",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_ALT + '2', LEGACY_HK_NAME( "Switch Grid To Fast Grid2" ),
         _( "Switch to Fast Grid 2" ), "" );
 
 TOOL_ACTION ACTIONS::gridNext( "common.Control.gridNext",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         'N', LEGACY_HK_NAME( "Switch Grid To Next" ),
         _("Switch to Next Grid" ), "" );
 
@@ -421,13 +423,13 @@ TOOL_ACTION ACTIONS::gridPrev( "common.Control.gridPrev",
         _( "Switch to Previous Grid" ), "" );
 
 TOOL_ACTION ACTIONS::gridSetOrigin( "common.Control.gridSetOrigin",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         'S', LEGACY_HK_NAME( "Set Grid Origin" ),
         _( "Grid Origin" ), _( "Set the grid origin point" ),
         grid_select_axis_xpm );
 
 TOOL_ACTION ACTIONS::gridResetOrigin( "common.Control.gridResetOrigin",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         'Z', LEGACY_HK_NAME( "Reset Grid Origin" ),
         _( "Reset Grid Origin" ), "" );
 
@@ -455,7 +457,7 @@ TOOL_ACTION ACTIONS::metricUnits( "common.Control.metricUnits",
         unit_mm_xpm );
 
 TOOL_ACTION ACTIONS::toggleUnits( "common.Control.toggleUnits",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         MD_CTRL + 'U', LEGACY_HK_NAME( "Switch Units" ),
         _( "Switch units" ), _( "Switch between inches and millimeters" ),
         unit_mm_xpm );
@@ -466,12 +468,12 @@ TOOL_ACTION ACTIONS::togglePolarCoords( "common.Control.togglePolarCoords",
         polar_coord_xpm );
 
 TOOL_ACTION ACTIONS::resetLocalCoords( "common.Control.resetLocalCoords",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         ' ', LEGACY_HK_NAME( "Reset Local Coordinates" ),
         _( "Reset Local Coordinates" ), "" );
 
 TOOL_ACTION ACTIONS::toggleCursor( "common.Control.toggleCursor",
-        AS_GLOBAL, 
+        AS_GLOBAL,
         // Don't be tempted to remove "Modern Toolset only".  It's in the legacy property name.
         MD_CTRL + MD_SHIFT + 'X', LEGACY_HK_NAME( "Toggle Cursor Display (Modern Toolset only)" ),
         _( "Always Show Cursor" ), _( "Display crosshairs even in selection tool" ),
@@ -489,7 +491,7 @@ TOOL_ACTION ACTIONS::highContrastMode( "common.Control.highContrastMode",
         contrast_mode_xpm );
 
 TOOL_ACTION ACTIONS::selectionTool( "common.InteractiveSelection.selectionTool",
-        AS_GLOBAL, 0, "", 
+        AS_GLOBAL, 0, "",
         _( "Select item(s)" ), "",
         cursor_xpm, AF_ACTIVATE );
 
@@ -544,7 +546,7 @@ TOOL_ACTION ACTIONS::acceleratedGraphics( "common.Control.acceleratedGraphics",
 #ifdef __WXMAC__
         MD_ALT + WXK_F11,
 #else
-        WXK_F11, 
+        WXK_F11,
 #endif
         LEGACY_HK_NAME( "Switch to Modern Toolset with hardware-accelerated graphics (recommended)" ),
         _( "Accelerated Graphics" ), _( "Use hardware-accelerated graphics (recommended)" ),
@@ -596,13 +598,13 @@ TOOL_ACTION ACTIONS::listHotKeys( "common.SuiteControl.listHotKeys",
         _( "List Hotkeys..." ),
         _( "Displays current hotkeys table and corresponding commands" ),
         hotkeys_xpm );
-        
+
 TOOL_ACTION ACTIONS::getInvolved( "common.SuiteControl.getInvolved",
         AS_GLOBAL, 0, "",
         _( "Get Involved" ),
         _( "Open \"Contribute to KiCad\" in a web browser" ),
         info_xpm );
-        
+
 
 // System-wide selection Events
 
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index 510ba8b1e5..c093eba6c1 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -497,14 +497,14 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
 {
     int idx = m_cbTheme->GetSelection();
 
-    if( idx == m_cbTheme->GetCount() - 2 )
+    if( idx == (int)m_cbTheme->GetCount() - 2 )
     {
         // separator; re-select active theme
         m_cbTheme->SetStringSelection( m_currentSettings->GetName() );
         return;
     }
 
-    if( idx == m_cbTheme->GetCount() - 1 )
+    if( idx == (int)m_cbTheme->GetCount() - 1 )
     {
         // New Theme...
 
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index c76140613b..b91de953ee 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -148,9 +148,10 @@ static const TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPost
 
 static const TOOL_ACTION ACT_SwitchRounding( "pcbnew.InteractiveRouter.SwitchRounding",
         AS_CONTEXT,
-        0, LEGACY_HK_NAME( "Switch Rounding" ),
-        _( "Switch Rounding" ),
-        _( "Switches the corner type of the currently routed track." ) );
+        0, LEGACY_HK_NAME( "Switch Corner Rounding" ),
+        _( "Switch Corner Rounding" ),
+        _( "Switches the corner type of the currently routed track." ),
+        switch_corner_rounding_shape_xpm );
 
 #undef _
 #define _(s) wxGetTranslation((s))