diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc
index 5da6ed90a..10416a756 100644
--- a/src/edt/edt/edtPlugin.cc
+++ b/src/edt/edt/edtPlugin.cc
@@ -261,12 +261,12 @@ private:
 };
 
 static tl::RegisteredClass<lay::PluginDeclaration> config_decl1 (
-  new edt::PluginDeclaration<edt::PolygonService> (tl::to_string (tr ("Polygons")), "polygon:edit_mode\t" + tl::to_string (tr ("Polygon")) + "<:polygon.png>" + tl::to_string (tr ("{Create a polygon}")), 0, &get_shape_editor_options_pages),
+  new edt::PluginDeclaration<edt::PolygonService> (tl::to_string (tr ("Polygons")), "polygon:edit_mode\t" + tl::to_string (tr ("Polygon")) + "<:polygon_24px.png>" + tl::to_string (tr ("{Create a polygon}")), 0, &get_shape_editor_options_pages),
   4010, 
   "edt::Service(Polygons)"
 );
 static tl::RegisteredClass<lay::PluginDeclaration> config_decl2 (
-  new edt::PluginDeclaration<edt::BoxService> (tl::to_string (tr ("Boxes")), "box:edit_mode\t" + tl::to_string (tr ("Box")) + "\t<:box.png>" + tl::to_string (tr ("{Create a box}")), 0, &get_shape_editor_options_pages),
+  new edt::PluginDeclaration<edt::BoxService> (tl::to_string (tr ("Boxes")), "box:edit_mode\t" + tl::to_string (tr ("Box")) + "\t<:box_24px.png>" + tl::to_string (tr ("{Create a box}")), 0, &get_shape_editor_options_pages),
   4011, 
   "edt::Service(Boxes)"
 );
@@ -276,7 +276,7 @@ static tl::RegisteredClass<lay::PluginDeclaration> config_decl3 (
   "edt::Service(Texts)"
 );
 static tl::RegisteredClass<lay::PluginDeclaration> config_decl4 (
-  new edt::PluginDeclaration<edt::PathService> (tl::to_string (tr ("Paths")), "path:edit_mode\t" + tl::to_string (tr ("Path")) + "\t<:path.png>" + tl::to_string (tr ("{Create a path}")), &get_path_options, &get_path_editor_options_pages),
+  new edt::PluginDeclaration<edt::PathService> (tl::to_string (tr ("Paths")), "path:edit_mode\t" + tl::to_string (tr ("Path")) + "\t<:path_24px.png>" + tl::to_string (tr ("{Create a path}")), &get_path_options, &get_path_editor_options_pages),
   4013, 
   "edt::Service(Paths)"
 );
@@ -414,19 +414,19 @@ public:
 
     if (cm == CM_Add) {
       combine_menu->set_title (tl::to_string (tr ("Add")));
-      combine_menu->set_icon (":/cm_add.png");
+      combine_menu->set_icon (":/cm_add_24px.png");
     } else if (cm == CM_Merge) {
       combine_menu->set_title (tl::to_string (tr ("Merge")));
-      combine_menu->set_icon (":/cm_merge.png");
+      combine_menu->set_icon (":/cm_merge_24px.png");
     } else if (cm == CM_Erase) {
       combine_menu->set_title (tl::to_string (tr ("Erase")));
-      combine_menu->set_icon (":/cm_erase.png");
+      combine_menu->set_icon (":/cm_erase_24px.png");
     } else if (cm == CM_Mask) {
       combine_menu->set_title (tl::to_string (tr ("Mask")));
-      combine_menu->set_icon (":/cm_mask.png");
+      combine_menu->set_icon (":/cm_mask_24px.png");
     } else if (cm == CM_Diff) {
       combine_menu->set_title (tl::to_string (tr ("Diff")));
-      combine_menu->set_icon (":/cm_diff.png");
+      combine_menu->set_icon (":/cm_diff_24px.png");
     }
 #endif
   }
@@ -528,7 +528,7 @@ private:
 };
 
 static tl::RegisteredClass<lay::PluginDeclaration> config_decl30 (
-  new edt::PartialPluginDeclaration (tl::to_string (tr ("Partial shapes")), "partial:edit_mode\t" + tl::to_string (tr ("Partial{Edit points and edges of shapes}")) + "<:partial.png>"),
+  new edt::PartialPluginDeclaration (tl::to_string (tr ("Partial shapes")), "partial:edit_mode\t" + tl::to_string (tr ("Partial{Edit points and edges of shapes}")) + "<:partial_24px.png>"),
   4030, 
   "edt::PartialService"
 );
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 5f2432663..5b7b34a29 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -26,7 +26,8 @@
         <file alias="back_16px@2x.png">images/back_16px@2x.png</file>
         <file alias="blue_flag_16px.png">images/blue_flag_16px.png</file>
         <file alias="blue_flag_16px@2x.png">images/blue_flag_16px@2x.png</file>
-        <file alias="box.png">images/box.png</file>
+        <file alias="box_24px.png">images/box_24px.png</file>
+        <file alias="box_24px@2x.png">images/box_24px@2x.png</file>
         <file alias="breakpoint_16px.png">images/breakpoint_16px.png</file>
         <file alias="breakpoint_16px@2x.png">images/breakpoint_16px@2x.png</file>
         <file alias="breakpointmark_16px.png">images/breakpointmark_16px.png</file>
