diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 94292e783..5aac1741e 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -121,7 +121,8 @@
         <file alias="m45_24px@2x.png">images/m45_24px@2x.png</file>
         <file alias="m90_24px.png">images/m90_24px.png</file>
         <file alias="m90_24px@2x.png">images/m90_24px@2x.png</file>
-        <file alias="move.png">images/move.png</file>
+        <file alias="move_24px.png">images/move_24px.png</file>
+        <file alias="move_24px@2x.png">images/move_24px@2x.png</file>
         <file alias="move_simple_16px.png">images/move_simple_16px.png</file>
         <file alias="move_simple_16px@2x.png">images/move_simple_16px@2x.png</file>
         <file alias="neutral_12px.png">images/neutral_12px.png</file>
@@ -196,7 +197,8 @@
         <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="select.png">images/select.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>
         <file alias="setup_16px@2x.png">images/setup_16px@2x.png</file>
         <file alias="singlestep_16px.png">images/singlestep_16px.png</file>
diff --git a/src/icons/images/move.png b/src/icons/images/move.png
deleted file mode 100644
index 90e407843..000000000
Binary files a/src/icons/images/move.png and /dev/null differ
diff --git a/src/icons/images/move_24px.png b/src/icons/images/move_24px.png
new file mode 100644
index 000000000..650d182c5
Binary files /dev/null and b/src/icons/images/move_24px.png differ
diff --git a/src/icons/images/move_24px@2x.png b/src/icons/images/move_24px@2x.png
new file mode 100644
index 000000000..64e7437ec
Binary files /dev/null and b/src/icons/images/move_24px@2x.png differ
diff --git a/src/icons/images/ruler.png b/src/icons/images/ruler.png
deleted file mode 100644
index 5d6d26895..000000000
Binary files a/src/icons/images/ruler.png and /dev/null differ
diff --git a/src/icons/images/select.png b/src/icons/images/select.png
deleted file mode 100644
index 9a5611aac..000000000
Binary files a/src/icons/images/select.png and /dev/null differ
diff --git a/src/icons/images/select_24px.png b/src/icons/images/select_24px.png
new file mode 100644
index 000000000..23065dfff
Binary files /dev/null and b/src/icons/images/select_24px.png differ
diff --git a/src/icons/images/select_24px@2x.png b/src/icons/images/select_24px@2x.png
new file mode 100644
index 000000000..4ddd743b4
Binary files /dev/null and b/src/icons/images/select_24px@2x.png differ
diff --git a/src/icons/svg/move_24px.svg b/src/icons/svg/move_24px.svg
new file mode 100644
index 000000000..ab191048e
--- /dev/null
+++ b/src/icons/svg/move_24px.svg
@@ -0,0 +1,98 @@
+<?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="move_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="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="9.4480162"
+     inkscape:cy="14.744631"
+     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="#linearGradient3600"
+       id="linearGradient984"
+       x1="3.96875"
+       y1="4.7625003"
+       x2="2.9104168"
+       y2="1.5875001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.13229162,0.26458333)" />
+  </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:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5;paint-order:normal"
+       d="m 1.9843751,1.190625 v 0 H 2.5135417 V 2.5135417 H 1.190625 V 1.984375 L 0.1322917,3.175 1.190625,4.3656251 V 3.8364584 l 1.3229168,-1e-7 V 5.1593749 H 1.9843752 L 3.1750001,6.2177085 4.3656251,5.1593751 H 3.8364584 V 3.8364584 H 5.1593751 V 4.3656251 L 6.2177085,3.175 5.1593751,1.984375 V 2.5135417 H 3.8364584 V 1.190625 H 4.3656251 L 3.1750001,0.13229166 Z"
+       id="path8518"
+       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+    <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
+       style="fill:url(#linearGradient984);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 1.9843751,1.190625 v 0 H 2.5135417 V 2.5135417 H 1.190625 V 1.984375 L 0.1322917,3.175 1.190625,4.3656251 V 3.8364584 l 1.3229168,-1e-7 V 5.1593749 H 1.9843752 L 3.1750001,6.2177085 4.3656251,5.1593751 H 3.8364584 V 3.8364584 H 5.1593751 V 4.3656251 L 6.2177085,3.175 5.1593751,1.984375 V 2.5135417 H 3.8364584 V 1.190625 H 4.3656251 L 3.1750001,0.13229166 Z"
+       id="path878"
+       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/src/icons/svg/select_24px.svg b/src/icons/svg/select_24px.svg
new file mode 100644
index 000000000..d7a911032
--- /dev/null
+++ b/src/icons/svg/select_24px.svg
@@ -0,0 +1,97 @@
+<?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="select_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="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="15.746693"
+     inkscape:cy="15.971646"
+     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="#linearGradient3600"
+       id="linearGradient1802"
+       x1="0.18770374"
+       y1="3.1699069"
+       x2="6.1521101"
+       y2="3.1699069"
+       gradientUnits="userSpaceOnUse" />
+  </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.39687498,0.39687498 1.7197917,3.5718751 2.2489584,3.0427084 4.6302085,5.9531251 5.9531252,4.6302082 3.0427084,2.2489584 3.5718751,1.7197917 Z"
+       id="path1634"
+       sodipodi:nodetypes="cccccccc" />
+    <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
+       style="fill:url(#linearGradient1802);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.39687498,0.39687498 1.7197917,3.5718751 2.2489584,3.0427084 4.6302085,5.9531251 5.9531252,4.6302082 3.0427084,2.2489584 3.5718751,1.7197917 Z"
+       id="path859"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/src/laybasic/laybasic/layLayoutViewBase.cc b/src/laybasic/laybasic/layLayoutViewBase.cc
index 859156ca1..57c00aa38 100644
--- a/src/laybasic/laybasic/layLayoutViewBase.cc
+++ b/src/laybasic/laybasic/layLayoutViewBase.cc
@@ -5390,8 +5390,8 @@ unsigned int
 LayoutViewBase::intrinsic_mouse_modes (std::vector<std::string> *descriptions)
 {
   if (descriptions) {
-    descriptions->push_back ("select\t" + tl::to_string (tr ("Select")) + "<:select.png>");
-    descriptions->push_back ("move\t" + tl::to_string (tr ("Move")) + "<:move.png>");
+    descriptions->push_back ("select\t" + tl::to_string (tr ("Select")) + "<:select_24px.png>");
+    descriptions->push_back ("move\t" + tl::to_string (tr ("Move")) + "<:move_24px.png>");
   }
   return 2;
 }