diff --git a/src/edt/edt/MakeCellOptionsDialog.ui b/src/edt/edt/MakeCellOptionsDialog.ui
index 9f9d2ba33..9fae1b2bc 100644
--- a/src/edt/edt/MakeCellOptionsDialog.ui
+++ b/src/edt/edt/MakeCellOptionsDialog.ui
@@ -145,7 +145,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/ct.png</normaloff>:/ct.png</iconset>
+                <normaloff>:/ct_31px.png</normaloff>:/ct_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -165,7 +165,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/lt.png</normaloff>:/lt.png</iconset>
+                <normaloff>:/lt_31px.png</normaloff>:/lt_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -185,7 +185,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/rt.png</normaloff>:/rt.png</iconset>
+                <normaloff>:/rt_31px.png</normaloff>:/rt_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -205,7 +205,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/lc.png</normaloff>:/lc.png</iconset>
+                <normaloff>:/lc_31px.png</normaloff>:/lc_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -225,7 +225,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/cc.png</normaloff>:/cc.png</iconset>
+                <normaloff>:/cc_31px.png</normaloff>:/cc_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -245,7 +245,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/rc.png</normaloff>:/rc.png</iconset>
+                <normaloff>:/rc_31px.png</normaloff>:/rc_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -265,7 +265,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/lb.png</normaloff>:/lb.png</iconset>
+                <normaloff>:/lb_31px.png</normaloff>:/lb_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -285,7 +285,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/cb.png</normaloff>:/cb.png</iconset>
+                <normaloff>:/cb_31px.png</normaloff>:/cb_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
@@ -305,7 +305,7 @@
               </property>
               <property name="icon">
                <iconset resource="../../lay/lay/layResources.qrc">
-                <normaloff>:/rb.png</normaloff>:/rb.png</iconset>
+                <normaloff>:/rb_31px.png</normaloff>:/rb_31px.png</iconset>
               </property>
               <property name="iconSize">
                <size>
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 7b5eddd82..885abe798 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -34,8 +34,10 @@
         <file alias="breakpointmarkdisabled_16px@2x.png">images/breakpointmarkdisabled_16px@2x.png</file>
         <file alias="bright.png">images/bright.png</file>
         <file alias="bulb.png">images/bulb.png</file>
-        <file alias="cb.png">images/cb.png</file>
-        <file alias="cc.png">images/cc.png</file>
+        <file alias="cb_31px.png">images/cb_31px.png</file>
+        <file alias="cb_31px@2x.png">images/cb_31px@2x.png</file>
+        <file alias="cc_31px.png">images/cc_31px.png</file>
+        <file alias="cc_31px@2x.png">images/cc_31px@2x.png</file>
         <file alias="checked.png">images/checked.png</file>
         <file alias="clear_16px.png">images/clear_16px.png</file>
         <file alias="clear_16px@2x.png">images/clear_16px@2x.png</file>
@@ -51,7 +53,8 @@
         <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="ct.png">images/ct.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.png">images/dark.png</file>
         <file alias="defaultmacroicon.png">images/defaultmacroicon.png</file>
         <file alias="del_16px.png">images/del_16px.png</file>
@@ -81,11 +84,14 @@
         <file alias="important.png">images/important.png</file>
         <file alias="instance.png">images/instance.png</file>
         <file alias="invert.png">images/invert.png</file>
-        <file alias="lb.png">images/lb.png</file>
-        <file alias="lc.png">images/lc.png</file>
+        <file alias="lb_31px.png">images/lb_31px.png</file>
+        <file alias="lb_31px@2x.png">images/lb_31px@2x.png</file>
+        <file alias="lc_31px.png">images/lc_31px.png</file>
+        <file alias="lc_31px@2x.png">images/lc_31px@2x.png</file>
         <file alias="left.png">images/left.png</file>
         <file alias="logo.png">images/logo.png</file>
-        <file alias="lt.png">images/lt.png</file>
+        <file alias="lt_31px.png">images/lt_31px.png</file>
+        <file alias="lt_31px@2x.png">images/lt_31px@2x.png</file>
         <file alias="m0.png">images/m0.png</file>
         <file alias="m135.png">images/m135.png</file>
         <file alias="m45.png">images/m45.png</file>
