diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 797e31c17..159c94214 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -72,7 +72,8 @@
         <file alias="fliph_16px@2x.png">images/fliph_16px@2x.png</file>
         <file alias="flipv_16px.png">images/flipv_16px.png</file>
         <file alias="flipv_16px@2x.png">images/flipv_16px@2x.png</file>
-        <file alias="folder.png">images/folder.png</file>
+        <file alias="folder_16px.png">images/folder_16px.png</file>
+        <file alias="folder_16px@2x.png">images/folder_16px@2x.png</file>
         <file alias="forward_24px.png">images/forward_24px.png</file>
         <file alias="forward_24px@2x.png">images/forward_24px@2x.png</file>
         <file alias="forward_16px.png">images/forward_16px.png</file>
@@ -111,7 +112,8 @@
         <file alias="move_simple.png">images/move_simple.png</file>
         <file alias="neutral_12px.png">images/neutral_12px.png</file>
         <file alias="neutral_12px@2x.png">images/neutral_12px@2x.png</file>
-        <file alias="new_folder.png">images/new_folder.png</file>
+        <file alias="new_folder_16px.png">images/new_folder_16px.png</file>
+        <file alias="new_folder_16px@2x.png">images/new_folder_16px@2x.png</file>
         <file alias="next_topic_24px.png">images/next_topic_24px.png</file>
         <file alias="next_topic_24px@2x.png">images/next_topic_24px@2x.png</file>
         <file alias="nextstep.png">images/nextstep.png</file>
