diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 04ba8d41f..5180e1704 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -200,8 +200,10 @@
         <file alias="run_16px@2x.png">images/run_16px@2x.png</file>
         <file alias="runthis_16px.png">images/runthis_16px.png</file>
         <file alias="runthis_16px@2x.png">images/runthis_16px@2x.png</file>
-        <file alias="save.png">images/save.png</file>
-        <file alias="save_all.png">images/save_all.png</file>
+        <file alias="save_16px.png">images/save_16px.png</file>
+        <file alias="save_16px@2x.png">images/save_16px@2x.png</file>
+        <file alias="save_all_16px.png">images/save_all_16px.png</file>
+        <file alias="save_all_16px@2x.png">images/save_all_16px@2x.png</file>
         <file alias="select_24px.png">images/select_24px.png</file>
         <file alias="select_24px@2x.png">images/select_24px@2x.png</file>
         <file alias="setup_16px.png">images/setup_16px.png</file>
diff --git a/src/icons/images/save.png b/src/icons/images/save.png
deleted file mode 100644
index 5a13d75ea..000000000
Binary files a/src/icons/images/save.png and /dev/null differ
diff --git a/src/icons/images/save_16px.png b/src/icons/images/save_16px.png
new file mode 100644
index 000000000..f65bc2cfd
Binary files /dev/null and b/src/icons/images/save_16px.png differ
diff --git a/src/icons/images/save_16px@2x.png b/src/icons/images/save_16px@2x.png
new file mode 100644
index 000000000..152fe5d66
Binary files /dev/null and b/src/icons/images/save_16px@2x.png differ
diff --git a/src/icons/images/save_all.png b/src/icons/images/save_all.png
deleted file mode 100644
index 0c2d44408..000000000
Binary files a/src/icons/images/save_all.png and /dev/null differ
diff --git a/src/icons/images/save_all_16px.png b/src/icons/images/save_all_16px.png
new file mode 100644
index 000000000..914cdae76
Binary files /dev/null and b/src/icons/images/save_all_16px.png differ
diff --git a/src/icons/images/save_all_16px@2x.png b/src/icons/images/save_all_16px@2x.png
new file mode 100644
index 000000000..f09c308fd
Binary files /dev/null and b/src/icons/images/save_all_16px@2x.png differ
diff --git a/src/icons/svg/save_16px.svg b/src/icons/svg/save_16px.svg
new file mode 100644
index 000000000..50a820f6f
--- /dev/null
+++ b/src/icons/svg/save_16px.svg
@@ -0,0 +1,135 @@
+<?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="save_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="-5.3214682"
+     inkscape:cy="6.9121244"
+     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
+       inkscape:collect="always"
+       id="linearGradient1649">
+      <stop
+         style="stop-color:#959595;stop-opacity:1"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#515151;stop-opacity:1"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <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="#linearGradient1649"
+       id="linearGradient1651"
+       x1="1.5875"
+       y1="3.0427084"
+       x2="3.1750001"
+       y2="3.0427084"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient2540"
+       x1="0.2645835"
+       y1="1.984375"
+       x2="2.3812444"
+       y2="1.984375"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#3d3d3d;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,3.571875 1e-8,-2.64583331 0.25723661,-0.26458334 h 2.65318 V 3.571875 Z"
+       id="path2866"
+       sodipodi:nodetypes="cccccc" />
+    <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:#3d3d3d;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,3.571875 1e-8,-2.64583331 0.25723661,-0.26458334 h 2.65318 V 3.571875 Z"
+       id="path859"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient1651);stroke:#000000;stroke-width:0.26458333;stroke-dashoffset:2.5;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       id="rect1168"
+       width="1.3229167"
+       height="1.0583334"
+       x="1.7197917"
+       y="2.5135417" />
+    <path
+       style="fill:url(#linearGradient2540);fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.69999999;fill-opacity:1"
+       d="M 0.39687501,1.9843751 V 1.4552084 l 0.79374999,-1e-7 V 0.92604168 L 2.2489584,1.984375 1.190625,3.0427083 V 2.5135417 h -0.79375 z"
+       id="path2622"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#linearGradient2540);fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1.0"
+       d="M 0.39687501,1.9843751 V 1.4552084 l 0.79374999,-1e-7 V 0.92604168 L 2.2489584,1.984375 1.190625,3.0427083 V 2.5135417 h -0.79375 z"
+       id="path2222"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/save_all_16px.svg b/src/icons/svg/save_all_16px.svg
new file mode 100644
index 000000000..6a38da07c
--- /dev/null
+++ b/src/icons/svg/save_all_16px.svg
@@ -0,0 +1,186 @@
+<?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="save_all_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="-1.0634131"
+     inkscape:cy="8.3232524"
+     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
+       inkscape:collect="always"
+       id="linearGradient876">
+      <stop
+         style="stop-color:#979797;stop-opacity:1"
+         offset="0"
+         id="stop872" />
+      <stop
+         style="stop-color:#5d5d5d;stop-opacity:1"
+         offset="1"
+         id="stop874" />
+    </linearGradient>
+    <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="#linearGradient876"
+       id="linearGradient1651"
+       x1="1.5875"
+       y1="3.0427084"
+       x2="3.1750002"
+       y2="3.0427084"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79998765,0,0,0.68750027,-0.18517063,-0.00826894)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient2540"
+       x1="0.2645835"
+       y1="1.984375"
+       x2="2.3812444"
+       y2="1.984375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient876"
+       id="linearGradient3055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79998765,0,0,0.81250022,0.34397963,0.0744133)"
+       x1="1.5875"
+       y1="3.0427084"
+       x2="3.1750002"
+       y2="3.0427084" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient876"
+       id="linearGradient3061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79998765,0,0,0.68750024,0.87316275,1.0500645)"
+       x1="1.5875"
+       y1="3.0427084"
+       x2="3.1750001"
+       y2="3.0427084" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path3694"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.00000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 3.5 1.5 L 2.5 2.5 L 2.5 9.5 L 4.5 9.5 L 4.5 11.5 L 6.5 11.5 L 6.5 13.5 L 14.5 13.5 L 14.5 5.5 L 12.5 5.5 L 12.5 3.5 L 10.5 3.5 L 10.5 1.5 L 3.5 1.5 z "
+       transform="scale(0.26458333)" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.7197917,3.5718751 V 1.7197918 L 1.9843751,1.4552084 h 1.8520833 v 2.1166667 z"
+       id="path3057"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient3061);fill-opacity:1;stroke:#000000;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect3059"
+       width="1.0583171"
+       height="0.72760445"
+       x="2.2489748"
+       y="2.7781248"
+       ry="2.6996275e-07"
+       rx="2.6996275e-07" />
+    <path
+       style="fill:#3d3d3d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.190625,3.0427084 0,-1.8520833 0.2645834,-0.26458341 H 3.3072917 V 3.0427084 Z"
+       id="path3051"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient3055);fill-opacity:1.0;stroke:#000000;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect3053"
+       width="1.0583171"
+       height="0.85989606"
+       x="1.7197917"
+       y="2.1166663"
+       ry="2.6996275e-07"
+       rx="2.6996275e-07" />
+    <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:#3d3d3d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.66145836,2.5135417 2e-8,-1.85208329 0.26458339,-0.2645834 H 2.7781251 V 2.5135417 Z"
+       id="path859"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="color:#000000;overflow:visible;fill:url(#linearGradient1651);fill-opacity:1.0;stroke:#000000;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.5;stroke-opacity:1"
+       id="rect1168"
+       width="1.0583171"
+       height="0.72760445"
+       x="1.1906414"
+       y="1.7197914"
+       ry="2.6996275e-07"
+       rx="2.6996275e-07" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.69999999"
+       d="M 0.39687501,1.9843751 V 1.4552084 l 0.79374989,-1e-7 V 0.92604167 L 1.8520669,1.8521395 1.1906085,2.7781812 V 2.2490145 H 0.39685857 Z"
+       id="path3223"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#linearGradient2540);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687501,1.9843751 V 1.4552084 l 0.79374989,-1e-7 V 0.92604167 L 1.8520669,1.8521395 1.1906085,2.7781812 V 2.2490145 H 0.39685857 Z"
+       id="path2222"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui
index 4a18b2856..3080ac48a 100644
--- a/src/lay/lay/MacroEditorDialog.ui
+++ b/src/lay/lay/MacroEditorDialog.ui
@@ -215,7 +215,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="../../icons/icons.qrc">
-               <normaloff>:/save_all.png</normaloff>:/save_all.png</iconset>
+               <normaloff>:/save_all_16px.png</normaloff>:/save_all_16px.png</iconset>
              </property>
              <property name="shortcut">
               <string>Ctrl+Shift+S</string>
@@ -235,7 +235,7 @@ p, li { white-space: pre-wrap; }
              </property>
              <property name="icon">
               <iconset resource="../../icons/icons.qrc">
-               <normaloff>:/save.png</normaloff>:/save.png</iconset>
+               <normaloff>:/save_16px.png</normaloff>:/save_16px.png</iconset>
              </property>
              <property name="shortcut">
               <string>Ctrl+S</string>
@@ -1422,7 +1422,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionSaveAll">
    <property name="icon">
     <iconset resource="../../icons/icons.qrc">
-     <normaloff>:/save_all.png</normaloff>:/save_all.png</iconset>
+     <normaloff>:/save_all_16px.png</normaloff>:/save_all_16px.png</iconset>
    </property>
    <property name="text">
     <string>Save All</string>
@@ -1431,7 +1431,7 @@ p, li { white-space: pre-wrap; }
   <action name="actionSave">
    <property name="icon">
     <iconset resource="../../icons/icons.qrc">
-     <normaloff>:/save.png</normaloff>:/save.png</iconset>
+     <normaloff>:/save_16px.png</normaloff>:/save_16px.png</iconset>
    </property>
    <property name="text">
     <string>Save</string>