@@ -50,11 +51,16 @@
         <file alias="clear_edit_16px@2x.png">images/clear_edit_16px@2x.png</file>
         <file alias="clearbreakpoints_16px.png">images/clearbreakpoints_16px.png</file>
         <file alias="clearbreakpoints_16px@2x.png">images/clearbreakpoints_16px@2x.png</file>
-        <file alias="cm_add.png">images/cm_add.png</file>
-        <file alias="cm_diff.png">images/cm_diff.png</file>
-        <file alias="cm_erase.png">images/cm_erase.png</file>
-        <file alias="cm_mask.png">images/cm_mask.png</file>
-        <file alias="cm_merge.png">images/cm_merge.png</file>
+        <file alias="cm_add_24px.png">images/cm_add_24px.png</file>
+        <file alias="cm_add_24px@2x.png">images/cm_add_24px@2x.png</file>
+        <file alias="cm_diff_24px.png">images/cm_diff_24px.png</file>
+        <file alias="cm_diff_24px@2x.png">images/cm_diff_24px@2x.png</file>
+        <file alias="cm_erase_24px.png">images/cm_erase_24px.png</file>
+        <file alias="cm_erase_24px@2x.png">images/cm_erase_24px@2x.png</file>
+        <file alias="cm_mask_24px.png">images/cm_mask_24px.png</file>
+        <file alias="cm_mask_24px@2x.png">images/cm_mask_24px@2x.png</file>
+        <file alias="cm_merge_24px.png">images/cm_merge_24px.png</file>
+        <file alias="cm_merge_24px@2x.png">images/cm_merge_24px@2x.png</file>
         <file alias="ct_31px.png">images/ct_31px.png</file>
         <file alias="ct_31px@2x.png">images/ct_31px@2x.png</file>
         <file alias="dark_12px.png">images/dark_12px.png</file>
@@ -131,12 +137,15 @@
         <file alias="nophoto.png">images/nophoto.png</file>
         <file alias="options_edit_16px.png">images/options_edit_16px.png</file>
         <file alias="options_edit_16px@2x.png">images/options_edit_16px@2x.png</file>
-        <file alias="partial.png">images/partial.png</file>
-        <file alias="path.png">images/path.png</file>
+        <file alias="partial_24px.png">images/partial_24px.png</file>
+        <file alias="partial_24px@2x.png">images/partial_24px@2x.png</file>
+        <file alias="path_24px.png">images/path_24px.png</file>
+        <file alias="path_24px@2x.png">images/path_24px@2x.png</file>
         <file alias="pause_16px.png">images/pause_16px.png</file>
         <file alias="pause_16px@2x.png">images/pause_16px@2x.png</file>
         <file alias="photo.png">images/photo.png</file>
-        <file alias="polygon.png">images/polygon.png</file>
+        <file alias="polygon_24px.png">images/polygon_24px.png</file>
+        <file alias="polygon_24px@2x.png">images/polygon_24px@2x.png</file>
         <file alias="prev_topic_24px.png">images/prev_topic_24px.png</file>
         <file alias="prev_topic_24px@2x.png">images/prev_topic_24px@2x.png</file>
         <file alias="properties_16px.png">images/properties_16px.png</file>