@@ -114,8 +120,10 @@
         <file alias="r180.png">images/r180.png</file>
         <file alias="r270.png">images/r270.png</file>
         <file alias="r90.png">images/r90.png</file>
-        <file alias="rb.png">images/rb.png</file>
-        <file alias="rc.png">images/rc.png</file>
+        <file alias="rb_31px.png">images/rb_31px.png</file>
+        <file alias="rb_31px@2x.png">images/rb_31px@2x.png</file>
+        <file alias="rc_31px.png">images/rc_31px.png</file>
+        <file alias="rc_31px@2x.png">images/rc_31px@2x.png</file>
         <file alias="red_flag_16px.png">images/red_flag_16px.png</file>
         <file alias="red_flag_16px@2x.png">images/red_flag_16px@2x.png</file>
         <file alias="rename.png">images/rename.png</file>
@@ -123,7 +131,8 @@
         <file alias="replace_all.png">images/replace_all.png</file>
         <file alias="right.png">images/right.png</file>
         <file alias="rotate.png">images/rotate.png</file>
-        <file alias="rt.png">images/rt.png</file>
+        <file alias="rt_31px.png">images/rt_31px.png</file>
+        <file alias="rt_31px@2x.png">images/rt_31px@2x.png</file>
         <file alias="rubymacroicon.png">images/rubymacroicon.png</file>
         <file alias="rubymacroiconactive.png">images/rubymacroiconactive.png</file>
         <file alias="pythonmacroicon.png">images/pythonmacroicon.png</file>
