diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 8315c7ece..5f2432663 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -203,7 +203,8 @@
         <file alias="up_16px@2x.png">images/up_16px@2x.png</file>
         <file alias="upup_16px.png">images/upup_16px.png</file>
         <file alias="upup_16px@2x.png">images/upup_16px@2x.png</file>
-        <file alias="waived.png">images/waived.png</file>
+        <file alias="waived_16px.png">images/waived_16px.png</file>
+        <file alias="waived_16px@2x.png">images/waived_16px@2x.png</file>
         <file alias="yellow_flag_16px.png">images/yellow_flag_16px.png</file>
         <file alias="yellow_flag_16px@2x.png">images/yellow_flag_16px@2x.png</file>
         <file alias="salt.png">images/salt.png</file>
diff --git a/src/icons/images/debug_16px.png b/src/icons/images/debug_16px.png
new file mode 100644
index 000000000..3097e1dd5
Binary files /dev/null and b/src/icons/images/debug_16px.png differ
diff --git a/src/icons/images/debug_16px@2x.png b/src/icons/images/debug_16px@2x.png
new file mode 100644
index 000000000..c47cb90d8
Binary files /dev/null and b/src/icons/images/debug_16px@2x.png differ
diff --git a/src/icons/images/find_16px.png b/src/icons/images/find_16px.png
new file mode 100644
index 000000000..bd13ec362
Binary files /dev/null and b/src/icons/images/find_16px.png differ
diff --git a/src/icons/images/find_16px@2x.png b/src/icons/images/find_16px@2x.png
new file mode 100644
index 000000000..ff8a10b20
Binary files /dev/null and b/src/icons/images/find_16px@2x.png differ
diff --git a/src/icons/images/marked_16px.png b/src/icons/images/marked_16px.png
new file mode 100644
index 000000000..b7b6b3adb
Binary files /dev/null and b/src/icons/images/marked_16px.png differ
diff --git a/src/icons/images/marked_16px@2x.png b/src/icons/images/marked_16px@2x.png
new file mode 100644
index 000000000..7288e62f6
Binary files /dev/null and b/src/icons/images/marked_16px@2x.png differ
diff --git a/src/icons/images/marked_24px.png b/src/icons/images/marked_24px.png
new file mode 100644
index 000000000..03944ccbc
Binary files /dev/null and b/src/icons/images/marked_24px.png differ
diff --git a/src/icons/images/marked_24px@2x.png b/src/icons/images/marked_24px@2x.png
new file mode 100644
index 000000000..28cadfcc6
Binary files /dev/null and b/src/icons/images/marked_24px@2x.png differ
diff --git a/src/icons/images/marked_64px.png b/src/icons/images/marked_64px.png
new file mode 100644
index 000000000..0c1facf37
Binary files /dev/null and b/src/icons/images/marked_64px.png differ
diff --git a/src/icons/images/marked_64px@2x.png b/src/icons/images/marked_64px@2x.png
new file mode 100644
index 000000000..0c162fb27
Binary files /dev/null and b/src/icons/images/marked_64px@2x.png differ
diff --git a/src/icons/images/nextstep_16px.png b/src/icons/images/nextstep_16px.png
new file mode 100644
index 000000000..8af3a6f27
Binary files /dev/null and b/src/icons/images/nextstep_16px.png differ
diff --git a/src/icons/images/nextstep_16px@2x.png b/src/icons/images/nextstep_16px@2x.png
new file mode 100644
index 000000000..4c7f7a855
Binary files /dev/null and b/src/icons/images/nextstep_16px@2x.png differ
diff --git a/src/icons/images/replace_16px.png b/src/icons/images/replace_16px.png
new file mode 100644
index 000000000..b0033bc34
Binary files /dev/null and b/src/icons/images/replace_16px.png differ
diff --git a/src/icons/images/replace_16px@2x.png b/src/icons/images/replace_16px@2x.png
new file mode 100644
index 000000000..aa4d4c563
Binary files /dev/null and b/src/icons/images/replace_16px@2x.png differ
diff --git a/src/icons/images/replace_all_16px.png b/src/icons/images/replace_all_16px.png
new file mode 100644
index 000000000..646168cdd
Binary files /dev/null and b/src/icons/images/replace_all_16px.png differ
diff --git a/src/icons/images/replace_all_16px@2x.png b/src/icons/images/replace_all_16px@2x.png
new file mode 100644
index 000000000..157d46ab3
Binary files /dev/null and b/src/icons/images/replace_all_16px@2x.png differ
diff --git a/src/icons/images/singlestep_16px.png b/src/icons/images/singlestep_16px.png
new file mode 100644
index 000000000..8bebaf89b
Binary files /dev/null and b/src/icons/images/singlestep_16px.png differ
diff --git a/src/icons/images/singlestep_16px@2x.png b/src/icons/images/singlestep_16px@2x.png
new file mode 100644
index 000000000..767d617a4
Binary files /dev/null and b/src/icons/images/singlestep_16px@2x.png differ
diff --git a/src/icons/images/waived.png b/src/icons/images/waived.png
deleted file mode 100644
index 1b2d47c4f..000000000
Binary files a/src/icons/images/waived.png and /dev/null differ
diff --git a/src/icons/images/waived_16px.png b/src/icons/images/waived_16px.png
new file mode 100644
index 000000000..d6765f0de
Binary files /dev/null and b/src/icons/images/waived_16px.png differ
diff --git a/src/icons/images/waived_16px@2x.png b/src/icons/images/waived_16px@2x.png
new file mode 100644
index 000000000..6c0d7565b
Binary files /dev/null and b/src/icons/images/waived_16px@2x.png differ
diff --git a/src/icons/svg/waived_16px.svg b/src/icons/svg/waived_16px.svg
new file mode 100644
index 000000000..11893e73c
--- /dev/null
+++ b/src/icons/svg/waived_16px.svg
@@ -0,0 +1,113 @@
+<?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="waived_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="32"
+     inkscape:cx="5.15625"
+     inkscape:cy="8.515625"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="133"
+     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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.96875px;line-height:125%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5"
+       x="0.35940969"
+       y="3.3072917"
+       id="text2434"><tspan
+         sodipodi:role="line"
+         id="tspan2432"
+         style="stroke-width:0.264583px;stroke:#ffffff;stroke-opacity:0.5"
+         x="0.35940969"
+         y="3.3072917">w</tspan></text>
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;stroke:#ffffff;stroke-width:0.26458333;stroke-dashoffset:0.499998;fill-opacity:1;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3308"
+       width="3.7041667"
+       height="0.26458332"
+       x="0.26458332"
+       y="2.1166666" />
+    <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" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.96875px;line-height:125%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5"
+       x="0.35940969"
+       y="3.3072917"
+       id="text4978"><tspan
+         sodipodi:role="line"
+         id="tspan4976"
+         style="stroke-width:0.264583px;stroke:none;stroke-opacity:0.5"
+         x="0.35940969"
+         y="3.3072917">w</tspan></text>
+    <rect
+       style="color:#000000;overflow:visible;fill:#000000;stroke:none;stroke-width:0.26458333;stroke-dashoffset:0.499998;fill-opacity:1;stroke-opacity:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect4980"
+       width="3.7041667"
+       height="0.26458332"
+       x="0.26458332"
+       y="2.1166666" />
+  </g>
+</svg>
diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui
index 7d88a98b4..a5651d155 100644
--- a/src/layui/layui/MarkerBrowserPage.ui
+++ b/src/layui/layui/MarkerBrowserPage.ui
@@ -512,7 +512,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../lay/lay/layResources.qrc">
-            <normaloff>:/waived.png</normaloff>:/waived.png</iconset>
+            <normaloff>:/waived_16px.png</normaloff>:/waived_16px.png</iconset>
           </property>
          </widget>
         </item>
diff --git a/src/layui/layui/rdbMarkerBrowserPage.cc b/src/layui/layui/rdbMarkerBrowserPage.cc
index 221a02cb9..3a7c48c87 100644
--- a/src/layui/layui/rdbMarkerBrowserPage.cc
+++ b/src/layui/layui/rdbMarkerBrowserPage.cc
@@ -1275,7 +1275,7 @@ public:
 
         const rdb::Item *i = item (index.row ());
         if (i != 0 && i->has_tag (m_waived_tag_id)) {
-          return QVariant (QIcon (QString::fromUtf8 (":waived.png")));
+          return QVariant (QIcon (QString::fromUtf8 (":waived_16px.png")));
         }
 
       }