diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 2154ff27b..7b5eddd82 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -167,12 +167,18 @@
         <file alias="folder_12.png">images/folder_12.png</file>
         <file alias="file_12.png">images/file_12.png</file>
         <file alias="empty_12.png">images/empty_12.png</file>
-        <file alias="fit_front.png">images/fit_front.png</file>
-        <file alias="fit_back.png">images/fit_back.png</file>
-        <file alias="fit_left.png">images/fit_left.png</file>
-        <file alias="fit_right.png">images/fit_right.png</file>
-        <file alias="fit_top.png">images/fit_top.png</file>
-        <file alias="fit_bottom.png">images/fit_bottom.png</file>
+        <file alias="fit_front_24px.png">images/fit_front_24px.png</file>
+        <file alias="fit_front_24px@2x.png">images/fit_front_24px@2x.png</file>
+        <file alias="fit_back_24px.png">images/fit_back_24px.png</file>
+        <file alias="fit_back_24px@2x.png">images/fit_back_24px@2x.png</file>
+        <file alias="fit_left_24px.png">images/fit_left_24px.png</file>
+        <file alias="fit_left_24px@2x.png">images/fit_left_24px@2x.png</file>
+        <file alias="fit_right_24px.png">images/fit_right_24px.png</file>
+        <file alias="fit_right_24px@2x.png">images/fit_right_24px@2x.png</file>
+        <file alias="fit_top_24px.png">images/fit_top_24px.png</file>
+        <file alias="fit_top_24px@2x.png">images/fit_top_24px@2x.png</file>
+        <file alias="fit_bottom_24px.png">images/fit_bottom_24px.png</file>
+        <file alias="fit_bottom_24px@2x.png">images/fit_bottom_24px@2x.png</file>
         <file alias="unlocked_16px.png">images/unlocked_16px.png</file>
         <file alias="unlocked_16px@2x.png">images/unlocked_16px@2x.png</file>
         <file alias="locked_16px.png">images/locked_16px.png</file>
