diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index f20bd96f6b..919907fc59 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -245,6 +245,12 @@ set( BMAPS_MID
     grid_select
     grid_select_axis
     grid
+    group
+    group_add
+    group_enter
+    group_leave
+    group_remove
+    group_ungroup
     hammer
     help
     hidden_pin
diff --git a/bitmaps_png/cpp_26/group.cpp b/bitmaps_png/cpp_26/group.cpp
new file mode 100644
index 0000000000..992fbdbe0c
--- /dev/null
+++ b/bitmaps_png/cpp_26/group.cpp
@@ -0,0 +1,23 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x04, 0x00, 0x00, 0x00, 0x03, 0x43, 0x84,
+ 0x45, 0x00, 0x00, 0x00, 0x5e, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x20, 0x0f, 0x84,
+ 0xfc, 0x07, 0xc1, 0xe0, 0x3c, 0x42, 0xea, 0x82, 0xf3, 0x20, 0x2a, 0x91, 0x34, 0xf5, 0xfe, 0xdf,
+ 0x79, 0x1f, 0x26, 0xbd, 0xf3, 0xfe, 0xce, 0xff, 0x50, 0x88, 0x24, 0xd6, 0xfb, 0x1f, 0x43, 0x13,
+ 0x89, 0x36, 0x05, 0xe7, 0xf5, 0x02, 0xb5, 0x04, 0xea, 0x13, 0xd2, 0x14, 0xa8, 0x0f, 0x51, 0x09,
+ 0xb7, 0x9a, 0x58, 0xff, 0x13, 0xaf, 0x72, 0x48, 0x02, 0xb2, 0x02, 0x62, 0xe7, 0x7f, 0xa2, 0x35,
+ 0xfd, 0x1f, 0x32, 0x9a, 0x46, 0x53, 0x04, 0xd9, 0x01, 0x41, 0x56, 0x26, 0x1c, 0xe4, 0x05, 0x0b,
+ 0xe9, 0x00, 0x00, 0x22, 0x06, 0x7f, 0x1d, 0x19, 0x52, 0xb1, 0x87, 0x00, 0x00, 0x00, 0x00, 0x49,
+ 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE group_xpm[1] = {{ png, sizeof( png ), "group_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/group_add.cpp b/bitmaps_png/cpp_26/group_add.cpp
new file mode 100644
index 0000000000..84f4e1fa60
--- /dev/null
+++ b/bitmaps_png/cpp_26/group_add.cpp
@@ -0,0 +1,40 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0x70, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x55, 0xcb, 0x4e, 0xc2,
+ 0x40, 0x14, 0xed, 0x47, 0x18, 0x51, 0x3a, 0x13, 0xf5, 0x73, 0x4c, 0x94, 0xce, 0x68, 0x89, 0x6f,
+ 0xd7, 0xee, 0xd8, 0xb0, 0xf6, 0x01, 0x46, 0xfd, 0xa5, 0x7e, 0x83, 0xc6, 0xf7, 0x9e, 0xc4, 0x84,
+ 0x16, 0x8b, 0xda, 0x02, 0xd3, 0x68, 0x34, 0x71, 0xbc, 0x53, 0x84, 0xb4, 0x50, 0x34, 0xd3, 0x97,
+ 0x1b, 0x27, 0x39, 0x8b, 0x72, 0x3b, 0xe7, 0x30, 0xe7, 0xdc, 0xdb, 0x51, 0x94, 0x3c, 0x97, 0xae,
+ 0xeb, 0x7c, 0x80, 0x4c, 0x79, 0x82, 0x2f, 0x18, 0x86, 0x21, 0xd0, 0x08, 0xd6, 0xc5, 0xf3, 0xf7,
+ 0xef, 0x3f, 0xd6, 0xa5, 0x84, 0x32, 0x77, 0x46, 0xfc, 0xa3, 0x34, 0x62, 0xf8, 0x95, 0x67, 0xd4,
+ 0x8e, 0x04, 0x42, 0x0d, 0xe5, 0x7f, 0x65, 0xb2, 0x72, 0xcb, 0x28, 0xcf, 0xae, 0x93, 0x12, 0x7a,
+ 0xc0, 0xa5, 0xa2, 0x89, 0xc9, 0x89, 0x89, 0xe8, 0xbd, 0x89, 0x08, 0x03, 0x3c, 0x01, 0x2e, 0x2e,
+ 0x2b, 0x67, 0xbc, 0x3d, 0xb7, 0x32, 0x9b, 0x8a, 0x50, 0x13, 0x6b, 0x6b, 0x40, 0xda, 0x03, 0xf0,
+ 0x09, 0xe8, 0x34, 0x31, 0x5d, 0x4f, 0x94, 0x51, 0x4b, 0xa5, 0x4b, 0x40, 0xf4, 0x11, 0x24, 0xb6,
+ 0x77, 0x8e, 0xb8, 0xbd, 0x7d, 0x38, 0x2a, 0xf6, 0x69, 0xa9, 0x9a, 0x1e, 0xcb, 0x7f, 0xdf, 0x2e,
+ 0x44, 0xba, 0x21, 0x42, 0x4c, 0x39, 0x73, 0x5c, 0xce, 0x5e, 0xdc, 0xa8, 0x93, 0x75, 0x5b, 0x05,
+ 0x3a, 0x2d, 0x2d, 0x64, 0x22, 0xed, 0x74, 0x8c, 0x0c, 0x84, 0x3c, 0xcf, 0xe3, 0x1e, 0x63, 0xd1,
+ 0x36, 0xaa, 0xda, 0x71, 0x0c, 0x21, 0x72, 0x27, 0x2d, 0x84, 0xc8, 0xb5, 0x74, 0x46, 0xb0, 0xe9,
+ 0x4d, 0x6c, 0x6e, 0xef, 0xd6, 0x38, 0x73, 0x3b, 0x7d, 0x81, 0x08, 0x88, 0x9a, 0xbd, 0x35, 0xcc,
+ 0x8c, 0x49, 0x77, 0x1d, 0x58, 0xf7, 0xea, 0x87, 0x0f, 0xc1, 0x8b, 0x5c, 0x26, 0x0a, 0x41, 0xcd,
+ 0xde, 0xd8, 0x1f, 0x08, 0xf5, 0xa4, 0xef, 0x23, 0xd8, 0x74, 0x1b, 0xc3, 0xba, 0x2b, 0xe9, 0x1b,
+ 0xf6, 0x66, 0xaf, 0xce, 0xe5, 0x9b, 0x81, 0xd4, 0xa4, 0x4f, 0x64, 0xcf, 0x97, 0x67, 0xc4, 0x30,
+ 0x46, 0xb6, 0xf7, 0xb3, 0x13, 0x25, 0xe4, 0x9a, 0xc5, 0xe5, 0xa9, 0x58, 0xb3, 0x64, 0x21, 0xb2,
+ 0x08, 0x04, 0xef, 0xa1, 0x81, 0xdd, 0x3c, 0x08, 0x66, 0x32, 0x1c, 0x58, 0xc8, 0x94, 0x26, 0xfa,
+ 0x70, 0x02, 0xc9, 0xea, 0xd8, 0xc9, 0xc2, 0x70, 0x2c, 0x95, 0x96, 0x53, 0xb9, 0x56, 0x1e, 0x17,
+ 0x4a, 0x05, 0xf0, 0xbf, 0x2e, 0xc2, 0xee, 0xb7, 0xbd, 0xdf, 0x91, 0xe7, 0x16, 0xd6, 0xaa, 0xa2,
+ 0xf6, 0x67, 0xf7, 0xdd, 0x17, 0x66, 0xc6, 0x32, 0x85, 0x8d, 0xf0, 0xf4, 0xc6, 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" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/group_enter.cpp b/bitmaps_png/cpp_26/group_enter.cpp
new file mode 100644
index 0000000000..32e7835df6
--- /dev/null
+++ b/bitmaps_png/cpp_26/group_enter.cpp
@@ -0,0 +1,46 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0xca, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x27, 0x08,
+ 0x09, 0x09, 0xf9, 0x0f, 0xc3, 0x34, 0x35, 0x07, 0x59, 0xc1, 0xce, 0x9d, 0x3b, 0x41, 0xf8, 0x3e,
+ 0xb2, 0x3c, 0x88, 0x0f, 0x15, 0xc7, 0x2b, 0x4f, 0x92, 0x45, 0x34, 0x0f, 0x19, 0x90, 0x8b, 0xa8,
+ 0x11, 0x0d, 0x04, 0xcd, 0x41, 0x0f, 0x0e, 0x0a, 0x2c, 0xba, 0xcf, 0x30, 0x0a, 0x68, 0x02, 0xe8,
+ 0x16, 0x47, 0xf4, 0x4c, 0x75, 0x24, 0x59, 0xf4, 0x48, 0xd6, 0x4f, 0xea, 0x99, 0x6c, 0x40, 0xdb,
+ 0x33, 0x99, 0xc0, 0x2b, 0xcf, 0x64, 0x02, 0xbe, 0x00, 0xf1, 0x1b, 0x20, 0x3e, 0x73, 0x2e, 0xbf,
+ 0xe3, 0xff, 0x6b, 0xf9, 0x20, 0x49, 0xaa, 0x58, 0xf4, 0x54, 0xd6, 0x3f, 0x1c, 0x68, 0xe8, 0x67,
+ 0x20, 0xfe, 0x8f, 0x03, 0x7f, 0x7c, 0x2a, 0x1b, 0x18, 0x41, 0x51, 0x1c, 0xbd, 0x90, 0x0e, 0xf4,
+ 0x01, 0x1a, 0xf4, 0x1b, 0x9b, 0x05, 0x2f, 0xec, 0x32, 0xff, 0xbf, 0x29, 0x9a, 0xf8, 0xff, 0x99,
+ 0x5c, 0x20, 0x88, 0xff, 0xef, 0xb9, 0xb4, 0x7f, 0x08, 0x59, 0xe1, 0x0f, 0x0e, 0x2e, 0x99, 0x80,
+ 0x4f, 0xb8, 0x7c, 0xf2, 0x71, 0xeb, 0xd1, 0xff, 0x5f, 0xbf, 0x7e, 0xfd, 0xff, 0xca, 0xbf, 0x0c,
+ 0x26, 0xf6, 0xe9, 0x85, 0x78, 0xa0, 0x18, 0xc9, 0x16, 0x3d, 0x93, 0xf1, 0x6f, 0xc7, 0x13, 0x5c,
+ 0xff, 0x3f, 0xee, 0x39, 0x05, 0xb1, 0x28, 0xb4, 0x1a, 0x21, 0x2e, 0xed, 0xdf, 0x42, 0x86, 0x45,
+ 0x01, 0x97, 0x91, 0x0d, 0x7e, 0xae, 0x18, 0x02, 0x74, 0x7d, 0xf9, 0xff, 0x67, 0xf2, 0x41, 0xb8,
+ 0x2d, 0x92, 0x09, 0xb8, 0x40, 0x72, 0x1c, 0x01, 0x35, 0xfd, 0x80, 0x5b, 0xa2, 0x1c, 0xfa, 0xff,
+ 0xe3, 0x8e, 0xe3, 0x60, 0x83, 0xdf, 0xe4, 0xf7, 0xe3, 0xb3, 0xe8, 0x0b, 0xc9, 0xa9, 0x0e, 0x18,
+ 0x74, 0xdf, 0xd1, 0x2d, 0xf9, 0xf2, 0xe8, 0xf9, 0xff, 0x17, 0x56, 0xe9, 0xf8, 0x2c, 0xfa, 0x4c,
+ 0x72, 0x7d, 0x04, 0xd4, 0x74, 0x09, 0xa4, 0xf9, 0xd3, 0xd5, 0xbb, 0x60, 0x03, 0xbf, 0x7e, 0xfe,
+ 0xfc, 0xff, 0xf3, 0xdd, 0x47, 0xff, 0x3f, 0xdf, 0xb8, 0x0f, 0xc6, 0x5f, 0xde, 0xbe, 0xc7, 0x66,
+ 0xd1, 0x79, 0x92, 0x6b, 0xd8, 0x8b, 0x19, 0xcd, 0x60, 0xcd, 0x5f, 0xde, 0xbc, 0x83, 0x58, 0x84,
+ 0x05, 0x7f, 0x79, 0xff, 0xe1, 0xff, 0x4b, 0xeb, 0x0c, 0xa4, 0xc4, 0x10, 0xd0, 0x44, 0xb2, 0x8f,
+ 0x5e, 0x29, 0x84, 0x4a, 0x80, 0x32, 0xe3, 0x4b, 0x9b, 0x4c, 0xa0, 0x4f, 0x1e, 0x83, 0x0d, 0xfe,
+ 0x74, 0xfa, 0xea, 0xff, 0x97, 0x4e, 0xb9, 0xff, 0x5f, 0x58, 0xa6, 0x81, 0xf1, 0x73, 0x9d, 0x18,
+ 0x64, 0xdf, 0x7c, 0x78, 0x26, 0xe5, 0x2b, 0x42, 0x56, 0x5e, 0x7a, 0x2e, 0x13, 0xe0, 0x09, 0x34,
+ 0xe0, 0xd7, 0x0b, 0xf3, 0x94, 0xff, 0x9f, 0x6f, 0x3d, 0x80, 0x24, 0x86, 0xd2, 0xc9, 0xd8, 0x92,
+ 0xfb, 0x3f, 0x60, 0x9c, 0x06, 0x52, 0x54, 0x70, 0x02, 0x0d, 0x09, 0x06, 0xf9, 0xec, 0x85, 0x69,
+ 0xf2, 0xff, 0xb7, 0xed, 0x0b, 0xff, 0x3f, 0xd7, 0x8d, 0x45, 0xb7, 0xe4, 0xfd, 0x73, 0xe9, 0xc0,
+ 0x50, 0xaa, 0x54, 0x2b, 0x2f, 0x15, 0xfd, 0xc4, 0x81, 0xe1, 0xdf, 0x0c, 0x8a, 0x6c, 0x48, 0xb2,
+ 0x07, 0xa7, 0xc8, 0xd3, 0xcf, 0x65, 0xfd, 0x4b, 0x40, 0x72, 0x03, 0x56, 0xdf, 0x01, 0x00, 0xae,
+ 0xf3, 0x3e, 0xad, 0xdb, 0x63, 0xfc, 0xa5, 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" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/group_leave.cpp b/bitmaps_png/cpp_26/group_leave.cpp
new file mode 100644
index 0000000000..609a581cd9
--- /dev/null
+++ b/bitmaps_png/cpp_26/group_leave.cpp
@@ -0,0 +1,44 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0xb1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x27, 0x08,
+ 0x09, 0x09, 0xf9, 0x0f, 0xc3, 0x34, 0x35, 0x07, 0x59, 0xc1, 0xce, 0x9d, 0x3b, 0x41, 0xf8, 0x3e,
+ 0xb2, 0x3c, 0x88, 0x0f, 0x15, 0xc7, 0x2b, 0x4f, 0x92, 0x45, 0x34, 0x0f, 0x19, 0x90, 0x8b, 0xa8,
+ 0x11, 0x0d, 0x04, 0xcd, 0x41, 0x0f, 0x0e, 0x0a, 0x2c, 0xba, 0xcf, 0x30, 0x0a, 0x68, 0x02, 0xe8,
+ 0x16, 0x47, 0xf4, 0x4c, 0x75, 0x24, 0x59, 0xf4, 0x48, 0xd6, 0x4f, 0xea, 0x99, 0x6c, 0x40, 0xdb,
+ 0x33, 0x99, 0xc0, 0x2b, 0xcf, 0x64, 0x02, 0xbe, 0x00, 0xf1, 0x1b, 0x20, 0x3e, 0x73, 0x2e, 0xbf,
+ 0xe3, 0xff, 0x6b, 0xf9, 0x20, 0x49, 0xaa, 0x58, 0xf4, 0x54, 0xd6, 0x3f, 0x1c, 0x68, 0xe8, 0x67,
+ 0x20, 0xfe, 0x8f, 0x03, 0x7f, 0x7c, 0x2a, 0x1b, 0x18, 0x41, 0x51, 0x1c, 0xbd, 0x90, 0x0e, 0xf4,
+ 0x01, 0x1a, 0xf4, 0x1b, 0x64, 0xe0, 0xbb, 0xee, 0xa5, 0xff, 0xdf, 0xcf, 0xde, 0x88, 0xcb, 0xb2,
+ 0x7f, 0xcf, 0xa5, 0xfd, 0x43, 0xc8, 0x0a, 0x7f, 0x70, 0x70, 0xc9, 0x04, 0x7c, 0x02, 0x19, 0xf4,
+ 0xb6, 0x6a, 0xfa, 0xff, 0xaf, 0x5f, 0xbf, 0x82, 0xf1, 0xfb, 0x49, 0xab, 0x70, 0x59, 0xf6, 0xe9,
+ 0x85, 0x78, 0xa0, 0x18, 0xc9, 0x16, 0x3d, 0x93, 0xf1, 0x6f, 0x87, 0x5b, 0xf2, 0xe5, 0x0b, 0xdc,
+ 0x22, 0x10, 0x7e, 0xd7, 0xb7, 0x1c, 0xbb, 0x65, 0xd2, 0xfe, 0x2d, 0x64, 0x58, 0x14, 0x70, 0xf9,
+ 0x55, 0x50, 0x25, 0xc4, 0x12, 0x10, 0x7e, 0xf7, 0x01, 0x62, 0xd1, 0xc7, 0x4f, 0x60, 0xfa, 0x4d,
+ 0x5a, 0x27, 0x36, 0xcb, 0x2e, 0x90, 0x1c, 0x47, 0x40, 0x4d, 0x3f, 0x5e, 0xda, 0x64, 0xfc, 0xff,
+ 0x74, 0xf2, 0xf2, 0xff, 0x37, 0xf9, 0xfd, 0xff, 0xbf, 0xbe, 0x7a, 0x0b, 0xb6, 0xe0, 0x75, 0x7a,
+ 0xe7, 0xff, 0x4f, 0xa7, 0xaf, 0xfe, 0x7f, 0xe9, 0x59, 0x84, 0xcd, 0xa2, 0x2f, 0x24, 0xa7, 0x3a,
+ 0x60, 0xd0, 0x7d, 0x47, 0x36, 0x04, 0x66, 0xd1, 0x33, 0xf5, 0x88, 0xff, 0x78, 0x52, 0xe0, 0x67,
+ 0x92, 0xeb, 0x23, 0xa0, 0xa6, 0x4b, 0xd8, 0x2c, 0x7a, 0x9d, 0xd3, 0xfb, 0xff, 0x75, 0x6a, 0x3b,
+ 0x02, 0x27, 0xb7, 0xfd, 0x7f, 0xae, 0x19, 0x05, 0x53, 0x77, 0x9e, 0xe4, 0x1a, 0xf6, 0x62, 0x46,
+ 0x33, 0x8a, 0x6b, 0xbf, 0x3c, 0x7f, 0x85, 0x92, 0x20, 0x90, 0xf1, 0xfb, 0x39, 0xd0, 0x64, 0x2f,
+ 0x1d, 0xd0, 0x44, 0xb2, 0x8f, 0x5e, 0x29, 0x84, 0x4a, 0x80, 0x32, 0x23, 0xcc, 0xa2, 0x37, 0x45,
+ 0x13, 0xff, 0x7f, 0x58, 0xb3, 0x0f, 0x03, 0xbf, 0x5f, 0xb9, 0xfb, 0xff, 0x4b, 0x9f, 0x12, 0x90,
+ 0x9a, 0x0f, 0xcf, 0xa4, 0x7c, 0x45, 0xc8, 0xca, 0x4b, 0xcf, 0x65, 0x02, 0x3c, 0x81, 0x06, 0xfc,
+ 0xc2, 0x13, 0x27, 0xf0, 0x0c, 0x0b, 0x8c, 0xd3, 0x40, 0x8a, 0x0a, 0x4e, 0xa0, 0x21, 0xc1, 0xc8,
+ 0x3e, 0xc3, 0x82, 0xdf, 0x3f, 0x97, 0x0e, 0x0c, 0xa5, 0x4a, 0xb5, 0xf2, 0x52, 0xd1, 0x4f, 0x1c,
+ 0x18, 0xfe, 0xcd, 0xa0, 0xc8, 0x06, 0x25, 0x7b, 0x68, 0x8a, 0x3c, 0xfd, 0x5c, 0xd6, 0xbf, 0x04,
+ 0x24, 0x37, 0x60, 0xf5, 0x1d, 0x00, 0xa1, 0xa5, 0x3e, 0xd7, 0xd9, 0x00, 0xb5, 0x7b, 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" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/group_remove.cpp b/bitmaps_png/cpp_26/group_remove.cpp
new file mode 100644
index 0000000000..0dd4632c00
--- /dev/null
+++ b/bitmaps_png/cpp_26/group_remove.cpp
@@ -0,0 +1,38 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0x4d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0xa0, 0x27, 0x08,
+ 0x09, 0x09, 0xf9, 0x0f, 0xc3, 0x34, 0x35, 0x07, 0x59, 0xc1, 0xce, 0x9d, 0x3b, 0x41, 0xf8, 0x3e,
+ 0xb2, 0x3c, 0x88, 0x0f, 0x15, 0xc7, 0x2b, 0x4f, 0x92, 0x45, 0x34, 0x0f, 0x19, 0x90, 0x8b, 0xa8,
+ 0x11, 0x0d, 0x04, 0xcd, 0x41, 0x0f, 0x0e, 0x0a, 0x2c, 0xba, 0xcf, 0x30, 0x0a, 0x68, 0x02, 0xe8,
+ 0x16, 0x47, 0xf4, 0x4c, 0x75, 0x24, 0x59, 0xf4, 0x48, 0xd6, 0x4f, 0xea, 0x99, 0x6c, 0x40, 0xdb,
+ 0x33, 0x99, 0xc0, 0x2b, 0xcf, 0x64, 0x02, 0xbe, 0x00, 0xf1, 0x1b, 0x20, 0x3e, 0x73, 0x2e, 0xbf,
+ 0xe3, 0xff, 0x6b, 0xf9, 0x20, 0x49, 0xaa, 0x58, 0xf4, 0x54, 0xd6, 0x3f, 0x1c, 0x68, 0xe8, 0x67,
+ 0x20, 0xfe, 0x8f, 0x03, 0x7f, 0x7c, 0x2a, 0x1b, 0x18, 0x41, 0x51, 0x1c, 0xbd, 0x90, 0x0e, 0xf4,
+ 0x01, 0x1a, 0xf4, 0x1b, 0x8f, 0x25, 0x30, 0xfc, 0xef, 0xb9, 0xb4, 0x7f, 0x08, 0x59, 0xe1, 0x0f,
+ 0x0e, 0x2e, 0x99, 0x80, 0x4f, 0x44, 0x58, 0x02, 0xc3, 0x9f, 0x5e, 0x88, 0x07, 0x8a, 0x91, 0x6c,
+ 0xd1, 0x33, 0x19, 0xff, 0x76, 0x12, 0x2c, 0x81, 0x60, 0x69, 0xff, 0x16, 0x32, 0x2c, 0x0a, 0xb8,
+ 0x4c, 0xb2, 0x45, 0x32, 0x01, 0x17, 0x48, 0x8e, 0x23, 0xa0, 0xa6, 0x1f, 0x20, 0xcd, 0xaf, 0xe3,
+ 0x9a, 0xfe, 0x7f, 0xf9, 0xf0, 0xf1, 0xff, 0xd7, 0xaf, 0x5f, 0xb1, 0x62, 0x90, 0xdc, 0xab, 0xe8,
+ 0x06, 0x98, 0x45, 0x5f, 0x48, 0x4e, 0x75, 0xc0, 0xa0, 0xfb, 0x0e, 0xd2, 0xfc, 0x2a, 0xa6, 0xe1,
+ 0xff, 0x97, 0xf7, 0x1f, 0x70, 0x5b, 0x04, 0x94, 0x7b, 0x15, 0x59, 0x07, 0xb3, 0xe8, 0x33, 0xc9,
+ 0xf5, 0x11, 0x50, 0xd3, 0x25, 0x32, 0x82, 0xee, 0x3c, 0xc9, 0x35, 0xec, 0xc5, 0x8c, 0xe6, 0xff,
+ 0xa4, 0x27, 0x86, 0x80, 0x26, 0x92, 0x7d, 0xf4, 0x4a, 0x21, 0x54, 0x02, 0x94, 0x19, 0x49, 0xb0,
+ 0xe8, 0xc3, 0x33, 0x29, 0x5f, 0x11, 0xb2, 0xf2, 0xd2, 0x73, 0x99, 0x00, 0x4f, 0xa0, 0x01, 0xbf,
+ 0x88, 0xc9, 0xb0, 0xc0, 0x38, 0x0d, 0xa4, 0xa8, 0xe0, 0x04, 0x1a, 0x12, 0x4c, 0xc0, 0x67, 0xef,
+ 0x9f, 0x4b, 0x07, 0x86, 0x52, 0xa5, 0x5a, 0x79, 0xa9, 0xe8, 0x27, 0x0e, 0x0c, 0xff, 0x66, 0x50,
+ 0x64, 0x43, 0x92, 0x3d, 0x38, 0x45, 0x9e, 0x7e, 0x2e, 0xeb, 0x5f, 0x02, 0x92, 0x1b, 0xb0, 0xfa,
+ 0x0e, 0x00, 0x8d, 0xcf, 0x1e, 0x4f, 0x33, 0x4e, 0xa2, 0x72, 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" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/group_ungroup.cpp b/bitmaps_png/cpp_26/group_ungroup.cpp
new file mode 100644
index 0000000000..4a503f19ed
--- /dev/null
+++ b/bitmaps_png/cpp_26/group_ungroup.cpp
@@ -0,0 +1,45 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0xbc, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x55, 0xdd, 0x2e, 0x03,
+ 0x41, 0x18, 0xed, 0x43, 0x88, 0xd2, 0xdd, 0x0d, 0xae, 0x2a, 0xa9, 0xfa, 0x79, 0x0c, 0x09, 0xdd,
+ 0x5d, 0xb6, 0xd1, 0x86, 0xaa, 0x4b, 0x77, 0x6e, 0x44, 0xb8, 0x55, 0xc1, 0x0b, 0xe0, 0x59, 0xfa,
+ 0x0c, 0x44, 0xff, 0x43, 0x69, 0x34, 0x91, 0x74, 0xa7, 0x68, 0x83, 0x4e, 0x1b, 0x42, 0x62, 0x7c,
+ 0x33, 0xed, 0xae, 0x6d, 0x51, 0xa6, 0x7f, 0x6e, 0x4c, 0x72, 0xd2, 0xf6, 0x9b, 0xdd, 0x73, 0x66,
+ 0xce, 0xf9, 0xa6, 0x63, 0xb3, 0xf5, 0x72, 0x68, 0x9a, 0x46, 0x0c, 0x74, 0x95, 0xc7, 0xfa, 0x40,
+ 0x38, 0x1c, 0xa6, 0xc8, 0x5a, 0xe7, 0xe9, 0xef, 0x5a, 0xbd, 0xe9, 0x3c, 0x97, 0x50, 0xd7, 0x9d,
+ 0xa1, 0x2b, 0xea, 0x44, 0x0c, 0x3f, 0xf2, 0x34, 0xda, 0xd1, 0x86, 0x50, 0xd6, 0xf6, 0x3f, 0xba,
+ 0x32, 0x7a, 0x96, 0x51, 0x2f, 0xbb, 0x8e, 0x4b, 0xe8, 0x5a, 0xf2, 0x38, 0x74, 0x49, 0xd9, 0xd5,
+ 0x45, 0x35, 0xa9, 0x8b, 0x4a, 0x19, 0x50, 0x00, 0x9c, 0x9c, 0xae, 0xed, 0x93, 0xbb, 0xa1, 0xb9,
+ 0xc1, 0x8e, 0x08, 0xe5, 0x24, 0x79, 0x01, 0x48, 0x31, 0x80, 0x7c, 0x83, 0xc7, 0x9c, 0xa4, 0xfa,
+ 0xda, 0xca, 0x28, 0x2f, 0xa8, 0x33, 0x40, 0xf4, 0xda, 0x44, 0xc4, 0xc0, 0x1b, 0x12, 0x64, 0xad,
+ 0x25, 0xff, 0x99, 0x5d, 0xa2, 0x52, 0x62, 0x44, 0xa3, 0x7e, 0x52, 0xdc, 0x3a, 0x22, 0xc8, 0x1d,
+ 0x30, 0xc9, 0xd1, 0x78, 0x80, 0xd5, 0x74, 0xa7, 0xdf, 0xa8, 0x95, 0xf2, 0x76, 0xb5, 0x9f, 0x5b,
+ 0x48, 0x17, 0xe5, 0x3d, 0x83, 0xb4, 0xb8, 0x79, 0x48, 0x2a, 0x95, 0x0a, 0xc1, 0xb1, 0x34, 0x41,
+ 0x13, 0xcb, 0x80, 0x20, 0xc1, 0xf1, 0x0b, 0x56, 0x2b, 0x6c, 0x1c, 0x7c, 0xec, 0x4c, 0x90, 0x77,
+ 0x5a, 0x10, 0x52, 0x12, 0xe6, 0xea, 0xc7, 0x96, 0x08, 0x8e, 0xa6, 0xab, 0x62, 0xc9, 0x0c, 0xc1,
+ 0xa9, 0x4c, 0xf5, 0x7b, 0xe4, 0x9c, 0x20, 0xd7, 0xa2, 0xd5, 0xc2, 0x28, 0x77, 0x46, 0xf0, 0xd2,
+ 0xb3, 0x35, 0x07, 0x6a, 0x15, 0x8e, 0x5f, 0x32, 0x01, 0x26, 0x92, 0xba, 0x22, 0x68, 0x32, 0xd8,
+ 0x98, 0x55, 0x99, 0xbb, 0xeb, 0xc0, 0xba, 0xa7, 0x3a, 0x21, 0xb0, 0x0c, 0x27, 0x2c, 0x42, 0x67,
+ 0x20, 0x34, 0xb5, 0xd2, 0x28, 0x84, 0xb9, 0xef, 0x23, 0x78, 0x29, 0x6e, 0x8a, 0xb8, 0x03, 0x66,
+ 0x26, 0xf4, 0xd3, 0x10, 0x64, 0x99, 0x81, 0xad, 0x16, 0xa1, 0x08, 0xf7, 0x0d, 0x1b, 0x5b, 0x0d,
+ 0x91, 0x4f, 0xcd, 0x40, 0x33, 0x01, 0x0b, 0x99, 0x8d, 0xb5, 0xcc, 0xea, 0x9b, 0x41, 0xd9, 0xe6,
+ 0xde, 0xd1, 0xed, 0xb0, 0x77, 0x80, 0x1e, 0x46, 0x46, 0x00, 0x2d, 0x4c, 0x09, 0xad, 0xab, 0xa7,
+ 0xbb, 0x64, 0x22, 0x4e, 0x9f, 0x51, 0x7b, 0xd0, 0x1d, 0xb3, 0x7d, 0x2d, 0x9d, 0x25, 0x24, 0x2a,
+ 0xd3, 0x40, 0xf0, 0xf2, 0x9b, 0x03, 0x0b, 0x99, 0xaa, 0x6d, 0xfd, 0x71, 0x02, 0xc9, 0xbc, 0xb9,
+ 0xb3, 0xaf, 0x71, 0x8f, 0x04, 0xd5, 0xdb, 0x91, 0x6b, 0xe5, 0x66, 0xc4, 0x63, 0x07, 0xff, 0x43,
+ 0x34, 0xec, 0x6a, 0xdb, 0xb3, 0x8e, 0x3c, 0x46, 0x92, 0xbc, 0x4e, 0xe7, 0xfe, 0xec, 0xbe, 0x7b,
+ 0x07, 0x8b, 0x54, 0x32, 0xde, 0xa0, 0xc4, 0x6d, 0x10, 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" }};
+
+//EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 5b81c06097..8350a08b2c 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -185,6 +185,12 @@ EXTERN_BITMAP( green_xpm )
 EXTERN_BITMAP( grid_select_axis_xpm )
 EXTERN_BITMAP( grid_select_xpm )
 EXTERN_BITMAP( grid_xpm )
+EXTERN_BITMAP( group_xpm )
+EXTERN_BITMAP( group_add_xpm )
+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 )
diff --git a/bitmaps_png/sources/group_add.svg b/bitmaps_png/sources/group_add.svg
new file mode 100644
index 0000000000..05cca9accf
--- /dev/null
+++ b/bitmaps_png/sources/group_add.svg
@@ -0,0 +1,162 @@
+<?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 26 26"
+   version="1.1"
+   sodipodi:docname="add_to_group.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="1719"
+     inkscape:window-height="1107"
+     id="namedview7947"
+     showgrid="false"
+     inkscape:zoom="27.961538"
+     inkscape:cx="13"
+     inkscape:cy="13"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Слой_1" />
+  <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>ungroup</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="defs7912">
+    <style
+       id="style7910">.cls-1,.cls-2,.cls-5{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1,.cls-2{stroke:#b9b9b9;}.cls-2{stroke-dasharray:4 4;}.cls-3{fill:#545454;}.cls-4{fill:#e61c50;}.cls-5{stroke:#f5f5f5;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title7914">ungroup</title>
+  <polyline
+     class="cls-1"
+     points="20.5 17.5 20.5 20.5 17.5 20.5"
+     id="polyline7916" />
+  <line
+     class="cls-2"
+     x1="13.5"
+     y1="20.5"
+     x2="7.5"
+     y2="20.5"
+     id="line7918" />
+  <polyline
+     class="cls-1"
+     points="5.5 20.5 2.5 20.5 2.5 17.5"
+     id="polyline7920" />
+  <line
+     class="cls-2"
+     x1="2.5"
+     y1="13.5"
+     x2="2.5"
+     y2="7.5"
+     id="line7922" />
+  <polyline
+     class="cls-1"
+     points="2.5 5.5 2.5 2.5 5.5 2.5"
+     id="polyline7924" />
+  <line
+     class="cls-2"
+     x1="9.5"
+     y1="2.5"
+     x2="15.5"
+     y2="2.5"
+     id="line7926" />
+  <polyline
+     class="cls-1"
+     points="17.5 2.5 20.5 2.5 20.5 5.5"
+     id="polyline7928" />
+  <line
+     class="cls-2"
+     x1="20.5"
+     y1="9.5"
+     x2="20.5"
+     y2="15.5"
+     id="line7930" />
+  <rect
+     class="cls-3"
+     x="1.0012"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7932" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7934" />
+  <rect
+     class="cls-3"
+     x="19.0006"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7936" />
+  <rect
+     class="cls-3"
+     x="18.9994"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7938" />
+  <path
+     class="cls-4"
+     d="M22.9513,22.948a7.0032,7.0032,0,1,1,0-9.9038A7.0034,7.0034,0,0,1,22.9513,22.948Z"
+     id="path7940" />
+  <line
+     class="cls-5"
+     x1="21.496372"
+     y1="17.991751"
+     x2="14.493328"
+     y2="17.991749"
+     id="line7942" />
+  <line
+     class="cls-5"
+     x1="17.99485"
+     y1="21.493271"
+     x2="17.99485"
+     y2="14.490228"
+     id="line7944" />
+</svg>
diff --git a/bitmaps_png/sources/group_enter.svg b/bitmaps_png/sources/group_enter.svg
new file mode 100644
index 0000000000..1acec784b2
--- /dev/null
+++ b/bitmaps_png/sources/group_enter.svg
@@ -0,0 +1,160 @@
+<?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 26 26"
+   version="1.1"
+   sodipodi:docname="enter_group.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="1719"
+     inkscape:window-height="1107"
+     id="namedview7947"
+     showgrid="false"
+     inkscape:zoom="6.9903846"
+     inkscape:cx="-13.740225"
+     inkscape:cy="19.067038"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Слой_1" />
+  <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>ungroup</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="defs7912">
+    <style
+       id="style7910">.cls-1,.cls-2,.cls-5{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1,.cls-2{stroke:#b9b9b9;}.cls-2{stroke-dasharray:4 4;}.cls-3{fill:#545454;}.cls-4{fill:#e61c50;}.cls-5{stroke:#f5f5f5;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title7914">ungroup</title>
+  <polyline
+     class="cls-1"
+     points="20.5 17.5 20.5 20.5 17.5 20.5"
+     id="polyline7916" />
+  <line
+     class="cls-2"
+     x1="13.5"
+     y1="20.5"
+     x2="7.5"
+     y2="20.5"
+     id="line7918" />
+  <polyline
+     class="cls-1"
+     points="5.5 20.5 2.5 20.5 2.5 17.5"
+     id="polyline7920" />
+  <line
+     class="cls-2"
+     x1="2.5"
+     y1="13.5"
+     x2="2.5"
+     y2="7.5"
+     id="line7922" />
+  <polyline
+     class="cls-1"
+     points="2.5 5.5 2.5 2.5 5.5 2.5"
+     id="polyline7924" />
+  <line
+     class="cls-2"
+     x1="9.5"
+     y1="2.5"
+     x2="15.5"
+     y2="2.5"
+     id="line7926" />
+  <polyline
+     class="cls-1"
+     points="17.5 2.5 20.5 2.5 20.5 5.5"
+     id="polyline7928" />
+  <line
+     class="cls-2"
+     x1="20.5"
+     y1="9.5"
+     x2="20.5"
+     y2="15.5"
+     id="line7930" />
+  <rect
+     class="cls-3"
+     x="1.0012"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7932" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7934" />
+  <rect
+     class="cls-3"
+     x="19.0006"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7936" />
+  <rect
+     class="cls-3"
+     x="18.9994"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7938" />
+  <path
+     class="cls-4"
+     d="M22.9513,22.948a7.0032,7.0032,0,1,1,0-9.9038A7.0034,7.0034,0,0,1,22.9513,22.948Z"
+     id="path7940" />
+  <g
+     id="g9325"
+     transform="matrix(-1,0,0,1,35.956089,0.25405115)">
+    <polyline
+       class="cls-5"
+       points="21.865 19.871 15.694 19.871 15.694 14.26"
+       id="polyline8755" />
+    <polyline
+       class="cls-5"
+       points="19.487 17.444 21.913 19.871 19.487 22.297"
+       id="polyline8757" />
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/group_leave.svg b/bitmaps_png/sources/group_leave.svg
new file mode 100644
index 0000000000..19d14d81eb
--- /dev/null
+++ b/bitmaps_png/sources/group_leave.svg
@@ -0,0 +1,160 @@
+<?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 26 26"
+   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="1719"
+     inkscape:window-height="1107"
+     id="namedview7947"
+     showgrid="false"
+     inkscape:zoom="9.8858967"
+     inkscape:cx="5.0862569"
+     inkscape:cy="22.883591"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Слой_1" />
+  <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>ungroup</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="defs7912">
+    <style
+       id="style7910">.cls-1,.cls-2,.cls-5{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1,.cls-2{stroke:#b9b9b9;}.cls-2{stroke-dasharray:4 4;}.cls-3{fill:#545454;}.cls-4{fill:#e61c50;}.cls-5{stroke:#f5f5f5;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title7914">ungroup</title>
+  <polyline
+     class="cls-1"
+     points="20.5 17.5 20.5 20.5 17.5 20.5"
+     id="polyline7916" />
+  <line
+     class="cls-2"
+     x1="13.5"
+     y1="20.5"
+     x2="7.5"
+     y2="20.5"
+     id="line7918" />
+  <polyline
+     class="cls-1"
+     points="5.5 20.5 2.5 20.5 2.5 17.5"
+     id="polyline7920" />
+  <line
+     class="cls-2"
+     x1="2.5"
+     y1="13.5"
+     x2="2.5"
+     y2="7.5"
+     id="line7922" />
+  <polyline
+     class="cls-1"
+     points="2.5 5.5 2.5 2.5 5.5 2.5"
+     id="polyline7924" />
+  <line
+     class="cls-2"
+     x1="9.5"
+     y1="2.5"
+     x2="15.5"
+     y2="2.5"
+     id="line7926" />
+  <polyline
+     class="cls-1"
+     points="17.5 2.5 20.5 2.5 20.5 5.5"
+     id="polyline7928" />
+  <line
+     class="cls-2"
+     x1="20.5"
+     y1="9.5"
+     x2="20.5"
+     y2="15.5"
+     id="line7930" />
+  <rect
+     class="cls-3"
+     x="1.0012"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7932" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7934" />
+  <rect
+     class="cls-3"
+     x="19.0006"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7936" />
+  <rect
+     class="cls-3"
+     x="18.9994"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7938" />
+  <path
+     class="cls-4"
+     d="M22.9513,22.948a7.0032,7.0032,0,1,1,0-9.9038A7.0034,7.0034,0,0,1,22.9513,22.948Z"
+     id="path7940" />
+  <g
+     id="g9325"
+     transform="matrix(0,-1,-1,0,35.920008,36.349178)">
+    <polyline
+       class="cls-5"
+       points="21.865 19.871 15.694 19.871 15.694 14.26"
+       id="polyline8755" />
+    <polyline
+       class="cls-5"
+       points="19.487 17.444 21.913 19.871 19.487 22.297"
+       id="polyline8757" />
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/group_remove.svg b/bitmaps_png/sources/group_remove.svg
new file mode 100644
index 0000000000..38c30129b6
--- /dev/null
+++ b/bitmaps_png/sources/group_remove.svg
@@ -0,0 +1,155 @@
+<?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 26 26"
+   version="1.1"
+   sodipodi:docname="remove_from_group.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="1719"
+     inkscape:window-height="1107"
+     id="namedview7947"
+     showgrid="false"
+     inkscape:zoom="27.961538"
+     inkscape:cx="13"
+     inkscape:cy="13"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Слой_1" />
+  <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>ungroup</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="defs7912">
+    <style
+       id="style7910">.cls-1,.cls-2,.cls-5{fill:none;stroke-linecap:round;stroke-linejoin:round;}.cls-1,.cls-2{stroke:#b9b9b9;}.cls-2{stroke-dasharray:4 4;}.cls-3{fill:#545454;}.cls-4{fill:#e61c50;}.cls-5{stroke:#f5f5f5;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title7914">ungroup</title>
+  <polyline
+     class="cls-1"
+     points="20.5 17.5 20.5 20.5 17.5 20.5"
+     id="polyline7916" />
+  <line
+     class="cls-2"
+     x1="13.5"
+     y1="20.5"
+     x2="7.5"
+     y2="20.5"
+     id="line7918" />
+  <polyline
+     class="cls-1"
+     points="5.5 20.5 2.5 20.5 2.5 17.5"
+     id="polyline7920" />
+  <line
+     class="cls-2"
+     x1="2.5"
+     y1="13.5"
+     x2="2.5"
+     y2="7.5"
+     id="line7922" />
+  <polyline
+     class="cls-1"
+     points="2.5 5.5 2.5 2.5 5.5 2.5"
+     id="polyline7924" />
+  <line
+     class="cls-2"
+     x1="9.5"
+     y1="2.5"
+     x2="15.5"
+     y2="2.5"
+     id="line7926" />
+  <polyline
+     class="cls-1"
+     points="17.5 2.5 20.5 2.5 20.5 5.5"
+     id="polyline7928" />
+  <line
+     class="cls-2"
+     x1="20.5"
+     y1="9.5"
+     x2="20.5"
+     y2="15.5"
+     id="line7930" />
+  <rect
+     class="cls-3"
+     x="1.0012"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7932" />
+  <rect
+     class="cls-3"
+     x="1"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7934" />
+  <rect
+     class="cls-3"
+     x="19.0006"
+     y="19"
+     width="3"
+     height="3"
+     id="rect7936" />
+  <rect
+     class="cls-3"
+     x="18.9994"
+     y="1"
+     width="3"
+     height="3"
+     id="rect7938" />
+  <path
+     class="cls-4"
+     d="M22.9513,22.948a7.0032,7.0032,0,1,1,0-9.9038A7.0034,7.0034,0,0,1,22.9513,22.948Z"
+     id="path7940" />
+  <line
+     class="cls-5"
+     x1="21.496372"
+     y1="17.991751"
+     x2="14.493328"
+     y2="17.991749"
+     id="line7942" />
+</svg>
diff --git a/bitmaps_png/sources/ungroup.svg b/bitmaps_png/sources/group_ungroup.svg
similarity index 100%
rename from bitmaps_png/sources/ungroup.svg
rename to bitmaps_png/sources/group_ungroup.svg
diff --git a/pcbnew/tools/group_tool.cpp b/pcbnew/tools/group_tool.cpp
index e980f9939e..45296b3b57 100644
--- a/pcbnew/tools/group_tool.cpp
+++ b/pcbnew/tools/group_tool.cpp
@@ -171,7 +171,7 @@ class GROUP_CONTEXT_MENU : public ACTION_MENU
 public:
     GROUP_CONTEXT_MENU( ) : ACTION_MENU( true )
     {
-        SetIcon( locked_xpm ); // fixme
+        SetIcon( group_xpm ); // fixme
         SetTitle( _( "Grouping" ) );
 
         Add( PCB_ACTIONS::groupCreate );
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index c75e6cc5ff..e1865c6d59 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -656,27 +656,27 @@ TOOL_ACTION PCB_ACTIONS::unlock( "pcbnew.EditorControl.unlock",
 TOOL_ACTION PCB_ACTIONS::groupCreate( "pcbnew.EditorControl.groupCreate",
         AS_GLOBAL, 0, "",
         _( "Group" ), _( "Add the selected items to a new group" ),
-        locked_xpm );
+        group_add_xpm );
 
 TOOL_ACTION PCB_ACTIONS::groupUngroup( "pcbnew.EditorControl.groupUngroup",
         AS_GLOBAL, 0, "",
         _( "Ungroup" ), "",
-        unlocked_xpm );
+        group_ungroup_xpm );
 
 TOOL_ACTION PCB_ACTIONS::groupRemoveItems( "pcbnew.EditorControl.groupRemoveItems",
         AS_GLOBAL, 0, "",
         _( "Remove Items" ), _( "Remove items from group" ),
-        unlocked_xpm );
+        group_remove_xpm );
 
 TOOL_ACTION PCB_ACTIONS::groupEnter( "pcbnew.EditorControl.groupEnter",
         AS_GLOBAL, 0, "",
         _( "Enter Group" ), _( "Enter the group to edit items" ),
-        unlocked_xpm );
+        group_enter_xpm );
 
 TOOL_ACTION PCB_ACTIONS::groupLeave( "pcbnew.EditorControl.groupLeave",
         AS_GLOBAL, 0, "",
         _( "Leave Group" ), _( "Leave the current group" ),
-        cancel_xpm );
+        group_leave_xpm );
 
 TOOL_ACTION PCB_ACTIONS::appendBoard( "pcbnew.EditorControl.appendBoard",
         AS_GLOBAL, 0, "",