diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 0092b5403..ed9e50b30 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -68,8 +68,10 @@
         <file alias="downdown_16px@2x.png">images/downdown_16px@2x.png</file>
         <file alias="execmark.png">images/execmark.png</file>
         <file alias="find.png">images/find.png</file>
-        <file alias="fliph.png">images/fliph.png</file>
-        <file alias="flipv.png">images/flipv.png</file>
+        <file alias="fliph_16px.png">images/fliph_16px.png</file>
+        <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="forward_24px.png">images/forward_24px.png</file>
         <file alias="forward_24px@2x.png">images/forward_24px@2x.png</file>
@@ -86,7 +88,8 @@
         <file alias="import.png">images/import.png</file>
         <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="invert_16px.png">images/invert_16px.png</file>
+        <file alias="invert_16px@2x.png">images/invert_16px@2x.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>
@@ -145,7 +148,10 @@
         <file alias="replace_all.png">images/replace_all.png</file>
         <file alias="right_16px.png">images/right_16px.png</file>
         <file alias="right_16px@2x.png">images/right_16px@2x.png</file>
-        <file alias="rotate.png">images/rotate.png</file>
+        <file alias="rotate_16px.png">images/rotate_16px.png</file>
+        <file alias="rotate_16px@2x.png">images/rotate_16px@2x.png</file>
+        <file alias="rrotate_16px.png">images/rrotate_16px.png</file>
+        <file alias="rrotate_16px@2x.png">images/rrotate_16px@2x.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>
diff --git a/src/icons/images/fliph.png b/src/icons/images/fliph.png
deleted file mode 100644
index a47b95fea..000000000
Binary files a/src/icons/images/fliph.png and /dev/null differ
diff --git a/src/icons/images/fliph_16px.png b/src/icons/images/fliph_16px.png
new file mode 100644
index 000000000..ea66e04de
Binary files /dev/null and b/src/icons/images/fliph_16px.png differ
diff --git a/src/icons/images/fliph_16px@2x.png b/src/icons/images/fliph_16px@2x.png
new file mode 100644
index 000000000..ad2cf57f9
Binary files /dev/null and b/src/icons/images/fliph_16px@2x.png differ
diff --git a/src/icons/images/flipv.png b/src/icons/images/flipv.png
deleted file mode 100644
index d660e9351..000000000
Binary files a/src/icons/images/flipv.png and /dev/null differ
diff --git a/src/icons/images/flipv_16px.png b/src/icons/images/flipv_16px.png
new file mode 100644
index 000000000..e3dadb933
Binary files /dev/null and b/src/icons/images/flipv_16px.png differ
diff --git a/src/icons/images/flipv_16px@2x.png b/src/icons/images/flipv_16px@2x.png
new file mode 100644
index 000000000..4d43ff5da
Binary files /dev/null and b/src/icons/images/flipv_16px@2x.png differ
diff --git a/src/icons/images/invert.png b/src/icons/images/invert.png
deleted file mode 100644
index 432939c66..000000000
Binary files a/src/icons/images/invert.png and /dev/null differ
diff --git a/src/icons/images/invert_16px.png b/src/icons/images/invert_16px.png
new file mode 100644
index 000000000..5c2c36302
Binary files /dev/null and b/src/icons/images/invert_16px.png differ
diff --git a/src/icons/images/invert_16px@2x.png b/src/icons/images/invert_16px@2x.png
new file mode 100644
index 000000000..79c4f4626
Binary files /dev/null and b/src/icons/images/invert_16px@2x.png differ
diff --git a/src/icons/images/rotate.png b/src/icons/images/rotate.png
deleted file mode 100644
index 165f2325d..000000000
Binary files a/src/icons/images/rotate.png and /dev/null differ
diff --git a/src/icons/images/rotate_16px.png b/src/icons/images/rotate_16px.png
new file mode 100644
index 000000000..6351d8086
Binary files /dev/null and b/src/icons/images/rotate_16px.png differ
diff --git a/src/icons/images/rotate_16px@2x.png b/src/icons/images/rotate_16px@2x.png
new file mode 100644
index 000000000..75f804a38
Binary files /dev/null and b/src/icons/images/rotate_16px@2x.png differ
diff --git a/src/icons/images/rrotate_16px.png b/src/icons/images/rrotate_16px.png
new file mode 100644
index 000000000..39a85d41d
Binary files /dev/null and b/src/icons/images/rrotate_16px.png differ
diff --git a/src/icons/images/rrotate_16px@2x.png b/src/icons/images/rrotate_16px@2x.png
new file mode 100644
index 000000000..0e2a26474
Binary files /dev/null and b/src/icons/images/rrotate_16px@2x.png differ
diff --git a/src/icons/svg/fliph_16px.svg b/src/icons/svg/fliph_16px.svg
new file mode 100644
index 000000000..857404da0
--- /dev/null
+++ b/src/icons/svg/fliph_16px.svg
@@ -0,0 +1,108 @@
+<?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="fliph_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="9.1390431"
+     inkscape:cy="10.498331"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="136"
+     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
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient4090"
+       gradientUnits="userSpaceOnUse"
+       x1="3.0427084"
+       y1="2.5135417"
+       x2="2.778125"
+       y2="1.0583333"
+       gradientTransform="matrix(-1,0,0,1,4.4979167,0.26458328)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="M 1.9843751,0.66145831 V 3.5718751 H 0.66145835 Z"
+       id="path1235"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:0.5;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5"
+       d="M 2.5135417,0.66145837 V 3.5718751 h 1.3229167 z"
+       id="path1237"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient4090);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.984375,0.66145828 V 3.5718751 H 0.66145837 Z"
+       id="path4088"
+       sodipodi:nodetypes="cccc" />
+    <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
+       style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.6"
+       d="M 2.5135417,0.66145837 V 3.5718751 h 1.3229167 z"
+       id="path914"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/flipv_16px.svg b/src/icons/svg/flipv_16px.svg
new file mode 100644
index 000000000..3f4b569b5
--- /dev/null
+++ b/src/icons/svg/flipv_16px.svg
@@ -0,0 +1,112 @@
+<?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="flipv_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="9.1390431"
+     inkscape:cy="10.498331"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="136"
+     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
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient4090"
+       gradientUnits="userSpaceOnUse"
+       x1="3.0427084"
+       y1="2.5135417"
+       x2="2.778125"
+       y2="1.0583333"
+       gradientTransform="matrix(-1,0,0,1,4.4979167,0.26458328)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1033"
+       transform="rotate(-90,2.1166667,2.1166669)">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+         d="M 1.9843751,0.66145831 V 3.5718751 H 0.66145835 Z"
+         id="path1235"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;fill-opacity:0.5;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5"
+         d="M 2.5135417,0.66145837 V 3.5718751 h 1.3229167 z"
+         id="path1237"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:url(#linearGradient4090);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 1.984375,0.66145828 V 3.5718751 H 0.66145837 Z"
+         id="path4088"
+         sodipodi:nodetypes="cccc" />
+      <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
+         style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.6"
+         d="M 2.5135417,0.66145837 V 3.5718751 h 1.3229167 z"
+         id="path914"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/invert_16px.svg b/src/icons/svg/invert_16px.svg
new file mode 100644
index 000000000..7f2175db7
--- /dev/null
+++ b/src/icons/svg/invert_16px.svg
@@ -0,0 +1,107 @@
+<?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="invert_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="11.313709"
+     inkscape:cx="7.7781746"
+     inkscape:cy="5.6126601"
+     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="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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="color:#000000;overflow:visible;fill:#000000;fill-opacity:0.998857;stroke:#333333;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path848"
+       sodipodi:type="arc"
+       sodipodi:cx="2.1163101"
+       sodipodi:cy="2.1169496"
+       sodipodi:rx="1.9834706"
+       sodipodi:ry="1.982132"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M 4.0997807,2.1169496 A 1.9834706,1.982132 0 0 1 2.1165957,4.0990815 1.9834706,1.982132 0 0 1 0.13283964,2.1175204 1.9834706,1.982132 0 0 1 2.1154532,0.13481779 1.9834706,1.982132 0 0 1 4.0997803,2.1158078" />
+    <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.2223287"
+       height="4.2268672"
+       x="0.0035604495"
+       y="0.0027145317"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.998857;fill-rule:evenodd;stroke:none;stroke-width:0.352049px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.1147249,0.1788337 2.994377,0.35495318 3.6980985,0.88331169 4.0499592,1.7639092 v 0.704478 L 3.6980985,3.3489846 2.994377,3.877343 2.1147249,4.0534625 Z"
+       id="path2225" />
+    <path
+       style="color:#000000;overflow:visible;fill:none;fill-opacity:0.998857;stroke:#333333;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.499998;stroke-opacity:1"
+       id="path1772"
+       sodipodi:type="arc"
+       sodipodi:cx="2.1160319"
+       sodipodi:cy="2.1172237"
+       sodipodi:rx="1.9824846"
+       sodipodi:ry="1.9830992"
+       sodipodi:start="0"
+       sodipodi:end="6.2826093"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="M 4.0985165,2.1172237 A 1.9824846,1.9830992 0 0 1 2.1163174,4.1003229 1.9824846,1.9830992 0 0 1 0.13354739,2.1177949 1.9824846,1.9830992 0 0 1 2.1151754,0.1341247 1.9824846,1.9830992 0 0 1 4.0985161,2.1160815" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rotate_16px.svg b/src/icons/svg/rotate_16px.svg
new file mode 100644
index 000000000..2b80ffbe1
--- /dev/null
+++ b/src/icons/svg/rotate_16px.svg
@@ -0,0 +1,126 @@
+<?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="rotate_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="24.449577"
+     inkscape:cx="2.2904282"
+     inkscape:cy="9.018561"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="136"
+     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
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient4090"
+       gradientUnits="userSpaceOnUse"
+       x1="3.0427084"
+       y1="2.5135417"
+       x2="2.778125"
+       y2="1.0583333"
+       gradientTransform="rotate(-90,3.1750001,3.175)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 0.39687505,3.8364584 H 3.3072918 V 2.5135417 Z"
+       id="path5035"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="m 1.9843748,1.0583332 c -0.5291666,0 -1.05833328,0.2645833 -1.05833328,1.0583333"
+       id="path5037"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 0.92604168,2.5135416 0.52916666,1.984375 H 1.3229167 Z"
+       id="path5039" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+       d="M 2.5135417,0.39687508 V 3.3072918 h 1.3229167 z"
+       id="path5041"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient4090);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.39687505,3.8364584 H 3.3072918 V 2.5135417 Z"
+       id="path4088"
+       sodipodi:nodetypes="cccc" />
+    <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
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.9843748,1.0583332 c -0.5291666,0 -1.05833328,0.2645833 -1.05833328,1.0583333"
+       id="path2584"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 0.92604168,2.5135416 0.52916666,1.984375 H 1.3229167 Z"
+       id="path3475" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60000002;fill-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+       d="M 2.5135417,0.39687508 V 3.3072918 h 1.3229167 z"
+       id="path914"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/rrotate_16px.svg b/src/icons/svg/rrotate_16px.svg
new file mode 100644
index 000000000..ddffc5edd
--- /dev/null
+++ b/src/icons/svg/rrotate_16px.svg
@@ -0,0 +1,127 @@
+<?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="rrotate_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="24.449577"
+     inkscape:cx="4.7853589"
+     inkscape:cy="7.6688444"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="136"
+     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
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient4090"
+       gradientUnits="userSpaceOnUse"
+       x1="3.0427084"
+       y1="2.5135417"
+       x2="2.778125"
+       y2="1.0583333"
+       gradientTransform="matrix(0,-1,-1,0,4.2333334,6.3500001)" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="M 3.8364584,3.8364584 H 0.9260417 V 2.5135417 Z"
+       id="path5035"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="m 2.2489587,1.0583332 c 0.5291666,0 1.0583333,0.2645833 1.0583333,1.0583333"
+       id="path5037"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+       d="M 3.3072918,2.5135416 3.7041668,1.984375 h -0.79375 z"
+       id="path5039" />
+    <path
+       style="fill:none;fill-opacity:0.5;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5"
+       d="M 1.7197918,0.39687511 V 3.3072918 H 0.3968751 Z"
+       id="path5041"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient4090);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.8364584,3.8364584 H 0.9260417 V 2.5135417 Z"
+       id="path4088"
+       sodipodi:nodetypes="cccc" />
+    <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="-4.2333331"
+       y="3.6333333e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.2489587,1.0583332 c 0.5291666,0 1.0583333,0.2645833 1.0583333,1.0583333"
+       id="path2584"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.3072918,2.5135416 3.7041668,1.984375 h -0.79375 z"
+       id="path3475" />
+    <path
+       style="fill:none;fill-opacity:0.5;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.6"
+       d="M 1.7197918,0.39687511 V 3.3072918 H 0.3968751 Z"
+       id="path914"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/src/layui/layui/EditStipplesForm.ui b/src/layui/layui/EditStipplesForm.ui
index a682951e5..f96b62e22 100644
--- a/src/layui/layui/EditStipplesForm.ui
+++ b/src/layui/layui/EditStipplesForm.ui
@@ -391,7 +391,7 @@
              <widget class="QToolButton" name="invert_button">
               <property name="icon">
                <iconset resource="../lay/layResources.qrc">
-                <normaloff>:/invert.png</normaloff>:/invert.png</iconset>
+                <normaloff>:/invert_16px.png</normaloff>:/invert_16px.png</iconset>
               </property>
              </widget>
             </item>
@@ -402,7 +402,7 @@
               </property>
               <property name="icon">
                <iconset resource="../lay/layResources.qrc">
-                <normaloff>:/fliph.png</normaloff>:/fliph.png</iconset>
+                <normaloff>:/fliph_16px.png</normaloff>:/fliph_16px.png</iconset>
               </property>
              </widget>
             </item>
@@ -413,7 +413,7 @@
               </property>
               <property name="icon">
                <iconset resource="../lay/layResources.qrc">
-                <normaloff>:/flipv.png</normaloff>:/flipv.png</iconset>
+                <normaloff>:/flipv_16px.png</normaloff>:/flipv_16px.png</iconset>
               </property>
              </widget>
             </item>
@@ -424,7 +424,7 @@
               </property>
               <property name="icon">
                <iconset resource="../lay/layResources.qrc">
-                <normaloff>:/rotate.png</normaloff>:/rotate.png</iconset>
+                <normaloff>:/rotate_16px.png</normaloff>:/rotate_16px.png</iconset>
               </property>
              </widget>
             </item>