diff --git a/src/icons/images/fit_back_24px.png b/src/icons/images/fit_back_24px.png
new file mode 100644
index 000000000..3e7a3d44e
Binary files /dev/null and b/src/icons/images/fit_back_24px.png differ
diff --git a/src/icons/images/fit_back_24px@2x.png b/src/icons/images/fit_back_24px@2x.png
new file mode 100644
index 000000000..696203967
Binary files /dev/null and b/src/icons/images/fit_back_24px@2x.png differ
diff --git a/src/icons/images/fit_bottom_24px.png b/src/icons/images/fit_bottom_24px.png
new file mode 100644
index 000000000..3f3203a4c
Binary files /dev/null and b/src/icons/images/fit_bottom_24px.png differ
diff --git a/src/icons/images/fit_bottom_24px@2x.png b/src/icons/images/fit_bottom_24px@2x.png
new file mode 100644
index 000000000..dafcb2c1b
Binary files /dev/null and b/src/icons/images/fit_bottom_24px@2x.png differ
diff --git a/src/icons/images/fit_front_24px.png b/src/icons/images/fit_front_24px.png
new file mode 100644
index 000000000..c65d4ce2e
Binary files /dev/null and b/src/icons/images/fit_front_24px.png differ
diff --git a/src/icons/images/fit_front_24px@2x.png b/src/icons/images/fit_front_24px@2x.png
new file mode 100644
index 000000000..3daf2f5b7
Binary files /dev/null and b/src/icons/images/fit_front_24px@2x.png differ
diff --git a/src/icons/images/fit_left_24px.png b/src/icons/images/fit_left_24px.png
new file mode 100644
index 000000000..586aebc5b
Binary files /dev/null and b/src/icons/images/fit_left_24px.png differ
diff --git a/src/icons/images/fit_left_24px@2x.png b/src/icons/images/fit_left_24px@2x.png
new file mode 100644
index 000000000..6002708ca
Binary files /dev/null and b/src/icons/images/fit_left_24px@2x.png differ
diff --git a/src/icons/images/fit_right_24px.png b/src/icons/images/fit_right_24px.png
new file mode 100644
index 000000000..b57ee7c93
Binary files /dev/null and b/src/icons/images/fit_right_24px.png differ
diff --git a/src/icons/images/fit_right_24px@2x.png b/src/icons/images/fit_right_24px@2x.png
new file mode 100644
index 000000000..a2b9c419f
Binary files /dev/null and b/src/icons/images/fit_right_24px@2x.png differ
diff --git a/src/icons/images/fit_top_24px.png b/src/icons/images/fit_top_24px.png
new file mode 100644
index 000000000..9bcff834a
Binary files /dev/null and b/src/icons/images/fit_top_24px.png differ
diff --git a/src/icons/images/fit_top_24px@2x.png b/src/icons/images/fit_top_24px@2x.png
new file mode 100644
index 000000000..c68e7b53a
Binary files /dev/null and b/src/icons/images/fit_top_24px@2x.png differ
diff --git a/src/icons/svg/fit_back_24px.svg b/src/icons/svg/fit_back_24px.svg
new file mode 100644
index 000000000..f17b3ea18
--- /dev/null
+++ b/src/icons/svg/fit_back_24px.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_back_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="8.644231"
+     inkscape:cx="26.838709"
+     inkscape:cy="18.914349"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="237"
+     inkscape:window-y="62"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5253"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5255"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5257"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5259"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1603"
+       d="M 1.8556108,1.0583263 H 4.5014443 V 3.9687445 H 1.8556108 Z"
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_back.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1585"
+       width="6.3499999"
+       height="6.3499999"
+       x="3.2278493e-08"
+       y="3.2278493e-08"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_back.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       id="g5251"
+       transform="matrix(0.07467129,0,0,0.07467129,27.781249,-109.27291)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_back.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect5239"
+         width="38.976345"
+         height="42.521633"
+         x="-349.01477"
+         y="1475.7864" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5241"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5253);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5255);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         id="path5243"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5257);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         id="path5245"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5259);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         id="path5247"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect5249"
+         width="60.238102"
+         height="56.694778"
+         x="-359.64661"
+         y="1486.4164" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/fit_bottom_24px.svg b/src/icons/svg/fit_bottom_24px.svg
new file mode 100644
index 000000000..12a66525a
--- /dev/null
+++ b/src/icons/svg/fit_bottom_24px.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_bottom_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="4.3221155"
+     inkscape:cx="13.187986"
+     inkscape:cy="-9.3704113"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="74"
+     inkscape:window-y="56"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5297"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5299"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5301"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5303"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path1625"
+       d="M 1.8556108,3.9616956 H 4.501444 l 1.0583333,1.852072 H 0.79727744 Z"
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746715px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_bottom.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1627"
+       width="6.3499999"
+       height="6.3499999"
+       x="3.1939063e-08"
+       y="3.1939035e-08"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_bottom.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       id="g5295"
+       transform="matrix(0.07467129,0,0,0.0746713,27.781249,-109.27292)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_bottom.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect5283"
+         width="38.976345"
+         height="42.521633"
+         x="-349.01477"
+         y="1475.7864" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5285"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5297);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5299);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         id="path5287"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5301);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         id="path5289"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5303);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         id="path5291"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect5293"
+         width="60.238102"
+         height="56.694778"
+         x="-359.64661"
+         y="1486.4164" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/fit_front_24px.svg b/src/icons/svg/fit_front_24px.svg
new file mode 100644
index 000000000..274c700d5
--- /dev/null
+++ b/src/icons/svg/fit_front_24px.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_front_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="8.644231"
+     inkscape:cx="17.005561"
+     inkscape:cy="21.575083"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="95"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1678"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1651"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1666"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1674"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="27.093334"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_front.png"
+       y="3.3160596e-08"
+       x="3.3160596e-08"
+       height="6.3499999"
+       width="6.3499999"
+       id="rect1485"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746714px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       d="M 1.0583328,1.8520824 H 5.2916666 V 5.8208317 H 1.0583328 Z"
+       id="path1535"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_front.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       id="g1738"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_front.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334"
+       transform="matrix(0.0746713,0,0,0.0746713,27.781249,-109.27291)">
+      <rect
+         y="1475.7864"
+         x="-349.01477"
+         height="42.521633"
+         width="38.976345"
+         id="rect1510-6"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1678);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         id="path1676"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path1527"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1651);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path1529"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1666);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1533"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1674);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <rect
+         y="1486.4164"
+         x="-359.64661"
+         height="56.694778"
+         width="60.238102"
+         id="rect1510"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/fit_left_24px.svg b/src/icons/svg/fit_left_24px.svg
new file mode 100644
index 000000000..8ebfd5649
--- /dev/null
+++ b/src/icons/svg/fit_left_24px.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_left_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="8.644231"
+     inkscape:cx="17.352614"
+     inkscape:cy="1.5617352"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="112"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1754"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1756"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1758"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient1760"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3596"
+       width="6.3499994"
+       height="6.3499999"
+       x="5.0000006e-07"
+       y="5.0000006e-07"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1545"
+       width="6.3499999"
+       height="6.3499999"
+       x="3.1707128e-08"
+       y="3.1707128e-08"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_left.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1563"
+       d="M 0.79492571,1.8520824 1.8532592,0.79374367 V 3.9687447 L 0.79492571,5.8208316 Z"
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746712px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_left.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       id="g1752"
+       transform="matrix(0.07467129,0,0,0.07467129,27.781249,-109.27291)"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_left.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334">
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect1740"
+         width="38.976345"
+         height="42.521633"
+         x="-349.01477"
+         y="1475.7864" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1742"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1754);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1756);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         id="path1744"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1758);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         id="path1746"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient1760);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         id="path1748"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect1750"
+         width="60.238102"
+         height="56.694778"
+         x="-359.64661"
+         y="1486.4164" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/fit_right_24px.svg b/src/icons/svg/fit_right_24px.svg
new file mode 100644
index 000000000..d2d1107ca
--- /dev/null
+++ b/src/icons/svg/fit_right_24px.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_right_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="17.288462"
+     inkscape:cx="15.964404"
+     inkscape:cy="17.959955"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="148"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5231"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5233"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5235"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5237"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787" />
+  </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="4.3552647"
+       height="3.0834491"
+       x="2.8855067e-07"
+       y="2.8855064e-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
+       inkscape:export-ydpi="27.093334"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_right.png"
+       y="2.8855061e-07"
+       x="-6.3499999"
+       height="6.3499994"
+       width="6.3499994"
+       id="rect1565"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="scale(-1,1)" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746711px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       d="M 5.5550747,1.8520824 4.4967413,0.79374384 V 3.9687446 l 1.0583334,1.8520871 z"
+       id="path1571"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_right.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       inkscape:export-ydpi="27.093334"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_right.png"
+       transform="matrix(0.07467129,0,0,0.07467129,27.78125,-109.27291)"
+       id="g5229">
+      <rect
+         y="1475.7864"
+         x="-349.01477"
+         height="42.521633"
+         width="38.976345"
+         id="rect5217"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5231);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         id="path5219"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5221"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5233);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5223"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5235);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5225"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5237);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <rect
+         y="1486.4164"
+         x="-359.64661"
+         height="56.694778"
+         width="60.238102"
+         id="rect5227"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/svg/fit_top_24px.svg b/src/icons/svg/fit_top_24px.svg
new file mode 100644
index 000000000..f77f567f1
--- /dev/null
+++ b/src/icons/svg/fit_top_24px.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.3500002"
+   version="1.1"
+   id="svg1011"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="fit_top_24px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="8.644231"
+     inkscape:cx="25.103448"
+     inkscape:cy="25.16129"
+     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="24px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#ff9f3f;stop-opacity:1;"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3604" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5275"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1541.3386"
+       x2="-308.26773"
+       y2="1520.0787" />
+    <linearGradient
+       id="linearGradient1649-0">
+      <stop
+         style="stop-color:#575757;stop-opacity:1;"
+         offset="0"
+         id="stop1645" />
+      <stop
+         style="stop-color:#9b9b9b;stop-opacity:0.99470901;"
+         offset="1"
+         id="stop1647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5277"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1484.6456"
+       x2="-350.78741"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5279"
+       gradientUnits="userSpaceOnUse"
+       x1="-301.18109"
+       y1="1484.6456"
+       x2="-308.26773"
+       y2="1477.5591" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1649-0"
+       id="linearGradient5281"
+       gradientUnits="userSpaceOnUse"
+       x1="-357.87402"
+       y1="1541.3386"
+       x2="-347.24411"
+       y2="1520.0787" />
+  </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="1.792111"
+       height="1.7921112"
+       x="0.19990753"
+       y="0.35160002"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/back.png"
+       inkscape:export-xdpi="27.093315"
+       inkscape:export-ydpi="27.093315" />
+    <rect
+       inkscape:export-ydpi="27.093334"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_top.png"
+       y="1.2577848e-07"
+       x="1.2577848e-07"
+       height="6.3499999"
+       width="6.3499999"
+       id="rect1607"
+       style="fill:none;stroke:#865b26;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:#ff9f3f;fill-opacity:0.50813;fill-rule:evenodd;stroke:none;stroke-width:0.0746713px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.670732"
+       d="M 1.8556112,0.78668718 H 4.5014447 L 5.5597776,1.8450258 H 0.79727777 Z"
+       id="path1605"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_top.png"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-ydpi="27.093334" />
+    <g
+       inkscape:export-ydpi="27.093334"
+       inkscape:export-xdpi="27.093334"
+       inkscape:export-filename="/home/matthias/klayout/master/src/lay/lay/images/fit_top.png"
+       transform="matrix(0.0746713,0,0,0.0746713,27.78125,-109.27292)"
+       id="g5273">
+      <rect
+         y="1475.7864"
+         x="-349.01477"
+         height="42.521633"
+         width="38.976345"
+         id="rect5261"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.996078;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5275);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935"
+         d="m -310.21226,1517.2425 10.62992,24.8032"
+         id="path5263"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5265"
+         d="m -359.79232,1486.564 10.62992,-10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5277);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5267"
+         d="m -309.89272,1475.809 10.62992,10.63"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5279);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5269"
+         d="m -349.1624,1518.4537 -10.62992,24.8032"
+         style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5281);stroke-width:3.541;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.995935" />
+      <rect
+         y="1486.4164"
+         x="-359.64661"
+         height="56.694778"
+         width="60.238102"
+         id="rect5271"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.47561;fill-rule:nonzero;stroke:#575757;stroke-width:3.541;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/src/plugins/tools/view_25d/lay_plugin/D25View.ui b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
index a38817f62..5ac851c82 100644
--- a/src/plugins/tools/view_25d/lay_plugin/D25View.ui
+++ b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
@@ -261,7 +261,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_left.png</normaloff>:/fit_left.png</iconset>
+          <normaloff>:/fit_left_24px.png</normaloff>:/fit_left_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -281,7 +281,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_front.png</normaloff>:/fit_front.png</iconset>
+          <normaloff>:/fit_front_24px.png</normaloff>:/fit_front_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -301,7 +301,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_right.png</normaloff>:/fit_right.png</iconset>
+          <normaloff>:/fit_right_24px.png</normaloff>:/fit_right_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -321,7 +321,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_back.png</normaloff>:/fit_back.png</iconset>
+          <normaloff>:/fit_back_24px.png</normaloff>:/fit_back_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -341,7 +341,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_top.png</normaloff>:/fit_top.png</iconset>
+          <normaloff>:/fit_top_24px.png</normaloff>:/fit_top_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -361,7 +361,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../../../lay/lay/layResources.qrc">
-          <normaloff>:/fit_bottom.png</normaloff>:/fit_bottom.png</iconset>
+          <normaloff>:/fit_bottom_24px.png</normaloff>:/fit_bottom_24px.png</iconset>
         </property>
         <property name="iconSize">
          <size>