diff --git a/src/icons/images/folder.png b/src/icons/images/folder.png
deleted file mode 100644
index 3246e27e3..000000000
Binary files a/src/icons/images/folder.png and /dev/null differ
diff --git a/src/icons/images/folder_16px.png b/src/icons/images/folder_16px.png
new file mode 100644
index 000000000..99611a07a
Binary files /dev/null and b/src/icons/images/folder_16px.png differ
diff --git a/src/icons/images/folder_16px@2x.png b/src/icons/images/folder_16px@2x.png
new file mode 100644
index 000000000..da8ff3b83
Binary files /dev/null and b/src/icons/images/folder_16px@2x.png differ
diff --git a/src/icons/images/new_folder.png b/src/icons/images/new_folder.png
deleted file mode 100644
index b6816a390..000000000
Binary files a/src/icons/images/new_folder.png and /dev/null differ
diff --git a/src/icons/images/new_folder_16px.png b/src/icons/images/new_folder_16px.png
new file mode 100644
index 000000000..5e3328c80
Binary files /dev/null and b/src/icons/images/new_folder_16px.png differ
diff --git a/src/icons/images/new_folder_16px@2x.png b/src/icons/images/new_folder_16px@2x.png
new file mode 100644
index 000000000..f3454ad1f
Binary files /dev/null and b/src/icons/images/new_folder_16px@2x.png differ
diff --git a/src/icons/images/pause_16px.png b/src/icons/images/pause_16px.png
new file mode 100644
index 000000000..8fc1c31f2
Binary files /dev/null and b/src/icons/images/pause_16px.png differ
diff --git a/src/icons/images/pause_16px@2x.png b/src/icons/images/pause_16px@2x.png
new file mode 100644
index 000000000..860a4ca05
Binary files /dev/null and b/src/icons/images/pause_16px@2x.png differ
diff --git a/src/icons/images/run_16px.png b/src/icons/images/run_16px.png
new file mode 100644
index 000000000..c05088464
Binary files /dev/null and b/src/icons/images/run_16px.png differ
diff --git a/src/icons/images/run_16px@2x.png b/src/icons/images/run_16px@2x.png
new file mode 100644
index 000000000..410319366
Binary files /dev/null and b/src/icons/images/run_16px@2x.png differ
diff --git a/src/icons/images/runthis_16px.png b/src/icons/images/runthis_16px.png
new file mode 100644
index 000000000..ab19c41c3
Binary files /dev/null and b/src/icons/images/runthis_16px.png differ
diff --git a/src/icons/images/runthis_16px@2x.png b/src/icons/images/runthis_16px@2x.png
new file mode 100644
index 000000000..0f9035961
Binary files /dev/null and b/src/icons/images/runthis_16px@2x.png differ
diff --git a/src/icons/images/stop_16px.png b/src/icons/images/stop_16px.png
new file mode 100644
index 000000000..1566fdad0
Binary files /dev/null and b/src/icons/images/stop_16px.png differ
diff --git a/src/icons/images/stop_16px@2x.png b/src/icons/images/stop_16px@2x.png
new file mode 100644
index 000000000..a59a87dd7
Binary files /dev/null and b/src/icons/images/stop_16px@2x.png differ
diff --git a/src/icons/svg/folder_16px.svg b/src/icons/svg/folder_16px.svg
new file mode 100644
index 000000000..38db9eb9a
--- /dev/null
+++ b/src/icons/svg/folder_16px.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="folder_16px.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="34.576923"
+     inkscape:cx="-0.8676307"
+     inkscape:cy="5.6829811"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="96"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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="linearGradient4338"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05106216,0,0,0.05256322,-2.5990542,-6.2502561)"
+       x1="81.496071"
+       y1="157.67715"
+       x2="113.38583"
+       y2="189.56693" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path3907"
+       style="color:#000000;fill:#333333;stroke-width:2.00000003;stroke-miterlimit:2;stroke:#ffffff;stroke-opacity:0.5;stroke-dasharray:none"
+       d="M 4.6875 0.99609375 L 4.1933594 2 L 2.9960938 2 L 2.9960938 2.5019531 L 2.9960938 2.9960938 L 2.6953125 2.9960938 L 2.1933594 4.0019531 L 1.0039062 4.0019531 L 1.0039062 4.5039062 L 1.0039062 15 L 13 15 L 13 14.003906 L 15 14.003906 L 15 2 L 9.8105469 2 L 9.3085938 0.99609375 L 4.6875 0.99609375 z M 5.3066406 2 L 8.6894531 2 L 9.1914062 2.9960938 L 14.003906 2.9960938 L 14.003906 13 L 13 13 L 13 4.0019531 L 7.8105469 4.0019531 L 7.3085938 2.9960938 L 4.8046875 2.9960938 L 5.3066406 2 z M 4.0019531 4.0019531 L 6.6875 4.0019531 L 7.1894531 4.9980469 L 12.003906 4.9980469 L 12.003906 13 L 4.0019531 13 L 4.0019531 4.0019531 z M 2.9960938 4.6191406 L 2.9960938 14.003906 L 2 14.003906 L 2 4.9980469 L 2.8046875 4.9980469 L 2.9960938 4.6191406 z "
+       transform="scale(0.26458333)" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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
+       inkscape:connector-curvature="0"
+       style="fill:#ebe8e4;fill-opacity:1;stroke:#333333;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.92604168,0.6614583 H 1.190625 L 1.3229167,0.39687496 H 2.38125 L 2.5135417,0.6614583 H 3.8364584 V 3.5718751 H 0.92604168 Z"
+       id="path3598-38-5-2-2"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8-5-8"
+       width="4.2309523"
+       height="4.2255969"
+       x="-0.010524755"
+       y="0.0077312589"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4338);fill-opacity:1;stroke:#000000;stroke-width:0.264268;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.396875,1.190625 H 0.66145834 L 0.79375001,0.92604164 H 1.8520833 L 1.984375,1.190625 H 3.3072917 V 3.8364584 H 0.396875 Z"
+       id="path3598-38-5-1"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/new_folder_16px.svg b/src/icons/svg/new_folder_16px.svg
new file mode 100644
index 000000000..83bab4bc0
--- /dev/null
+++ b/src/icons/svg/new_folder_16px.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="new_folder_16px.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="34.576923"
+     inkscape:cx="6.8253615"
+     inkscape:cy="5.6829811"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="96"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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="linearGradient4338"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05106216,0,0,0.05256322,-2.5990542,-6.2502561)"
+       x1="81.496071"
+       y1="157.67715"
+       x2="113.38583"
+       y2="189.56693" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path3907"
+       style="color:#000000;fill:#333333;stroke-width:2.00000003;stroke-miterlimit:2;stroke:#ffffff;stroke-opacity:0.5;stroke-dasharray:none"
+       d="M 4.6875 0.99609375 L 4.1933594 2 L 2.9960938 2 L 2.9960938 2.5019531 L 2.9960938 2.9960938 L 2.6953125 2.9960938 L 2.1933594 4.0019531 L 1.0039062 4.0019531 L 1.0039062 4.5039062 L 1.0039062 15 L 13 15 L 13 14.003906 L 15 14.003906 L 15 2 L 9.8105469 2 L 9.3085938 0.99609375 L 4.6875 0.99609375 z M 5.3066406 2 L 8.6894531 2 L 9.1914062 2.9960938 L 14.003906 2.9960938 L 14.003906 13 L 13 13 L 13 4.0019531 L 7.8105469 4.0019531 L 7.3085938 2.9960938 L 4.8046875 2.9960938 L 5.3066406 2 z M 4.0019531 4.0019531 L 6.6875 4.0019531 L 7.1894531 4.9980469 L 12.003906 4.9980469 L 12.003906 13 L 4.0019531 13 L 4.0019531 4.0019531 z M 2.9960938 4.6191406 L 2.9960938 14.003906 L 2 14.003906 L 2 4.9980469 L 2.8046875 4.9980469 L 2.9960938 4.6191406 z "
+       transform="scale(0.26458333)" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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
+       inkscape:connector-curvature="0"
+       style="fill:#ebe8e4;fill-opacity:1;stroke:#333333;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.92604168,0.6614583 H 1.190625 L 1.3229167,0.39687496 H 2.38125 L 2.5135417,0.6614583 H 3.8364584 V 3.5718751 H 0.92604168 Z"
+       id="path3598-38-5-2-2"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8-5-8"
+       width="4.2309523"
+       height="4.2255969"
+       x="-0.010524755"
+       y="0.0077312589"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4338);fill-opacity:1;stroke:#000000;stroke-width:0.264268;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.396875,1.190625 H 0.66145834 L 0.79375001,0.92604164 H 1.8520833 L 1.984375,1.190625 H 3.3072917 V 3.8364584 H 0.396875 Z"
+       id="path3598-38-5-1"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.0745821"
+       d="M 1.5877971,2.2499255 V 1.7217261 H 2.1166667 V 2.2499255 H 2.6455355 V 2.778125 H 2.1166667 V 3.3063252 H 1.5877971 V 2.778125 H 1.0589282 V 2.2499255 Z"
+       id="path4335"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/new_folder.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+  </g>
+</svg>
diff --git a/src/icons/svg/pause_16px.svg b/src/icons/svg/pause_16px.svg
new file mode 100644
index 000000000..02033e9fb
--- /dev/null
+++ b/src/icons/svg/pause_16px.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="pause_16px.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.576923"
+     inkscape:cx="4.4538376"
+     inkscape:cy="9.1535039"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="215"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff5a5a;stop-opacity:1;" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       id="rect958"
+       width="1.0626982"
+       height="2.9105427"
+       x="0.65927601"
+       y="0.65927601"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/pause.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       id="rect960"
+       width="1.0626982"
+       height="2.9105427"
+       x="2.5091767"
+       y="0.66133213"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/pause.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4656"
+       width="4.2333331"
+       height="4.2333331"
+       x="3.3504609e-08"
+       y="3.3504637e-08"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/pause.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <rect
+       style="fill:#ff0303;fill-opacity:1;stroke:#242424;stroke-width:0.26458333;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4660"
+       width="1.0626982"
+       height="2.9105427"
+       x="0.65927601"
+       y="0.65927601"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/pause.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:#ff0303;fill-opacity:1;stroke:#242424;stroke-width:0.26458333;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4660-3"
+       width="1.0626982"
+       height="2.9105427"
+       x="2.5091767"
+       y="0.66133213"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/pause.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#ff8989;fill-opacity:1;stroke-width:0.529167;stroke-opacity:0.5"
+       id="path911"
+       cx="1.0583333"
+       cy="2.1166666"
+       rx="0.13229166"
+       ry="1.0583333" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#ff8989;fill-opacity:1;stroke-width:0.529167;stroke-opacity:0.5"
+       id="path911-3"
+       cx="2.9104168"
+       cy="2.1166668"
+       rx="0.13229166"
+       ry="1.0583333" />
+  </g>
+</svg>
diff --git a/src/icons/svg/run_16px.svg b/src/icons/svg/run_16px.svg
new file mode 100644
index 000000000..6ef8fdf9c
--- /dev/null
+++ b/src/icons/svg/run_16px.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="run_16px.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="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="34.576924"
+     inkscape:cx="6.6807562"
+     inkscape:cy="9.9632923"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="227"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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
+       id="linearGradient4507-1">
+      <stop
+         style="stop-color:#03b800;stop-opacity:1;"
+         offset="0"
+         id="stop4509-2" />
+      <stop
+         style="stop-color:#23ff7b;stop-opacity:1;"
+         offset="1"
+         id="stop4511-1" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="M 0.92497793,0.64355046 3.64098,2.1439337 0.92497793,3.6443169 Z"
+       id="path832"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8-2-5-1"
+       width="4.2333331"
+       height="4.2333331"
+       x="3.7700726e-08"
+       y="3.7700726e-08"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <path
+       style="fill:#03b800;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.92497793,0.64355046 3.64098,2.1439337 0.92497793,3.6443169 Z"
+       id="path4505-7"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#70ff6d;fill-opacity:1;stroke-width:0.529167;stroke-opacity:0.5"
+       id="path1304"
+       cx="1.3917166"
+       cy="2.1190763"
+       rx="0.15329799"
+       ry="0.84416813" />
+  </g>
+</svg>
diff --git a/src/icons/svg/runthis_16px.svg b/src/icons/svg/runthis_16px.svg
new file mode 100644
index 000000000..ac1be0680
--- /dev/null
+++ b/src/icons/svg/runthis_16px.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="runthis_16px.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="-2.7185761"
+     inkscape:cy="12.754171"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="232"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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="#linearGradient4507-1"
+       id="linearGradient3416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07665165,0,0,0.07057361,-5.593432,-46.618541)"
+       x1="83.289368"
+       y1="690.94489"
+       x2="122.22244"
+       y2="690.94489" />
+    <linearGradient
+       id="linearGradient4507-1">
+      <stop
+         style="stop-color:#03b800;stop-opacity:1;"
+         offset="0"
+         id="stop4509-2" />
+      <stop
+         style="stop-color:#23ff7b;stop-opacity:1;"
+         offset="1"
+         id="stop4511-1" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="M 0.92497793,0.64355046 3.64098,2.1439337 0.92497793,3.6443169 Z"
+       id="path840"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596-8-2-5-1"
+       width="4.2333331"
+       height="4.2333331"
+       x="3.7700726e-08"
+       y="3.7700726e-08"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <path
+       style="fill:url(#linearGradient3416);fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.92497793,0.64355046 3.64098,2.1439337 0.92497793,3.6443169 Z"
+       id="path4505-7"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/run.png"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-ydpi="25.399982" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#70ff6d;fill-opacity:1;stroke-width:0.529167;stroke-opacity:0.5"
+       id="path1304"
+       cx="1.3019104"
+       cy="2.1985402"
+       rx="0.15329799"
+       ry="0.84416813" />
+    <path
+       id="path8155"
+       style="color:#000000;fill:#fefefe;fill-opacity:0.80000001;fill-rule:evenodd;stroke-width:3.77953;-inkscape-stroke:none"
+       d="M 6.0527344 0 L 6.0019531 0.9453125 L 5.4726562 10.425781 C 4.5946843 10.950695 4.0019531 11.910869 4.0019531 13 C 4.0019531 14.645008 5.3530389 15.996094 6.9980469 15.996094 C 8.6430549 15.996094 10.001953 14.645008 10.001953 13 C 10.001953 12.061058 9.5591392 11.217122 8.8730469 10.666016 L 11.25 0 L 6.0527344 0 z M 7.9511719 2 L 8.7480469 2 L 7.6777344 6.8203125 L 7.9511719 2 z M 6.9453125 12.003906 C 6.9626751 12.003071 6.9804178 12.003906 6.9980469 12.003906 C 7.5621758 12.003906 8.0019531 12.435871 8.0019531 13 C 8.0019531 13.564129 7.5621758 14.003906 6.9980469 14.003906 C 6.433918 14.003906 6.0019531 13.564129 6.0019531 13 C 6.0019531 12.453501 6.4070713 12.029803 6.9453125 12.003906 z "
+       transform="scale(0.26458333)" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.96875px;line-height:125%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.5317726"
+       y="0.72737259"
+       id="text3056"><tspan
+         sodipodi:role="line"
+         id="tspan3054"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583px"
+         x="2.5317726"
+         y="0.72737259" /></text>
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.8520833,0.26458333 h 0.79375 l -0.5291666,2.38124997 -0.396875,10e-8 z"
+       id="path7161"
+       sodipodi:nodetypes="ccccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#000000;stroke:none;stroke-width:0.264583;stroke-opacity:0.5;fill-opacity:1"
+       id="path7388"
+       cx="1.8520833"
+       cy="3.4395833"
+       r="0.52916664" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:0.529167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       id="path8318"
+       cx="2.080898"
+       cy="1.1121511"
+       rx="0.06614583"
+       ry="0.79374999"
+       transform="rotate(5.8600718)" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:0.529167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       id="path8686"
+       cx="-1.1500865"
+       cy="3.3660035"
+       rx="0.1984375"
+       ry="0.06614583"
+       transform="rotate(-45.093115)" />
+  </g>
+</svg>
diff --git a/src/icons/svg/stop_16px.svg b/src/icons/svg/stop_16px.svg
new file mode 100644
index 000000000..e8f2a50f7
--- /dev/null
+++ b/src/icons/svg/stop_16px.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="stop_16px.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="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="9.6525187"
+     inkscape:cy="13.967522"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="116"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px">
+    <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
+       id="linearGradient4100">
+      <stop
+         id="stop4102"
+         offset="0"
+         style="stop-color:#ff1f1f;stop-opacity:1" />
+      <stop
+         id="stop4104"
+         offset="1"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.52916667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       id="rect832"
+       width="2.9104166"
+       height="2.9104166"
+       x="0.66145867"
+       y="0.66145867"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/stop.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="4.2333326"
+       height="4.2333331"
+       x="3.3333333e-07"
+       y="3.3333333e-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="fill:#ff1f1f;fill-opacity:1;stroke:#242424;stroke-width:0.264584;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4638"
+       width="2.9104166"
+       height="2.9104166"
+       x="0.66145867"
+       y="0.66145867"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/stop.png"
+       inkscape:export-xdpi="25"
+       inkscape:export-ydpi="25" />
+    <rect
+       inkscape:export-ydpi="25.399982"
+       inkscape:export-xdpi="25.399982"
+       inkscape:export-filename="/home/matthias/klayout/trunk/src/lay/images/stop.png"
+       y="3.2908435e-08"
+       x="3.2908435e-08"
+       height="4.2333331"
+       width="4.2333331"
+       id="rect4632"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#ffc0c0;fill-opacity:1;stroke-width:0.529167;stroke-opacity:0.5"
+       id="path927"
+       cx="1.237847"
+       cy="2.0770953"
+       rx="0.17951365"
+       ry="1.0187619" />
+  </g>
+</svg>
diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui
index d02f93ee8..c14d56af0 100644
--- a/src/lay/lay/MacroEditorDialog.ui
+++ b/src/lay/lay/MacroEditorDialog.ui
@@ -104,7 +104,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="layResources.qrc">
-               <normaloff>:/new_folder.png</normaloff>:/new_folder.png</iconset>
+               <normaloff>:/new_folder_16px.png</normaloff>:/new_folder_16px.png</iconset>
              </property>
              <property name="autoRaise">
               <bool>true</bool>
@@ -1377,7 +1377,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionNewFolder">
    <property name="icon">
     <iconset resource="layResources.qrc">
-     <normaloff>:/new_folder.png</normaloff>:/new_folder.png</iconset>
+     <normaloff>:/new_folder_16px.png</normaloff>:/new_folder_16px.png</iconset>
    </property>
    <property name="text">
     <string>New Folder</string>
diff --git a/src/lay/lay/layMacroEditorTree.cc b/src/lay/lay/layMacroEditorTree.cc
index a6035d641..b85111f78 100644
--- a/src/lay/lay/layMacroEditorTree.cc
+++ b/src/lay/lay/layMacroEditorTree.cc
@@ -363,7 +363,7 @@ QVariant MacroTreeModel::data (const QModelIndex &index, int role) const
     if (role == Qt::DisplayRole) {
       return QVariant (tl::to_qstring (mc->display_string ()));
     } else if (role == Qt::DecorationRole) {
-      return QVariant (QIcon (QString::fromUtf8 (":/folder.png")));
+      return QVariant (QIcon (QString::fromUtf8 (":/folder_16px.png")));
     } else if (role == Qt::ToolTipRole) {
       return QVariant (tl::to_qstring (mc->path ()));
     } else if (role == Qt::UserRole) {