diff --git a/src/icons/images/box_24px.png b/src/icons/images/box_24px.png
new file mode 100644
index 000000000..ddad5610c
Binary files /dev/null and b/src/icons/images/box_24px.png differ
diff --git a/src/icons/images/box_24px@2x.png b/src/icons/images/box_24px@2x.png
new file mode 100644
index 000000000..44b8f1cfc
Binary files /dev/null and b/src/icons/images/box_24px@2x.png differ
diff --git a/src/icons/images/cm_add.png b/src/icons/images/cm_add.png
deleted file mode 100644
index 2e8b62374..000000000
Binary files a/src/icons/images/cm_add.png and /dev/null differ
diff --git a/src/icons/images/cm_add_24px.png b/src/icons/images/cm_add_24px.png
new file mode 100644
index 000000000..94fdb6143
Binary files /dev/null and b/src/icons/images/cm_add_24px.png differ
diff --git a/src/icons/images/cm_add_24px@2x.png b/src/icons/images/cm_add_24px@2x.png
new file mode 100644
index 000000000..4b5170061
Binary files /dev/null and b/src/icons/images/cm_add_24px@2x.png differ
diff --git a/src/icons/images/cm_diff.png b/src/icons/images/cm_diff.png
deleted file mode 100644
index 5c5ac922c..000000000
Binary files a/src/icons/images/cm_diff.png and /dev/null differ
diff --git a/src/icons/images/cm_diff_24px.png b/src/icons/images/cm_diff_24px.png
new file mode 100644
index 000000000..2c48b683a
Binary files /dev/null and b/src/icons/images/cm_diff_24px.png differ
diff --git a/src/icons/images/cm_diff_24px@2x.png b/src/icons/images/cm_diff_24px@2x.png
new file mode 100644
index 000000000..775abccb6
Binary files /dev/null and b/src/icons/images/cm_diff_24px@2x.png differ
diff --git a/src/icons/images/cm_erase.png b/src/icons/images/cm_erase.png
deleted file mode 100644
index 74a6505a5..000000000
Binary files a/src/icons/images/cm_erase.png and /dev/null differ
diff --git a/src/icons/images/cm_erase_24px.png b/src/icons/images/cm_erase_24px.png
new file mode 100644
index 000000000..5f37f9d87
Binary files /dev/null and b/src/icons/images/cm_erase_24px.png differ
diff --git a/src/icons/images/cm_erase_24px@2x.png b/src/icons/images/cm_erase_24px@2x.png
new file mode 100644
index 000000000..731db1338
Binary files /dev/null and b/src/icons/images/cm_erase_24px@2x.png differ
diff --git a/src/icons/images/cm_mask.png b/src/icons/images/cm_mask.png
deleted file mode 100644
index 304bb9ef0..000000000
Binary files a/src/icons/images/cm_mask.png and /dev/null differ
diff --git a/src/icons/images/cm_mask_24px.png b/src/icons/images/cm_mask_24px.png
new file mode 100644
index 000000000..94c7e307a
Binary files /dev/null and b/src/icons/images/cm_mask_24px.png differ
diff --git a/src/icons/images/cm_mask_24px@2x.png b/src/icons/images/cm_mask_24px@2x.png
new file mode 100644
index 000000000..400d44a93
Binary files /dev/null and b/src/icons/images/cm_mask_24px@2x.png differ
diff --git a/src/icons/images/cm_merge.png b/src/icons/images/cm_merge.png
deleted file mode 100644
index 11dcb87cc..000000000
Binary files a/src/icons/images/cm_merge.png and /dev/null differ
diff --git a/src/icons/images/cm_merge_24px.png b/src/icons/images/cm_merge_24px.png
new file mode 100644
index 000000000..11b8de5a0
Binary files /dev/null and b/src/icons/images/cm_merge_24px.png differ
diff --git a/src/icons/images/cm_merge_24px@2x.png b/src/icons/images/cm_merge_24px@2x.png
new file mode 100644
index 000000000..d100bb000
Binary files /dev/null and b/src/icons/images/cm_merge_24px@2x.png differ
diff --git a/src/icons/images/partial_24px.png b/src/icons/images/partial_24px.png
new file mode 100644
index 000000000..a811b6dbe
Binary files /dev/null and b/src/icons/images/partial_24px.png differ
diff --git a/src/icons/images/partial_24px@2x.png b/src/icons/images/partial_24px@2x.png
new file mode 100644
index 000000000..a9df0e603
Binary files /dev/null and b/src/icons/images/partial_24px@2x.png differ
diff --git a/src/icons/images/path.png b/src/icons/images/path.png
deleted file mode 100644
index d6759d242..000000000
Binary files a/src/icons/images/path.png and /dev/null differ
diff --git a/src/icons/images/path_24px.png b/src/icons/images/path_24px.png
new file mode 100644
index 000000000..b439108e9
Binary files /dev/null and b/src/icons/images/path_24px.png differ
diff --git a/src/icons/images/path_24px@2x.png b/src/icons/images/path_24px@2x.png
new file mode 100644
index 000000000..5fadc2053
Binary files /dev/null and b/src/icons/images/path_24px@2x.png differ
diff --git a/src/icons/images/polygon.png b/src/icons/images/polygon.png
deleted file mode 100644
index 687210e56..000000000
Binary files a/src/icons/images/polygon.png and /dev/null differ
diff --git a/src/icons/images/polygon_24px.png b/src/icons/images/polygon_24px.png
new file mode 100644
index 000000000..e62f1d609
Binary files /dev/null and b/src/icons/images/polygon_24px.png differ
diff --git a/src/icons/images/polygon_24px@2x.png b/src/icons/images/polygon_24px@2x.png
new file mode 100644
index 000000000..e323437d2
Binary files /dev/null and b/src/icons/images/polygon_24px@2x.png differ
diff --git a/src/icons/svg/box_24px.svg b/src/icons/svg/box_24px.svg
new file mode 100644
index 000000000..53cd061ed
--- /dev/null
+++ b/src/icons/svg/box_24px.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="box_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="11.741935"
+     inkscape:cy="17.323693"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="178"
+     inkscape:window-y="140"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="5.1593752"
+       y1="4.1010418"
+       x2="1.1906251"
+       y2="2.2489583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90476198,0,0,1,0.30238094,0)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1395"
+       width="5.0270834"
+       height="2.9104166"
+       x="0.66145837"
+       y="1.7197917" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient936);fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.0270834"
+       height="2.9104166"
+       x="0.66145837"
+       y="1.7197917" />
+    <path
+       id="rect2627"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:3.77953;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 0.99609375 2.9960938 L 0.99609375 4.9980469 L -0.99609375 4.9980469 L -0.99609375 6.0019531 L -0.99609375 8.0019531 L 0.99609375 8.0019531 L 0.99609375 10.001953 L 4.0019531 10.001953 L 4.0019531 8.0019531 L 6.0019531 8.0019531 L 6.0019531 4.9980469 L 4.0019531 4.9980469 L 4.0019531 2.9960938 L 2 2.9960938 L 0.99609375 2.9960938 z "
+       transform="scale(0.26458333)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271"
+       width="1.3229166"
+       height="0.26458332"
+       x="0"
+       y="1.5875" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.0583335"
+       y="0.5291667"
+       transform="matrix(0,1,1,0,0,0)" />
+    <path
+       id="path3184"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 5.2901165,3.7026165 V 4.2323 H 4.7630169 V 4.4979168 5.0270835 H 5.2901165 V 5.5562501 H 6.0854168 V 5.0270835 H 6.6145835 V 4.2323 H 6.0854168 V 3.7026165 H 5.5557334 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-6"
+       width="1.3229166"
+       height="0.26458332"
+       x="5.0270834"
+       y="4.4979167" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687502"
+       y="5.5562501"
+       transform="matrix(0,1,1,0,0,0)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="0.66145831"
+       cy="1.7197917"
+       r="0.26458332" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2523"
+       cx="5.6885419"
+       cy="4.6302085"
+       r="0.26458332" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cm_add_24px.svg b/src/icons/svg/cm_add_24px.svg
new file mode 100644
index 000000000..1a6fd0a1e
--- /dev/null
+++ b/src/icons/svg/cm_add_24px.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cm_add_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="2.828427"
+     inkscape:cx="-20.859651"
+     inkscape:cy="14.318913"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="2.2976973"
+       y1="4.3656249"
+       x2="6.0993419"
+       y2="0.13229162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient2084"
+       x1="2.5532291"
+       y1="2.4870832"
+       x2="4.3590102"
+       y2="4.2465625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95238106,0,0,1.0526317,0.08189475,-0.10444099)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path852"
+       style="overflow:visible;fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-dashoffset:0.66145787;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.66145787;stroke-opacity:0.5"
+       id="rect854"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.5718749"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-2.7781253"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2052"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient2084);fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:0.999955"
+       id="rect2076"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182171,1.0578169 V 1.5875003 H 2.6453167 V 1.8531171 2.3822838 H 2.1182171 V 2.9114504 H 1.3229169 V 2.3822838 H 0.79375018 V 1.5875003 H 1.3229169 V 1.0578169 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812501"
+       y="1.8520833"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229171"
+       y="-1.8520838"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-1.7197919"
+       cy="1.9843746"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2375"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640499,3.7036507 V 4.2333341 H 5.2911495 V 4.4989509 5.0281176 H 4.7640499 V 5.5572842 H 3.9687497 V 5.0281176 H 3.439583 V 4.2333341 H 3.9687497 V 3.7036507 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2377"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270829"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2379"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.968751"
+       y="-4.4979167"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2381"
+       cx="-4.3656249"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2383"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182169,3.7036509 V 4.2333343 H 2.6453165 V 4.4989511 5.0281178 H 2.1182169 V 5.5572844 H 1.3229167 V 5.0281178 H 0.79375 V 4.2333343 H 1.3229167 V 3.7036509 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2385"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812499"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2387"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687512"
+       y="-1.8520837"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2389"
+       cx="-1.7197919"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2391"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640502,1.0578177 V 1.5875011 H 5.2911498 V 1.8531179 2.3822846 H 4.7640502 V 2.9114512 H 3.96875 V 2.3822846 H 3.4395833 V 1.5875011 H 3.96875 V 1.0578177 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2393"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270834"
+       y="1.8520839"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2395"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229179"
+       y="-4.4979172"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2397"
+       cx="-4.3656254"
+       cy="1.9843752"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-2.7781248"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cm_diff_24px.svg b/src/icons/svg/cm_diff_24px.svg
new file mode 100644
index 000000000..724c3720d
--- /dev/null
+++ b/src/icons/svg/cm_diff_24px.svg
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cm_diff_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="2.1610578"
+     inkscape:cx="-34.705227"
+     inkscape:cy="64.088986"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="0.25065801"
+       y1="6.4822917"
+       x2="6.6842103"
+       y2="-0.92604172"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient872"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.57142864,0,0,0.63157897,1.7953868,0.73108556)"
+       x1="2.4143229"
+       y1="2.6127603"
+       x2="5.6554685"
+       y2="4.7073784" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916673;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.32291547;stroke-opacity:0.5"
+       id="rect1018"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path854"
+       style="overflow:visible;fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-dashoffset:0.499998;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="path1257"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:none;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 5.4239585,3.5718751 H 4.3656251 l 0,1.0583334 H 1.7197917 V 1.9843751 l 1.0583334,0 0,-1.32291675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient872);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:0.999955"
+       id="rect852"
+       width="1.5875002"
+       height="1.5875001"
+       x="2.7781248"
+       y="1.984375" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:none;stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-2.7781253"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-2.7781253"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2052"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:0.999955"
+       id="rect2076"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182171,1.0578169 V 1.5875003 H 2.6453167 V 1.8531171 2.3822838 H 2.1182171 V 2.9114504 H 1.3229169 V 2.3822838 H 0.79375018 V 1.5875003 H 1.3229169 V 1.0578169 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812501"
+       y="1.8520833"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229171"
+       y="-1.8520838"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-1.7197919"
+       cy="1.9843746"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2375"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640499,3.7036507 V 4.2333341 H 5.2911495 V 4.4989509 5.0281176 H 4.7640499 V 5.5572842 H 3.9687497 V 5.0281176 H 3.439583 V 4.2333341 H 3.9687497 V 3.7036507 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2377"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270829"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2379"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.968751"
+       y="-4.4979167"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2381"
+       cx="-4.3656249"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2383"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182169,3.7036509 V 4.2333343 H 2.6453165 V 4.4989511 5.0281178 H 2.1182169 V 5.5572844 H 1.3229167 V 5.0281178 H 0.79375 V 4.2333343 H 1.3229167 V 3.7036509 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2385"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812499"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2387"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687512"
+       y="-1.8520837"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2389"
+       cx="-1.7197919"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2391"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640502,1.0578177 V 1.5875011 H 5.2911498 V 1.8531179 2.3822846 H 4.7640502 V 2.9114512 H 3.96875 V 2.3822846 H 3.4395833 V 1.5875011 H 3.96875 V 1.0578177 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2393"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270834"
+       y="1.8520839"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2395"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229179"
+       y="-4.4979172"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2397"
+       cx="-4.3656254"
+       cy="1.9843752"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cm_erase_24px.svg b/src/icons/svg/cm_erase_24px.svg
new file mode 100644
index 000000000..4a0a0b4cb
--- /dev/null
+++ b/src/icons/svg/cm_erase_24px.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cm_erase_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="8.5606227"
+     inkscape:cy="13.332591"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="170"
+     inkscape:window-y="134"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="0.25065801"
+       y1="6.4822917"
+       x2="6.6842103"
+       y2="-0.92604172"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916673;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.32291547;stroke-opacity:0.5"
+       id="rect1018"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path854"
+       style="overflow:visible;fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-dashoffset:0.499998;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="path1257"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:none;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 5.4239585,3.5718751 H 4.3656251 l 0,1.0583334 H 1.7197917 V 1.9843751 l 1.0583334,0 0,-1.32291675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       id="path1797"
+       style="overflow:visible;fill:none;stroke:#999999;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:1"
+       d="M 5.4239585,3.5718751 H 3.5235107 2.7781251 V 0.66145835 l -2.11666675,-10e-8 V 5.6885422 H 5.4239585 Z"
+       sodipodi:nodetypes="cccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:none;stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="m 5.4239585,3.5718751 -1.0583334,0 0,1.0583334 H 1.7197917 V 1.9843751 h 1.0583334 l 0,-1.32291675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-2.7781253"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-2.7781253"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2052"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:0.999955"
+       id="rect2076"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182171,1.0578169 V 1.5875003 H 2.6453167 V 1.8531171 2.3822838 H 2.1182171 V 2.9114504 H 1.3229169 V 2.3822838 H 0.79375018 V 1.5875003 H 1.3229169 V 1.0578169 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812501"
+       y="1.8520833"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229171"
+       y="-1.8520838"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-1.7197919"
+       cy="1.9843746"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2375"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640499,3.7036507 V 4.2333341 H 5.2911495 V 4.4989509 5.0281176 H 4.7640499 V 5.5572842 H 3.9687497 V 5.0281176 H 3.439583 V 4.2333341 H 3.9687497 V 3.7036507 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2377"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270829"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2379"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.968751"
+       y="-4.4979167"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2381"
+       cx="-4.3656249"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2383"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182169,3.7036509 V 4.2333343 H 2.6453165 V 4.4989511 5.0281178 H 2.1182169 V 5.5572844 H 1.3229167 V 5.0281178 H 0.79375 V 4.2333343 H 1.3229167 V 3.7036509 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2385"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812499"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2387"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687512"
+       y="-1.8520837"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2389"
+       cx="-1.7197919"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2391"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640502,1.0578177 V 1.5875011 H 5.2911498 V 1.8531179 2.3822846 H 4.7640502 V 2.9114512 H 3.96875 V 2.3822846 H 3.4395833 V 1.5875011 H 3.96875 V 1.0578177 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2393"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270834"
+       y="1.8520839"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2395"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229179"
+       y="-4.4979172"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2397"
+       cx="-4.3656254"
+       cy="1.9843752"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cm_mask_24px.svg b/src/icons/svg/cm_mask_24px.svg
new file mode 100644
index 000000000..2b8f15859
--- /dev/null
+++ b/src/icons/svg/cm_mask_24px.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cm_mask_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="16"
+     inkscape:cx="9"
+     inkscape:cy="16.71875"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="88"
+     inkscape:window-y="74"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="2.8825657"
+       y1="4.1010418"
+       x2="6.0993419"
+       y2="0.13229162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.66145786;stroke-opacity:0.5"
+       id="rect3029"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path2559"
+       style="overflow:visible;fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-dashoffset:0.499998;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="path1257"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:none;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="m 4.3656251,4.2333334 0,-0.6614583 h -1.5875 v -1.5875 H 1.7197917 2.7781251 v 0 H 1.7197917 l 0,2.6458334 h 2.6458334 z"
+       sodipodi:nodetypes="ccccccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:none;stroke:#999999;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:1"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-2.7781253"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2052"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path1892"
+       style="overflow:visible;fill:none;stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="m 4.3656251,3.5718751 -1.5875,0 0,-1.5875 H 1.7197917 v 2.6458334 h 2.6458334 z"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:0.999955"
+       id="rect2076"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182171,1.0578169 V 1.5875003 H 2.6453167 V 1.8531171 2.3822838 H 2.1182171 V 2.9114504 H 1.3229169 V 2.3822838 H 0.79375018 V 1.5875003 H 1.3229169 V 1.0578169 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812501"
+       y="1.8520833"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229171"
+       y="-1.8520838"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-1.7197919"
+       cy="1.9843746"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2375"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640499,3.7036507 V 4.2333341 H 5.2911495 V 4.4989509 5.0281176 H 4.7640499 V 5.5572842 H 3.9687497 V 5.0281176 H 3.439583 V 4.2333341 H 3.9687497 V 3.7036507 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2377"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270829"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2379"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.968751"
+       y="-4.4979167"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2381"
+       cx="-4.3656249"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2383"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182169,3.7036509 V 4.2333343 H 2.6453165 V 4.4989511 5.0281178 H 2.1182169 V 5.5572844 H 1.3229167 V 5.0281178 H 0.79375 V 4.2333343 H 1.3229167 V 3.7036509 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2385"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812499"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2387"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687512"
+       y="-1.8520837"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2389"
+       cx="-1.7197919"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2391"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640502,1.0578177 V 1.5875011 H 5.2911498 V 1.8531179 2.3822846 H 4.7640502 V 2.9114512 H 3.96875 V 2.3822846 H 3.4395833 V 1.5875011 H 3.96875 V 1.0578177 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2393"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270834"
+       y="1.8520839"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2395"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229179"
+       y="-4.4979172"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2397"
+       cx="-4.3656254"
+       cy="1.9843752"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-2.7781253"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cm_merge_24px.svg b/src/icons/svg/cm_merge_24px.svg
new file mode 100644
index 000000000..a4c0902e3
--- /dev/null
+++ b/src/icons/svg/cm_merge_24px.svg
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cm_merge_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="15.114408"
+     inkscape:cy="7.026874"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="2.2976973"
+       y1="4.3656249"
+       x2="6.0993419"
+       y2="0.13229162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path852"
+       style="overflow:visible;fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-dashoffset:0.66145787;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.4239585,3.5718751 H 2.7781251 l 0,-2.91041675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.66145787;stroke-opacity:0.5"
+       id="rect854"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:none;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="m 5.4239585,3.5718751 -1.0583334,0 0,-1.5875 h -1.5875 l 0,-1.32291675 -2.11666673,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:0.264583, 0.264583;stroke-dashoffset:0.661457;stroke-opacity:1"
+       id="rect1371"
+       width="2.6458337"
+       height="2.6458337"
+       x="1.7197917"
+       y="1.984375" />
+    <path
+       id="path1563"
+       style="overflow:visible;fill:none;stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 5.4239584,3.5718752 H 4.3656251 v -1.5875 h -1.5875 V 0.66145835 H 0.66145832 V 5.6885418 H 5.4239584 Z"
+       sodipodi:nodetypes="ccccccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.5718749"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="circle2039"
+       cx="-2.7781253"
+       cy="3.5718753"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-2.7781253"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2052"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182171,1.0578169 V 1.5875003 H 2.6453167 V 1.8531171 2.3822838 H 2.1182171 V 2.9114504 H 1.3229169 V 2.3822838 H 0.79375018 V 1.5875003 H 1.3229169 V 1.0578169 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812501"
+       y="1.8520833"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229171"
+       y="-1.8520838"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-1.7197919"
+       cy="1.9843746"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2375"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7640499,3.7036507 V 4.2333341 H 5.2911495 V 4.4989509 5.0281176 H 4.7640499 V 5.5572842 H 3.9687497 V 5.0281176 H 3.439583 V 4.2333341 H 3.9687497 V 3.7036507 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2377"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270829"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2379"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.968751"
+       y="-4.4979167"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2381"
+       cx="-4.3656249"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2383"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 2.1182169,3.7036509 V 4.2333343 H 2.6453165 V 4.4989511 5.0281178 H 2.1182169 V 5.5572844 H 1.3229167 V 5.0281178 H 0.79375 V 4.2333343 H 1.3229167 V 3.7036509 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2385"
+       width="1.3229166"
+       height="0.26458332"
+       x="-2.3812499"
+       y="4.4979172"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2387"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687512"
+       y="-1.8520837"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2389"
+       cx="-1.7197919"
+       cy="4.6302085"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2391"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.7625001,1.0567831 V 1.5864666 H 5.2895997 V 1.8520834 2.3812501 H 4.7625001 V 2.9104167 H 3.9671999 V 2.3812501 H 3.4380332 V 1.5864666 H 3.9671999 V 1.0567831 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2393"
+       width="1.3229166"
+       height="0.26458332"
+       x="-5.0270834"
+       y="1.8520839"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2395"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.3229179"
+       y="-4.4979172"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2397"
+       cx="-4.3656254"
+       cy="1.9843752"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/partial_24px.svg b/src/icons/svg/partial_24px.svg
new file mode 100644
index 000000000..9443b6cb1
--- /dev/null
+++ b/src/icons/svg/partial_24px.svg
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="partial_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="3.875417"
+     inkscape:cy="18.307007"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="95"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="2.2976973"
+       y1="4.3656249"
+       x2="5.6606908"
+       y2="2.1166666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:#999999;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       d="m 5.4239585,3.0427084 -2.3812501,0 0,-2.38125005 -2.38125003,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="rect2627"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 5.821867,2.1156336 V 2.645317 H 6.3489666 V 2.9109338 3.4401005 H 5.821867 V 3.9692671 H 5.0265667 V 3.4401005 H 4.4974 V 2.645317 H 5.0265667 V 2.1156336 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271"
+       width="1.3229166"
+       height="0.26458332"
+       x="-6.0854168"
+       y="2.9104173"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3"
+       width="1.3229166"
+       height="0.26458332"
+       x="2.3812506"
+       y="-5.5562501"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.0427086"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 1.0598837,4.7619841 V 5.2916675 H 1.5869833 V 5.5572843 6.086451 H 1.0598837 V 6.6156176 H 0.2645835 V 6.086451 H -0.2645832 V 5.2916675 H 0.2645835 V 4.7619841 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-1.3229166"
+       y="5.5562506"
+       transform="scale(-1,1)" />
+    <path
+       id="path2453"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 1.0598838,-0.26613314 v 0.5296834 H 1.5869834 V 0.52916706 1.0583338 H 1.0598838 V 1.5875004 H 0.2645836 V 1.0583338 H -0.2645831 V 0.26355026 h 0.5291667 v -0.5296834 H 0.794267 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2367"
+       width="6.3499994"
+       height="0.26458332"
+       x="7.8121622e-07"
+       y="-0.79375046"
+       transform="rotate(90)" />
+    <path
+       id="path1371"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 5.821867,4.7614666 V 5.29115 H 6.3489666 V 5.5567668 6.0859335 H 5.821867 V 6.6151001 H 5.0265667 V 6.0859335 H 4.4974 V 5.29115 H 5.0265667 V 4.7614666 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect1373"
+       width="1.3229166"
+       height="0.26458332"
+       x="-6.0854168"
+       y="5.5562501"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect1375"
+       width="1.3229166"
+       height="0.26458332"
+       x="5.0270834"
+       y="-5.5562501"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#999999;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2033"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 3.4406169,2.1156336 V 2.645317 H 3.9677165 V 2.9109338 3.4401005 H 3.4406169 V 3.9692671 H 2.6453166 V 3.4401005 H 2.1161499 V 2.645317 H 2.6453166 V 2.1156336 H 3.175 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2035"
+       width="1.3229166"
+       height="0.26458332"
+       x="-3.7041667"
+       y="2.9104173"
+       transform="scale(-1,1)" />
+    <path
+       id="path2041"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 3.4406169,-0.26561653 v 0.5296834 H 3.9677165 V 0.52968367 1.0588504 H 3.4406169 V 1.588017 H 2.6453166 V 1.0588504 H 2.1161499 V 0.26406687 h 0.5291667 v -0.5296834 H 3.175 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264584;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2045"
+       width="3.7041662"
+       height="0.26458332"
+       x="4.9166744e-07"
+       y="-3.175"
+       transform="rotate(90)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264584;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2365"
+       width="3.7041669"
+       height="0.26458332"
+       x="-3.7041664"
+       y="0.52916723"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-3.0427086"
+       cy="0.66145849"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-3.0427086"
+       cy="3.0427086"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/path_24px.svg b/src/icons/svg/path_24px.svg
new file mode 100644
index 000000000..7bf2f3fa6
--- /dev/null
+++ b/src/icons/svg/path_24px.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="path_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="10.1802"
+     inkscape:cy="17.844271"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="95"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="5.1593752"
+       y1="4.1010418"
+       x2="1.1906251"
+       y2="2.2489583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90476198,0,0,1,0.30238086,0.39687507)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path3012"
+       style="overflow:visible;fill:none;stroke:#fcfcfc;stroke-width:0.79375;stroke-dashoffset:0.499998;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 0.66145835,3.5718751 H 3.5718751 l 0,-2.91041675 h 2.1166667 l 0,5.02708345 H 0.66145835 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="M 0.66145835,3.5718751 H 3.5718751 l 0,-2.91041675 h 2.1166667 l 0,5.02708345 H 0.66145835 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="rect2627"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 0.26355003,3.7031335 v 0.5296834 h -0.5270996 v 0.2656168 0.5291667 h 0.5270996 V 5.556767 H 1.0588503 V 5.0276004 H 1.588017 V 4.2328169 H 1.0588503 V 3.7031335 H 0.52916689 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271"
+       width="1.3229166"
+       height="0.26458332"
+       x="2.1534882e-07"
+       y="4.4979172" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687505"
+       y="0.52916694"
+       transform="matrix(0,1,1,0,0,0)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="0.66145855"
+       cy="4.6302085"
+       r="0.26458332" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 4.2317833,3.7036501 V 4.2333335 H 3.7046837 V 4.4989503 5.028117 H 4.2317833 V 5.5572836 H 5.0270835 V 5.028117 H 5.5562502 V 4.2333335 H 5.0270835 V 3.7036501 H 4.4974001 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687502"
+       y="4.4979167" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687502"
+       y="4.4979167"
+       transform="matrix(0,1,1,0,0,0)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="4.6302085"
+       cy="4.630208"
+       r="0.26458332" />
+    <path
+       id="path2453"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 4.2317832,-0.26613354 v 0.5296834 H 3.7046836 V 0.52916666 1.0583334 H 4.2317832 V 1.5875 H 5.0270834 V 1.0583334 H 5.5562501 V 0.26354986 H 5.0270834 v -0.5296834 H 4.4974 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2365"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.9687505"
+       y="0.52916682" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2367"
+       width="1.3229166"
+       height="0.26458332"
+       x="3.7820229e-07"
+       y="4.4979167"
+       transform="matrix(0,1,1,0,0,0)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="4.6302085"
+       cy="0.66145813"
+       r="0.26458332" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect2477"
+       width="0.26458332"
+       height="0.52916664"
+       x="4.4979167"
+       y="1.5875" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect2477-3"
+       width="0.26458332"
+       height="0.52916664"
+       x="4.4979167"
+       y="2.3812501" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect3004"
+       width="0.26458332"
+       height="0.52916664"
+       x="4.4979172"
+       y="3.175" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect3006"
+       width="0.26458332"
+       height="0.52916664"
+       x="-4.7625003"
+       y="1.5875001"
+       transform="rotate(-90)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect3008"
+       width="0.26458332"
+       height="0.52916664"
+       x="-4.7625003"
+       y="2.3812501"
+       transform="rotate(-90)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke-width:0.264583;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect3010"
+       width="0.26458332"
+       height="0.52916664"
+       x="-4.7624998"
+       y="3.1750007"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/polygon_24px.svg b/src/icons/svg/polygon_24px.svg
new file mode 100644
index 000000000..cdae72412
--- /dev/null
+++ b/src/icons/svg/polygon_24px.svg
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="polygon_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="6.1123944"
+     inkscape:cx="7.8528965"
+     inkscape:cy="19.714042"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="95"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient936"
+       x1="2.2976973"
+       y1="4.3656249"
+       x2="5.6606908"
+       y2="2.1166666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.90476198,0,0,1,6.0476193,0.39687506)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="-6.0864506"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       id="rect848"
+       style="overflow:visible;fill:url(#linearGradient936);stroke:#000000;stroke-width:0.264583;stroke-dashoffset:0.499998"
+       d="m 5.4239585,3.0427084 -2.3812501,0 0,-2.38125005 -2.38125003,-10e-9 V 5.6885418 H 5.4239585 Z"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       id="rect2627"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 5.821867,2.1156336 V 2.645317 H 6.3489666 V 2.9109338 3.4401005 H 5.821867 V 3.9692671 H 5.0265667 V 3.4401005 H 4.4974 V 2.645317 H 5.0265667 V 2.1156336 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271"
+       width="1.3229166"
+       height="0.26458332"
+       x="-6.0854168"
+       y="2.9104173"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3"
+       width="1.3229166"
+       height="0.26458332"
+       x="2.3812506"
+       y="-5.5562501"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581"
+       cx="-5.4239588"
+       cy="3.0427086"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2451"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 1.0598837,4.7619841 V 5.2916675 H 1.5869833 V 5.5572843 6.086451 H 1.0598837 V 6.6156176 H 0.2645835 V 6.086451 H -0.2645832 V 5.2916675 H 0.2645835 V 4.7619841 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-36"
+       width="1.3229166"
+       height="0.26458332"
+       x="-1.3229166"
+       y="5.5562506"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2271-3-7"
+       width="1.3229166"
+       height="0.26458332"
+       x="5.0270844"
+       y="-0.79375046"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="path1581-5"
+       cx="-0.66145855"
+       cy="5.6885419"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2453"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 1.0598838,-0.26613314 v 0.5296834 H 1.5869834 V 0.52916706 1.0583338 H 1.0598838 V 1.5875004 H 0.2645836 V 1.0583338 H -0.2645831 V 0.26355026 h 0.5291667 v -0.5296834 H 0.794267 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2365"
+       width="1.3229166"
+       height="0.26458332"
+       x="-1.3229165"
+       y="0.52916723"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2367"
+       width="1.3229166"
+       height="0.26458332"
+       x="7.8121622e-07"
+       y="-0.79375046"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2369"
+       cx="-0.66145855"
+       cy="0.66145855"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path1371"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 5.821867,4.7614666 V 5.29115 H 6.3489666 V 5.5567668 6.0859335 H 5.821867 V 6.6151001 H 5.0265667 V 6.0859335 H 4.4974 V 5.29115 H 5.0265667 V 4.7614666 h 0.5296834 z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect1373"
+       width="1.3229166"
+       height="0.26458332"
+       x="-6.0854168"
+       y="5.5562501"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect1375"
+       width="1.3229166"
+       height="0.26458332"
+       x="5.0270834"
+       y="-5.5562501"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle1377"
+       cx="-5.4239588"
+       cy="5.6885414"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2033"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="M 3.4406169,2.1156336 V 2.645317 H 3.9677165 V 2.9109338 3.4401005 H 3.4406169 V 3.9692671 H 2.6453166 V 3.4401005 H 2.1161499 V 2.645317 H 2.6453166 V 2.1156336 H 3.175 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2035"
+       width="1.3229166"
+       height="0.26458332"
+       x="-3.7041667"
+       y="2.9104173"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2037"
+       width="1.3229166"
+       height="0.26458332"
+       x="2.3812506"
+       y="-3.175"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2039"
+       cx="-3.0427086"
+       cy="3.0427086"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+    <path
+       id="path2041"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.825526;stroke-width:1;stroke-dashoffset:0.499998;-inkscape-stroke:none"
+       d="m 3.4406169,-0.26561653 v 0.5296834 H 3.9677165 V 0.52968367 1.0588504 H 3.4406169 V 1.588017 H 2.6453166 V 1.0588504 H 2.1161499 V 0.26406687 h 0.5291667 v -0.5296834 H 3.175 Z" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2043"
+       width="1.3229166"
+       height="0.26458332"
+       x="-3.7041667"
+       y="0.52916718"
+       transform="scale(-1,1)" />
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="rect2045"
+       width="1.3229166"
+       height="0.26458332"
+       x="4.9166744e-07"
+       y="-3.175"
+       transform="rotate(90)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.999955"
+       id="circle2047"
+       cx="-3.0427086"
+       cy="0.66145849"
+       r="0.26458332"
+       transform="scale(-1,1)" />
+  </g>
+</svg>