diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 320df94c53..09c7b6b885 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -420,6 +420,7 @@ set( BMAPS_MID
     options_all_tracks
     options_all_vias
     options_arc
+    options_board
     options_circle
     options_generic
     options_module
diff --git a/bitmaps_png/cpp_26/options_board.cpp b/bitmaps_png/cpp_26/options_board.cpp
new file mode 100644
index 0000000000..7e02513fa0
--- /dev/null
+++ b/bitmaps_png/cpp_26/options_board.cpp
@@ -0,0 +1,93 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.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, 0xbf, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x56, 0x7b, 0x4c, 0xdb,
+ 0x55, 0x14, 0x66, 0x6a, 0x5c, 0xd4, 0x39, 0xe7, 0xb2, 0x04, 0x8d, 0xdb, 0x12, 0x43, 0x42, 0x16,
+ 0x13, 0x27, 0x7f, 0xd8, 0x31, 0x67, 0x44, 0x09, 0x96, 0x57, 0x61, 0xf2, 0x0c, 0xaf, 0x66, 0x29,
+ 0xc4, 0x81, 0xc2, 0xb6, 0x32, 0xcb, 0x43, 0x87, 0x7b, 0xf1, 0x1a, 0x20, 0xb0, 0x31, 0x60, 0x2d,
+ 0xac, 0x40, 0x69, 0x69, 0xb3, 0x09, 0x61, 0x29, 0x2f, 0xd9, 0x60, 0x2b, 0x0d, 0x14, 0xac, 0x64,
+ 0x9a, 0x98, 0x4d, 0xf4, 0x0f, 0xd4, 0x84, 0x01, 0x15, 0xe8, 0x5c, 0xcb, 0x0a, 0xcb, 0x18, 0x7c,
+ 0xfe, 0xce, 0x95, 0x16, 0x2a, 0x4c, 0xc1, 0xc4, 0xff, 0x6c, 0x72, 0xfa, 0xeb, 0xf9, 0x7a, 0xef,
+ 0xfd, 0xee, 0x39, 0xe7, 0x3b, 0xbf, 0x7b, 0x5d, 0x44, 0x45, 0xef, 0x88, 0x82, 0x72, 0x3c, 0xda,
+ 0xbb, 0xae, 0xa4, 0x9d, 0xfa, 0xf9, 0x46, 0x61, 0x7a, 0x6a, 0x19, 0x5f, 0x41, 0x7e, 0x9e, 0x3c,
+ 0xac, 0x92, 0xfc, 0x5a, 0x55, 0xfc, 0x17, 0xe4, 0x0b, 0x0b, 0xf7, 0x35, 0x92, 0x4f, 0x46, 0xfe,
+ 0x6a, 0x73, 0x1e, 0x67, 0xc4, 0xe1, 0xb2, 0x3f, 0xd7, 0xa3, 0xcd, 0xe5, 0x43, 0x17, 0x5c, 0x6d,
+ 0x96, 0xe0, 0x97, 0xeb, 0x45, 0x10, 0x64, 0xbf, 0x01, 0xf2, 0xc5, 0xe7, 0xf8, 0xcc, 0xaf, 0xac,
+ 0x13, 0x32, 0xdf, 0x5d, 0xe2, 0xca, 0x7c, 0x32, 0xf2, 0xc9, 0xae, 0x2d, 0xce, 0x09, 0xcc, 0xde,
+ 0xed, 0xc0, 0x56, 0x33, 0xc6, 0xf1, 0x3f, 0xd1, 0x6a, 0x44, 0x41, 0x8b, 0x73, 0xfe, 0x73, 0x22,
+ 0x9d, 0x36, 0x03, 0xae, 0x87, 0x37, 0x33, 0x8c, 0x9e, 0x39, 0xb2, 0x50, 0xe4, 0x57, 0x85, 0x3b,
+ 0xac, 0x52, 0x21, 0x2c, 0xfd, 0x57, 0x44, 0x4f, 0x27, 0x3e, 0xc5, 0xb0, 0xa8, 0x33, 0x7b, 0x30,
+ 0x7c, 0xbd, 0xd0, 0x41, 0xf6, 0x51, 0xc9, 0x7b, 0xec, 0x69, 0x1f, 0x67, 0x37, 0x52, 0xe6, 0x9a,
+ 0x89, 0x76, 0xa6, 0x6e, 0x75, 0x2c, 0x7a, 0xfc, 0x42, 0xb0, 0x23, 0xaa, 0xe5, 0x64, 0xcb, 0xed,
+ 0xca, 0x97, 0x87, 0x70, 0xb6, 0x26, 0x1a, 0x37, 0xdb, 0x4f, 0xae, 0x8d, 0x48, 0xdb, 0x78, 0x18,
+ 0x1b, 0x0e, 0x6e, 0x60, 0xd8, 0x81, 0xc2, 0x7d, 0x8e, 0x85, 0xf2, 0xb9, 0x0d, 0x98, 0x2c, 0x26,
+ 0x3c, 0x7c, 0xf4, 0x10, 0x16, 0xdb, 0xef, 0x50, 0x35, 0x1e, 0x65, 0x9b, 0x22, 0x8b, 0x3a, 0xe3,
+ 0x89, 0xad, 0x47, 0xb6, 0xc0, 0xab, 0xe0, 0x6d, 0xb8, 0x1e, 0x79, 0x11, 0x9d, 0xcd, 0x47, 0x4f,
+ 0xaf, 0x20, 0xb2, 0x17, 0xf6, 0xad, 0x2c, 0x37, 0x0c, 0x5d, 0xcb, 0x63, 0xd8, 0x29, 0xe9, 0x07,
+ 0x0c, 0x73, 0xfb, 0xcc, 0x0d, 0x9f, 0x72, 0x39, 0x27, 0xcc, 0x32, 0xf2, 0x2d, 0x54, 0x2a, 0x15,
+ 0xf8, 0x7c, 0x3e, 0x64, 0x32, 0x19, 0x94, 0xfd, 0x4a, 0x36, 0x66, 0x5b, 0xea, 0x36, 0x78, 0x9c,
+ 0xf6, 0x40, 0xfb, 0xf7, 0xed, 0xa0, 0x8f, 0x7f, 0xc9, 0xfb, 0x10, 0x16, 0xed, 0x6d, 0x5a, 0x41,
+ 0x24, 0xab, 0x3f, 0x80, 0x27, 0x0f, 0x3e, 0xc1, 0x26, 0xed, 0x3d, 0xe6, 0x86, 0x5b, 0x9d, 0x39,
+ 0x0c, 0xef, 0x34, 0xaa, 0x61, 0x36, 0x9b, 0x61, 0xb3, 0xd9, 0x60, 0xbc, 0xf5, 0x15, 0xe6, 0x66,
+ 0x2d, 0x48, 0x48, 0x48, 0x40, 0x6f, 0x6f, 0x2f, 0x84, 0x42, 0x21, 0x26, 0xb8, 0xe8, 0x34, 0x86,
+ 0x3a, 0xcc, 0xcc, 0xce, 0x60, 0x72, 0x72, 0x12, 0x5d, 0xb7, 0xbb, 0xa0, 0xfb, 0x51, 0x87, 0x57,
+ 0x24, 0x2f, 0x51, 0xaa, 0xab, 0x56, 0x10, 0x91, 0x5d, 0x54, 0x8a, 0xb0, 0x31, 0xe9, 0xcf, 0x82,
+ 0xbf, 0x9e, 0xb1, 0x1d, 0xb7, 0x7b, 0xce, 0x63, 0x6a, 0x6a, 0x0a, 0x7e, 0x7e, 0x7e, 0x08, 0x08,
+ 0x08, 0x40, 0x77, 0x77, 0x37, 0xd4, 0x6a, 0x35, 0x7c, 0x7d, 0x7d, 0x61, 0x34, 0x1a, 0x11, 0x18,
+ 0x18, 0x08, 0x85, 0x42, 0x81, 0x9e, 0x9e, 0x1e, 0xf6, 0x9b, 0x70, 0x93, 0xc9, 0x84, 0xa0, 0xb3,
+ 0x7c, 0xa4, 0x57, 0x04, 0x2e, 0xd5, 0x68, 0x4b, 0xf2, 0xb3, 0x18, 0x6c, 0x3f, 0xe1, 0x54, 0x4c,
+ 0x8d, 0x26, 0x09, 0xcf, 0x7d, 0xbc, 0x91, 0x91, 0xed, 0x39, 0xf1, 0x1a, 0x66, 0x66, 0x6c, 0x8c,
+ 0xa4, 0xaf, 0xaf, 0x0f, 0x62, 0xb1, 0x18, 0xb9, 0xb9, 0xb9, 0xd0, 0xe9, 0x74, 0x2c, 0x22, 0xbd,
+ 0x5e, 0x8f, 0x82, 0x82, 0x02, 0xa4, 0xa4, 0xa4, 0xb0, 0xff, 0x05, 0x02, 0x01, 0xac, 0x56, 0x2b,
+ 0x46, 0x0c, 0x55, 0x4b, 0xaa, 0xcb, 0x96, 0x85, 0x4a, 0xdb, 0x9a, 0xc4, 0x2b, 0x54, 0x43, 0xd6,
+ 0x78, 0x29, 0x19, 0x9b, 0x93, 0x9f, 0x61, 0x64, 0xda, 0xc1, 0x4b, 0x2c, 0x12, 0x22, 0xa1, 0xc5,
+ 0x0c, 0x06, 0x03, 0xfa, 0xfb, 0xfb, 0x31, 0x30, 0x30, 0xc0, 0x9e, 0xe4, 0x13, 0x9e, 0x99, 0x99,
+ 0x09, 0xad, 0x56, 0x8b, 0xfb, 0xa6, 0x1f, 0x9c, 0xe5, 0x4d, 0x5f, 0xe4, 0x18, 0xdb, 0x3e, 0x07,
+ 0x9f, 0x13, 0xc2, 0xab, 0x69, 0x2f, 0x43, 0x5c, 0xe6, 0xeb, 0x18, 0x54, 0xa9, 0x4e, 0x44, 0xc5,
+ 0x8d, 0x0a, 0xdc, 0xb9, 0x3b, 0xc2, 0x45, 0xa9, 0x61, 0x91, 0xd0, 0xa2, 0xad, 0xad, 0xad, 0x88,
+ 0x88, 0x88, 0x40, 0x6c, 0x6c, 0x2c, 0xc2, 0xc3, 0xc3, 0xd1, 0xd2, 0xd2, 0xc2, 0xf0, 0xe2, 0xe2,
+ 0x62, 0xc8, 0xe5, 0x72, 0xcc, 0x3d, 0xb0, 0xc2, 0x7a, 0xe7, 0x3b, 0x2e, 0x2a, 0xa9, 0x33, 0x51,
+ 0x48, 0x3e, 0x0f, 0x71, 0x17, 0xe3, 0xa0, 0xff, 0x49, 0x8f, 0x9d, 0xe9, 0xdb, 0x21, 0xe7, 0xea,
+ 0x44, 0xb8, 0x6d, 0xe6, 0x1e, 0x1a, 0x1a, 0x1a, 0x10, 0x1f, 0x1f, 0xcf, 0x72, 0x4f, 0xe9, 0xa2,
+ 0x08, 0x22, 0x23, 0x23, 0x31, 0x36, 0x36, 0x86, 0x31, 0x6e, 0x03, 0x54, 0xfc, 0xd0, 0xd0, 0x50,
+ 0x86, 0x53, 0x1a, 0xfd, 0xfd, 0xfd, 0x21, 0x12, 0x89, 0x50, 0x5b, 0x5b, 0x8b, 0xf9, 0xb9, 0x59,
+ 0x67, 0xa2, 0x37, 0xb3, 0xdc, 0x71, 0x79, 0xf0, 0x32, 0x93, 0x64, 0x50, 0x99, 0x00, 0x27, 0x2f,
+ 0xec, 0x67, 0x44, 0xf3, 0xf3, 0x8f, 0xe0, 0xe3, 0xe3, 0xc3, 0x6a, 0x41, 0x85, 0xa7, 0x27, 0xa5,
+ 0x2b, 0x3a, 0x3a, 0x1a, 0x73, 0xdc, 0x26, 0x48, 0x99, 0x43, 0xe3, 0x43, 0x88, 0x89, 0x89, 0x61,
+ 0xb8, 0x7d, 0x1c, 0xa5, 0xd1, 0xdb, 0xdb, 0x1b, 0x58, 0x58, 0x70, 0x26, 0x2a, 0x96, 0x47, 0xe1,
+ 0xf9, 0x43, 0x9b, 0xc0, 0xcb, 0xe3, 0xe1, 0x85, 0x94, 0x4d, 0x18, 0x68, 0xcb, 0x62, 0x44, 0xb3,
+ 0xb3, 0x56, 0x54, 0x57, 0x57, 0x33, 0x09, 0x93, 0xa2, 0x48, 0x59, 0xb4, 0x73, 0x4a, 0x17, 0x45,
+ 0xf2, 0xeb, 0xc4, 0x30, 0xcc, 0x77, 0xcd, 0x08, 0x09, 0x09, 0x71, 0x44, 0x14, 0x1c, 0x1c, 0x8c,
+ 0xb8, 0xb8, 0x38, 0x94, 0x97, 0x97, 0xe3, 0xfe, 0x83, 0x69, 0x7c, 0x72, 0xde, 0xaf, 0xce, 0x41,
+ 0x44, 0x46, 0x52, 0xa6, 0xc2, 0x67, 0x72, 0x92, 0xb4, 0x63, 0xd4, 0xf1, 0xf5, 0xfd, 0xf5, 0xac,
+ 0x4f, 0x94, 0x4a, 0x25, 0x53, 0x17, 0xd5, 0x82, 0x6a, 0x12, 0x16, 0x16, 0xc6, 0x22, 0x23, 0x92,
+ 0xe6, 0xe6, 0x66, 0x86, 0x97, 0x94, 0x94, 0x40, 0x2a, 0x95, 0xb2, 0xb7, 0x46, 0xc3, 0xd7, 0x0d,
+ 0x70, 0xe7, 0x32, 0xc5, 0x5a, 0x68, 0x39, 0x11, 0xa5, 0x81, 0x88, 0x38, 0x25, 0x2e, 0x89, 0x61,
+ 0xf1, 0x5d, 0xa7, 0xea, 0xab, 0x61, 0xd1, 0xd8, 0x25, 0xfc, 0x38, 0xd5, 0xa5, 0xa5, 0xa5, 0xa1,
+ 0xa3, 0xa3, 0x03, 0x0a, 0x83, 0xc2, 0xf9, 0x98, 0x58, 0x0b, 0x11, 0xbd, 0x56, 0xa8, 0xe3, 0x29,
+ 0x75, 0xb4, 0x20, 0x49, 0x98, 0xd4, 0x45, 0x69, 0xb2, 0xf7, 0x51, 0x69, 0x69, 0x29, 0x24, 0x12,
+ 0x09, 0x23, 0xa5, 0x7e, 0x9b, 0x9e, 0x9e, 0xc6, 0x8e, 0x8c, 0x1d, 0xeb, 0x23, 0xda, 0x75, 0x7c,
+ 0x17, 0x26, 0x26, 0x26, 0xd8, 0x9b, 0x81, 0x9a, 0x91, 0xfa, 0x84, 0x24, 0x4c, 0xea, 0xa2, 0xc2,
+ 0x53, 0x4d, 0x28, 0x5d, 0x14, 0x09, 0x91, 0xd0, 0xb8, 0xd1, 0xd1, 0x51, 0xf0, 0x72, 0x79, 0xeb,
+ 0x23, 0x22, 0x4c, 0xa1, 0xaf, 0xc2, 0xf8, 0xf8, 0x38, 0x2c, 0x56, 0x0b, 0x34, 0x46, 0x0d, 0xcc,
+ 0xd6, 0xdf, 0x98, 0x84, 0x29, 0x5d, 0x54, 0x78, 0xaa, 0x09, 0xa5, 0x8b, 0x22, 0x21, 0x92, 0x2a,
+ 0x6e, 0xfc, 0xba, 0x53, 0x67, 0x3f, 0xf8, 0x46, 0xbf, 0xa9, 0xc7, 0x31, 0x79, 0x0c, 0xf3, 0xaf,
+ 0xde, 0x6c, 0x62, 0x7d, 0xe2, 0xe5, 0xe5, 0xc5, 0xd4, 0x45, 0x85, 0x27, 0x9c, 0xd2, 0xe5, 0x99,
+ 0xef, 0xb9, 0xf2, 0x28, 0x5f, 0x0f, 0x11, 0xf9, 0x49, 0xdc, 0x29, 0x4a, 0x7e, 0x52, 0xb9, 0x80,
+ 0x35, 0xe3, 0xfc, 0xc2, 0x3c, 0xee, 0x71, 0xfd, 0x44, 0xea, 0xfa, 0xdb, 0x3b, 0xc3, 0x70, 0x77,
+ 0x31, 0xcf, 0x7e, 0x31, 0x4c, 0x2c, 0x7d, 0x57, 0x4d, 0x17, 0xbe, 0xb2, 0xda, 0xd8, 0x73, 0x76,
+ 0xec, 0xaf, 0x17, 0x48, 0xee, 0x6c, 0x92, 0x91, 0x9f, 0x5e, 0x11, 0x50, 0xb3, 0x7c, 0xce, 0x3f,
+ 0x5d, 0x20, 0xff, 0x00, 0xd4, 0xfe, 0x77, 0xca, 0x54, 0x73, 0x73, 0x92, 0x00, 0x00, 0x00, 0x00,
+ 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE options_board_xpm[1] = {{ png, sizeof( png ), "options_board_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/sources/options_board.svg b/bitmaps_png/sources/options_board.svg
new file mode 100644
index 0000000000..ad1a111f0d
--- /dev/null
+++ b/bitmaps_png/sources/options_board.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48.000001"
+   id="svg3485"
+   version="1.1"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="options_board.svg">
+  <defs
+     id="defs3487">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4402"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4441"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4449"
+       is_visible="true" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3846"
+       id="radialGradient4649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.875,0,0,0.875,12.585545,1097.5149)"
+       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.875,0,0,0.875,12.585545,1097.5149)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3846"
+       id="radialGradient4223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.875,0,0,0.875,12.585545,1097.5149)"
+       cx="13"
+       cy="13"
+       fx="13"
+       fy="13"
+       r="12" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="32.927789"
+     inkscape:cy="28.013116"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:window-width="954"
+     inkscape:window-height="860"
+     inkscape:window-x="1680"
+     inkscape:window-y="198"
+     inkscape:window-maximized="0"
+     inkscape:snap-page="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3490">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dfbd8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       id="rect3500"
+       width="46"
+       height="46.000019"
+       x="1"
+       y="1005.3622" />
+    <path
+       inkscape:connector-curvature="0"
+       inkscape:original-d="m 32,1005.3622 v 8 l 3,3 h 2 v 0 l 2,-2 h 8 v -9 c -4.646746,0.7657 -7.666667,0.3333 -15,0 z"
+       inkscape:path-effect="#path-effect4402"
+       id="path4400"
+       d="m 32,1005.3622 v 8 l 3,3 h 2 v 0 l 2,-2 h 8 v -9 z"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#006400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#006400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 30,1051.3622 v -25 h 5 l 3,10 h 9 v 15 z"
+       id="path4439"
+       inkscape:path-effect="#path-effect4441"
+       inkscape:original-d="m 30,1051.3622 v -25 h 5 l 3,10 h 9 v 15 z"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       inkscape:original-d="m 1,1029.3622 c -2.028701,-8.2446 -4.306402,-17.5099 0,-24 1.3333333,0 2.8791242,0.1189 3,0 v 22 l -2,2 z"
+       inkscape:path-effect="#path-effect4449"
+       id="path4447"
+       d="m 1,1029.3622 v -24 h 3 v 22 l -2,2 z"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#006400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5073"
+       d="m 10,1007.3622 v 15 l 8,7.5 v 19.5"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#006400;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       sodipodi:nodetypes="cccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5077"
+       d="m 18,1007.3622 v 12 l 7,7.5 v 22.5"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#006400;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       sodipodi:nodetypes="cccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5081"
+       d="m 26,1007.3622 v 9 l 6,6 h 9"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#006400;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path5093"
+       d="m 8,1034.3622 v 15"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#006400;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <circle
+       r="3.0011458"
+       cy="1022.3622"
+       cx="42.998856"
+       id="path4361"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#006400;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <circle
+       r="2.9938667"
+       cy="1034.3622"
+       cx="7.9938669"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#006400;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path5218" />
+    <g
+       id="g4645"
+       transform="matrix(1.1481444,0,0,1.1481944,14.633997,-202.57224)">
+      <g
+         id="g5128"
+         transform="translate(-10.141767,-31.167382)"
+         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;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 23.960545,1097.3899 c -0.313616,0 -0.630223,0.038 -0.9375,0.062 l -0.75,3.5937 c -0.95747,0.2036 -1.827822,0.6124 -2.625,1.125 l -3.125,-2.0312 c -0.471052,0.401 -0.911514,0.8414 -1.3125,1.3125 l 2.03125,3.125 c -0.512591,0.7972 -0.921386,1.6675 -1.125,2.625 l -3.59375,0.75 c -0.02463,0.3073 -0.0625,0.6239 -0.0625,0.9375 0,0.3136 0.03787,0.6302 0.0625,0.9375 l 3.59375,0.75 c 0.203614,0.9574 0.612409,1.8278 1.125,2.625 l -2.03125,3.125 c 0.400986,0.471 0.841448,0.9115 1.3125,1.3125 l 3.125,-2.0313 c 0.797178,0.5126 1.66753,0.9214 2.625,1.125 l 0.75,3.5938 c 0.307277,0.025 0.623884,0.062 0.9375,0.062 0.313616,0 0.630223,-0.038 0.9375,-0.062 l 0.75,-3.5938 c 0.95747,-0.2036 1.827822,-0.6124 2.625,-1.125 l 3.125,2.0313 c 0.471052,-0.401 0.911514,-0.8415 1.3125,-1.3125 l -2.03125,-3.125 c 0.51259,-0.7972 0.921386,-1.6676 1.125,-2.625 l 3.59375,-0.75 c 0.02463,-0.3073 0.0625,-0.6239 0.0625,-0.9375 0,-0.3136 -0.03787,-0.6302 -0.0625,-0.9375 l -3.59375,-0.75 c -0.203614,-0.9575 -0.61241,-1.8278 -1.125,-2.625 l 2.03125,-3.125 c -0.400986,-0.4711 -0.841448,-0.9115 -1.3125,-1.3125 l -3.125,2.0312 c -0.797178,-0.5126 -1.66753,-0.9214 -2.625,-1.125 l -0.75,-3.5937 c -0.307277,-0.025 -0.623884,-0.062 -0.9375,-0.062 z m 0,8 c 1.932997,0 3.5,1.567 3.5,3.5 0,1.933 -1.567003,3.5 -3.5,3.5 -1.932997,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567003,-3.5 3.5,-3.5 z"
+           id="path5130" />
+        <path
+           id="path5132"
+           d="m 23.960545,1097.3899 c -0.313616,0 -0.630223,0.038 -0.9375,0.062 l -0.75,3.5937 c -0.95747,0.2036 -1.827822,0.6124 -2.625,1.125 l -3.125,-2.0312 c -0.471052,0.401 -0.911514,0.8414 -1.3125,1.3125 l 2.03125,3.125 c -0.512591,0.7972 -0.921386,1.6675 -1.125,2.625 l -3.59375,0.75 c -0.02463,0.3073 -0.0625,0.6239 -0.0625,0.9375 0,0.3136 0.03787,0.6302 0.0625,0.9375 l 3.59375,0.75 c 0.203614,0.9574 0.612409,1.8278 1.125,2.625 l -2.03125,3.125 c 0.400986,0.471 0.841448,0.9115 1.3125,1.3125 l 3.125,-2.0313 c 0.797178,0.5126 1.66753,0.9214 2.625,1.125 l 0.75,3.5938 c 0.307277,0.025 0.623884,0.062 0.9375,0.062 0.313616,0 0.630223,-0.038 0.9375,-0.062 l 0.75,-3.5938 c 0.95747,-0.2036 1.827822,-0.6124 2.625,-1.125 l 3.125,2.0313 c 0.471052,-0.401 0.911514,-0.8415 1.3125,-1.3125 l -2.03125,-3.125 c 0.51259,-0.7972 0.921386,-1.6676 1.125,-2.625 l 3.59375,-0.75 c 0.02463,-0.3073 0.0625,-0.6239 0.0625,-0.9375 0,-0.3136 -0.03787,-0.6302 -0.0625,-0.9375 l -3.59375,-0.75 c -0.203614,-0.9575 -0.61241,-1.8278 -1.125,-2.625 l 2.03125,-3.125 c -0.400986,-0.4711 -0.841448,-0.9115 -1.3125,-1.3125 l -3.125,2.0312 c -0.797178,-0.5126 -1.66753,-0.9214 -2.625,-1.125 l -0.75,-3.5937 c -0.307277,-0.025 -0.623884,-0.062 -0.9375,-0.062 z m 0,8 c 1.932997,0 3.5,1.567 3.5,3.5 0,1.933 -1.567003,3.5 -3.5,3.5 -1.932997,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567003,-3.5 3.5,-3.5 z"
+           style="fill:url(#radialGradient3852);fill-opacity:1;stroke:#ffffff;stroke-width:4;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.141767,-31.167382)"
+         id="g4219">
+        <path
+           id="path4215"
+           d="m 23.960545,1097.3899 c -0.313616,0 -0.630223,0.038 -0.9375,0.062 l -0.75,3.5937 c -0.95747,0.2036 -1.827822,0.6124 -2.625,1.125 l -3.125,-2.0312 c -0.471052,0.401 -0.911514,0.8414 -1.3125,1.3125 l 2.03125,3.125 c -0.512591,0.7972 -0.921386,1.6675 -1.125,2.625 l -3.59375,0.75 c -0.02463,0.3073 -0.0625,0.6239 -0.0625,0.9375 0,0.3136 0.03787,0.6302 0.0625,0.9375 l 3.59375,0.75 c 0.203614,0.9574 0.612409,1.8278 1.125,2.625 l -2.03125,3.125 c 0.400986,0.471 0.841448,0.9115 1.3125,1.3125 l 3.125,-2.0313 c 0.797178,0.5126 1.66753,0.9214 2.625,1.125 l 0.75,3.5938 c 0.307277,0.025 0.623884,0.062 0.9375,0.062 0.313616,0 0.630223,-0.038 0.9375,-0.062 l 0.75,-3.5938 c 0.95747,-0.2036 1.827822,-0.6124 2.625,-1.125 l 3.125,2.0313 c 0.471052,-0.401 0.911514,-0.8415 1.3125,-1.3125 l -2.03125,-3.125 c 0.51259,-0.7972 0.921386,-1.6676 1.125,-2.625 l 3.59375,-0.75 c 0.02463,-0.3073 0.0625,-0.6239 0.0625,-0.9375 0,-0.3136 -0.03787,-0.6302 -0.0625,-0.9375 l -3.59375,-0.75 c -0.203614,-0.9575 -0.61241,-1.8278 -1.125,-2.625 l 2.03125,-3.125 c -0.400986,-0.4711 -0.841448,-0.9115 -1.3125,-1.3125 l -3.125,2.0312 c -0.797178,-0.5126 -1.66753,-0.9214 -2.625,-1.125 l -0.75,-3.5937 c -0.307277,-0.025 -0.623884,-0.062 -0.9375,-0.062 z m 0,8 c 1.932997,0 3.5,1.567 3.5,3.5 0,1.933 -1.567003,3.5 -3.5,3.5 -1.932997,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567003,-3.5 3.5,-3.5 z"
+           style="fill:url(#radialGradient4223);fill-opacity:1;stroke:#000000;stroke-width:1;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>
+</svg>
diff --git a/include/bitmaps.h b/include/bitmaps.h
index 16b0f2002f..4a64d8eb6a 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -355,6 +355,7 @@ EXTERN_BITMAP( options_all_tracks_and_vias_xpm )
 EXTERN_BITMAP( options_all_tracks_xpm )
 EXTERN_BITMAP( options_all_vias_xpm )
 EXTERN_BITMAP( options_arc_xpm )
+EXTERN_BITMAP( options_board_xpm )
 EXTERN_BITMAP( options_circle_xpm )
 EXTERN_BITMAP( options_generic_xpm )
 EXTERN_BITMAP( options_module_xpm )
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index bd5179dabc..ed3ba934fa 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -855,7 +855,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
     AddMenuItem( aParentMenu, ID_BOARD_SETUP_DIALOG,
                  _( "&Board Setup..." ),
                  _( "Edit board setup including layers, design rules and various defaults" ),
-                 KiBitmap( config_xpm ) );
+                 KiBitmap( options_board_xpm ) );
 
     aParentMenu->AppendSeparator();
 
diff --git a/pcbnew/tool_pcb_editor.cpp b/pcbnew/tool_pcb_editor.cpp
index dd6222a04c..6395ea61d9 100644
--- a/pcbnew/tool_pcb_editor.cpp
+++ b/pcbnew/tool_pcb_editor.cpp
@@ -255,7 +255,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
     ADD_TOOL( ID_SAVE_BOARD, save_xpm, _( "Save board" ) );
 
     KiScaledSeparator( m_mainToolBar, this );
-    ADD_TOOL( ID_BOARD_SETUP_DIALOG, preference_xpm, _( "Board setup" ) );
+    ADD_TOOL( ID_BOARD_SETUP_DIALOG, options_board_xpm, _( "Board setup" ) );
 
     KiScaledSeparator( m_mainToolBar, this );
     ADD_TOOL( ID_SHEET_SET, sheetset_xpm, _( "Page settings for paper size and texts" ) );