diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index b5dacce9c0..2b954f6acd 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -240,6 +240,7 @@ set( BMAPS_MID
     file_drl
     file_dsn
     file_gbr
+    file_gerber_job
     file_html
     file_idf
     file_pdf
@@ -251,14 +252,10 @@ set( BMAPS_MID
     find_replace
     flag
     flip_board
-    footprint_browser
     gbr_select_mode2
-    gerber_job_file
     gerbview_show_negative_objects
-    gerbview_drill_file
     general_deletions
     general_ratsnest
-    green
     grid_select
     grid_select_axis
     grid
@@ -268,7 +265,6 @@ set( BMAPS_MID
     group_leave
     group_remove
     group_ungroup
-    hammer
     help
     hidden_pin
     hide_ratsnest
@@ -277,6 +273,7 @@ set( BMAPS_MID
     hole_to_hole_clearance
     hole_to_copper_clearance
     icon_cvpcb_24
+    icon_footprint_browser
     icon_gerbview_24
     import3d
     image
@@ -387,6 +384,7 @@ set( BMAPS_MID
     ps_diff_pair_tune_phase
     ps_tune_length
     push_pad_settings
+    puzzle_piece
     py_script
     recent
     redo
diff --git a/bitmaps_png/cpp_24/gerber_job_file.cpp b/bitmaps_png/cpp_24/file_gerber_job.cpp
similarity index 97%
rename from bitmaps_png/cpp_24/gerber_job_file.cpp
rename to bitmaps_png/cpp_24/file_gerber_job.cpp
index 2d6203ad8b..ee9013da13 100644
--- a/bitmaps_png/cpp_24/gerber_job_file.cpp
+++ b/bitmaps_png/cpp_24/file_gerber_job.cpp
@@ -52,6 +52,6 @@ static const unsigned char png[] = {
  0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE gerber_job_file_xpm[1] = {{ png, sizeof( png ), "gerber_job_file_xpm" }};
+const BITMAP_OPAQUE file_gerber_job_xpm[1] = {{ png, sizeof( png ), "file_gerber_job_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/cpp_24/flip_board.cpp b/bitmaps_png/cpp_24/flip_board.cpp
index c32a35e5ff..2b373bc44a 100644
--- a/bitmaps_png/cpp_24/flip_board.cpp
+++ b/bitmaps_png/cpp_24/flip_board.cpp
@@ -8,31 +8,30 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x68, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xc0, 0x07, 0x1a,
- 0xfe, 0x33, 0x49, 0x35, 0x1e, 0x79, 0x07, 0xc4, 0x47, 0xa4, 0x1a, 0x0e, 0x4f, 0x94, 0x6e, 0x3a,
- 0x1c, 0x27, 0xd1, 0x74, 0x44, 0x1b, 0x24, 0xce, 0x40, 0x15, 0xb0, 0x6a, 0x15, 0x33, 0xd0, 0xf0,
- 0xff, 0x58, 0xf0, 0x27, 0x90, 0xa5, 0xd2, 0x0d, 0x47, 0x67, 0x4a, 0x36, 0x1e, 0xce, 0x97, 0x6a,
- 0x38, 0x62, 0xa3, 0xd0, 0xb0, 0x9f, 0x83, 0xa0, 0x79, 0xbb, 0x76, 0xed, 0x2a, 0x02, 0xe2, 0x0e,
- 0x28, 0xce, 0x87, 0xfa, 0xe0, 0x3f, 0x31, 0x58, 0xa6, 0xe9, 0xc8, 0x1f, 0xdd, 0x8e, 0xc3, 0xcf,
- 0x6d, 0x7a, 0x0f, 0x1d, 0xc1, 0x69, 0xc1, 0xce, 0x9d, 0x3b, 0xff, 0xed, 0xd8, 0xb1, 0xa3, 0x1c,
- 0x84, 0x81, 0xec, 0x34, 0x3c, 0x3e, 0xc0, 0x8b, 0xf1, 0x5a, 0x40, 0x64, 0x10, 0x0d, 0x5e, 0x0b,
- 0x22, 0x68, 0x6a, 0x01, 0x3a, 0x08, 0x8c, 0x89, 0xd1, 0xa7, 0x99, 0x05, 0x21, 0x21, 0x21, 0x4d,
- 0x40, 0xfc, 0x92, 0xaa, 0x16, 0x00, 0x53, 0x4f, 0x14, 0x88, 0x0e, 0x0d, 0x0d, 0x4d, 0x00, 0x1a,
- 0x7e, 0xd7, 0x3b, 0x2a, 0x4a, 0x89, 0x26, 0x91, 0x0c, 0x34, 0xfc, 0x06, 0xd0, 0x12, 0x3f, 0x9a,
- 0xa4, 0x22, 0xa0, 0xc1, 0x3c, 0x40, 0x0b, 0xfe, 0x00, 0x69, 0x4e, 0x9a, 0x58, 0xe0, 0xe0, 0xe0,
- 0xc0, 0x02, 0xb4, 0xe0, 0x7b, 0x42, 0x42, 0x02, 0x07, 0xcd, 0xf2, 0x01, 0xd0, 0x82, 0xa3, 0x34,
- 0x09, 0x22, 0x58, 0x24, 0x07, 0x07, 0x07, 0x7b, 0x01, 0x2d, 0xb9, 0xed, 0x97, 0x92, 0x22, 0x0e,
- 0xd2, 0x20, 0x5f, 0xb7, 0xe7, 0xbf, 0x1c, 0x10, 0x53, 0x3b, 0x99, 0xf6, 0x01, 0xf1, 0x73, 0x93,
- 0x9c, 0x89, 0xff, 0x2d, 0x32, 0x3b, 0xff, 0x03, 0xd9, 0xff, 0x7d, 0x22, 0x12, 0xff, 0x3b, 0x26,
- 0x57, 0xfe, 0x37, 0xcb, 0xee, 0xfb, 0xaf, 0x51, 0xb6, 0x82, 0xf2, 0x8c, 0x16, 0x10, 0x12, 0xe2,
- 0xe9, 0x90, 0x5c, 0xf5, 0xdf, 0x27, 0x2a, 0x19, 0x6c, 0x01, 0x08, 0x7b, 0x45, 0xa7, 0xfd, 0x37,
- 0xcd, 0x99, 0x00, 0xf6, 0x15, 0xd5, 0x8a, 0x0a, 0xf5, 0xb2, 0x55, 0xff, 0xad, 0xd3, 0x9b, 0xff,
- 0xab, 0x56, 0xac, 0x1b, 0x2d, 0x4d, 0x69, 0x5c, 0xe1, 0x20, 0x57, 0x99, 0x40, 0x4b, 0x0a, 0x48,
- 0xb1, 0x00, 0xd8, 0x20, 0xf8, 0xa3, 0xd3, 0x7e, 0xf8, 0x85, 0x55, 0xcf, 0xc1, 0x63, 0x03, 0x57,
- 0xe9, 0xe3, 0xb0, 0xe0, 0x99, 0x74, 0xe3, 0x91, 0x6d, 0xd2, 0x0d, 0x47, 0x5a, 0xa5, 0x1b, 0x0f,
- 0x87, 0xca, 0x34, 0x1c, 0x53, 0x61, 0xf8, 0xff, 0x9f, 0x91, 0x58, 0x23, 0x00, 0x56, 0x0c, 0x2f,
- 0x42, 0x86, 0xe0, 0x8b, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
- 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x5c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x68, 0x20,
+ 0xd5, 0x78, 0xe4, 0x99, 0x54, 0xd3, 0xd1, 0xcd, 0x52, 0x8d, 0x87, 0xcb, 0xa5, 0x1a, 0x8e, 0xd8,
+ 0x68, 0x37, 0x5c, 0x65, 0x23, 0xdb, 0xb0, 0x90, 0x90, 0x90, 0xb7, 0x40, 0xfc, 0x1f, 0x84, 0x83,
+ 0x83, 0x83, 0xaf, 0x41, 0x2d, 0xf8, 0x8f, 0x86, 0xbf, 0x00, 0xf1, 0x11, 0xa9, 0xc6, 0xa3, 0x1d,
+ 0x40, 0x4b, 0x7d, 0xe5, 0xda, 0x0f, 0x0b, 0x92, 0x62, 0xc1, 0x3f, 0x2c, 0x3e, 0xf8, 0x4f, 0x00,
+ 0xff, 0x01, 0xe2, 0xab, 0xd2, 0x0d, 0x47, 0x67, 0x4a, 0x37, 0x1d, 0x8e, 0x93, 0x68, 0x3a, 0xa2,
+ 0x4d, 0x6d, 0x0b, 0x30, 0x30, 0x4e, 0x0b, 0x80, 0xc1, 0x72, 0x93, 0xa6, 0x16, 0xe0, 0x88, 0x64,
+ 0xda, 0x59, 0x10, 0x1a, 0x1a, 0xaa, 0x4b, 0x33, 0x0b, 0x80, 0xf1, 0xd1, 0x04, 0xc4, 0x2f, 0xa9,
+ 0x6a, 0x01, 0xd0, 0xc5, 0x51, 0x50, 0x3a, 0x01, 0x68, 0xf8, 0xdd, 0xa0, 0xa0, 0x20, 0x79, 0xaa,
+ 0x5a, 0x00, 0x4b, 0x45, 0x40, 0xfa, 0x06, 0xd0, 0x12, 0x3f, 0xaa, 0xc7, 0x01, 0xc8, 0x02, 0xa0,
+ 0xc1, 0x3c, 0x40, 0xfa, 0x0f, 0x90, 0xe6, 0xa4, 0x89, 0x05, 0x0e, 0x0e, 0x0e, 0x2c, 0x40, 0xfa,
+ 0x7b, 0x42, 0x42, 0x02, 0x07, 0x4d, 0x2c, 0x80, 0xd2, 0x47, 0x69, 0x12, 0x44, 0xc0, 0x8c, 0x16,
+ 0x09, 0xa5, 0xbd, 0x80, 0x96, 0xdc, 0x8e, 0x8c, 0x8c, 0x14, 0x01, 0x69, 0x90, 0xaf, 0xdb, 0xf3,
+ 0x5f, 0x0e, 0x88, 0xa9, 0x9d, 0x4c, 0xfb, 0x80, 0xf8, 0xb9, 0x49, 0xce, 0xc4, 0xff, 0x16, 0x99,
+ 0x9d, 0xe0, 0x02, 0xd0, 0x27, 0x22, 0xf1, 0xbf, 0x63, 0x72, 0xe5, 0x7f, 0xb3, 0xec, 0xbe, 0xff,
+ 0x1a, 0x65, 0x2b, 0x28, 0xcf, 0x68, 0x40, 0x9f, 0xb8, 0x3b, 0x24, 0x57, 0xfd, 0xf7, 0x89, 0x4a,
+ 0xfe, 0x0f, 0x2b, 0x65, 0xbd, 0xa2, 0xd3, 0xfe, 0x9b, 0xe6, 0x4c, 0x00, 0xfb, 0x8a, 0x6a, 0x45,
+ 0x85, 0x7a, 0xd9, 0xaa, 0xff, 0xd6, 0xe9, 0xcd, 0xff, 0x55, 0x2b, 0xd6, 0x0d, 0xf2, 0xc2, 0x8e,
+ 0xe6, 0xc5, 0x35, 0x3d, 0x2c, 0x78, 0x43, 0x44, 0x95, 0x09, 0xc3, 0xbf, 0xa5, 0x1b, 0x8f, 0xdc,
+ 0x95, 0x6a, 0x3a, 0xb2, 0x5b, 0xaa, 0xe1, 0xf0, 0x44, 0xc9, 0xa6, 0xc3, 0x69, 0x40, 0xda, 0x45,
+ 0xb6, 0xe1, 0x88, 0x14, 0xa9, 0x91, 0xfc, 0x06, 0x52, 0x07, 0x1f, 0x99, 0x03, 0xac, 0xfc, 0xcb,
+ 0x80, 0x75, 0xb1, 0xbf, 0x54, 0xf3, 0x11, 0x75, 0xe3, 0x99, 0x67, 0x58, 0x19, 0x06, 0x03, 0x00,
+ 0x00, 0x76, 0x28, 0xae, 0x65, 0x4b, 0x8b, 0xc8, 0x36, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+ 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE flip_board_xpm[1] = {{ png, sizeof( png ), "flip_board_xpm" }};
diff --git a/bitmaps_png/cpp_24/gerbview_drill_file.cpp b/bitmaps_png/cpp_24/gerbview_drill_file.cpp
deleted file mode 100644
index aa465c77f8..0000000000
--- a/bitmaps_png/cpp_24/gerbview_drill_file.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* 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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x89, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x27, 0xd8,
- 0xb1, 0x63, 0x87, 0xd1, 0xce, 0x9d, 0x3b, 0x77, 0x03, 0xf1, 0x47, 0x20, 0xfe, 0x4f, 0x26, 0xfe,
- 0x0c, 0xc4, 0x07, 0x80, 0xd8, 0x0a, 0xdd, 0x70, 0x7d, 0xa0, 0xe0, 0x4f, 0x0a, 0x0c, 0x46, 0xc7,
- 0x7f, 0xb6, 0x6f, 0xdf, 0x6e, 0x89, 0x6c, 0xc1, 0x46, 0x2a, 0x1a, 0x0e, 0xc3, 0xc7, 0xe1, 0x16,
- 0x00, 0x39, 0x4f, 0x68, 0x60, 0xc1, 0x4f, 0x06, 0xa9, 0xc6, 0xc3, 0x0d, 0x20, 0x9c, 0x36, 0x67,
- 0xdf, 0xf7, 0xcc, 0xb9, 0xfb, 0xfe, 0x93, 0x8b, 0x1b, 0x96, 0xee, 0xc5, 0x6a, 0x09, 0xd0, 0x82,
- 0x23, 0xff, 0x71, 0xe1, 0x90, 0x85, 0x97, 0xff, 0x07, 0x03, 0x31, 0xb2, 0x98, 0x4a, 0xdb, 0xf1,
- 0xff, 0x5d, 0xfb, 0x1f, 0x62, 0xa8, 0xf5, 0x98, 0x78, 0x90, 0x74, 0x0b, 0xa6, 0x1d, 0x7d, 0xf2,
- 0x7f, 0xca, 0x91, 0xc7, 0x28, 0x62, 0x06, 0xbd, 0xa7, 0xfe, 0xff, 0xf9, 0xf7, 0x8f, 0x32, 0x0b,
- 0x82, 0x17, 0x5c, 0xfe, 0x5f, 0xbc, 0xe9, 0xf6, 0xff, 0x79, 0xa7, 0x9e, 0x81, 0x2d, 0x30, 0x9b,
- 0x70, 0xfa, 0x7f, 0xd4, 0x92, 0x2b, 0xff, 0x53, 0x56, 0x5d, 0xff, 0xef, 0x38, 0xed, 0x1c, 0x65,
- 0x16, 0x84, 0x2e, 0xba, 0xfc, 0xff, 0xe5, 0xe7, 0x9f, 0xff, 0x3b, 0xf7, 0x3d, 0xfc, 0xff, 0xe8,
- 0xfd, 0x0f, 0xb0, 0x05, 0x89, 0x2b, 0xae, 0xfd, 0xff, 0xf4, 0xe3, 0xcf, 0xff, 0xb5, 0x97, 0x5e,
- 0xfd, 0xb7, 0x9b, 0x7a, 0x96, 0x32, 0x0b, 0x16, 0x9e, 0x7e, 0xfe, 0xbf, 0xef, 0xe0, 0x23, 0x94,
- 0x20, 0x02, 0x59, 0x70, 0xfa, 0xd1, 0x27, 0xea, 0x04, 0xd1, 0xf2, 0xf3, 0x2f, 0xfe, 0xb7, 0xee,
- 0x79, 0x80, 0x61, 0xc1, 0xa9, 0x47, 0x1f, 0x29, 0xb3, 0x60, 0xd2, 0xe1, 0xc7, 0xff, 0x4d, 0xfa,
- 0x4f, 0xff, 0xcf, 0x58, 0x73, 0xe3, 0xff, 0xfd, 0xb7, 0xdf, 0xff, 0x97, 0x6f, 0xb9, 0xf3, 0xff,
- 0xc6, 0xab, 0xaf, 0xd4, 0xb3, 0xa0, 0x68, 0xe3, 0xed, 0xff, 0xba, 0xdd, 0x27, 0xc1, 0xec, 0x54,
- 0x60, 0x64, 0x36, 0xed, 0xba, 0x0f, 0x8e, 0x6c, 0x50, 0x32, 0xb5, 0x9e, 0x7c, 0xf6, 0x7f, 0xee,
- 0xba, 0x9b, 0x60, 0x39, 0xe5, 0xb6, 0x63, 0xff, 0x6b, 0xb7, 0xdf, 0x25, 0xc1, 0x82, 0xa6, 0x23,
- 0xbb, 0x41, 0xd8, 0xa9, 0xff, 0xe0, 0x6f, 0x97, 0x09, 0x07, 0xff, 0x93, 0x8b, 0x81, 0x19, 0x15,
- 0xbb, 0x05, 0x48, 0x45, 0xc5, 0x7b, 0x1a, 0x14, 0x15, 0xa3, 0x16, 0x90, 0x66, 0x01, 0x6d, 0x8a,
- 0x6b, 0x24, 0x0b, 0x36, 0xd0, 0xc0, 0x82, 0x63, 0x70, 0x0b, 0x80, 0xd5, 0x9b, 0x1e, 0x50, 0xe0,
- 0x07, 0x15, 0x0d, 0xff, 0xbd, 0x7b, 0xf7, 0x6e, 0x0b, 0x94, 0x7a, 0x19, 0x28, 0x60, 0x08, 0xad,
- 0xb0, 0xbf, 0x53, 0x60, 0x30, 0xc8, 0x91, 0xc7, 0x30, 0x0c, 0xa7, 0x15, 0x00, 0x00, 0x5b, 0xf4,
- 0xc9, 0x3b, 0x89, 0x5c, 0x95, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
-};
-
-const BITMAP_OPAQUE gerbview_drill_file_xpm[1] = {{ png, sizeof( png ), "gerbview_drill_file_xpm" }};
-
-//EOF
diff --git a/bitmaps_png/cpp_24/gerbview_show_negative_objects.cpp b/bitmaps_png/cpp_24/gerbview_show_negative_objects.cpp
index b283c3bbfa..7ec6746423 100644
--- a/bitmaps_png/cpp_24/gerbview_show_negative_objects.cpp
+++ b/bitmaps_png/cpp_24/gerbview_show_negative_objects.cpp
@@ -8,17 +8,15 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x00, 0x91, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x01, 0x84,
- 0x38, 0x84, 0x5c, 0x25, 0x45, 0xb9, 0x6d, 0xc8, 0xcb, 0x50, 0x27, 0x32, 0x94, 0x33, 0x12, 0x03,
- 0x83, 0xec, 0x42, 0x5e, 0x86, 0x38, 0x03, 0x59, 0x40, 0x9d, 0xff, 0x49, 0x82, 0x3f, 0x80, 0x1a,
- 0x76, 0x12, 0x80, 0x7d, 0xff, 0x43, 0xfe, 0x85, 0x14, 0x83, 0x1c, 0x93, 0xc0, 0x41, 0x84, 0x06,
- 0x84, 0x72, 0xa2, 0x34, 0x20, 0x2b, 0x27, 0x42, 0x03, 0xaa, 0x72, 0x82, 0x1a, 0xd0, 0x95, 0x13,
- 0xd0, 0x80, 0xa9, 0x1c, 0xaf, 0x06, 0x6c, 0xca, 0xf1, 0x68, 0xc0, 0xae, 0x1c, 0xa7, 0x06, 0x5c,
- 0xca, 0x71, 0x68, 0xc0, 0xad, 0x1c, 0xab, 0x06, 0x7c, 0xca, 0xb1, 0x68, 0xc0, 0xaf, 0x1c, 0x43,
- 0x03, 0x21, 0xe5, 0x68, 0x1a, 0xc0, 0xca, 0xcb, 0x3d, 0xd9, 0xf1, 0xc1, 0x68, 0x3e, 0xb0, 0x06,
- 0x38, 0xfc, 0x13, 0xf2, 0x93, 0x20, 0xfc, 0x48, 0x59, 0xe6, 0xa3, 0x85, 0x72, 0xa0, 0x86, 0xab,
- 0x21, 0x0e, 0xa4, 0x14, 0x35, 0x00, 0x8e, 0x14, 0x97, 0xd0, 0xc9, 0xad, 0x00, 0x12, 0x00, 0x00,
- 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x00, 0x73, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x01, 0x84,
+ 0x38, 0x84, 0x5c, 0x25, 0x45, 0xb9, 0x6d, 0xc8, 0xcb, 0x50, 0x27, 0xba, 0x28, 0x0f, 0xf9, 0x4f,
+ 0x3c, 0x84, 0x6a, 0xd8, 0x89, 0x17, 0x2e, 0xfc, 0x1f, 0xf9, 0x05, 0x62, 0x3a, 0x51, 0x1a, 0x10,
+ 0xca, 0x89, 0xd2, 0x80, 0xac, 0x9c, 0x08, 0x0d, 0xa8, 0xca, 0x09, 0x6a, 0x40, 0x57, 0x4e, 0x40,
+ 0x03, 0xa6, 0x72, 0xbc, 0x1a, 0xb0, 0x29, 0xc7, 0xa3, 0x01, 0xbb, 0x72, 0x9c, 0x1a, 0x70, 0x29,
+ 0xc7, 0xa1, 0x01, 0xb7, 0x72, 0xac, 0x1a, 0xf0, 0x29, 0xc7, 0xa2, 0x01, 0xbf, 0x72, 0x0c, 0x0d,
+ 0x84, 0x94, 0xa3, 0x69, 0x20, 0xac, 0x1c, 0x49, 0x03, 0x89, 0xc9, 0x9b, 0xae, 0x99, 0x8f, 0x28,
+ 0x0d, 0x57, 0x43, 0x1c, 0x48, 0x29, 0x6a, 0x00, 0x77, 0x52, 0x6f, 0x00, 0x62, 0x66, 0xc5, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE gerbview_show_negative_objects_xpm[1] = {{ png, sizeof( png ), "gerbview_show_negative_objects_xpm" }};
diff --git a/bitmaps_png/cpp_24/green.cpp b/bitmaps_png/cpp_24/green.cpp
deleted file mode 100644
index ce1f1d19c7..0000000000
--- a/bitmaps_png/cpp_24/green.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/* 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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x49, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x55, 0x4b, 0x4e, 0x02,
- 0x41, 0x14, 0xec, 0x4b, 0x98, 0x30, 0xd5, 0x83, 0x7a, 0x1d, 0x13, 0x25, 0x5e, 0x43, 0xf9, 0x78,
- 0x85, 0x7e, 0x1d, 0x74, 0xef, 0x4e, 0xa3, 0x71, 0xe1, 0xd2, 0x3d, 0xca, 0x16, 0xba, 0x5a, 0xb9,
- 0x01, 0x18, 0x4f, 0x01, 0xb8, 0x03, 0xa2, 0x8b, 0x99, 0x80, 0xa0, 0xc0, 0x00, 0xd3, 0xbe, 0xa4,
- 0xb6, 0x55, 0xef, 0x55, 0xbf, 0x7e, 0xa5, 0xd4, 0x8a, 0x82, 0xe1, 0x3e, 0xc4, 0x57, 0x21, 0xae,
- 0x09, 0x61, 0x0f, 0xc2, 0xcf, 0x14, 0x3d, 0x88, 0x6b, 0xc2, 0xb2, 0x82, 0x7a, 0xab, 0xa8, 0x36,
- 0xad, 0xb8, 0xfe, 0xaa, 0xb5, 0xf1, 0xb7, 0x10, 0x8e, 0x21, 0xfc, 0x5a, 0x83, 0x09, 0xc4, 0x3f,
- 0x15, 0xcc, 0xdb, 0x61, 0x26, 0x72, 0x98, 0xf6, 0x29, 0x84, 0xc3, 0x0c, 0xc4, 0x8b, 0x18, 0xc0,
- 0xb0, 0xb4, 0x92, 0x3c, 0x12, 0x77, 0x91, 0x74, 0xb4, 0x31, 0xf9, 0x6c, 0x1a, 0xeb, 0x6b, 0xab,
- 0x3a, 0xdf, 0x85, 0x7c, 0x26, 0xb2, 0x38, 0x89, 0x36, 0x9d, 0x78, 0x4b, 0x5b, 0x96, 0xda, 0x55,
- 0x34, 0xc4, 0xac, 0x7b, 0x71, 0x0f, 0x39, 0x92, 0x27, 0x30, 0xbc, 0xfb, 0xb1, 0x8a, 0x99, 0xb6,
- 0x65, 0x53, 0x8c, 0xb5, 0xe9, 0xc4, 0x0a, 0xd6, 0xd7, 0x02, 0x90, 0xa7, 0x70, 0x65, 0x05, 0xcb,
- 0x97, 0x50, 0x02, 0x91, 0x65, 0x43, 0x41, 0xf8, 0x11, 0x6e, 0x02, 0xf6, 0x54, 0xce, 0xdb, 0xb3,
- 0x88, 0x61, 0x68, 0x81, 0xbe, 0x82, 0xf0, 0x3d, 0xa0, 0x40, 0xf7, 0x1f, 0x1e, 0xd9, 0xb2, 0x12,
- 0x4a, 0x40, 0x8b, 0x3f, 0x53, 0xa8, 0xb7, 0x8a, 0x81, 0x3e, 0xda, 0x48, 0x9b, 0x4e, 0x9c, 0x9e,
- 0x0a, 0xde, 0xe7, 0x6e, 0x8f, 0xf0, 0x66, 0x2e, 0x60, 0x20, 0x1c, 0xe4, 0xb9, 0x3d, 0x07, 0x97,
- 0xed, 0x68, 0xee, 0xa2, 0x16, 0x84, 0x47, 0x39, 0x59, 0x35, 0x81, 0xb8, 0x93, 0xbf, 0x33, 0x21,
- 0xb9, 0x4b, 0xbb, 0x05, 0x8e, 0xf8, 0xea, 0x9a, 0xc8, 0x64, 0x69, 0x4b, 0xbb, 0xfa, 0xda, 0xb8,
- 0xe3, 0x4c, 0xb9, 0x5c, 0xb8, 0x6a, 0xef, 0xc1, 0xb8, 0x6b, 0x08, 0x47, 0x59, 0xba, 0xd6, 0xe2,
- 0x1f, 0x7f, 0x79, 0x9e, 0xa5, 0x92, 0xa4, 0x73, 0x65, 0x2d, 0x7c, 0x86, 0xb0, 0x9b, 0x9e, 0x95,
- 0x21, 0x84, 0xdd, 0xc8, 0xb2, 0x01, 0xeb, 0xce, 0xa7, 0xab, 0xb8, 0xa4, 0xbe, 0x01, 0x55, 0xa4,
- 0x57, 0xfc, 0x6a, 0x3a, 0x8b, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
- 0x60, 0x82,
-};
-
-const BITMAP_OPAQUE green_xpm[1] = {{ png, sizeof( png ), "green_xpm" }};
-
-//EOF
diff --git a/bitmaps_png/cpp_24/group.cpp b/bitmaps_png/cpp_24/group.cpp
index 1a5dee4a3f..13933cdcc8 100644
--- a/bitmaps_png/cpp_24/group.cpp
+++ b/bitmaps_png/cpp_24/group.cpp
@@ -8,13 +8,12 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x00, 0x53, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x08, 0xf9, 0x0f, 0x81,
- 0x0c, 0x04, 0x00, 0x5c, 0x1d, 0x8c, 0x11, 0xf2, 0x3f, 0xd4, 0x18, 0x28, 0x7c, 0x06, 0x37, 0x1f,
- 0x4d, 0x03, 0xc9, 0x36, 0x10, 0xad, 0x01, 0xc4, 0x64, 0x20, 0x12, 0x40, 0x55, 0xd2, 0x41, 0xc3,
- 0x19, 0x12, 0x35, 0x10, 0x0f, 0x40, 0x01, 0x8d, 0xa0, 0x88, 0x07, 0x24, 0xf8, 0xe1, 0x0c, 0xbd,
- 0x42, 0x69, 0x34, 0x1e, 0xa8, 0x1f, 0x0f, 0xb4, 0xcf, 0x71, 0x88, 0x2c, 0x8f, 0x94, 0xd5, 0xcf,
- 0x80, 0x82, 0x02, 0x95, 0x4f, 0xb6, 0x0d, 0x00, 0x75, 0xb4, 0x96, 0xf9, 0x2a, 0x9d, 0x15, 0x6f,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x73, 0x00, 0x00, 0x00, 0x47, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x11, 0x30,
+ 0x32, 0x30, 0x84, 0xfc, 0x87, 0x30, 0xd7, 0x30, 0xe2, 0x56, 0x86, 0x50, 0x83, 0xa4, 0x01, 0xa2,
+ 0x05, 0xc2, 0xc3, 0xc6, 0xc2, 0xd0, 0x40, 0x9c, 0x0d, 0x4c, 0x0c, 0xe4, 0x00, 0x84, 0x95, 0x94,
+ 0xab, 0xa2, 0x12, 0x20, 0xc5, 0x49, 0x24, 0x7b, 0x9a, 0x89, 0x61, 0x70, 0x82, 0x51, 0x4f, 0x13,
+ 0x50, 0x45, 0xfb, 0xfc, 0x40, 0xfb, 0x2c, 0x4a, 0x72, 0x00, 0x01, 0x00, 0xd8, 0x01, 0x2a, 0xab,
+ 0x7b, 0x63, 0xa1, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_xpm[1] = {{ png, sizeof( png ), "group_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_add.cpp b/bitmaps_png/cpp_24/group_add.cpp
index c59e3430a8..1132108e42 100644
--- a/bitmaps_png/cpp_24/group_add.cpp
+++ b/bitmaps_png/cpp_24/group_add.cpp
@@ -8,27 +8,27 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x2f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
- 0x8f, 0x8c, 0x19, 0x28, 0x04, 0x18, 0xe6, 0xa1, 0x0b, 0xe0, 0xb2, 0x90, 0x58, 0x71, 0x82, 0x16,
- 0xd0, 0xdc, 0x07, 0x54, 0xb7, 0x00, 0x26, 0xc8, 0x40, 0x65, 0x40, 0x0b, 0x33, 0x07, 0x10, 0xd0,
- 0x3c, 0x88, 0x46, 0x9e, 0x05, 0x7b, 0x14, 0x9d, 0xc5, 0xf7, 0xab, 0x3b, 0x34, 0xef, 0x57, 0x73,
- 0xba, 0x74, 0x40, 0xcd, 0xf1, 0x23, 0x10, 0xbf, 0xdc, 0xaf, 0xe6, 0x78, 0x1a, 0x28, 0x56, 0xbe,
- 0x5f, 0xdb, 0x41, 0x82, 0x22, 0x47, 0x03, 0x0d, 0x09, 0x01, 0x19, 0x0a, 0x34, 0xf0, 0x3f, 0x36,
- 0x0c, 0x91, 0x73, 0x08, 0x27, 0xcb, 0xf0, 0x03, 0x6a, 0x4e, 0x9e, 0x40, 0x43, 0x7e, 0x21, 0x1b,
- 0x78, 0x2e, 0xb1, 0x04, 0x8c, 0xd1, 0x2c, 0xfa, 0xb7, 0x4f, 0xd5, 0x31, 0x98, 0xa4, 0x20, 0x02,
- 0x79, 0x1d, 0x9b, 0xcb, 0x3f, 0xbf, 0x7b, 0x0f, 0xc6, 0xe8, 0xe2, 0xbb, 0x34, 0x9d, 0xfe, 0xef,
- 0x54, 0x76, 0x13, 0x23, 0xda, 0x02, 0xa0, 0xe1, 0xad, 0xd8, 0x82, 0xe4, 0xeb, 0xd7, 0xaf, 0x60,
- 0x8c, 0x35, 0xc8, 0xd4, 0x9d, 0x5a, 0x48, 0xb1, 0xe0, 0x22, 0xa9, 0x16, 0x80, 0xf4, 0x10, 0x1f,
- 0x44, 0x6a, 0x8e, 0xdf, 0x40, 0x9a, 0xce, 0x27, 0x95, 0xfe, 0xff, 0xfc, 0xe1, 0x23, 0xdc, 0x60,
- 0x74, 0x0c, 0x92, 0x03, 0xa9, 0x01, 0x5b, 0xa0, 0xee, 0xf8, 0x95, 0xf8, 0xd4, 0x43, 0x7b, 0x0b,
- 0x9c, 0x2e, 0xd1, 0x34, 0x88, 0xc8, 0x8e, 0x64, 0x62, 0x2b, 0x1c, 0x50, 0x32, 0x05, 0x6a, 0xfa,
- 0x84, 0x91, 0x4c, 0xdf, 0x7f, 0x00, 0x63, 0x74, 0xf1, 0x9d, 0x1a, 0x4e, 0xff, 0x63, 0x03, 0x82,
- 0x49, 0xab, 0xd1, 0xf6, 0xa9, 0x39, 0x7a, 0x01, 0x35, 0xff, 0x46, 0x36, 0x08, 0x14, 0xde, 0xb0,
- 0x30, 0x87, 0x61, 0xa0, 0xba, 0xff, 0xe5, 0xae, 0xbe, 0xe4, 0x55, 0xfa, 0x15, 0xae, 0x7e, 0x60,
- 0xd7, 0xe1, 0x2a, 0x2a, 0x40, 0x19, 0xac, 0xd2, 0xc5, 0x97, 0xb2, 0x3a, 0x19, 0x14, 0x5c, 0x40,
- 0x57, 0xb6, 0x41, 0x23, 0x1e, 0x54, 0x74, 0xfc, 0x00, 0xb2, 0xcf, 0x81, 0x0a, 0xbb, 0xb8, 0x80,
- 0x20, 0x14, 0xf3, 0x00, 0x61, 0x30, 0x41, 0xb7, 0x72, 0xbd, 0x79, 0x18, 0x00, 0x00, 0x00, 0x00,
- 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x2c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
+ 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
+ 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
+ 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
+ 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
+ 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0x90, 0x0d, 0x3c,
+ 0x97, 0x58, 0x02, 0xc6, 0x68, 0x16, 0xfd, 0xdb, 0xa7, 0xea, 0x18, 0x4c, 0x52, 0x10, 0x81, 0xbc,
+ 0x8e, 0xcd, 0xe5, 0x9f, 0xdf, 0xbd, 0x07, 0x63, 0x6c, 0x3e, 0xd9, 0xa9, 0xec, 0x26, 0x46, 0xb4,
+ 0x05, 0x40, 0x0d, 0xad, 0xd8, 0x82, 0xe4, 0xeb, 0xd7, 0xaf, 0x60, 0x8c, 0x35, 0xc8, 0xd4, 0x9d,
+ 0x5a, 0x48, 0xb1, 0xe0, 0x22, 0xa9, 0x16, 0x80, 0xf4, 0x10, 0x1f, 0xb9, 0x6a, 0x8e, 0xdf, 0x40,
+ 0x9a, 0xce, 0x27, 0x95, 0xfe, 0xff, 0xfc, 0xe1, 0x23, 0xdc, 0x60, 0x74, 0x0c, 0x92, 0x03, 0xa9,
+ 0x01, 0x5b, 0xa0, 0xee, 0xf8, 0x95, 0x7e, 0x16, 0x10, 0x8c, 0x64, 0x60, 0x9a, 0x27, 0x3b, 0x88,
+ 0x88, 0x29, 0xae, 0x29, 0x8a, 0x64, 0x62, 0x2c, 0x00, 0x25, 0x53, 0xa0, 0xa6, 0x4f, 0x18, 0xc9,
+ 0xf4, 0xfd, 0x07, 0x30, 0x46, 0x17, 0xdf, 0xa9, 0xe1, 0xf4, 0x1f, 0x9e, 0x4c, 0x89, 0xad, 0x32,
+ 0xf7, 0xa9, 0x39, 0x7a, 0x01, 0x35, 0xff, 0x46, 0x36, 0x08, 0x14, 0xde, 0xb0, 0x30, 0x87, 0x61,
+ 0xa0, 0xba, 0xff, 0xe5, 0xae, 0xbe, 0xe4, 0xd5, 0x68, 0x07, 0xd4, 0x9d, 0x42, 0xb1, 0xf9, 0x04,
+ 0x86, 0x77, 0x69, 0x3a, 0xfd, 0xaf, 0x74, 0xf1, 0xfd, 0x4f, 0x59, 0x79, 0x04, 0x0c, 0x2e, 0xa0,
+ 0x2b, 0xdb, 0xa0, 0x11, 0x0f, 0x2a, 0x3a, 0x7e, 0x00, 0xd9, 0xe7, 0x60, 0x85, 0x1d, 0xb2, 0x5a,
+ 0x00, 0x4b, 0x17, 0x23, 0xd7, 0x2e, 0x7f, 0x3c, 0xb2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+ 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_add_xpm[1] = {{ png, sizeof( png ), "group_add_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_enter.cpp b/bitmaps_png/cpp_24/group_enter.cpp
index 345e8096bc..20630b35a2 100644
--- a/bitmaps_png/cpp_24/group_enter.cpp
+++ b/bitmaps_png/cpp_24/group_enter.cpp
@@ -8,29 +8,29 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
- 0x8f, 0x8c, 0x19, 0x28, 0x04, 0x18, 0xe6, 0xa1, 0x0b, 0xe0, 0xb2, 0x90, 0x58, 0x71, 0x82, 0x16,
- 0xd0, 0xdc, 0x07, 0x54, 0xb7, 0x00, 0x26, 0xc8, 0x40, 0x65, 0x40, 0x0b, 0x33, 0x07, 0x10, 0xd0,
- 0x3c, 0x88, 0x46, 0x9e, 0x05, 0x7b, 0x14, 0x9d, 0xc5, 0xf7, 0xab, 0x3b, 0x34, 0xef, 0x57, 0x73,
- 0xba, 0x74, 0x40, 0xcd, 0xf1, 0x23, 0x10, 0xbf, 0xdc, 0xaf, 0xe6, 0x78, 0x1a, 0x28, 0x56, 0xbe,
- 0x5f, 0xdb, 0x41, 0x82, 0x22, 0x47, 0x03, 0x0d, 0x09, 0x01, 0x19, 0x0a, 0x34, 0xf0, 0x3f, 0x36,
- 0x0c, 0x91, 0x73, 0x08, 0x27, 0xcb, 0xf0, 0x03, 0x6a, 0x4e, 0x9e, 0x40, 0x43, 0x7e, 0x61, 0x33,
- 0xf8, 0x4a, 0x79, 0x07, 0x18, 0x43, 0xf9, 0xff, 0xf6, 0xa9, 0x3a, 0x06, 0x93, 0x14, 0x44, 0x20,
- 0xaf, 0xe3, 0x73, 0xf9, 0x97, 0x4f, 0x9f, 0xc0, 0x18, 0xc6, 0xdf, 0xa5, 0xe9, 0xf4, 0x7f, 0xa7,
- 0xb2, 0x9b, 0x18, 0xd1, 0x16, 0x00, 0x0d, 0x6f, 0xc5, 0x65, 0x38, 0x08, 0x7f, 0xfd, 0xfa, 0x15,
- 0x8c, 0x51, 0xc4, 0xd5, 0x9d, 0x5a, 0x48, 0xb1, 0xe0, 0x22, 0xb2, 0xe6, 0xe3, 0xae, 0x31, 0xff,
- 0x2f, 0xa4, 0x55, 0xe2, 0xb5, 0x00, 0xa4, 0x87, 0xf8, 0x20, 0x52, 0x73, 0xfc, 0x06, 0xd3, 0x78,
- 0xca, 0x3f, 0xf5, 0xff, 0xa7, 0x17, 0x2f, 0xc1, 0x06, 0x1e, 0x77, 0x89, 0xc1, 0x6d, 0x81, 0xba,
- 0xe3, 0x57, 0xe2, 0x53, 0x0f, 0xd4, 0x02, 0x64, 0xc3, 0x1f, 0x6f, 0xdc, 0xf9, 0x7f, 0xbf, 0x86,
- 0x13, 0xb5, 0x2c, 0x70, 0xba, 0x74, 0xcc, 0x29, 0xf2, 0xff, 0xd7, 0x2f, 0x5f, 0xe0, 0x86, 0x61,
- 0xc3, 0x64, 0x07, 0x11, 0x28, 0x92, 0x09, 0x59, 0xf0, 0xe2, 0xc8, 0x29, 0xcc, 0x48, 0x26, 0xb6,
- 0xc2, 0x01, 0x25, 0x53, 0xa0, 0xa6, 0x4f, 0xb8, 0x82, 0x08, 0x1d, 0xef, 0x04, 0x8a, 0xc7, 0x06,
- 0x04, 0x93, 0x56, 0xa3, 0xed, 0x53, 0x73, 0xf4, 0x02, 0x6a, 0xfe, 0x8d, 0x2d, 0x92, 0x91, 0x31,
- 0x50, 0xdd, 0xff, 0x72, 0x57, 0x5f, 0xf2, 0x2a, 0xfd, 0x0a, 0x57, 0x3f, 0xb0, 0xeb, 0xd0, 0x93,
- 0x29, 0x72, 0x06, 0xab, 0x74, 0xf1, 0xa5, 0xac, 0x4e, 0x06, 0x05, 0x17, 0xd0, 0x95, 0x6d, 0xa0,
- 0x88, 0x87, 0x16, 0x1d, 0x3f, 0x80, 0xec, 0x73, 0xa0, 0xc2, 0x2e, 0x2e, 0x20, 0x08, 0xc5, 0x3c,
- 0x00, 0x59, 0xcc, 0x4f, 0x28, 0x7b, 0xab, 0x1b, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
- 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x4d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
+ 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
+ 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
+ 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
+ 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
+ 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0xae, 0x94, 0x77,
+ 0xfc, 0x07, 0x61, 0x5c, 0x96, 0x00, 0xf1, 0xbf, 0x7d, 0xaa, 0x8e, 0xc1, 0x24, 0x05, 0x11, 0xc8,
+ 0xeb, 0x30, 0x97, 0x7f, 0xf9, 0xf4, 0x09, 0x8c, 0xf1, 0x58, 0x00, 0xf6, 0xc9, 0x4e, 0x65, 0x37,
+ 0x31, 0xa2, 0x2d, 0x00, 0x6a, 0x68, 0x85, 0x69, 0xfe, 0xfa, 0xf5, 0x2b, 0x18, 0xe3, 0xb3, 0x00,
+ 0x8c, 0xd5, 0x9d, 0x5a, 0x48, 0xb1, 0xe0, 0x22, 0x2e, 0x0b, 0x2e, 0xa4, 0x55, 0xfe, 0x3f, 0xee,
+ 0x1a, 0x83, 0xcd, 0x17, 0x17, 0x89, 0x8f, 0x5c, 0x35, 0xc7, 0x6f, 0xd8, 0x2c, 0x38, 0xee, 0x12,
+ 0x03, 0x66, 0x7f, 0x7a, 0xf1, 0xf2, 0xff, 0x29, 0xff, 0x54, 0x54, 0x0b, 0xd4, 0x1d, 0xbf, 0x52,
+ 0x6c, 0xc1, 0x7e, 0x0d, 0xa7, 0xff, 0x8f, 0x37, 0xee, 0xc4, 0x6a, 0x09, 0x8a, 0x05, 0x04, 0x23,
+ 0x19, 0x98, 0xe6, 0xd1, 0x2d, 0xc0, 0x8a, 0xbf, 0x7c, 0xf9, 0x7f, 0xcc, 0x39, 0x0a, 0x35, 0x88,
+ 0x88, 0x29, 0xae, 0x91, 0x23, 0xf9, 0xc5, 0x91, 0x53, 0x44, 0x59, 0x00, 0x8f, 0x64, 0x62, 0x2c,
+ 0x00, 0x25, 0x53, 0xa0, 0xa6, 0x4f, 0x18, 0x29, 0x05, 0x47, 0x10, 0xed, 0x04, 0x8a, 0xc3, 0x93,
+ 0x29, 0xb1, 0x55, 0xe6, 0x3e, 0x35, 0x47, 0x2f, 0xa0, 0xe6, 0xdf, 0xc8, 0x16, 0x60, 0x8b, 0x64,
+ 0xa0, 0xba, 0xff, 0xe5, 0xae, 0xbe, 0xe4, 0xd5, 0x68, 0x07, 0xd4, 0x9d, 0x42, 0xd1, 0x7d, 0x82,
+ 0x9c, 0x4c, 0x77, 0x69, 0x3a, 0xfd, 0xaf, 0x74, 0xf1, 0xfd, 0x4f, 0x59, 0x79, 0x04, 0x0c, 0x2e,
+ 0xa0, 0x2b, 0xdb, 0xa0, 0x11, 0xff, 0x0b, 0x88, 0x7f, 0x00, 0xd9, 0xe7, 0x60, 0x85, 0x1d, 0xb2,
+ 0x5a, 0x00, 0x15, 0x9f, 0x31, 0x4c, 0x93, 0xc5, 0x50, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_enter_xpm[1] = {{ png, sizeof( png ), "group_enter_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_leave.cpp b/bitmaps_png/cpp_24/group_leave.cpp
index 2de61dc7e1..13b6d9ae1a 100644
--- a/bitmaps_png/cpp_24/group_leave.cpp
+++ b/bitmaps_png/cpp_24/group_leave.cpp
@@ -8,31 +8,30 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x6f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
- 0x8f, 0x8c, 0x19, 0x28, 0x04, 0x18, 0xe6, 0xa1, 0x0b, 0xe0, 0xb2, 0x90, 0x58, 0x71, 0x82, 0x16,
- 0xd0, 0xdc, 0x07, 0x54, 0xb7, 0x00, 0x26, 0xc8, 0x40, 0x65, 0x40, 0x0b, 0x33, 0x07, 0x10, 0xd0,
- 0x3c, 0x88, 0x46, 0x9e, 0x05, 0x7b, 0x14, 0x9d, 0xc5, 0xf7, 0xab, 0x3b, 0x34, 0xef, 0x57, 0x73,
- 0xba, 0x74, 0x40, 0xcd, 0xf1, 0x23, 0x10, 0xbf, 0xdc, 0xaf, 0xe6, 0x78, 0x1a, 0x28, 0x56, 0xbe,
- 0x5f, 0xdb, 0x41, 0x82, 0x22, 0x47, 0x03, 0x0d, 0x09, 0x01, 0x19, 0x0a, 0x34, 0xf0, 0x3f, 0x36,
- 0x0c, 0x91, 0x73, 0x08, 0x27, 0xcb, 0xf0, 0x03, 0x6a, 0x4e, 0x9e, 0x40, 0x43, 0x7e, 0xed, 0xd7,
- 0x70, 0xfa, 0xff, 0x6c, 0xef, 0x11, 0x30, 0x06, 0xb1, 0xb1, 0x58, 0xf4, 0x6f, 0x9f, 0xaa, 0x63,
- 0x30, 0x49, 0x41, 0x04, 0xf2, 0x3a, 0xd8, 0x75, 0x40, 0x03, 0x1f, 0x2e, 0xdf, 0xf8, 0xff, 0xeb,
- 0xd7, 0xaf, 0x60, 0x0c, 0x62, 0x63, 0xb3, 0x64, 0x97, 0xa6, 0xd3, 0xff, 0x9d, 0xca, 0x6e, 0x62,
- 0x44, 0x5b, 0x00, 0x34, 0xbc, 0x15, 0xdd, 0x70, 0x42, 0x96, 0xec, 0x57, 0x77, 0x6a, 0x21, 0xc5,
- 0x82, 0x8b, 0x97, 0x72, 0xeb, 0xc1, 0x06, 0x7e, 0x7a, 0xfd, 0x06, 0x6e, 0x38, 0x8c, 0x0d, 0x92,
- 0xc3, 0x12, 0x1f, 0x17, 0x89, 0x0f, 0x22, 0x35, 0xc7, 0x6f, 0x47, 0xed, 0xc2, 0xfe, 0x3f, 0x5a,
- 0xb3, 0xf5, 0xff, 0x99, 0xd0, 0x2c, 0xb8, 0x05, 0x20, 0x36, 0x48, 0x0c, 0x24, 0x87, 0x61, 0x81,
- 0xba, 0xe3, 0x57, 0xe2, 0x53, 0x0f, 0xd0, 0x02, 0x64, 0xcd, 0x30, 0x0b, 0x70, 0xa5, 0x26, 0x32,
- 0x2c, 0x70, 0xba, 0x84, 0xcd, 0x82, 0x1b, 0x6d, 0x53, 0x51, 0xf0, 0xf5, 0xd6, 0xc9, 0x70, 0xdf,
- 0x90, 0x14, 0x44, 0xe0, 0x48, 0x46, 0xb2, 0xe0, 0xf3, 0xbb, 0xf7, 0x18, 0x91, 0x0d, 0xc3, 0x77,
- 0x67, 0x2c, 0x41, 0x44, 0x32, 0xb1, 0x15, 0x0e, 0x28, 0x99, 0x02, 0x35, 0x7d, 0x82, 0x59, 0x70,
- 0x3e, 0xa9, 0xf4, 0xff, 0x9d, 0xa9, 0x0b, 0x31, 0xf0, 0xad, 0xbe, 0xd9, 0x60, 0x1f, 0xec, 0x04,
- 0xa6, 0xaa, 0xd8, 0x80, 0x60, 0xd2, 0x6a, 0xb4, 0x7d, 0x6a, 0x8e, 0x5e, 0x40, 0xc3, 0x7f, 0xe3,
- 0x0b, 0x77, 0x10, 0x06, 0xaa, 0xfb, 0x5f, 0xee, 0xea, 0x4b, 0x5e, 0xa5, 0x5f, 0xe1, 0xea, 0x07,
- 0x76, 0x1d, 0x2e, 0xc3, 0x41, 0x19, 0xac, 0xd2, 0xc5, 0x97, 0xb2, 0x3a, 0x19, 0x14, 0x5c, 0x40,
- 0x57, 0xb6, 0x41, 0x23, 0xfe, 0x17, 0x10, 0xff, 0x00, 0xb2, 0xcf, 0x81, 0x0a, 0xbb, 0xb8, 0x80,
- 0x20, 0x14, 0xf3, 0x00, 0x9e, 0xd7, 0x4f, 0x84, 0x17, 0x78, 0x54, 0xb2, 0x00, 0x00, 0x00, 0x00,
- 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x65, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
+ 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
+ 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
+ 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
+ 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
+ 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0x40, 0x06, 0x1d,
+ 0x73, 0x8c, 0x00, 0x63, 0x1c, 0x16, 0xfd, 0xdb, 0xa7, 0xea, 0x18, 0x4c, 0x52, 0x10, 0x81, 0xbc,
+ 0x0e, 0x73, 0xf9, 0x29, 0xff, 0xd4, 0xff, 0x5f, 0xbf, 0x7c, 0x01, 0x63, 0x10, 0x1b, 0x97, 0x4f,
+ 0x76, 0x2a, 0xbb, 0x89, 0x11, 0x6d, 0x01, 0x50, 0x43, 0x2b, 0xcc, 0xf0, 0x4f, 0x2f, 0x5e, 0xfe,
+ 0xff, 0xfa, 0xf5, 0x2b, 0x18, 0x83, 0xd8, 0xb8, 0x2c, 0xd9, 0xaf, 0xee, 0xd4, 0x42, 0x8a, 0x05,
+ 0x17, 0x8f, 0xbb, 0xc6, 0xa0, 0x18, 0x8e, 0x6c, 0x09, 0x48, 0x0e, 0x8b, 0x2f, 0x2e, 0x12, 0x1f,
+ 0xb9, 0x6a, 0x8e, 0xdf, 0x2e, 0xa4, 0x57, 0x81, 0x0d, 0x7c, 0xbc, 0x71, 0x27, 0xdc, 0x70, 0x18,
+ 0x1b, 0x24, 0x87, 0x61, 0x81, 0xba, 0xe3, 0x57, 0x92, 0x2c, 0x00, 0x69, 0x3a, 0xee, 0x02, 0x74,
+ 0xa9, 0x86, 0x13, 0xdc, 0x02, 0x10, 0x1b, 0x2c, 0x86, 0x2d, 0x1e, 0x90, 0x2d, 0x20, 0x18, 0xc9,
+ 0xc0, 0x34, 0x8f, 0xac, 0x19, 0x6e, 0x01, 0x8e, 0xe4, 0x8a, 0x12, 0x44, 0xc4, 0x14, 0xd7, 0xb0,
+ 0x48, 0x86, 0x5b, 0x00, 0x4a, 0x45, 0x68, 0x71, 0x01, 0xc2, 0x5f, 0x3e, 0x7d, 0xfa, 0x7f, 0xa5,
+ 0xac, 0x1d, 0x35, 0x92, 0x89, 0xb1, 0x00, 0x94, 0x4c, 0x81, 0x9a, 0x3e, 0xc1, 0x2c, 0x78, 0x71,
+ 0xe4, 0x14, 0x5e, 0x0b, 0x76, 0x02, 0x83, 0x0e, 0x9e, 0x4c, 0x89, 0xad, 0x32, 0xf7, 0xa9, 0x39,
+ 0x7a, 0x01, 0x0d, 0xff, 0x8d, 0x2f, 0x58, 0x40, 0x18, 0xa8, 0xee, 0x7f, 0xb9, 0xab, 0x2f, 0x79,
+ 0x35, 0xda, 0x01, 0x75, 0xa7, 0x50, 0x64, 0x9f, 0xa0, 0xe3, 0x5d, 0x9a, 0x4e, 0xff, 0x2b, 0x5d,
+ 0x7c, 0xff, 0x53, 0x56, 0x1e, 0x01, 0x83, 0x0b, 0xe8, 0xca, 0x36, 0x68, 0xc4, 0x83, 0x8a, 0x8e,
+ 0x1f, 0x40, 0xf6, 0x39, 0x58, 0x61, 0x87, 0xac, 0x16, 0x00, 0x06, 0x6f, 0x31, 0x42, 0xb8, 0x93,
+ 0x4c, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_leave_xpm[1] = {{ png, sizeof( png ), "group_leave_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_remove.cpp b/bitmaps_png/cpp_24/group_remove.cpp
index 5b3af25e29..860c9c1f53 100644
--- a/bitmaps_png/cpp_24/group_remove.cpp
+++ b/bitmaps_png/cpp_24/group_remove.cpp
@@ -8,25 +8,25 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x13, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
- 0x8f, 0x8c, 0x19, 0x28, 0x04, 0x18, 0xe6, 0xa1, 0x0b, 0xe0, 0xb2, 0x90, 0x58, 0x71, 0x82, 0x16,
- 0xd0, 0xdc, 0x07, 0x54, 0xb7, 0x00, 0x26, 0xc8, 0x40, 0x65, 0x40, 0x0b, 0x33, 0x07, 0x10, 0xd0,
- 0x3c, 0x88, 0x46, 0x9e, 0x05, 0x7b, 0x14, 0x9d, 0xc5, 0xf7, 0xab, 0x3b, 0x34, 0xef, 0x57, 0x73,
- 0xba, 0x74, 0x40, 0xcd, 0xf1, 0x23, 0x10, 0xbf, 0xdc, 0xaf, 0xe6, 0x78, 0x1a, 0x28, 0x56, 0xbe,
- 0x5f, 0xdb, 0x41, 0x82, 0x22, 0x47, 0x03, 0x0d, 0x09, 0x01, 0x19, 0x0a, 0x34, 0xf0, 0x3f, 0x36,
- 0x0c, 0x91, 0x73, 0x08, 0x27, 0xcb, 0xf0, 0x03, 0x6a, 0x4e, 0x9e, 0x40, 0x43, 0x7e, 0xe1, 0x32,
- 0x1c, 0x09, 0xff, 0xdb, 0xa7, 0xea, 0x18, 0x4c, 0x52, 0x10, 0x81, 0xbc, 0x8e, 0xcf, 0xe5, 0xe8,
- 0x78, 0x97, 0xa6, 0xd3, 0xff, 0x9d, 0xca, 0x6e, 0x62, 0x44, 0x5b, 0x00, 0x34, 0xbc, 0x95, 0x58,
- 0xc3, 0xe1, 0x58, 0xdd, 0xa9, 0x85, 0x14, 0x0b, 0x2e, 0x92, 0x6a, 0x01, 0x48, 0x0f, 0xf1, 0x41,
- 0xa4, 0xe6, 0xf8, 0x0d, 0xa4, 0xe9, 0x7c, 0x52, 0xe9, 0xff, 0xcf, 0x1f, 0x3e, 0xfe, 0xff, 0xfa,
- 0xf5, 0x2b, 0x56, 0x0c, 0x92, 0x03, 0xa9, 0x01, 0x5b, 0xa0, 0xee, 0xf8, 0x95, 0xf8, 0xd4, 0x43,
- 0x7b, 0x0b, 0x9c, 0x2e, 0xd1, 0x34, 0x88, 0xc8, 0x8e, 0x64, 0x62, 0x2b, 0x1c, 0x50, 0x32, 0x05,
- 0x6a, 0xfa, 0x44, 0xac, 0xe1, 0x3b, 0x35, 0x9c, 0xfe, 0xc7, 0x06, 0x04, 0x93, 0x56, 0xa3, 0xed,
- 0x53, 0x73, 0xf4, 0x02, 0x6a, 0xfe, 0x4d, 0xc8, 0x70, 0xa0, 0xba, 0xff, 0xe5, 0xae, 0xbe, 0xe4,
- 0x55, 0xfa, 0x15, 0xae, 0x7e, 0x60, 0xd7, 0xe1, 0xcb, 0x60, 0x95, 0x2e, 0xbe, 0x94, 0xd5, 0xc9,
- 0xa0, 0xe0, 0x02, 0xba, 0xb2, 0x0d, 0x1a, 0xf1, 0xa0, 0xa2, 0xe3, 0x07, 0x90, 0x7d, 0x0e, 0x54,
- 0xd8, 0xc5, 0x05, 0x04, 0xa1, 0x98, 0x07, 0x00, 0xab, 0x5c, 0x2b, 0x49, 0x08, 0x1b, 0xfa, 0xe8,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x11, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
+ 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
+ 0x44, 0x83, 0xca, 0x82, 0x3d, 0x8a, 0xce, 0xe2, 0xfb, 0xd5, 0x1d, 0x9a, 0xf7, 0xab, 0x39, 0x5d,
+ 0x3a, 0xa0, 0xe6, 0xf8, 0x11, 0x88, 0x5f, 0xee, 0x57, 0x73, 0x3c, 0x0d, 0x14, 0x2b, 0xdf, 0xaf,
+ 0xed, 0x20, 0x41, 0x91, 0x63, 0x81, 0x86, 0x84, 0x80, 0x0c, 0x05, 0x1a, 0xf8, 0x1f, 0x1b, 0x86,
+ 0xc8, 0x39, 0x84, 0x93, 0x65, 0xf8, 0x01, 0x35, 0x27, 0x4f, 0xa0, 0x21, 0xbf, 0x70, 0x19, 0x8e,
+ 0x84, 0xff, 0xed, 0x53, 0x75, 0x0c, 0x26, 0x29, 0x88, 0x40, 0x5e, 0xc7, 0xe7, 0x72, 0x6c, 0x3e,
+ 0xd9, 0xa9, 0xec, 0x26, 0x46, 0xb4, 0x05, 0x40, 0x0d, 0xad, 0xc4, 0x1a, 0x0e, 0xc7, 0xea, 0x4e,
+ 0x2d, 0xa4, 0x58, 0x70, 0x91, 0x54, 0x0b, 0x40, 0x7a, 0x88, 0x8f, 0x5c, 0x35, 0xc7, 0x6f, 0x20,
+ 0x4d, 0xe7, 0x93, 0x4a, 0xff, 0x7f, 0xfe, 0xf0, 0xf1, 0xff, 0xd7, 0xaf, 0x5f, 0xb1, 0x62, 0x90,
+ 0x1c, 0x48, 0x0d, 0xd8, 0x02, 0x75, 0xc7, 0xaf, 0xf4, 0xb3, 0x80, 0x60, 0x24, 0x03, 0xd3, 0x3c,
+ 0xd9, 0x41, 0x44, 0x4c, 0x71, 0x4d, 0x51, 0x24, 0x13, 0x63, 0x01, 0x28, 0x99, 0x02, 0x35, 0x7d,
+ 0x22, 0xd6, 0xf0, 0x9d, 0x1a, 0x4e, 0xff, 0xe1, 0xc9, 0x94, 0xd8, 0x2a, 0x73, 0x9f, 0x9a, 0xa3,
+ 0x17, 0x50, 0xf3, 0x6f, 0x42, 0x86, 0x03, 0xd5, 0xfd, 0x2f, 0x77, 0xf5, 0x25, 0xaf, 0x46, 0x3b,
+ 0xa0, 0xee, 0x14, 0x8a, 0xcf, 0x27, 0xbb, 0x34, 0x9d, 0xfe, 0x57, 0xba, 0xf8, 0xfe, 0xa7, 0xac,
+ 0x3c, 0x02, 0x06, 0x17, 0xd0, 0x95, 0x6d, 0xd0, 0x88, 0x07, 0x15, 0x1d, 0x3f, 0x80, 0xec, 0x73,
+ 0xb0, 0xc2, 0x0e, 0x59, 0x2d, 0x00, 0x95, 0x43, 0x0d, 0x69, 0x48, 0x9b, 0xb2, 0x3d, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE group_remove_xpm[1] = {{ png, sizeof( png ), "group_remove_xpm" }};
diff --git a/bitmaps_png/cpp_24/group_ungroup.cpp b/bitmaps_png/cpp_24/group_ungroup.cpp
index c3057a7ea3..e9a916e69e 100644
--- a/bitmaps_png/cpp_24/group_ungroup.cpp
+++ b/bitmaps_png/cpp_24/group_ungroup.cpp
@@ -8,28 +8,30 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x42, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x08, 0x09, 0x09, 0xf9,
- 0x8f, 0x8c, 0x19, 0x28, 0x04, 0x18, 0xe6, 0xa1, 0x0b, 0xe0, 0xb2, 0x90, 0x58, 0x71, 0x82, 0x16,
- 0xd0, 0xdc, 0x07, 0x54, 0xb7, 0x00, 0x26, 0xc8, 0x40, 0x65, 0x40, 0x0b, 0x33, 0x07, 0x10, 0xd0,
- 0x3c, 0x88, 0x46, 0x2d, 0xa0, 0x49, 0xb0, 0xef, 0x51, 0x74, 0x16, 0xdf, 0xaf, 0xee, 0xd0, 0xbc,
- 0x5f, 0xcd, 0xe9, 0xd2, 0x01, 0x35, 0xc7, 0x8f, 0x40, 0xfc, 0x72, 0xbf, 0x9a, 0xe3, 0x69, 0xa0,
- 0x58, 0xf9, 0x7e, 0x6d, 0x07, 0x09, 0x8a, 0x0c, 0x07, 0x1a, 0x12, 0x02, 0x32, 0x14, 0x68, 0xe0,
- 0x7f, 0x6c, 0x18, 0x22, 0xe7, 0x10, 0x4e, 0x96, 0x77, 0x0e, 0xa8, 0x39, 0x79, 0x02, 0x0d, 0xf9,
- 0x85, 0xcb, 0x70, 0x18, 0xde, 0x07, 0xc2, 0xaa, 0x8e, 0xc1, 0x24, 0x59, 0x00, 0xf2, 0x3a, 0xcc,
- 0xe5, 0x87, 0x0c, 0xbd, 0xfe, 0x5f, 0xab, 0xed, 0xfd, 0x7f, 0xd8, 0xcc, 0x1f, 0x6e, 0x28, 0x88,
- 0x0d, 0x12, 0x03, 0xc9, 0xc1, 0x7c, 0x42, 0x92, 0x05, 0x40, 0x0d, 0xad, 0x30, 0xc3, 0x40, 0x06,
- 0x7d, 0xfd, 0xfa, 0xf5, 0xff, 0x9b, 0x4b, 0xd7, 0xfe, 0x1f, 0xb1, 0x08, 0x00, 0x63, 0x10, 0x1b,
- 0x24, 0x06, 0x92, 0x83, 0xa9, 0x23, 0xd5, 0x82, 0x8b, 0x70, 0xd7, 0x9a, 0xfa, 0x01, 0x0d, 0xbc,
- 0x0e, 0x36, 0xf0, 0xed, 0xd5, 0x9b, 0x60, 0x0c, 0xb1, 0xf0, 0x3a, 0x58, 0x0e, 0xc5, 0x02, 0xa2,
- 0x23, 0x57, 0xcd, 0xf1, 0x3b, 0x72, 0x38, 0x1f, 0x36, 0x07, 0xba, 0xfa, 0xca, 0x0d, 0xb0, 0xc1,
- 0x20, 0xfc, 0xee, 0xc6, 0x9d, 0xff, 0x47, 0xac, 0x82, 0x51, 0xe2, 0x82, 0x54, 0x0b, 0xbe, 0xa1,
- 0x5b, 0xf0, 0xf6, 0xca, 0x75, 0xc2, 0x16, 0x10, 0x1d, 0xc9, 0xc0, 0x34, 0x8f, 0x1a, 0x44, 0xd7,
- 0xb0, 0x04, 0xd1, 0x35, 0xd4, 0x20, 0x22, 0xa5, 0xc2, 0x21, 0x2b, 0x92, 0x49, 0xb1, 0x00, 0x94,
- 0x4c, 0x81, 0x9a, 0x3e, 0xc1, 0x93, 0x69, 0x1d, 0x96, 0x64, 0x5a, 0x87, 0x48, 0xa6, 0x3b, 0x35,
- 0x9c, 0x48, 0xaf, 0xf4, 0x8b, 0xdd, 0xfd, 0xff, 0xef, 0x25, 0x90, 0xc9, 0x60, 0x19, 0xad, 0xdc,
- 0xd5, 0x97, 0xbc, 0x3a, 0xf9, 0x80, 0xba, 0x53, 0x28, 0xcc, 0x27, 0xd8, 0xf0, 0x2e, 0x4d, 0xa7,
- 0xff, 0x95, 0x2e, 0xbe, 0x60, 0xf3, 0x00, 0xe7, 0x8e, 0x1a, 0xc4, 0xa9, 0x90, 0x5f, 0xdb, 0x00,
- 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xf8, 0x00, 0x00, 0x01, 0x58, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x07, 0x08,
+ 0x09, 0x09, 0xf9, 0x8f, 0x8c, 0xa9, 0x6e, 0x0e, 0xba, 0x04, 0xb2, 0x24, 0x39, 0x62, 0x04, 0x2d,
+ 0xa0, 0xb9, 0x0f, 0x68, 0x12, 0xd4, 0x94, 0x18, 0x8c, 0xcd, 0x22, 0x86, 0xe1, 0x07, 0x68, 0x1e,
+ 0x44, 0x83, 0xca, 0x82, 0xfd, 0xda, 0x0e, 0x12, 0xfb, 0xd5, 0x9d, 0x5a, 0xf6, 0xab, 0x3a, 0x5e,
+ 0xde, 0xaf, 0xe6, 0xf8, 0x09, 0x88, 0x5f, 0x03, 0xf1, 0x99, 0xfd, 0x6a, 0x4e, 0x15, 0x87, 0x34,
+ 0x6d, 0x25, 0x29, 0x72, 0xec, 0x01, 0x75, 0xa7, 0x50, 0xa8, 0xa1, 0xff, 0xb1, 0xe1, 0x03, 0x6a,
+ 0x8e, 0x1f, 0xf7, 0xab, 0x39, 0x44, 0x90, 0x65, 0xf8, 0x3e, 0x35, 0x47, 0x2f, 0xa0, 0x21, 0xbf,
+ 0x71, 0x19, 0x8e, 0x84, 0xff, 0xed, 0x53, 0x75, 0x0c, 0x26, 0x29, 0x88, 0x40, 0x5e, 0x87, 0xb8,
+ 0xce, 0xf1, 0xff, 0x21, 0x43, 0xaf, 0xff, 0xd7, 0xea, 0x7a, 0xff, 0x1f, 0x36, 0xf3, 0x87, 0x1b,
+ 0x0a, 0x62, 0x83, 0xc4, 0x40, 0x72, 0x50, 0xb1, 0x4f, 0x3b, 0x95, 0xdd, 0xc4, 0x88, 0xb6, 0x00,
+ 0xe8, 0xfa, 0x36, 0x98, 0x61, 0xd7, 0x6a, 0x7b, 0xff, 0x7f, 0xfd, 0xfa, 0xf5, 0xff, 0x9b, 0x4b,
+ 0xd7, 0xfe, 0x1f, 0xb1, 0x08, 0x00, 0x63, 0x10, 0x1b, 0x24, 0x06, 0x92, 0x83, 0xfb, 0x04, 0x18,
+ 0x4f, 0x44, 0x5b, 0x00, 0x8c, 0xc0, 0x4b, 0x70, 0xd7, 0x9a, 0xfa, 0xc1, 0x0d, 0x7c, 0x7b, 0xf5,
+ 0x26, 0x18, 0xc3, 0x2c, 0x04, 0xc9, 0x21, 0xc5, 0xc7, 0x45, 0xa2, 0xc3, 0x1f, 0xa8, 0xe1, 0x1b,
+ 0x72, 0x38, 0x1f, 0x36, 0x07, 0xba, 0xfa, 0xca, 0x0d, 0xb0, 0xc1, 0x20, 0xfc, 0xee, 0xc6, 0x9d,
+ 0xff, 0x47, 0x2c, 0x83, 0x50, 0x23, 0x5c, 0xdd, 0xf1, 0x2b, 0x45, 0x16, 0xbc, 0xbd, 0x72, 0x1d,
+ 0xd5, 0x02, 0xab, 0x60, 0xdc, 0x16, 0x10, 0x0a, 0x22, 0x90, 0x77, 0xc9, 0x0e, 0x22, 0x62, 0x8a,
+ 0x6b, 0xa0, 0xe2, 0x56, 0xb2, 0x23, 0x99, 0x18, 0x0b, 0x40, 0xb9, 0x97, 0x94, 0x64, 0xba, 0x4b,
+ 0xd3, 0xe9, 0x3f, 0x3c, 0x99, 0x12, 0x5b, 0x65, 0x42, 0x33, 0xda, 0x2f, 0x42, 0x19, 0x0d, 0xa8,
+ 0xee, 0x7f, 0xb9, 0xab, 0x2f, 0x79, 0x35, 0xda, 0x7e, 0x75, 0x87, 0x10, 0x98, 0x4f, 0xb0, 0x61,
+ 0x90, 0xcb, 0x2b, 0x5d, 0x7c, 0x29, 0xaa, 0x19, 0x61, 0xc1, 0xd5, 0x0a, 0x8d, 0x78, 0x90, 0x8f,
+ 0x7e, 0x00, 0xf3, 0xc9, 0x39, 0xa0, 0xe5, 0xe5, 0x20, 0x39, 0x64, 0xb5, 0x00, 0xbd, 0x1f, 0x24,
+ 0x4c, 0xed, 0x0f, 0x42, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+ 0x82,
 };
 
 const BITMAP_OPAQUE group_ungroup_xpm[1] = {{ png, sizeof( png ), "group_ungroup_xpm" }};
diff --git a/bitmaps_png/cpp_24/footprint_browser.cpp b/bitmaps_png/cpp_24/icon_footprint_browser.cpp
similarity index 98%
rename from bitmaps_png/cpp_24/footprint_browser.cpp
rename to bitmaps_png/cpp_24/icon_footprint_browser.cpp
index a9a23f3192..0d34d750e6 100644
--- a/bitmaps_png/cpp_24/footprint_browser.cpp
+++ b/bitmaps_png/cpp_24/icon_footprint_browser.cpp
@@ -63,6 +63,6 @@ static const unsigned char png[] = {
  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE footprint_browser_xpm[1] = {{ png, sizeof( png ), "footprint_browser_xpm" }};
+const BITMAP_OPAQUE icon_footprint_browser_xpm[1] = {{ png, sizeof( png ), "icon_footprint_browser_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/cpp_24/hammer.cpp b/bitmaps_png/cpp_24/puzzle_piece.cpp
similarity index 96%
rename from bitmaps_png/cpp_24/hammer.cpp
rename to bitmaps_png/cpp_24/puzzle_piece.cpp
index d676e0b535..963bfa6fff 100644
--- a/bitmaps_png/cpp_24/hammer.cpp
+++ b/bitmaps_png/cpp_24/puzzle_piece.cpp
@@ -33,6 +33,6 @@ static const unsigned char png[] = {
  0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE hammer_xpm[1] = {{ png, sizeof( png ), "hammer_xpm" }};
+const BITMAP_OPAQUE puzzle_piece_xpm[1] = {{ png, sizeof( png ), "puzzle_piece_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 6e9146cf46..9da75d52d3 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -165,6 +165,7 @@ EXTERN_BITMAP( file_bom_xpm )
 EXTERN_BITMAP( file_drl_xpm )
 EXTERN_BITMAP( file_dsn_xpm )
 EXTERN_BITMAP( file_gbr_xpm )
+EXTERN_BITMAP( file_gerber_job_xpm )
 EXTERN_BITMAP( file_html_xpm )
 EXTERN_BITMAP( file_idf_xpm )
 EXTERN_BITMAP( file_pdf_xpm )
@@ -177,12 +178,9 @@ EXTERN_BITMAP( find_replace_xpm )
 EXTERN_BITMAP( flag_xpm )
 EXTERN_BITMAP( flip_board_xpm )
 EXTERN_BITMAP( fonts_xpm )
-EXTERN_BITMAP( footprint_browser_xpm )
 EXTERN_BITMAP( gbr_select_mode0_xpm )
 EXTERN_BITMAP( gbr_select_mode1_xpm )
 EXTERN_BITMAP( gbr_select_mode2_xpm )
-EXTERN_BITMAP( gerbview_drill_file_xpm )
-EXTERN_BITMAP( gerber_job_file_xpm )
 EXTERN_BITMAP( gerber_file_xpm )
 EXTERN_BITMAP( gerbview_clear_layers_xpm )
 EXTERN_BITMAP( gerbview_show_negative_objects_xpm )
@@ -190,7 +188,6 @@ EXTERN_BITMAP( general_deletions_xpm )
 EXTERN_BITMAP( general_ratsnest_xpm )
 EXTERN_BITMAP( go_down_xpm )
 EXTERN_BITMAP( go_up_xpm )
-EXTERN_BITMAP( green_xpm )
 EXTERN_BITMAP( grid_select_axis_xpm )
 EXTERN_BITMAP( grid_select_xpm )
 EXTERN_BITMAP( grid_xpm )
@@ -200,7 +197,6 @@ EXTERN_BITMAP( group_enter_xpm )
 EXTERN_BITMAP( group_leave_xpm )
 EXTERN_BITMAP( group_remove_xpm )
 EXTERN_BITMAP( group_ungroup_xpm )
-EXTERN_BITMAP( hammer_xpm )
 EXTERN_BITMAP( help_xpm )
 EXTERN_BITMAP( hidden_pin_xpm )
 EXTERN_BITMAP( hide_ratsnest_xpm )
@@ -211,6 +207,7 @@ EXTERN_BITMAP( hole_to_hole_clearance_xpm )
 EXTERN_BITMAP( icon_cvpcb_24_xpm )
 EXTERN_BITMAP( icon_cvpcb_xpm )
 EXTERN_BITMAP( icon_eeschema_xpm )
+EXTERN_BITMAP( icon_footprint_browser_xpm )
 EXTERN_BITMAP( icon_gerbview_xpm )
 EXTERN_BITMAP( icon_kicad_xpm )
 EXTERN_BITMAP( icon_modedit_xpm )
@@ -409,6 +406,7 @@ EXTERN_BITMAP( ps_diff_pair_tune_length_xpm )
 EXTERN_BITMAP( ps_diff_pair_tune_phase_xpm )
 EXTERN_BITMAP( ps_diff_pair_via_gap_xpm )
 EXTERN_BITMAP( ps_tune_length_xpm )
+EXTERN_BITMAP( puzzle_piece_xpm )
 EXTERN_BITMAP( py_script_xpm )
 EXTERN_BITMAP( question_mark_xpm )
 EXTERN_BITMAP( reannotate_right_down_xpm )
diff --git a/bitmaps_png/sources/gerber_job_file.svg b/bitmaps_png/sources/file_gerber_job.svg
similarity index 99%
rename from bitmaps_png/sources/gerber_job_file.svg
rename to bitmaps_png/sources/file_gerber_job.svg
index 5dcfe6b718..1f39bb9c41 100755
--- a/bitmaps_png/sources/gerber_job_file.svg
+++ b/bitmaps_png/sources/file_gerber_job.svg
@@ -11,7 +11,7 @@
    data-name="Слой 1"
    viewBox="0 0 24 24"
    version="1.1"
-   sodipodi:docname="gerber_job_file.svg"
+   sodipodi:docname="file_gerber_job.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/bitmaps_png/sources/flip_board.svg b/bitmaps_png/sources/flip_board.svg
index 29a172d36e..dd728d43d0 100755
--- a/bitmaps_png/sources/flip_board.svg
+++ b/bitmaps_png/sources/flip_board.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="flip_board.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="12.090945"
-     inkscape:cy="13.142499"
+     inkscape:zoom="25.147751"
+     inkscape:cx="11.959656"
+     inkscape:cy="10.740151"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -81,41 +81,26 @@
      id="title117341">flip_board</title>
   <path
      class="cls-1"
-     d="m 20.4356,21.5063 h -2.9833 a 0.5,0.5 0 0 1 0,-1 h 2.4861 v -2.5 a 0.4972,0.4972 0 1 1 0.9944,0 v 3 a 0.4983,0.4983 0 0 1 -0.4972,0.5 z"
-     id="path117343" />
+     d="M 6.4805,21.9972 H 3.4972 A 0.4983,0.4983 0 0 1 3,21.4972 v -3 a 0.4972,0.4972 0 1 1 0.9944,0 v 2.5 h 2.4861 a 0.5,0.5 0 0 1 0,1 z"
+     id="path117347"
+     style="fill:#545454;fill-opacity:1" />
   <path
      class="cls-1"
-     d="m 13.795,21.5063 h -3.6572 a 0.5,0.5 0 0 1 0,-1 h 3.6572 a 0.5,0.5 0 0 1 0,1 z"
-     id="path117345" />
+     d="M 3.4972,14.5011 A 0.4983,0.4983 0 0 1 3,14.0011 V 9.9972 a 0.4972,0.4972 0 1 1 0.9944,0 v 4.0039 a 0.4983,0.4983 0 0 1 -0.4972,0.5 z"
+     id="path117349"
+     style="fill:#545454;fill-opacity:1" />
   <path
      class="cls-1"
-     d="M 6.4805,21.5063 H 3.4972 A 0.4983,0.4983 0 0 1 3,21.0063 v -3 a 0.4972,0.4972 0 1 1 0.9944,0 v 2.5 h 2.4861 a 0.5,0.5 0 0 1 0,1 z"
-     id="path117347" />
+     d="M 3.4972,6 A 0.4984,0.4984 0 0 1 3,5.5 v -3 A 0.4983,0.4983 0 0 1 3.4972,2 h 2.9833 a 0.5,0.5 0 0 1 0,1 H 3.9944 V 5.5 A 0.4984,0.4984 0 0 1 3.4972,6 Z"
+     id="path117351"
+     style="fill:#545454;fill-opacity:1" />
   <path
-     class="cls-1"
-     d="M 3.4972,14.5024 A 0.4983,0.4983 0 0 1 3,14.0024 V 9.9985 a 0.4972,0.4972 0 1 1 0.9944,0 v 4.0039 a 0.4983,0.4983 0 0 1 -0.4972,0.5 z"
-     id="path117349" />
-  <path
-     class="cls-1"
-     d="M 3.4972,6.4946 A 0.4984,0.4984 0 0 1 3,5.9946 v -3 a 0.4983,0.4983 0 0 1 0.4972,-0.5 h 2.9833 a 0.5,0.5 0 0 1 0,1 H 3.9944 v 2.5 a 0.4984,0.4984 0 0 1 -0.4972,0.5 z"
-     id="path117351" />
-  <path
-     class="cls-1"
-     d="m 13.795,3.4946 h -3.6572 a 0.5,0.5 0 0 1 0,-1 h 3.6572 a 0.5,0.5 0 0 1 0,1 z"
-     id="path117353" />
-  <path
-     class="cls-1"
-     d="m 20.4356,6.4946 a 0.4984,0.4984 0 0 1 -0.4972,-0.5 v -2.5 h -2.4861 a 0.5,0.5 0 0 1 0,-1 h 2.9833 a 0.4983,0.4983 0 0 1 0.4972,0.5 v 3 a 0.4984,0.4984 0 0 1 -0.4972,0.5 z"
-     id="path117355" />
-  <path
-     class="cls-1"
-     d="m 20.4356,14.5024 a 0.4983,0.4983 0 0 1 -0.4972,-0.5 V 9.9985 a 0.4972,0.4972 0 1 1 0.9944,0 v 4.0039 a 0.4983,0.4983 0 0 1 -0.4972,0.5 z"
-     id="path117357" />
-  <polygon
-     class="cls-2"
-     points="8.989,25 8.992,1 22,3.49 22,22.522 "
      id="polygon117359"
-     transform="translate(-1,-1)" />
+     transform="translate(-1,-1)"
+     style="fill:#1a81c4"
+     d="M 9,24 V 2 l 13,3 v 17 z"
+     class="cls-2"
+     sodipodi:nodetypes="ccccc" />
   <polygon
      class="cls-3"
      points="16.048,16.826 10.738,18.872 10.62,15.757 "
diff --git a/bitmaps_png/sources/gerbview_drill_file.svg b/bitmaps_png/sources/gerbview_drill_file.svg
deleted file mode 100755
index 26b89909f5..0000000000
--- a/bitmaps_png/sources/gerbview_drill_file.svg
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Слой_1"
-   data-name="Слой 1"
-   viewBox="0 0 24 24"
-   version="1.1"
-   sodipodi:docname="gerbview_drill_file.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
-     id="namedview30"
-     showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="37"
-     inkscape:window-maximized="0"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="Слой_1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid_kicad"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata43">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25063">
-    <style
-       id="style25061">.cls-1{fill:#b9b9b9;}.cls-2{fill:#1a81c4;}.cls-3{fill:#fff;}</style>
-  </defs>
-  <title
-     id="title25065">gerbview_drill_file</title>
-  <rect
-     class="cls-1"
-     x="2.0637"
-     y="1.0043001"
-     width="21.935101"
-     height="21.9914"
-     rx="3.6605"
-     id="rect25067" />
-  <rect
-     class="cls-2"
-     x="0.0011999607"
-     y="5.5005999"
-     width="18.7099"
-     height="9.2299004"
-     id="rect25069" />
-  <path
-     class="cls-3"
-     d="M 3.1963,13.4375 H 2.123 v -1.0361 h 1.0733 z"
-     id="path25071" />
-  <path
-     class="cls-3"
-     d="M 4.3486,11.0986 A 3.1764,3.1764 0 0 1 4.8408,9.2432 1.591,1.591 0 0 1 6.2246,8.5381 1.5093,1.5093 0 0 1 6.9229,8.6963 1.5658,1.5658 0 0 1 7.457,9.1475 V 6.502 h 1.0772 v 6.9355 H 7.63 L 7.5235,12.8418 A 1.5884,1.5884 0 0 1 6.9698,13.3555 1.557,1.557 0 0 1 6.2159,13.5312 1.6291,1.6291 0 0 1 4.8409,12.8857 2.7161,2.7161 0 0 1 4.3487,11.1924 Z m 1.0772,0.0938 A 1.9413,1.9413 0 0 0 5.6807,12.2549 0.8929,0.8929 0 0 0 6.49,12.65 1.0824,1.0824 0 0 0 7.0691,12.5035 1.1156,1.1156 0 0 0 7.4568,12.0855 V 9.9873 A 1.1269,1.1269 0 0 0 7.0662,9.5723 1.0485,1.0485 0 0 0 6.4988,9.4229 0.87,0.87 0 0 0 5.6873,9.8877 2.46,2.46 0 0 0 5.4256,11.0986 Z"
-     id="path25073" />
-  <path
-     class="cls-3"
-     d="M 12.083,9.6006 11.6221,9.583 a 0.96,0.96 0 0 0 -0.5264,0.1338 0.8794,0.8794 0 0 0 -0.3252,0.377 v 3.3437 H 9.6924 V 8.627 h 0.9844 l 0.0712,0.6982 a 1.5456,1.5456 0 0 1 0.4678,-0.5781 1.0838,1.0838 0 0 1 0.6582,-0.209 0.9815,0.9815 0 0 1 0.1826,0.0156 1.4216,1.4216 0 0 1 0.1543,0.0381 z"
-     id="path25075" />
-  <path
-     class="cls-3"
-     d="M 13.9844,13.4375 H 12.9072 V 6.502 h 1.0772 z"
-     id="path25077" />
-</svg>
diff --git a/bitmaps_png/sources/gerbview_show_negative_objects.svg b/bitmaps_png/sources/gerbview_show_negative_objects.svg
index c093fc53e4..992a70c21f 100755
--- a/bitmaps_png/sources/gerbview_show_negative_objects.svg
+++ b/bitmaps_png/sources/gerbview_show_negative_objects.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 24 24"
    version="1.1"
    sodipodi:docname="gerbview_show_negative_objects.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2631"
-     inkscape:window-height="1611"
+     inkscape:window-width="1280"
+     inkscape:window-height="715"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
-     inkscape:window-x="825"
-     inkscape:window-y="265"
+     inkscape:zoom="25.126575"
+     inkscape:cx="12.502081"
+     inkscape:cy="11.98658"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,15 +79,18 @@
   </defs>
   <title
      id="title25087">gerbview_show_negative_opbjects</title>
-  <path
-     class="cls-1"
-     d="M 22.9669,4.998 V 18.9741 H 0.9951 V 4.998 h 21.9718 m 1,-1 H -0.0049 v 15.9761 h 23.9718 z"
-     id="path25089" />
   <path
      id="polygon25091"
-     style="fill:#b9b9b9;stroke:#545454;stroke-width:1;stroke-opacity:1;fill-opacity:1"
-     d="m 19.5,4.5 -15,15 h -4 v -15 z"
+     style="fill:#b9b9b9;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
+     d="m 19.5,4.5 -15,15 h -3 v -15 z"
      sodipodi:nodetypes="ccccc" />
+  <rect
+     style="display:inline;fill:none;stroke:#545454;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1427"
+     width="21"
+     height="15"
+     x="1.5"
+     y="4.5" />
   <line
      class="cls-3"
      x1="0.5"
diff --git a/bitmaps_png/sources/green.svg b/bitmaps_png/sources/green.svg
deleted file mode 100755
index 3747a35a29..0000000000
--- a/bitmaps_png/sources/green.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Слой_1"
-   data-name="Слой 1"
-   viewBox="0 0 24 24"
-   version="1.1"
-   sodipodi:docname="green.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1609"
-     inkscape:window-height="1286"
-     id="namedview30"
-     showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="37"
-     inkscape:window-maximized="0"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="Слой_1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid_kicad"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata43">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25101">
-    <style
-       id="style25099">.cls-1{fill:#1a81c4;}</style>
-  </defs>
-  <title
-     id="title25103">green</title>
-  <circle
-     class="cls-1"
-     cx="12"
-     cy="12"
-     r="12"
-     id="circle25105" />
-</svg>
diff --git a/bitmaps_png/sources/group.svg b/bitmaps_png/sources/group.svg
index 9b19874090..225260da79 100755
--- a/bitmaps_png/sources/group.svg
+++ b/bitmaps_png/sources/group.svg
@@ -22,15 +22,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2064"
-     inkscape:window-height="1587"
+     inkscape:window-width="1904"
+     inkscape:window-height="1041"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
-     inkscape:cy="13"
+     inkscape:zoom="30.702139"
+     inkscape:cx="8.016224"
+     inkscape:cy="11.40402"
      inkscape:window-x="0"
-     inkscape:window-y="37"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
@@ -79,44 +79,100 @@
   </defs>
   <title
      id="title9">group</title>
-  <rect
-     style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6, 2;stroke-dashoffset:2.3"
-     id="rect859"
-     width="21"
-     height="21"
-     x="1.5"
-     y="1.5"
-     rx="0" />
   <rect
      class="cls-3"
-     x="0.0018999577"
-     y="19.999998"
-     width="3.9981005"
-     height="3.9991004"
+     x="1.0000002"
+     y="19"
+     width="4"
+     height="3.9999998"
      id="rect27"
      style="stroke-width:1" />
   <rect
      class="cls-3"
-     x="0.00049996376"
-     y="0.00090003014"
+     x="1"
+     y="1"
      width="3.9995003"
-     height="3.9990997"
+     height="4"
      id="rect29"
      style="stroke-width:1" />
   <rect
      class="cls-3"
-     x="20"
-     y="19.999998"
-     width="3.9995003"
-     height="3.9991004"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
      id="rect31"
      style="stroke-width:0.999999" />
   <rect
      class="cls-3"
-     x="20"
-     y="0.00090003014"
-     width="3.9980996"
-     height="3.9990997"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
      id="rect33"
      style="stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,2.5 H 6"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,21.5 H 6"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,3 V 6"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.5,3 V 6"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,21.5 h 3"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,2.5 h 3"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,8 v 3"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499999,8 v 3"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
 </svg>
diff --git a/bitmaps_png/sources/group_add.svg b/bitmaps_png/sources/group_add.svg
index d0e3dfd349..900ce83ba4 100644
--- a/bitmaps_png/sources/group_add.svg
+++ b/bitmaps_png/sources/group_add.svg
@@ -1,42 +1,199 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="group_add.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2064" inkscape:window-height="1587" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" inkscape:window-x="1423" inkscape:window-y="176" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>group</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs7">
-      <style id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-   </defs>
-   <title id="title9">group</title>
-   <rect style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:3.5" id="rect859" width="21" height="21" x="1.5" y="1.5" rx="0" />
-   <rect class="cls-3" x="0.0018999577" y="19.999998" width="3.9981005" height="3.9991004" id="rect27" style="stroke-width:1" />
-   <rect class="cls-3" x="0.00049996376" y="0.00090003014" width="3.9995003" height="3.9990997" id="rect29" style="stroke-width:1" />
-   <rect class="cls-3" x="20.0005" y="20.0009" width="3.9995003" height="3.9991004" id="rect31" style="stroke-width:0.999999" />
-   <rect class="cls-3" x="20" y="0.00090003014" width="3.9980996" height="3.9990997" id="rect33" style="stroke-width:1" />
-   <path class="cls-4" d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z" id="path7940" style="fill:#bf2641" />
-   <line class="cls-5" x1="20.501522" y1="17.001522" x2="13.498478" y2="17.00152" id="line7942" style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-   <line class="cls-5" x1="17" y1="20.503042" x2="17" y2="13.5" id="line7944" style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="group_add.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="958"
+     inkscape:window-height="1008"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="19.147172"
+     inkscape:cx="12.787879"
+     inkscape:cy="11.110881"
+     inkscape:window-x="953"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>group</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     class="cls-3"
+     x="1"
+     y="19"
+     width="4"
+     height="3.9999998"
+     id="rect27"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3.9995003"
+     height="4"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect31"
+     style="fill:#545454;stroke-width:0.999999" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,2.5000002 H 6"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5000002 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,21.5 H 6"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,3.0000002 v 3"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,3.0000002 v 3"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,21.5 h 3"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,2.5000002 h 3"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5000002 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,8.0000002 V 11"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.499999,8.0000002 V 11"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
+  <path
+     class="cls-4"
+     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
+     id="path7940"
+     style="fill:#bf2641" />
+  <line
+     class="cls-5"
+     x1="20.501522"
+     y1="17.001522"
+     x2="13.498478"
+     y2="17.00152"
+     id="line7942"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+  <line
+     class="cls-5"
+     x1="17"
+     y1="20.503042"
+     x2="17"
+     y2="13.5"
+     id="line7944"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/group_enter.svg b/bitmaps_png/sources/group_enter.svg
index 49db6959c6..0981fff36e 100644
--- a/bitmaps_png/sources/group_enter.svg
+++ b/bitmaps_png/sources/group_enter.svg
@@ -1,44 +1,198 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="group_enter.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2064" inkscape:window-height="1587" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" inkscape:window-x="1423" inkscape:window-y="176" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>group</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs7">
-      <style id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-   </defs>
-   <title id="title9">group</title>
-   <rect style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:3.5" id="rect859" width="21" height="21" x="1.5" y="1.5" rx="0" />
-   <rect class="cls-3" x="0.0018999577" y="19.999998" width="3.9981005" height="3.9991004" id="rect27" style="stroke-width:1" />
-   <rect class="cls-3" x="0.00049996376" y="0.00090003014" width="3.9995003" height="3.9990997" id="rect29" style="stroke-width:1" />
-   <rect class="cls-3" x="20.0005" y="20.0009" width="3.9995003" height="3.9991004" id="rect31" style="stroke-width:0.999999" />
-   <rect class="cls-3" x="20" y="0.00090003014" width="3.9980996" height="3.9990997" id="rect33" style="stroke-width:1" />
-   <path class="cls-4" d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z" id="path7940" style="fill:#bf2641" />
-   <g id="g9325" transform="matrix(-1,0,0,1,34.694,-0.871)" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <polyline class="cls-5" points="21.865 19.871 15.694 19.871 15.694 14.26" id="polyline8755" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <polyline class="cls-5" points="19.487 17.444 21.913 19.871 19.487 22.297" id="polyline8757" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="group_enter.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1904"
+     inkscape:window-height="1041"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="30.702139"
+     inkscape:cx="8.2930777"
+     inkscape:cy="12.446293"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>group</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     class="cls-3"
+     x="1"
+     y="19"
+     width="4"
+     height="3.9999998"
+     id="rect27"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3.9995003"
+     height="4"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect31"
+     style="fill:#545454;stroke-width:0.999999" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 3.0000004,2.5 h 3"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5000004,21.5 h 3.5"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5000004,3 V 6"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5000004,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.5,3 V 6"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 8.0000004,21.5 H 11"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 8.0000004,2.5 H 11"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5000004,8 v 3"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499999,8 v 3"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5000004,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
+  <path
+     class="cls-4"
+     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
+     id="path7940"
+     style="fill:#bf2641" />
+  <g
+     id="g9325"
+     transform="translate(-1.694,-0.871)"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <polyline
+       class="cls-5"
+       points="21.865 19.871 15.694 19.871 15.694 14.26"
+       id="polyline8755"
+       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <polyline
+       class="cls-5"
+       points="19.487 17.444 21.913 19.871 19.487 22.297"
+       id="polyline8757"
+       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/bitmaps_png/sources/group_leave.svg b/bitmaps_png/sources/group_leave.svg
index 860cb01005..b2c2d81786 100644
--- a/bitmaps_png/sources/group_leave.svg
+++ b/bitmaps_png/sources/group_leave.svg
@@ -1,44 +1,198 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="group_leave.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2064" inkscape:window-height="1587" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" inkscape:window-x="1423" inkscape:window-y="176" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>group</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs7">
-      <style id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-   </defs>
-   <title id="title9">group</title>
-   <rect style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:3.5" id="rect859" width="21" height="21" x="1.5" y="1.5" rx="0" />
-   <rect class="cls-3" x="0.0018999577" y="19.999998" width="3.9981005" height="3.9991004" id="rect27" style="stroke-width:1" />
-   <rect class="cls-3" x="0.00049996376" y="0.00090003014" width="3.9995003" height="3.9990997" id="rect29" style="stroke-width:1" />
-   <rect class="cls-3" x="20.0005" y="20.0009" width="3.9995003" height="3.9991004" id="rect31" style="stroke-width:0.999999" />
-   <rect class="cls-3" x="20" y="0.00090003014" width="3.9980996" height="3.9990997" id="rect33" style="stroke-width:1" />
-   <path class="cls-4" d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z" id="path7940" style="fill:#bf2641" />
-   <g id="g9325" transform="matrix(0,-1,-1,0,34.871,35.194)" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <polyline class="cls-5" points="21.865 19.871 15.694 19.871 15.694 14.26" id="polyline8755" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <polyline class="cls-5" points="19.487 17.444 21.913 19.871 19.487 22.297" id="polyline8757" style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-   </g>
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="group_leave.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1904"
+     inkscape:window-height="1041"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="43.419381"
+     inkscape:cx="11.521801"
+     inkscape:cy="16.268211"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>group</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     class="cls-3"
+     x="1"
+     y="19"
+     width="4"
+     height="3.9999998"
+     id="rect27"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3.9995003"
+     height="4"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect31"
+     style="fill:#545454;stroke-width:0.999999" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,2.5 H 6"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,21.5 H 6"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,3 V 6"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.5,3 V 6"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,21.5 h 3"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,2.5 h 3"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,7.9999998 V 11"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.499999,7.9999998 V 11"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
+  <path
+     class="cls-4"
+     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
+     id="path7940"
+     style="fill:#bf2641" />
+  <g
+     id="g9325"
+     transform="matrix(0,-1,-1,0,34.871,35.693959)"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <polyline
+       class="cls-5"
+       points="21.865 19.871 15.694 19.871 15.694 14.26"
+       id="polyline8755"
+       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <polyline
+       class="cls-5"
+       points="19.487 17.444 21.913 19.871 19.487 22.297"
+       id="polyline8757"
+       style="fill:none;stroke:#f5f5f5;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/bitmaps_png/sources/group_remove.svg b/bitmaps_png/sources/group_remove.svg
index d9948e05f3..76ba327daa 100644
--- a/bitmaps_png/sources/group_remove.svg
+++ b/bitmaps_png/sources/group_remove.svg
@@ -1,41 +1,191 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="group_remove.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2064" inkscape:window-height="1587" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" inkscape:window-x="1423" inkscape:window-y="176" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>group</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs7">
-      <style id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-   </defs>
-   <title id="title9">group</title>
-   <rect style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:3.5" id="rect859" width="21" height="21" x="1.5" y="1.5" rx="0" />
-   <rect class="cls-3" x="0.0018999577" y="19.999998" width="3.9981005" height="3.9991004" id="rect27" style="stroke-width:1" />
-   <rect class="cls-3" x="0.00049996376" y="0.00090003014" width="3.9995003" height="3.9990997" id="rect29" style="stroke-width:1" />
-   <rect class="cls-3" x="20.0005" y="20.0009" width="3.9995003" height="3.9991004" id="rect31" style="stroke-width:0.999999" />
-   <rect class="cls-3" x="20" y="0.00090003014" width="3.9980996" height="3.9990997" id="rect33" style="stroke-width:1" />
-   <path class="cls-4" d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z" id="path7940" style="fill:#bf2641" />
-   <line class="cls-5" x1="20.501522" y1="17.001522" x2="13.498478" y2="17.00152" id="line7942" style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="group_remove.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1904"
+     inkscape:window-height="1041"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="30.702139"
+     inkscape:cx="2.5605781"
+     inkscape:cy="11.697159"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>group</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     class="cls-3"
+     x="1"
+     y="19"
+     width="4"
+     height="3.9999998"
+     id="rect27"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3.9995003"
+     height="4"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect31"
+     style="fill:#545454;stroke-width:0.999999" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,2.5 H 6"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,21.5 H 6"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,3 V 6"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.5,3 V 6"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,21.5 h 3"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,2.5 h 3"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,8 v 3"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499999,8 v 3"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
+  <path
+     class="cls-4"
+     d="m 21.95645,21.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
+     id="path7940"
+     style="fill:#bf2641" />
+  <line
+     class="cls-5"
+     x1="20.501522"
+     y1="17.001522"
+     x2="13.498478"
+     y2="17.00152"
+     id="line7942"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/group_ungroup.svg b/bitmaps_png/sources/group_ungroup.svg
index cfd0b7272c..87a714bc1f 100755
--- a/bitmaps_png/sources/group_ungroup.svg
+++ b/bitmaps_png/sources/group_ungroup.svg
@@ -1,42 +1,199 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" viewBox="0 0 24 24" version="1.1" sodipodi:docname="group_ungroup.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="2064" inkscape:window-height="1587" id="namedview30" showgrid="true" inkscape:zoom="27.961538" inkscape:cx="3.3259971" inkscape:cy="13" inkscape:window-x="1423" inkscape:window-y="176" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1">
-      <inkscape:grid type="xygrid" id="grid_kicad" spacingx="0.5" spacingy="0.5" color="#9999ff" opacity="0.13" empspacing="2" />
-   </sodipodi:namedview>
-   <metadata id="metadata43">
-      <rdf:RDF>
-         <cc:Work rdf:about="">
-            <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-            <dc:format>image/svg+xml</dc:format>
-            <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-            <dc:title>group</dc:title>
-         </cc:Work>
-         <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
-            <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-            <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-         </cc:License>
-      </rdf:RDF>
-   </metadata>
-   <defs id="defs7">
-      <style id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
-   </defs>
-   <title id="title9">group</title>
-   <rect style="fill:none;stroke:#545454;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:3.5" id="rect859" width="21" height="21" x="1.5" y="1.5" rx="0" />
-   <rect class="cls-3" x="0.0018999577" y="19.999998" width="3.9981005" height="3.9991004" id="rect27" style="stroke-width:1" />
-   <rect class="cls-3" x="0.00049996376" y="0.00090003014" width="3.9995003" height="3.9990997" id="rect29" style="stroke-width:1" />
-   <rect class="cls-3" x="20.0005" y="20.0009" width="3.9995003" height="3.9991004" id="rect31" style="stroke-width:0.999999" />
-   <rect class="cls-3" x="20" y="0.00090003014" width="3.9980996" height="3.9990997" id="rect33" style="stroke-width:1" />
-   <path class="cls-4" d="m 22.95645,22.957771 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z" id="path7940" style="fill:#bf2641" />
-   <line class="cls-5" x1="20.47595" y1="15.525572" x2="15.52405" y2="20.47747" id="line7942" style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-   <line class="cls-5" x1="20.47595" y1="20.47747" x2="15.52405" y2="15.525572" id="line7944" style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="group_ungroup.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1904"
+     inkscape:window-height="1041"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="30.702139"
+     inkscape:cx="2.5605781"
+     inkscape:cy="13"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>group</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7">
+    <style
+       id="style5">.cls-1,.cls-2{fill:none;stroke:#b9b9b9;stroke-linecap:round;stroke-linejoin:round;}.cls-2{stroke-dasharray:5 5;}.cls-3{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title9">group</title>
+  <rect
+     class="cls-3"
+     x="1"
+     y="19"
+     width="4"
+     height="3.9999998"
+     id="rect27"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3.9995003"
+     height="4"
+     id="rect29"
+     style="fill:#545454;stroke-width:1" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="19"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect31"
+     style="fill:#545454;stroke-width:0.999999" />
+  <rect
+     class="cls-3"
+     x="19"
+     y="1"
+     width="3.9999998"
+     height="3.9999998"
+     id="rect33"
+     style="fill:#545454;stroke-width:1" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,2.5 H 6"
+     id="path14" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,2.5 h 3"
+     id="path14-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,21.5 H 6"
+     id="path14-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 18,21.5 h 3.5"
+     id="path14-8-6" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,3 V 6"
+     id="path14-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,18 v 3"
+     id="path14-0-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.5,18 v 3"
+     id="path14-0-3-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.5,3 V 6"
+     id="path14-0-3-7-7" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,21.5 h 3"
+     id="path14-6-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,21.5 h 3"
+     id="path14-6-3-2" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 8,2.5 h 3"
+     id="path14-6-3-8" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 13,2.5 h 3"
+     id="path14-6-3-2-3" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5,7.9999998 V 11"
+     id="path14-0-30" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 21.499999,7.9999998 V 11"
+     id="path14-0-3-7-7-4" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 2.5,13 v 3"
+     id="path14-0-30-0" />
+  <path
+     style="fill:none;stroke:#545454;stroke-width:0.999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 21.499998,13 v 3"
+     id="path14-0-3-7-7-4-0" />
+  <path
+     class="cls-4"
+     d="m 21.95532,21.9551 a 7.0032,7.0032 0 1 1 0,-9.9038 7.0034,7.0034 0 0 1 0,9.9038 z"
+     id="path7940"
+     style="fill:#bf2641" />
+  <line
+     class="cls-5"
+     x1="19.474821"
+     y1="14.522901"
+     x2="14.522921"
+     y2="19.4748"
+     id="line7942"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
+  <line
+     class="cls-5"
+     x1="19.474821"
+     y1="19.4748"
+     x2="14.522921"
+     y2="14.522901"
+     id="line7944"
+     style="fill:none;stroke:#f5f5f5;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
 </svg>
diff --git a/bitmaps_png/sources/footprint_browser.svg b/bitmaps_png/sources/icon_footprint_browser.svg
similarity index 100%
rename from bitmaps_png/sources/footprint_browser.svg
rename to bitmaps_png/sources/icon_footprint_browser.svg
diff --git a/bitmaps_png/sources/hammer.svg b/bitmaps_png/sources/puzzle_piece.svg
similarity index 100%
rename from bitmaps_png/sources/hammer.svg
rename to bitmaps_png/sources/puzzle_piece.svg
diff --git a/gerbview/tools/gerbview_actions.cpp b/gerbview/tools/gerbview_actions.cpp
index 3b1072a1b4..7f3ef91d71 100644
--- a/gerbview/tools/gerbview_actions.cpp
+++ b/gerbview/tools/gerbview_actions.cpp
@@ -50,7 +50,7 @@ TOOL_ACTION GERBVIEW_ACTIONS::openJobFile( "gerbview.Control.openJobFile",
         AS_GLOBAL, 0, "",
         _( "Open Gerber Job File..." ),
         _( "Open a Gerber job file and its associated gerber plot files" ),
-        gerber_job_file_xpm );
+        file_gerber_job_xpm );
 
 TOOL_ACTION GERBVIEW_ACTIONS::openZipFile( "gerbview.Control.openZipFile",
         AS_GLOBAL, 0, "",
diff --git a/kicad/project_tree.cpp b/kicad/project_tree.cpp
index 72ac32e412..f3e39a57bd 100644
--- a/kicad/project_tree.cpp
+++ b/kicad/project_tree.cpp
@@ -59,7 +59,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) :
     m_imageList->Add( KiBitmap( icon_pcbnew_24_xpm ) );         // TREE_LEGACY_PCB
     m_imageList->Add( KiBitmap( icon_pcbnew_24_xpm ) );         // TREE_SEXPR_PCB
     m_imageList->Add( KiBitmap( icon_gerbview_24_xpm ) );       // TREE_GERBER
-    m_imageList->Add( KiBitmap( gerber_job_file_xpm ) );        // TREE_GERBER_JOB_FILE (.gbrjob)
+    m_imageList->Add( KiBitmap( file_gerber_job_xpm ) );        // TREE_GERBER_JOB_FILE (.gbrjob)
     m_imageList->Add( KiBitmap( file_html_xpm ) );              // TREE_HTML
     m_imageList->Add( KiBitmap( file_pdf_xpm ) );               // TREE_PDF
     m_imageList->Add( KiBitmap( editor_xpm ) );                 // TREE_TXT
diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
index 4bdf9c734f..41e165d9a6 100644
--- a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
@@ -36,7 +36,7 @@ PANEL_PCBNEW_ACTION_PLUGINS::PANEL_PCBNEW_ACTION_PLUGINS( PCB_EDIT_FRAME* aFrame
         PANEL_PCBNEW_ACTION_PLUGINS_BASE( aWindow->GetTreebook() ),
         m_frame( aFrame )
 {
-    m_genericIcon = KiBitmap( hammer_xpm );
+    m_genericIcon = KiBitmap( puzzle_piece_xpm );
     m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
 
     m_moveUpButton->SetBitmap( KiBitmap( small_up_xpm ) );
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index a348eb71f6..8106d00571 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -130,7 +130,7 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
 
     // Give an icon
     wxIcon  icon;
-    icon.CopyFromBitmap( KiBitmap( footprint_browser_xpm ) );
+    icon.CopyFromBitmap( KiBitmap( icon_footprint_browser_xpm ) );
     SetIcon( icon );
 
     wxPanel* libPanel = new wxPanel( this );
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index d4d47778ad..c94c7b66aa 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -404,7 +404,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     ACTION_MENU* submenuActionPlugins = new ACTION_MENU( false );
     submenuActionPlugins->SetTool( selTool );
     submenuActionPlugins->SetTitle( _( "External Plugins" ) );
-    submenuActionPlugins->SetIcon( hammer_xpm );
+    submenuActionPlugins->SetIcon( puzzle_piece_xpm );
 
     submenuActionPlugins->Add( _( "Refresh Plugins" ),
                                _( "Reload all python plugins and refresh plugin menus" ),
diff --git a/pcbnew/swig/pcbnew_action_plugins.cpp b/pcbnew/swig/pcbnew_action_plugins.cpp
index 1aa4961b5e..09b1b9047d 100644
--- a/pcbnew/swig/pcbnew_action_plugins.cpp
+++ b/pcbnew/swig/pcbnew_action_plugins.cpp
@@ -363,7 +363,7 @@ void PCB_EDIT_FRAME::buildActionPluginMenus( ACTION_MENU* actionMenu )
     {
         wxMenuItem* item;
         ACTION_PLUGIN* ap = ACTION_PLUGINS::GetAction( ii );
-        const wxBitmap& bitmap = ap->iconBitmap.IsOk() ? ap->iconBitmap : KiBitmap( hammer_xpm );
+        const wxBitmap& bitmap = ap->iconBitmap.IsOk() ? ap->iconBitmap : KiBitmap( puzzle_piece_xpm );
 
         item = AddMenuItem( actionMenu, wxID_ANY,  ap->GetName(), ap->GetDescription(), bitmap );
 
@@ -396,7 +396,7 @@ void PCB_EDIT_FRAME::AddActionPluginTools()
             if ( ap->iconBitmap.IsOk() )
                 bitmap = KiScaledBitmap( ap->iconBitmap, this );
             else
-                bitmap = KiScaledBitmap( hammer_xpm, this );
+                bitmap = KiScaledBitmap( puzzle_piece_xpm, this );
 
             wxAuiToolBarItem* button = m_mainToolBar->AddTool(
                     wxID_ANY, wxEmptyString, bitmap, ap->GetName() );