diff --git a/src/icons/images/cb.png b/src/icons/images/cb.png
deleted file mode 100644
index 2fce471d3..000000000
Binary files a/src/icons/images/cb.png and /dev/null differ
diff --git a/src/icons/images/cb_31px.png b/src/icons/images/cb_31px.png
new file mode 100644
index 000000000..d1dff71ea
Binary files /dev/null and b/src/icons/images/cb_31px.png differ
diff --git a/src/icons/images/cb_31px@2x.png b/src/icons/images/cb_31px@2x.png
new file mode 100644
index 000000000..4c9f4fef1
Binary files /dev/null and b/src/icons/images/cb_31px@2x.png differ
diff --git a/src/icons/images/cc.png b/src/icons/images/cc.png
deleted file mode 100644
index c6d6791ac..000000000
Binary files a/src/icons/images/cc.png and /dev/null differ
diff --git a/src/icons/images/cc_31px.png b/src/icons/images/cc_31px.png
new file mode 100644
index 000000000..794fe0aea
Binary files /dev/null and b/src/icons/images/cc_31px.png differ
diff --git a/src/icons/images/cc_31px@2x.png b/src/icons/images/cc_31px@2x.png
new file mode 100644
index 000000000..a3bcb59b2
Binary files /dev/null and b/src/icons/images/cc_31px@2x.png differ
diff --git a/src/icons/images/ct.png b/src/icons/images/ct.png
deleted file mode 100644
index 61682544f..000000000
Binary files a/src/icons/images/ct.png and /dev/null differ
diff --git a/src/icons/images/ct_31px.png b/src/icons/images/ct_31px.png
new file mode 100644
index 000000000..08e46f8d0
Binary files /dev/null and b/src/icons/images/ct_31px.png differ
diff --git a/src/icons/images/ct_31px@2x.png b/src/icons/images/ct_31px@2x.png
new file mode 100644
index 000000000..129431062
Binary files /dev/null and b/src/icons/images/ct_31px@2x.png differ
diff --git a/src/icons/images/empty_12px.png b/src/icons/images/empty_12px.png
new file mode 100644
index 000000000..46ef0f7b7
Binary files /dev/null and b/src/icons/images/empty_12px.png differ
diff --git a/src/icons/images/empty_12px@2x.png b/src/icons/images/empty_12px@2x.png
new file mode 100644
index 000000000..27bcbf6b3
Binary files /dev/null and b/src/icons/images/empty_12px@2x.png differ
diff --git a/src/icons/images/empty_31px.png b/src/icons/images/empty_31px.png
new file mode 100644
index 000000000..62edd4bec
Binary files /dev/null and b/src/icons/images/empty_31px.png differ
diff --git a/src/icons/images/empty_31px@2x.png b/src/icons/images/empty_31px@2x.png
new file mode 100644
index 000000000..54a39c48c
Binary files /dev/null and b/src/icons/images/empty_31px@2x.png differ
diff --git a/src/icons/images/empty_32px.png b/src/icons/images/empty_32px.png
new file mode 100644
index 000000000..3bb143569
Binary files /dev/null and b/src/icons/images/empty_32px.png differ
diff --git a/src/icons/images/empty_32px@2x.png b/src/icons/images/empty_32px@2x.png
new file mode 100644
index 000000000..aa798e7c9
Binary files /dev/null and b/src/icons/images/empty_32px@2x.png differ
diff --git a/src/icons/images/lb.png b/src/icons/images/lb.png
deleted file mode 100644
index a986c1ba4..000000000
Binary files a/src/icons/images/lb.png and /dev/null differ
diff --git a/src/icons/images/lb_31px.png b/src/icons/images/lb_31px.png
new file mode 100644
index 000000000..ee4301fbf
Binary files /dev/null and b/src/icons/images/lb_31px.png differ
diff --git a/src/icons/images/lb_31px@2x.png b/src/icons/images/lb_31px@2x.png
new file mode 100644
index 000000000..24c6b9e94
Binary files /dev/null and b/src/icons/images/lb_31px@2x.png differ
diff --git a/src/icons/images/lc.png b/src/icons/images/lc.png
deleted file mode 100644
index 57df93e1e..000000000
Binary files a/src/icons/images/lc.png and /dev/null differ
diff --git a/src/icons/images/lc_31px.png b/src/icons/images/lc_31px.png
new file mode 100644
index 000000000..4f9f0f0bf
Binary files /dev/null and b/src/icons/images/lc_31px.png differ
diff --git a/src/icons/images/lc_31px@2x.png b/src/icons/images/lc_31px@2x.png
new file mode 100644
index 000000000..fff8af27e
Binary files /dev/null and b/src/icons/images/lc_31px@2x.png differ
diff --git a/src/icons/images/lt.png b/src/icons/images/lt.png
deleted file mode 100644
index 63af853b6..000000000
Binary files a/src/icons/images/lt.png and /dev/null differ
diff --git a/src/icons/images/lt_31px.png b/src/icons/images/lt_31px.png
new file mode 100644
index 000000000..6c31256dc
Binary files /dev/null and b/src/icons/images/lt_31px.png differ
diff --git a/src/icons/images/lt_31px@2x.png b/src/icons/images/lt_31px@2x.png
new file mode 100644
index 000000000..b583b2f93
Binary files /dev/null and b/src/icons/images/lt_31px@2x.png differ
diff --git a/src/icons/images/rb.png b/src/icons/images/rb.png
deleted file mode 100644
index bf87b5aa0..000000000
Binary files a/src/icons/images/rb.png and /dev/null differ
diff --git a/src/icons/images/rb_31px.png b/src/icons/images/rb_31px.png
new file mode 100644
index 000000000..e01b1acb0
Binary files /dev/null and b/src/icons/images/rb_31px.png differ
diff --git a/src/icons/images/rb_31px@2x.png b/src/icons/images/rb_31px@2x.png
new file mode 100644
index 000000000..7c30d127c
Binary files /dev/null and b/src/icons/images/rb_31px@2x.png differ
diff --git a/src/icons/images/rc.png b/src/icons/images/rc.png
deleted file mode 100644
index 42fd9fdd7..000000000
Binary files a/src/icons/images/rc.png and /dev/null differ
diff --git a/src/icons/images/rc_31px.png b/src/icons/images/rc_31px.png
new file mode 100644
index 000000000..70a2c6f3d
Binary files /dev/null and b/src/icons/images/rc_31px.png differ
diff --git a/src/icons/images/rc_31px@2x.png b/src/icons/images/rc_31px@2x.png
new file mode 100644
index 000000000..d335910b7
Binary files /dev/null and b/src/icons/images/rc_31px@2x.png differ
diff --git a/src/icons/images/rt.png b/src/icons/images/rt.png
deleted file mode 100644
index 13b4c0f3a..000000000
Binary files a/src/icons/images/rt.png and /dev/null differ
diff --git a/src/icons/images/rt_31px.png b/src/icons/images/rt_31px.png
new file mode 100644
index 000000000..6d876a04c
Binary files /dev/null and b/src/icons/images/rt_31px.png differ
diff --git a/src/icons/images/rt_31px@2x.png b/src/icons/images/rt_31px@2x.png
new file mode 100644
index 000000000..7a0dc4284
Binary files /dev/null and b/src/icons/images/rt_31px@2x.png differ
diff --git a/src/icons/svg/cb_31px.svg b/src/icons/svg/cb_31px.svg
new file mode 100644
index 000000000..429576949
--- /dev/null
+++ b/src/icons/svg/cb_31px.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cb_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="18.914349"
+     inkscape:cy="16.10901"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.7041666,5.8208335 h 0.79375 l 0.1322918,0.6614583 0.9260417,0.1322917 v 0.79375 L 4.6302084,7.5406252 4.4979166,8.2020835 h -0.79375 L 3.5718751,7.5406252 2.6458334,7.4083335 v -0.79375 L 3.5718751,6.4822918 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.1010416,5.8208335 c 0,2.3812501 0,2.3812501 0,2.3812501"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.910417,7.0114586 c 2.3812499,0 2.3812499,0 2.3812499,0"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="4.1010418"
+       sodipodi:cy="7.0114584"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M 4.6302084,7.0114584 A 0.52916664,0.52916664 0 0 1 4.101118,7.540625 0.52916664,0.52916664 0 0 1 3.5718752,7.0116108 0.52916664,0.52916664 0 0 1 4.1008132,6.4822918 0.52916664,0.52916664 0 0 1 4.6302083,7.0111536" />
+  </g>
+</svg>
diff --git a/src/icons/svg/cc_31px.svg b/src/icons/svg/cc_31px.svg
new file mode 100644
index 000000000..88fb2fc4f
--- /dev/null
+++ b/src/icons/svg/cc_31px.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cc_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="16.022247"
+     inkscape:cy="14.662958"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.7041668,2.6458334 h 0.79375 L 4.6302085,3.5718751 5.5562502,3.7041668 V 4.4979167 L 4.6302085,4.6302084 4.4979168,5.5562501 h -0.79375 L 3.5718752,4.6302084 2.6458335,4.4979167 V 3.7041668 L 3.5718752,3.5718751 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.1010417,2.9104167 c 0,2.3812501 0,2.3812501 0,2.3812501"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.9104171,4.1010418 c 2.3812499,0 2.3812499,0 2.3812499,0"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="4.1010418"
+       sodipodi:cy="4.1010418"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M 4.6302084,4.1010418 A 0.52916664,0.52916664 0 0 1 4.101118,4.6302084 0.52916664,0.52916664 0 0 1 3.5718752,4.1011942 0.52916664,0.52916664 0 0 1 4.1008132,3.5718752 0.52916664,0.52916664 0 0 1 4.6302083,4.100737" />
+  </g>
+</svg>
diff --git a/src/icons/svg/ct_31px.svg b/src/icons/svg/ct_31px.svg
new file mode 100644
index 000000000..3c0be3fd6
--- /dev/null
+++ b/src/icons/svg/ct_31px.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="ct_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="13.824249"
+     inkscape:cy="11.655172"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.7041666,0 h 0.79375 l 0.1322918,0.66145835 0.9260417,0.13229167 0,0.79374998 L 4.6302084,1.7197917 4.4979166,2.38125 h -0.79375 L 3.5718751,1.7197917 2.6458334,1.5875 V 0.79375002 L 3.5718751,0.66145835 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.1010416,-1.2756698e-8 C 4.1010416,2.3812501 4.1010416,2.3812501 4.1010416,2.3812501"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.910417,1.1906251 c 2.3812499,0 2.3812499,0 2.3812499,0"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="4.1010418"
+       sodipodi:cy="1.190625"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M 4.6302084,1.190625 A 0.52916664,0.52916664 0 0 1 4.101118,1.7197916 0.52916664,0.52916664 0 0 1 3.5718752,1.1907773 0.52916664,0.52916664 0 0 1 4.1008132,0.66145836 0.52916664,0.52916664 0 0 1 4.6302083,1.1903202" />
+  </g>
+</svg>
diff --git a/src/icons/svg/empty_12px.svg b/src/icons/svg/empty_12px.svg
new file mode 100644
index 000000000..2ecfed838
--- /dev/null
+++ b/src/icons/svg/empty_12px.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="12"
+   height="12"
+   viewBox="0 0 3.1749999 3.1750001"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="empty_12.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="4"
+     inkscape:cx="7.5"
+     inkscape:cy="18.625"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="12px">
+    <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>
+  </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="3.1749995"
+       height="3.1749995"
+       x="2.5000003e-07"
+       y="2.5000003e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+  </g>
+</svg>
diff --git a/src/icons/svg/empty_31px.svg b/src/icons/svg/empty_31px.svg
new file mode 100644
index 000000000..04c346dac
--- /dev/null
+++ b/src/icons/svg/empty_31px.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="empty_31.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="34.576924"
+     inkscape:cx="33.519465"
+     inkscape:cy="31.68298"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </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="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+  </g>
+</svg>
diff --git a/src/icons/svg/empty_32px.svg b/src/icons/svg/empty_32px.svg
new file mode 100644
index 000000000..572db2a9d
--- /dev/null
+++ b/src/icons/svg/empty_32px.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666664 8.4666669"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="empty_32.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="12.224789"
+     inkscape:cx="22.249873"
+     inkscape:cy="13.210862"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="32px">
+    <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>
+  </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="8.4666653"
+       height="8.4666653"
+       x="6.6666666e-07"
+       y="6.6666666e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+  </g>
+</svg>
diff --git a/src/icons/svg/lb_31px.svg b/src/icons/svg/lb_31px.svg
new file mode 100644
index 000000000..f8ab93c6a
--- /dev/null
+++ b/src/icons/svg/lb_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="lb_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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.6763068"
+     inkscape:cy="15.704115"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1e-8,7.4083337 v -0.79375 L 0.66145836,6.4822919 0.79375003,5.5562502 H 1.5875 l 0.1322917,0.9260417 0.9260417,0.1322916 v 0.79375 L 1.7197917,7.5406252 1.5875,8.2020835 H 0.79375002 L 0.66145836,7.5406252 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,7.0114587 c 2.3812501,0 2.3812501,0 2.3812501,0"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.1906251,8.2020833 c 0,-2.3812499 0,-2.3812499 0,-2.3812499"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-7.0114584"
+       sodipodi:cy="1.190625"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M -6.4822918,1.190625 A 0.52916664,0.52916664 0 0 1 -7.0113822,1.7197916 0.52916664,0.52916664 0 0 1 -7.540625,1.1907774 0.52916664,0.52916664 0 0 1 -7.011687,0.66145836 0.52916664,0.52916664 0 0 1 -6.4822918,1.1903201"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/lc_31px.svg b/src/icons/svg/lc_31px.svg
new file mode 100644
index 000000000..72edc347c
--- /dev/null
+++ b/src/icons/svg/lc_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cl_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="13.187986"
+     inkscape:cy="11.481646"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,4.497917 V 3.704167 L 0.66145835,3.5718752 0.79375002,2.6458335 H 1.5875 L 1.7197917,3.5718752 2.38125,3.704167 v 0.79375 L 1.7197917,4.6302085 1.5875,5.5562502 H 0.79375002 L 0.66145835,4.6302085 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -1.2756698e-8,4.101042 C 2.3812501,4.101042 2.3812501,4.101042 2.3812501,4.101042"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.1906251,5.2916666 c 0,-2.3812499 0,-2.3812499 0,-2.3812499"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-4.1010418"
+       sodipodi:cy="1.190625"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M -3.5718752,1.190625 A 0.52916664,0.52916664 0 0 1 -4.1009656,1.7197916 0.52916664,0.52916664 0 0 1 -4.6302084,1.1907774 0.52916664,0.52916664 0 0 1 -4.1012704,0.66145836 0.52916664,0.52916664 0 0 1 -3.5718752,1.1903201"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/lt_31px.svg b/src/icons/svg/lt_31px.svg
new file mode 100644
index 000000000..f733c76ff
--- /dev/null
+++ b/src/icons/svg/lt_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="lt_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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.0077863"
+     inkscape:cy="14.894327"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1.5875002 V 0.79375021 L 0.66145836,0.66145841 0.79375002,0 H 1.5875 L 1.7197917,0.66145841 2.6458334,0.79375002 V 1.5875 L 1.7197917,1.7197917 1.5875,2.6458334 H 0.79375003 L 0.66145836,1.7197917 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1.1906252 c 2.3812501,0 2.3812501,0 2.3812501,0"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.1906251,2.3812498 c 0,-2.38124989 0,-2.38124989 0,-2.38124989"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-1.190625"
+       sodipodi:cy="1.190625"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M -0.66145831,1.190625 A 0.52916664,0.52916664 0 0 1 -1.1905488,1.7197916 0.52916664,0.52916664 0 0 1 -1.7197916,1.1907774 0.52916664,0.52916664 0 0 1 -1.1908536,0.66145836 0.52916664,0.52916664 0 0 1 -0.6614584,1.1903201"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rb_31px.svg b/src/icons/svg/rb_31px.svg
new file mode 100644
index 000000000..a14b5d899
--- /dev/null
+++ b/src/icons/svg/rb_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="rb_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="17.410456"
+     inkscape:cy="13.506118"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5562501,7.4083335 v -0.79375 L 6.4822918,6.4822919 6.6145835,5.5562502 h 0.79375 l 0.1322917,0.9260417 0.6614583,0.1322918 v 0.79375 L 7.5406252,7.5406252 7.4083335,8.2020835 h -0.79375 L 6.4822918,7.5406252 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.8208335,7.0114587 c 2.3812501,0 2.3812501,0 2.3812501,0"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.0114586,8.2020833 c 0,-2.3812499 0,-2.3812499 0,-2.3812499"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-7.0114584"
+       sodipodi:cy="7.0114584"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M -6.4822918,7.0114584 A 0.52916664,0.52916664 0 0 1 -7.0113822,7.540625 0.52916664,0.52916664 0 0 1 -7.540625,7.0116108 a 0.52916664,0.52916664 0 0 1 0.528938,-0.529319 0.52916664,0.52916664 0 0 1 0.5293952,0.5288618"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rc_31px.svg b/src/icons/svg/rc_31px.svg
new file mode 100644
index 000000000..7830c34cd
--- /dev/null
+++ b/src/icons/svg/rc_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="cr_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="13.130144"
+     inkscape:cy="16.39822"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.8208335,4.4979169 v -0.79375 L 6.4822918,3.5718751 6.6145835,2.6458334 h 0.79375 l 0.1322917,0.9260417 0.6614583,0.1322918 v 0.79375 L 7.5406252,4.6302084 7.4083335,5.5562501 h -0.79375 L 6.4822918,4.6302084 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.8208335,4.1010419 c 2.3812501,0 2.3812501,0 2.3812501,0"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.0114586,5.2916665 c 0,-2.3812499 0,-2.3812499 0,-2.3812499"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-4.1010418"
+       sodipodi:cy="7.0114584"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="m -3.5718752,7.0114584 a 0.52916664,0.52916664 0 0 1 -0.5290904,0.5291666 0.52916664,0.52916664 0 0 1 -0.5292428,-0.5290142 0.52916664,0.52916664 0 0 1 0.528938,-0.529319 0.52916664,0.52916664 0 0 1 0.5293952,0.5288618"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rt_31px.svg b/src/icons/svg/rt_31px.svg
new file mode 100644
index 000000000..85ff8f427
--- /dev/null
+++ b/src/icons/svg/rt_31px.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="31"
+   height="31"
+   viewBox="0 0 8.2020831 8.2020836"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="rb_31px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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="18.39377"
+     inkscape:cy="15.993325"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="316"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="31px">
+    <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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="color:#000000;overflow:visible;fill:none;stroke:#fefefe;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:0.5"
+       id="rect1461"
+       width="5.8208337"
+       height="5.8208332"
+       x="1.190625"
+       y="1.1906251" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="8.2020826"
+       height="8.2020826"
+       x="6.4583332e-07"
+       y="6.4583332e-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:none;stroke:#858585;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="rect848"
+       width="5.8208337"
+       height="5.8208337"
+       x="1.1906248"
+       y="1.190625" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5562501,1.5875 0,-0.79374998 L 6.4822918,0.66145841 6.6145835,0 h 0.79375 l 0.1322917,0.66145841 0.6614583,0.1322918 V 1.5875002 L 7.5406252,1.7197917 7.4083335,2.6458334 h -0.79375 L 6.4822918,1.7197917 Z"
+       id="path1861"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.8208335,1.1906252 c 2.3812501,0 2.3812501,0 2.3812501,0"
+       id="path1586" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.0114586,2.3812498 c 0,-2.38124989 0,-2.38124989 0,-2.38124989"
+       id="path1586-6" />
+    <path
+       style="color:#000000;overflow:visible;fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path2479"
+       sodipodi:type="arc"
+       sodipodi:cx="-1.1906251"
+       sodipodi:cy="7.0114584"
+       sodipodi:rx="0.52916664"
+       sodipodi:ry="0.52916664"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M -0.66145843,7.0114584 A 0.52916664,0.52916664 0 0 1 -1.1905489,7.540625 0.52916664,0.52916664 0 0 1 -1.7197917,7.0116108 a 0.52916664,0.52916664 0 0 1 0.528938,-0.529319 0.52916664,0.52916664 0 0 1 0.52939518,0.5288618"
+       transform="rotate(-90)" />
+  </g>
+</svg>
diff --git a/src/layui/layui/AlignCellOptionsDialog.ui b/src/layui/layui/AlignCellOptionsDialog.ui
index fb90dd6ac..5d3b2dbff 100644
--- a/src/layui/layui/AlignCellOptionsDialog.ui
+++ b/src/layui/layui/AlignCellOptionsDialog.ui
@@ -110,7 +110,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/ct.png</normaloff>:/ct.png</iconset>
+             <normaloff>:/ct_31px.png</normaloff>:/ct_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -130,7 +130,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/lt.png</normaloff>:/lt.png</iconset>
+             <normaloff>:/lt_31px.png</normaloff>:/lt_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -150,7 +150,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/rt.png</normaloff>:/rt.png</iconset>
+             <normaloff>:/rt_31px.png</normaloff>:/rt_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -170,7 +170,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/lc.png</normaloff>:/lc.png</iconset>
+             <normaloff>:/lc_31px.png</normaloff>:/lc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -190,7 +190,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/cc.png</normaloff>:/cc.png</iconset>
+             <normaloff>:/cc_31px.png</normaloff>:/cc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -210,7 +210,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/rc.png</normaloff>:/rc.png</iconset>
+             <normaloff>:/rc_31px.png</normaloff>:/rc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -230,7 +230,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/lb.png</normaloff>:/lb.png</iconset>
+             <normaloff>:/lb_31px.png</normaloff>:/lb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -250,7 +250,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/cb.png</normaloff>:/cb.png</iconset>
+             <normaloff>:/cb_31px.png</normaloff>:/cb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -270,7 +270,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/rb.png</normaloff>:/rb.png</iconset>
+             <normaloff>:/rb_31px.png</normaloff>:/rb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
diff --git a/src/layui/layui/MoveToOptionsDialog.ui b/src/layui/layui/MoveToOptionsDialog.ui
index 26cb98bc8..f8155d23e 100644
--- a/src/layui/layui/MoveToOptionsDialog.ui
+++ b/src/layui/layui/MoveToOptionsDialog.ui
@@ -162,7 +162,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/ct.png</normaloff>:/ct.png</iconset>
+             <normaloff>:/ct_31px.png</normaloff>:/ct_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -182,7 +182,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/lt.png</normaloff>:/lt.png</iconset>
+             <normaloff>:/lt_31px.png</normaloff>:/lt_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -202,7 +202,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/rt.png</normaloff>:/rt.png</iconset>
+             <normaloff>:/rt_31px.png</normaloff>:/rt_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -222,7 +222,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/lc.png</normaloff>:/lc.png</iconset>
+             <normaloff>:/lc_31px.png</normaloff>:/lc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -242,7 +242,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/cc.png</normaloff>:/cc.png</iconset>
+             <normaloff>:/cc_31px.png</normaloff>:/cc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -262,7 +262,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/rc.png</normaloff>:/rc.png</iconset>
+             <normaloff>:/rc_31px.png</normaloff>:/rc_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -282,7 +282,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/lb.png</normaloff>:/lb.png</iconset>
+             <normaloff>:/lb_31px.png</normaloff>:/lb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -302,7 +302,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/cb.png</normaloff>:/cb.png</iconset>
+             <normaloff>:/cb_31px.png</normaloff>:/cb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -322,7 +322,7 @@
            </property>
            <property name="icon">
             <iconset resource="layResources.qrc">
-             <normaloff>:/rb.png</normaloff>:/rb.png</iconset>
+             <normaloff>:/rb_31px.png</normaloff>:/rb_31px.png</iconset>
            </property>
            <property name="iconSize">
             <size>