diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 5a95af6e05..53d4e286ba 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -168,6 +168,7 @@ set( BMAPS_MID
     break_bus
     break_line
     browse_files
+    bus_definition_tool
     calculator
     cancel
     change_entry_orient
diff --git a/bitmaps_png/cpp_16/folder.cpp b/bitmaps_png/cpp_16/folder.cpp
index afcdb299e8..174d982dda 100644
--- a/bitmaps_png/cpp_16/folder.cpp
+++ b/bitmaps_png/cpp_16/folder.cpp
@@ -8,19 +8,13 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
- 0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
- 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x0e,
- 0xc4, 0x01, 0x95, 0x2b, 0x0e, 0x1b, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
- 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
- 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x69, 0x49,
- 0x44, 0x41, 0x54, 0x38, 0x8d, 0xed, 0xd2, 0x31, 0x0e, 0x82, 0x40, 0x14, 0x06, 0xe1, 0x4f, 0x0e,
- 0x20, 0x94, 0x9c, 0xd5, 0xda, 0x78, 0x16, 0x1a, 0xe8, 0x0d, 0xd9, 0xc4, 0xd8, 0xca, 0x55, 0xb8,
- 0x82, 0x6b, 0x01, 0x41, 0xb4, 0xda, 0xd5, 0x86, 0x82, 0x49, 0xfe, 0xe2, 0x15, 0x33, 0xd5, 0x63,
- 0x2b, 0x5c, 0x10, 0x10, 0x31, 0xe2, 0x81, 0x3a, 0x27, 0x70, 0xc7, 0x71, 0x75, 0x9f, 0xd0, 0xe4,
- 0x04, 0x62, 0xe6, 0x02, 0xce, 0xdf, 0x81, 0x1c, 0x4a, 0xdc, 0xfe, 0x09, 0x2c, 0x4e, 0xf1, 0x83,
- 0xf8, 0xc1, 0x1e, 0x78, 0x07, 0x7a, 0xd3, 0x23, 0x1d, 0x12, 0x57, 0xe1, 0xba, 0x0e, 0x0c, 0xe8,
- 0xf0, 0x4c, 0x5c, 0x3b, 0x3b, 0x1b, 0xe0, 0x05, 0x48, 0x07, 0x25, 0x8f, 0x26, 0x9b, 0x81, 0x8e,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x61, 0x00, 0x00, 0x00, 0x52, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x2c, 0xa0,
+ 0x0d, 0x88, 0xf7, 0x02, 0xf1, 0x7f, 0x20, 0x7e, 0x0b, 0xc4, 0xa7, 0x81, 0x58, 0x82, 0x14, 0x03,
+ 0x0e, 0x01, 0x31, 0x1f, 0x12, 0xbf, 0x0a, 0x88, 0x57, 0x90, 0x62, 0xc0, 0x7f, 0x12, 0x31, 0xc8,
+ 0xb5, 0x2d, 0xe8, 0x06, 0x90, 0x02, 0xf8, 0x81, 0xf8, 0x00, 0x25, 0x06, 0x60, 0xe8, 0x19, 0x35,
+ 0x80, 0x0a, 0x06, 0xec, 0x82, 0x26, 0x24, 0x46, 0x22, 0xb1, 0x00, 0x10, 0xef, 0x40, 0x4f, 0xca,
+ 0x7b, 0x28, 0x49, 0x48, 0x03, 0x07, 0x00, 0x53, 0x4f, 0x2f, 0x0f, 0x29, 0x5f, 0x3d, 0xf7, 0x00,
+ 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE folder_xpm[1] = {{ png, sizeof( png ), "folder_xpm" }};
diff --git a/bitmaps_png/cpp_26/bus_definition_tool.cpp b/bitmaps_png/cpp_26/bus_definition_tool.cpp
new file mode 100644
index 0000000000..669f452f56
--- /dev/null
+++ b/bitmaps_png/cpp_26/bus_definition_tool.cpp
@@ -0,0 +1,87 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x04, 0x58, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x6b, 0x48, 0xa4,
+ 0x55, 0x18, 0xc7, 0x4f, 0x52, 0xb1, 0x49, 0xd4, 0xba, 0x50, 0x51, 0x81, 0x0b, 0xed, 0x87, 0xed,
+ 0x02, 0xa2, 0x89, 0x8a, 0xe6, 0xad, 0x56, 0x51, 0x51, 0xd1, 0xe6, 0x83, 0x09, 0x86, 0xa0, 0x48,
+ 0xa9, 0x69, 0x48, 0x5e, 0xc2, 0xdb, 0xec, 0x5c, 0xb6, 0x12, 0x9c, 0x34, 0x42, 0x74, 0x57, 0x45,
+ 0x68, 0x26, 0xbf, 0x2c, 0x53, 0xe8, 0x8a, 0x69, 0xea, 0x07, 0xef, 0x97, 0x41, 0x4a, 0x44, 0x2b,
+ 0x16, 0x46, 0x28, 0x5d, 0xc6, 0x51, 0xca, 0x0f, 0x66, 0x9a, 0x33, 0xce, 0xd3, 0xff, 0x39, 0x3b,
+ 0xef, 0xf0, 0x2a, 0xe6, 0x8e, 0xd1, 0x1e, 0xf8, 0x31, 0x73, 0xce, 0x9c, 0xf7, 0xf9, 0x9f, 0xf3,
+ 0x3c, 0xff, 0x73, 0xde, 0x11, 0xe2, 0xd4, 0xb6, 0xf8, 0xb4, 0x10, 0xf3, 0xcb, 0x42, 0x2c, 0x7c,
+ 0x7e, 0x6c, 0xd8, 0x28, 0xde, 0x12, 0x06, 0xf1, 0xde, 0xb9, 0xb9, 0x21, 0xde, 0x3e, 0x5d, 0x47,
+ 0xcc, 0x87, 0x03, 0x02, 0xbf, 0xf8, 0x86, 0x0c, 0xe2, 0x5d, 0x08, 0xdd, 0xc3, 0x43, 0xb7, 0xce,
+ 0x8d, 0x41, 0x34, 0xfb, 0x27, 0x74, 0x43, 0xbc, 0x23, 0x45, 0x0c, 0xe2, 0x35, 0xf1, 0xff, 0x36,
+ 0x95, 0xd0, 0xc3, 0x13, 0x51, 0x09, 0x5d, 0x18, 0xbb, 0xf7, 0x10, 0x45, 0x54, 0x42, 0x97, 0xac,
+ 0x2e, 0x08, 0xbd, 0xe2, 0x1b, 0xd6, 0x89, 0x40, 0xf0, 0xd2, 0x7f, 0xe0, 0x85, 0xb3, 0x85, 0x02,
+ 0xa6, 0xec, 0xbe, 0xa1, 0xcf, 0x44, 0x10, 0x44, 0x17, 0xc1, 0xaf, 0x48, 0xa7, 0xfd, 0x5c, 0x18,
+ 0xc5, 0x5d, 0x25, 0x4c, 0x1d, 0x78, 0x11, 0x58, 0xc0, 0x6d, 0x21, 0xcc, 0xb1, 0xc7, 0xcc, 0xa0,
+ 0x13, 0x17, 0x31, 0xd9, 0x86, 0x14, 0xfa, 0xec, 0x4e, 0x44, 0x17, 0xc0, 0x07, 0x40, 0x07, 0xc2,
+ 0xfc, 0xc9, 0x13, 0x56, 0x2f, 0x66, 0x41, 0x21, 0xb8, 0x03, 0x3a, 0x84, 0x08, 0xd3, 0xfb, 0x84,
+ 0x4e, 0x11, 0xf1, 0x0a, 0xfd, 0xb4, 0xb2, 0xb2, 0x42, 0x63, 0x63, 0x63, 0x74, 0x78, 0x78, 0xe8,
+ 0x41, 0xff, 0xe5, 0x07, 0x09, 0x25, 0x82, 0x56, 0x60, 0x05, 0x1a, 0x50, 0x21, 0xc4, 0xab, 0xcd,
+ 0x52, 0xe8, 0x91, 0xd9, 0xbb, 0x8a, 0x08, 0x02, 0xbd, 0x0f, 0x4c, 0xe0, 0x71, 0xaf, 0xd0, 0x51,
+ 0x6c, 0x6c, 0x2c, 0x65, 0x67, 0x67, 0xd3, 0xd0, 0xd0, 0x10, 0xba, 0xd4, 0xec, 0x1d, 0xd7, 0x80,
+ 0x9b, 0xe0, 0xe2, 0x49, 0xa1, 0x40, 0x2e, 0x0a, 0xb0, 0x01, 0x2e, 0xbc, 0x43, 0x88, 0xaa, 0x4c,
+ 0x29, 0x14, 0xf4, 0xed, 0x3e, 0x1f, 0x36, 0x3c, 0x74, 0x6b, 0x6b, 0x6b, 0x8b, 0xe6, 0xe6, 0xe6,
+ 0x38, 0xe0, 0x9f, 0xe0, 0x9b, 0xed, 0xed, 0x6d, 0xd2, 0x68, 0x34, 0x64, 0x36, 0x9b, 0x49, 0xab,
+ 0xd5, 0xf2, 0xf8, 0x26, 0x98, 0xdf, 0xd9, 0xd9, 0xa1, 0xc9, 0xc9, 0x49, 0xee, 0xff, 0x0e, 0x2e,
+ 0xa9, 0x85, 0x1e, 0x05, 0x01, 0xde, 0xef, 0x8f, 0x81, 0x27, 0x7c, 0x66, 0x08, 0xfc, 0xde, 0x89,
+ 0xc9, 0x97, 0xf7, 0xf7, 0xf7, 0x29, 0x2e, 0x2e, 0x8e, 0x72, 0x73, 0x73, 0xa9, 0xb8, 0xb8, 0x98,
+ 0x26, 0x26, 0x26, 0x28, 0x2b, 0x2b, 0x8b, 0x0c, 0x06, 0x03, 0x4d, 0x4d, 0x4d, 0x51, 0x68, 0x68,
+ 0x28, 0x75, 0x74, 0x74, 0x90, 0xd5, 0x6a, 0xa5, 0xf8, 0xf8, 0x78, 0x4a, 0x4d, 0x4d, 0xa5, 0xc1,
+ 0xc1, 0x41, 0x16, 0x1b, 0x50, 0x0b, 0x45, 0x83, 0x3f, 0x78, 0xd7, 0xc0, 0x03, 0x56, 0x84, 0xd0,
+ 0xa7, 0x28, 0x35, 0xc2, 0xe4, 0x27, 0x3d, 0x1e, 0x8f, 0x3b, 0x3d, 0x3d, 0x5d, 0x3e, 0xdc, 0xd5,
+ 0xd5, 0x45, 0x45, 0x45, 0x45, 0xd4, 0xd7, 0xd7, 0x27, 0x45, 0x98, 0xf1, 0xf1, 0x71, 0xd2, 0xeb,
+ 0xf5, 0x54, 0x51, 0x51, 0x21, 0x77, 0xcd, 0x8b, 0x58, 0x5e, 0x5e, 0x66, 0x21, 0xd3, 0x59, 0x35,
+ 0xd3, 0x0a, 0x11, 0xf2, 0x89, 0xda, 0x75, 0x78, 0xe0, 0xd3, 0xb5, 0xb5, 0x35, 0xb9, 0xd2, 0xd9,
+ 0xd9, 0x59, 0x19, 0x7c, 0x66, 0x66, 0x46, 0x7e, 0x57, 0x98, 0x9e, 0x9e, 0x96, 0x63, 0x2d, 0x2d,
+ 0x2d, 0xd4, 0xd0, 0xd0, 0xc0, 0x22, 0xdb, 0x27, 0x03, 0x73, 0xea, 0x82, 0xbc, 0x3c, 0x0f, 0x6e,
+ 0xc2, 0x88, 0x5a, 0xd5, 0x8e, 0xae, 0x01, 0x8b, 0xd3, 0xe9, 0x94, 0x42, 0x2c, 0xc2, 0x81, 0xb9,
+ 0x36, 0x19, 0x19, 0x19, 0x72, 0xac, 0xba, 0xba, 0x5a, 0x8a, 0xb0, 0x98, 0xc9, 0x64, 0xa2, 0xa6,
+ 0xa6, 0x26, 0x16, 0x72, 0x80, 0x62, 0xb5, 0x29, 0xa2, 0xc0, 0x96, 0x37, 0x7d, 0xbf, 0x81, 0xef,
+ 0x84, 0xe8, 0x8e, 0x67, 0xa1, 0x2b, 0x57, 0x7e, 0x3c, 0x74, 0x38, 0x1c, 0xd4, 0xdf, 0xdf, 0x4f,
+ 0x39, 0x39, 0x39, 0x32, 0x08, 0x07, 0xe4, 0xb4, 0xa5, 0xa4, 0xa4, 0x10, 0x17, 0x1e, 0xcd, 0xd3,
+ 0xd6, 0xd6, 0x46, 0x65, 0x65, 0x65, 0x72, 0x01, 0x6c, 0x84, 0xa8, 0xa8, 0x28, 0xea, 0xec, 0xec,
+ 0xa4, 0xa5, 0xa5, 0x25, 0x3a, 0x3a, 0x3a, 0x62, 0xeb, 0xbf, 0x79, 0x72, 0x77, 0xcf, 0x80, 0x60,
+ 0xc5, 0x0c, 0x57, 0xaf, 0x2e, 0x51, 0x48, 0x48, 0x08, 0xe9, 0x74, 0x3a, 0xea, 0xed, 0xed, 0x95,
+ 0x22, 0x4c, 0x55, 0x55, 0x95, 0xac, 0x0b, 0xda, 0x17, 0xe0, 0x59, 0xe0, 0x4e, 0x4b, 0x4b, 0x93,
+ 0xf5, 0xe1, 0x1d, 0xb3, 0xdd, 0x39, 0x85, 0x5c, 0x2b, 0x8b, 0xc5, 0xc2, 0xf3, 0xbe, 0xe2, 0xe0,
+ 0x4f, 0x01, 0xbe, 0x22, 0x86, 0x01, 0xd7, 0xc4, 0x29, 0x44, 0xa9, 0x46, 0x11, 0x8a, 0x88, 0x88,
+ 0xa0, 0xfc, 0xfc, 0x7c, 0x32, 0x1a, 0x8d, 0x32, 0x38, 0x0b, 0xd5, 0xd5, 0xd5, 0xd1, 0xc0, 0xc0,
+ 0x00, 0x07, 0x18, 0x01, 0x59, 0xbc, 0xea, 0xe4, 0xe4, 0x64, 0x9f, 0x50, 0x4f, 0x4f, 0x0f, 0x95,
+ 0x97, 0x97, 0x53, 0x4c, 0x4c, 0x8c, 0xcc, 0x06, 0x5a, 0x17, 0x0b, 0xc5, 0x81, 0x2f, 0xef, 0x9b,
+ 0x00, 0x6f, 0x43, 0x1c, 0x22, 0x64, 0xb3, 0x96, 0x85, 0x82, 0x83, 0x7f, 0xd8, 0xe3, 0x59, 0x76,
+ 0xbb, 0x9d, 0x6a, 0x6b, 0x6b, 0xa5, 0xb3, 0xb8, 0x0e, 0xa3, 0xa3, 0xa3, 0xd2, 0xee, 0x9c, 0xaa,
+ 0xf5, 0xf5, 0x75, 0x69, 0x79, 0x5e, 0x08, 0xf7, 0x79, 0x31, 0xca, 0x6f, 0x7c, 0x2c, 0xd0, 0x76,
+ 0x95, 0x5b, 0xe3, 0x9a, 0x57, 0x48, 0x07, 0x3e, 0x04, 0xd7, 0x85, 0x88, 0x68, 0x54, 0x99, 0x81,
+ 0xef, 0xb4, 0xd2, 0xdd, 0xdd, 0x5d, 0x79, 0x46, 0x14, 0xc7, 0x0d, 0x0f, 0x0f, 0x53, 0x49, 0x49,
+ 0x09, 0xe5, 0xe5, 0xe5, 0x51, 0x7b, 0x7b, 0xbb, 0xcf, 0x79, 0x8d, 0x8d, 0x8d, 0xb2, 0x3e, 0x7c,
+ 0x45, 0xf1, 0x19, 0x54, 0xd7, 0xe5, 0x0d, 0x60, 0x3f, 0x4e, 0xc2, 0x47, 0x27, 0xec, 0x7d, 0x7b,
+ 0x61, 0x61, 0x41, 0x1a, 0x42, 0x49, 0x8f, 0xda, 0xde, 0x8a, 0xe3, 0xf8, 0x93, 0xd3, 0x56, 0x50,
+ 0x50, 0xc0, 0x42, 0x7f, 0x81, 0x40, 0xbf, 0xdf, 0xb0, 0x5c, 0x6c, 0x97, 0xcb, 0xe5, 0x49, 0x4c,
+ 0x4c, 0x94, 0x37, 0x42, 0x7d, 0x7d, 0x3d, 0x25, 0x25, 0x25, 0x51, 0x6b, 0x6b, 0xab, 0x74, 0x18,
+ 0x0b, 0xf0, 0x8d, 0xc0, 0xc1, 0xf9, 0xde, 0x1b, 0x19, 0x19, 0xa1, 0xc2, 0xc2, 0x42, 0x79, 0xd9,
+ 0xa2, 0x7d, 0x7d, 0x6e, 0x21, 0x76, 0x50, 0x42, 0x42, 0x02, 0xb1, 0x95, 0xf9, 0xde, 0xab, 0xa9,
+ 0xa9, 0xa1, 0xca, 0xca, 0x4a, 0x59, 0x93, 0xf0, 0xf0, 0x70, 0xb9, 0xb3, 0xd5, 0xd5, 0x55, 0x62,
+ 0x53, 0x44, 0x47, 0x47, 0x93, 0xcd, 0x66, 0x63, 0x21, 0xb3, 0xff, 0xff, 0x19, 0xee, 0xa7, 0xae,
+ 0xf4, 0xe0, 0xe0, 0xc0, 0xb3, 0xb9, 0xb9, 0x29, 0xbd, 0x01, 0x2a, 0xb9, 0x66, 0x99, 0x99, 0x99,
+ 0xd4, 0xdd, 0xdd, 0xad, 0x1c, 0xd0, 0x55, 0xbe, 0xb5, 0xdd, 0x6e, 0xb7, 0x67, 0x63, 0x63, 0x43,
+ 0xe9, 0x07, 0x3c, 0x40, 0x68, 0xee, 0x75, 0xaf, 0xd0, 0xcf, 0xaa, 0xf7, 0x4f, 0x18, 0xc8, 0x56,
+ 0xf5, 0x5d, 0xec, 0xae, 0xc8, 0xc8, 0x48, 0x59, 0x33, 0xb4, 0xeb, 0xde, 0xf1, 0xcb, 0xa0, 0xc0,
+ 0xcf, 0xff, 0x0c, 0x8b, 0x28, 0xe2, 0xfc, 0x20, 0x04, 0x3f, 0xfe, 0xb7, 0x19, 0x08, 0x36, 0xba,
+ 0xb7, 0xb7, 0x47, 0x7c, 0x73, 0xa0, 0xfd, 0x0d, 0x9e, 0x3b, 0x2b, 0xe2, 0x3f, 0x64, 0x1d, 0xf5,
+ 0x90, 0x43, 0x37, 0x56, 0xad, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+ 0x82,
+};
+
+const BITMAP_OPAQUE bus_definition_tool_xpm[1] = {{ png, sizeof( png ), "bus_definition_tool_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index af94229d4a..2d5f33830b 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -90,6 +90,7 @@ EXTERN_BITMAP( book_xpm )
 EXTERN_BITMAP( break_bus_xpm )
 EXTERN_BITMAP( break_line_xpm )
 EXTERN_BITMAP( browse_files_xpm )
+EXTERN_BITMAP( bus_definition_tool_xpm )
 EXTERN_BITMAP( calculator_xpm )
 EXTERN_BITMAP( cancel_xpm )
 EXTERN_BITMAP( change_entry_orient_xpm )
diff --git a/bitmaps_png/sources/bus_definition_tool.svg b/bitmaps_png/sources/bus_definition_tool.svg
new file mode 100644
index 0000000000..2ee69b13ed
--- /dev/null
+++ b/bitmaps_png/sources/bus_definition_tool.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="bus_definition_tool.svg">
+  <metadata
+     id="metadata40">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1276"
+     inkscape:window-height="966"
+     id="namedview38"
+     showgrid="false"
+     inkscape:zoom="27.086547"
+     inkscape:cx="17.367575"
+     inkscape:cy="12.688961"
+     inkscape:window-x="65"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     showguides="false" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="d"
+       y2="39.685001"
+       gradientUnits="userSpaceOnUse"
+       x2="34.534"
+       gradientTransform="matrix(0.92673,0,0,0.84499,4.7271,52.187)"
+       y1="12.285"
+       x1="14.463">
+      <stop
+         stop-color="#c9c9c9"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#f8f8f8"
+         offset=".25"
+         id="stop9" />
+      <stop
+         stop-color="#e2e2e2"
+         offset=".5"
+         id="stop11" />
+      <stop
+         stop-color="#b0b0b0"
+         offset=".75"
+         id="stop13" />
+      <stop
+         stop-color="#c9c9c9"
+         offset="1"
+         id="stop15" />
+    </linearGradient>
+    <filter
+       id="c"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.78951921"
+         id="feGaussianBlur18" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3846"
+       id="radialGradient4649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93333333,0,0,0.93333333,13.424581,1170.6826)"
+       cx="13"
+       cy="13"
+       fx="13"
+       fy="13"
+       r="12" />
+    <linearGradient
+       id="linearGradient3846">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="0"
+         id="stop3848" />
+      <stop
+         id="stop3793"
+         offset="0.61904764"
+         style="stop-color:#c3c3c3;stop-opacity:1" />
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1"
+         id="stop3850" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3846"
+       id="radialGradient3852"
+       cx="13"
+       cy="13"
+       fx="13"
+       fy="13"
+       r="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93333333,0,0,0.93333333,13.424581,1170.6826)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3846"
+       id="radialGradient4223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93333333,0,0,0.93333333,13.424581,1170.6826)"
+       cx="13"
+       cy="13"
+       fx="13"
+       fy="13"
+       r="12" />
+  </defs>
+  <g
+     transform="translate(-18.583467,8.0405322)"
+     id="g20">
+    <rect
+       height="17.066668"
+       width="17.066668"
+       y="0"
+       x="0"
+       id="rect22"
+       style="fill-opacity:0;stroke-width:1.06666672" />
+  </g>
+  <g
+     id="g4645"
+     transform="matrix(0.6399426,0,0,0.640713,6.7756694,-719.63076)">
+    <g
+       id="g5128"
+       transform="translate(-10.817885,-33.245207)"
+       style="stroke:#ffffff;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient4649);fill-opacity:1;stroke:#ffffff;stroke-width:4.26666689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 25.557915,1170.5492 c -0.334524,0 -0.672238,0.041 -1,0.066 l -0.8,3.8332 c -1.021302,0.2172 -1.949677,0.6533 -2.8,1.2 l -3.333334,-2.1666 c -0.502455,0.4278 -0.972281,0.8975 -1.4,1.4 l 2.166667,3.3334 c -0.546764,0.8503 -0.982812,1.7786 -1.2,2.8 l -3.833333,0.8 c -0.02627,0.3277 -0.06667,0.6655 -0.06667,1 0,0.3345 0.0404,0.6722 0.06667,1 l 3.833333,0.8 c 0.217188,1.0212 0.653236,1.9496 1.2,2.8 l -2.166667,3.3333 c 0.427719,0.5024 0.897545,0.9723 1.4,1.4 l 3.333334,-2.1667 c 0.850323,0.5467 1.778698,0.9828 2.8,1.2 l 0.8,3.8334 c 0.327762,0.027 0.665476,0.066 1,0.066 0.334523,0 0.672238,-0.041 1,-0.066 l 0.8,-3.8334 c 1.021301,-0.2172 1.949676,-0.6533 2.8,-1.2 l 3.333333,2.1667 c 0.502455,-0.4277 0.972282,-0.8976 1.4,-1.4 l -2.166667,-3.3333 c 0.546763,-0.8504 0.982812,-1.7788 1.2,-2.8 l 3.833334,-0.8 c 0.02627,-0.3278 0.06667,-0.6655 0.06667,-1 0,-0.3345 -0.04039,-0.6723 -0.06667,-1 l -3.833334,-0.8 c -0.217188,-1.0214 -0.653237,-1.9497 -1.2,-2.8 l 2.166667,-3.3334 c -0.427718,-0.5025 -0.897545,-0.9722 -1.4,-1.4 l -3.333333,2.1666 c -0.850324,-0.5467 -1.778699,-0.9828 -2.8,-1.2 l -0.8,-3.8332 c -0.327762,-0.027 -0.665477,-0.066 -1,-0.066 z m 0,8.5334 c 2.061863,0 3.733333,1.6714 3.733333,3.7333 0,2.0619 -1.67147,3.7333 -3.733333,3.7333 -2.061864,0 -3.733334,-1.6714 -3.733334,-3.7333 0,-2.0619 1.67147,-3.7333 3.733334,-3.7333 z"
+         id="path5130" />
+      <path
+         id="path5132"
+         d="m 25.557915,1170.5492 c -0.334524,0 -0.672238,0.041 -1,0.066 l -0.8,3.8332 c -1.021302,0.2172 -1.949677,0.6533 -2.8,1.2 l -3.333334,-2.1666 c -0.502455,0.4278 -0.972281,0.8975 -1.4,1.4 l 2.166667,3.3334 c -0.546764,0.8503 -0.982812,1.7786 -1.2,2.8 l -3.833333,0.8 c -0.02627,0.3277 -0.06667,0.6655 -0.06667,1 0,0.3345 0.0404,0.6722 0.06667,1 l 3.833333,0.8 c 0.217188,1.0212 0.653236,1.9496 1.2,2.8 l -2.166667,3.3333 c 0.427719,0.5024 0.897545,0.9723 1.4,1.4 l 3.333334,-2.1667 c 0.850323,0.5467 1.778698,0.9828 2.8,1.2 l 0.8,3.8334 c 0.327762,0.027 0.665476,0.066 1,0.066 0.334523,0 0.672238,-0.041 1,-0.066 l 0.8,-3.8334 c 1.021301,-0.2172 1.949676,-0.6533 2.8,-1.2 l 3.333333,2.1667 c 0.502455,-0.4277 0.972282,-0.8976 1.4,-1.4 l -2.166667,-3.3333 c 0.546763,-0.8504 0.982812,-1.7788 1.2,-2.8 l 3.833334,-0.8 c 0.02627,-0.3278 0.06667,-0.6655 0.06667,-1 0,-0.3345 -0.04039,-0.6723 -0.06667,-1 l -3.833334,-0.8 c -0.217188,-1.0214 -0.653237,-1.9497 -1.2,-2.8 l 2.166667,-3.3334 c -0.427718,-0.5025 -0.897545,-0.9722 -1.4,-1.4 l -3.333333,2.1666 c -0.850324,-0.5467 -1.778699,-0.9828 -2.8,-1.2 l -0.8,-3.8332 c -0.327762,-0.027 -0.665477,-0.066 -1,-0.066 z m 0,8.5334 c 2.061863,0 3.733333,1.6714 3.733333,3.7333 0,2.0619 -1.67147,3.7333 -3.733333,3.7333 -2.061864,0 -3.733334,-1.6714 -3.733334,-3.7333 0,-2.0619 1.67147,-3.7333 3.733334,-3.7333 z"
+         style="fill:url(#radialGradient3852);fill-opacity:1;stroke:#ffffff;stroke-width:4.26666689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       style="stroke:#000000"
+       transform="translate(-10.817885,-33.245207)"
+       id="g4219">
+      <path
+         id="path4215"
+         d="m 25.557915,1170.5492 c -0.334524,0 -0.672238,0.041 -1,0.066 l -0.8,3.8332 c -1.021302,0.2172 -1.949677,0.6533 -2.8,1.2 l -3.333334,-2.1666 c -0.502455,0.4278 -0.972281,0.8975 -1.4,1.4 l 2.166667,3.3334 c -0.546764,0.8503 -0.982812,1.7786 -1.2,2.8 l -3.833333,0.8 c -0.02627,0.3277 -0.06667,0.6655 -0.06667,1 0,0.3345 0.0404,0.6722 0.06667,1 l 3.833333,0.8 c 0.217188,1.0212 0.653236,1.9496 1.2,2.8 l -2.166667,3.3333 c 0.427719,0.5024 0.897545,0.9723 1.4,1.4 l 3.333334,-2.1667 c 0.850323,0.5467 1.778698,0.9828 2.8,1.2 l 0.8,3.8334 c 0.327762,0.027 0.665476,0.066 1,0.066 0.334523,0 0.672238,-0.041 1,-0.066 l 0.8,-3.8334 c 1.021301,-0.2172 1.949676,-0.6533 2.8,-1.2 l 3.333333,2.1667 c 0.502455,-0.4277 0.972282,-0.8976 1.4,-1.4 l -2.166667,-3.3333 c 0.546763,-0.8504 0.982812,-1.7788 1.2,-2.8 l 3.833334,-0.8 c 0.02627,-0.3278 0.06667,-0.6655 0.06667,-1 0,-0.3345 -0.04039,-0.6723 -0.06667,-1 l -3.833334,-0.8 c -0.217188,-1.0214 -0.653237,-1.9497 -1.2,-2.8 l 2.166667,-3.3334 c -0.427718,-0.5025 -0.897545,-0.9722 -1.4,-1.4 l -3.333333,2.1666 c -0.850324,-0.5467 -1.778699,-0.9828 -2.8,-1.2 l -0.8,-3.8332 c -0.327762,-0.027 -0.665477,-0.066 -1,-0.066 z m 0,8.5334 c 2.061863,0 3.733333,1.6714 3.733333,3.7333 0,2.0619 -1.67147,3.7333 -3.733333,3.7333 -2.061864,0 -3.733334,-1.6714 -3.733334,-3.7333 0,-2.0619 1.67147,-3.7333 3.733334,-3.7333 z"
+         style="fill:url(#radialGradient4223);fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     id="g5118">
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path5069"
+       d="m 7.2103535,11.126809 4.7295995,-4.7296 h 13.725379"
+       style="fill:none;fill-rule:evenodd;stroke:#008300;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path5069-1"
+       d="M 7.0157009,5.8418954 11.7453,1.1122958 h 13.762299"
+       style="fill:none;fill-rule:evenodd;stroke:#008300;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:2.04428124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 6.8258543,1.0837996 V 24.810217"
+     id="path3703"
+     inkscape:connector-curvature="0" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.67062235px;line-height:166.76554871px;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83382779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="-20.690458"
+     y="5.6071129"
+     id="text5110"
+     transform="matrix(0.00373681,-1.0326644,0.96835438,0.00398498,0,0)"><tspan
+       sodipodi:role="line"
+       id="tspan5108"
+       x="-20.690458"
+       y="5.6071129"
+       style="stroke-width:0.83382779px">BUS</tspan></text>
+</svg>
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 363f227456..44d8f9c4c1 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -543,7 +543,7 @@ void prepareToolsMenu( wxMenu* aParentMenu )
                  _( "Find old symbols in project and rename/rescue them" ),
                  KiBitmap( rescue_xpm ) );
 
-    AddMenuItem( aParentMenu, ID_REMAP_SYMBOLS, _( "Remap Symbols..." ),
+    AddMenuItem( aParentMenu, ID_REMAP_SYMBOLS, _( "Remap S&ymbols..." ),
                  _( "Remap legacy library symbols to symbol library table" ),
                  KiBitmap( rescue_xpm ) );
 
@@ -553,7 +553,7 @@ void prepareToolsMenu( wxMenu* aParentMenu )
                  KiBitmap( spreadsheet_xpm ) );
 
     AddMenuItem( aParentMenu, ID_EDIT_COMPONENTS_TO_SYMBOLS_LIB_ID,
-                 _( "Edit Symbol Library References..." ),
+                 _( "Edit Symbol &Library References..." ),
                  _( "Edit links between schematic symbols and library symbols" ),
                  KiBitmap( edit_cmp_symb_links_xpm ) );
 
@@ -575,7 +575,7 @@ void prepareToolsMenu( wxMenu* aParentMenu )
                  ID_BUS_MANAGER,
                  _( "Bus &Definitions" ),
                  HELP_BUS_MANAGER,
-                 KiBitmap( bom_xpm ) );     // TODO(JE) new icon?
+                 KiBitmap( bus_definition_tool_xpm ) );
 
     aParentMenu->AppendSeparator();