diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 4babee05d..b7ae4f671 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -23,7 +23,8 @@
         <file alias="back_24px@2x.png">images/back_24px@2x.png</file>
         <file alias="back_16px.png">images/back_16px.png</file>
         <file alias="back_16px@2x.png">images/back_16px@2x.png</file>
-        <file alias="blue_flag.png">images/blue_flag.png</file>
+        <file alias="blue_flag_16px.png">images/blue_flag_16px.png</file>
+        <file alias="blue_flag_16px@2x.png">images/blue_flag_16px@2x.png</file>
         <file alias="box.png">images/box.png</file>
         <file alias="breakpoint.png">images/breakpoint.png</file>
         <file alias="breakpointmark.png">images/breakpointmark.png</file>
@@ -65,7 +66,8 @@
         <file alias="forward_16px@2x.png">images/forward_16px@2x.png</file>
         <file alias="generalmacroicon.png">images/generalmacroicon.png</file>
         <file alias="generalmacroiconactive.png">images/generalmacroiconactive.png</file>
-        <file alias="green_flag.png">images/green_flag.png</file>
+        <file alias="green_flag_16px.png">images/green_flag_16px.png</file>
+        <file alias="green_flag_16px@2x.png">images/green_flag_16px@2x.png</file>
         <file alias="help.png">images/help.png</file>
         <file alias="home.png">images/home.png</file>
         <file alias="import.png">images/import.png</file>
@@ -87,7 +89,8 @@
         <file alias="new_folder.png">images/new_folder.png</file>
         <file alias="next_topic.png">images/next_topic.png</file>
         <file alias="nextstep.png">images/nextstep.png</file>
-        <file alias="no_flag.png">images/no_flag.png</file>
+        <file alias="no_flag_16px.png">images/no_flag_16px.png</file>
+        <file alias="no_flag_16px@2x.png">images/no_flag_16px@2x.png</file>
         <file alias="nophoto.png">images/nophoto.png</file>
         <file alias="options_edit.png">images/options_edit.png</file>
         <file alias="partial.png">images/partial.png</file>
@@ -103,7 +106,8 @@
         <file alias="r90.png">images/r90.png</file>
         <file alias="rb.png">images/rb.png</file>
         <file alias="rc.png">images/rc.png</file>
-        <file alias="red_flag.png">images/red_flag.png</file>
+        <file alias="red_flag_16px.png">images/red_flag_16px.png</file>
+        <file alias="red_flag_16px@2x.png">images/red_flag_16px@2x.png</file>
         <file alias="rename.png">images/rename.png</file>
         <file alias="replace.png">images/replace.png</file>
         <file alias="replace_all.png">images/replace_all.png</file>
@@ -132,7 +136,8 @@
         <file alias="up.png">images/up.png</file>
         <file alias="upup.png">images/upup.png</file>
         <file alias="waived.png">images/waived.png</file>
-        <file alias="yellow_flag.png">images/yellow_flag.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>
         <file alias="salt_icon.png">images/salt_icon.png</file>
         <file alias="warn.png">images/warn.png</file>
diff --git a/src/icons/images/blue_flag.png b/src/icons/images/blue_flag.png
deleted file mode 100644
index d3189e225..000000000
Binary files a/src/icons/images/blue_flag.png and /dev/null differ
diff --git a/src/icons/images/blue_flag_16px.png b/src/icons/images/blue_flag_16px.png
new file mode 100644
index 000000000..614cb07cb
Binary files /dev/null and b/src/icons/images/blue_flag_16px.png differ
diff --git a/src/icons/images/blue_flag_16px@2x.png b/src/icons/images/blue_flag_16px@2x.png
new file mode 100644
index 000000000..ab2847238
Binary files /dev/null and b/src/icons/images/blue_flag_16px@2x.png differ
diff --git a/src/icons/images/green_flag.png b/src/icons/images/green_flag.png
deleted file mode 100644
index 5bfded202..000000000
Binary files a/src/icons/images/green_flag.png and /dev/null differ
diff --git a/src/icons/images/green_flag_16px.png b/src/icons/images/green_flag_16px.png
new file mode 100644
index 000000000..ccde0b969
Binary files /dev/null and b/src/icons/images/green_flag_16px.png differ
diff --git a/src/icons/images/green_flag_16px@2x.png b/src/icons/images/green_flag_16px@2x.png
new file mode 100644
index 000000000..2bdbb0400
Binary files /dev/null and b/src/icons/images/green_flag_16px@2x.png differ
diff --git a/src/icons/images/no_flag.png b/src/icons/images/no_flag.png
deleted file mode 100644
index d6749c911..000000000
Binary files a/src/icons/images/no_flag.png and /dev/null differ
diff --git a/src/icons/images/no_flag_16px.png b/src/icons/images/no_flag_16px.png
new file mode 100644
index 000000000..d7e9ec303
Binary files /dev/null and b/src/icons/images/no_flag_16px.png differ
diff --git a/src/icons/images/no_flag_16px@2x.png b/src/icons/images/no_flag_16px@2x.png
new file mode 100644
index 000000000..abb898c68
Binary files /dev/null and b/src/icons/images/no_flag_16px@2x.png differ
diff --git a/src/icons/images/red_flag.png b/src/icons/images/red_flag.png
deleted file mode 100644
index d288cf7d8..000000000
Binary files a/src/icons/images/red_flag.png and /dev/null differ
diff --git a/src/icons/images/red_flag_16px.png b/src/icons/images/red_flag_16px.png
new file mode 100644
index 000000000..e725e36fe
Binary files /dev/null and b/src/icons/images/red_flag_16px.png differ
diff --git a/src/icons/images/red_flag_16px@2x.png b/src/icons/images/red_flag_16px@2x.png
new file mode 100644
index 000000000..8501bd1ca
Binary files /dev/null and b/src/icons/images/red_flag_16px@2x.png differ
diff --git a/src/icons/images/yellow_flag.png b/src/icons/images/yellow_flag.png
deleted file mode 100644
index d84f9f324..000000000
Binary files a/src/icons/images/yellow_flag.png and /dev/null differ
diff --git a/src/icons/images/yellow_flag_16px.png b/src/icons/images/yellow_flag_16px.png
new file mode 100644
index 000000000..e0dfd4860
Binary files /dev/null and b/src/icons/images/yellow_flag_16px.png differ
diff --git a/src/icons/images/yellow_flag_16px@2x.png b/src/icons/images/yellow_flag_16px@2x.png
new file mode 100644
index 000000000..45376b2fc
Binary files /dev/null and b/src/icons/images/yellow_flag_16px@2x.png differ
diff --git a/src/icons/svg/blue_flag_16px.svg b/src/icons/svg/blue_flag_16px.svg
new file mode 100644
index 000000000..00d6b8247
--- /dev/null
+++ b/src/icons/svg/blue_flag_16px.svg
@@ -0,0 +1,143 @@
+<?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="blue_flag_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="11.002235"
+     inkscape:cy="8.2823519"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="385"
+     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="linearGradient9468">
+      <stop
+         style="stop-color:#0000ff;stop-opacity:1"
+         offset="0"
+         id="stop9464" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop9466" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8838">
+      <stop
+         style="stop-color:#0000ff;stop-opacity:1"
+         offset="0"
+         id="stop8834" />
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1"
+         offset="1"
+         id="stop8836" />
+    </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="#linearGradient8838"
+       id="linearGradient8840"
+       x1="1.7197917"
+       y1="1.5875001"
+       x2="2.778125"
+       y2="2.1166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9468"
+       id="linearGradient9470"
+       x1="2.6458335"
+       y1="2.9104168"
+       x2="2.2489583"
+       y2="2.6458335"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.5"
+       d="M 0.79375002,0 H 1.5875 V 0.52916666 L 2.6458333,0.79375002 3.175,1.8520833 2.9104166,2.1166667 H 3.96875 V 2.6458333 L 2.9104166,3.7041666 2.1166667,3.8364583 1.3229167,3.7041666 1.0583333,3.4395833 0.92604168,4.1010416 H 0 Z"
+       id="path1726" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.4552084,3.1749998 C 1.4351575,2.8928624 2.1166668,2.2489581 2.1166668,2.2489581 L 3.1750001,2.6458331 2.7781251,3.1749997 2.2489585,3.4395832 H 1.7197918 c 0,0 -0.2445325,0.017554 -0.2645834,-0.2645834 z"
+       id="path4342"
+       sodipodi:nodetypes="zcccccz" />
+    <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:url(#linearGradient9470);fill-rule:evenodd;stroke:#0000ff;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 2.2489585,1.9843748 0.2645834,0.2645833 c 0,0 -0.2274383,0.5655248 -0.3968751,0.6614584 -0.1694368,0.095933 -0.2781483,-0.049178 -0.3968749,0 -0.1187266,0.049178 -0.2645833,0.1398575 -0.2645833,0.2645833 0,0.1247258 0.084746,0.1900922 0.2645833,0.2645833 0.1798374,0.074491 0.5423591,0.069631 0.79375,0 0.2513909,-0.069631 0.4583497,-0.2193674 0.6614583,-0.396875 0.2031086,-0.1775076 0.5291667,-0.6614582 0.5291667,-0.6614582 0,0 -0.5966172,0.1919787 -0.7937501,0.1322916 C 2.7132839,2.4538546 2.3812502,2.2489581 2.3812502,2.2489581 Z"
+       id="path2852"
+       sodipodi:nodetypes="cczzzzzzczcc" />
+    <path
+       style="fill:url(#linearGradient8840);fill-rule:evenodd;stroke:#0000ff;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.0583336,0.79374985 c 0.6614582,-1.1e-7 0.9260416,0.13229156 1.1906249,0.26458325 0.2645833,0.1322917 0.5291667,0.5291667 0.5291667,0.79375 -0.1322915,0.2645834 -0.6614583,1.0583334 -0.6614583,1.0583334 0,0 0.1775475,-0.2649752 0.1322917,-0.396875 C 2.197359,2.3631526 1.947209,2.3294132 1.7197918,2.3812498 1.4923746,2.4330863 1.4148473,2.4707659 1.1906252,2.6458332 0.96640314,2.8209005 0.66145849,3.1749998 0.66145849,3.1749998 L 1.0583336,0.79374979"
+       id="path1068"
+       sodipodi:nodetypes="ccccszzcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687529,4.1010415 1.1906252,0.13229144"
+       id="path1033" />
+  </g>
+</svg>
diff --git a/src/icons/svg/green_flag_16px.svg b/src/icons/svg/green_flag_16px.svg
new file mode 100644
index 000000000..c136e8aa6
--- /dev/null
+++ b/src/icons/svg/green_flag_16px.svg
@@ -0,0 +1,143 @@
+<?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="green_flag_16px.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1013"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     units="px"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:zoom="24.449577"
+     inkscape:cx="-2.1268262"
+     inkscape:cy="9.6320685"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="385"
+     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="linearGradient9468">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1"
+         offset="0"
+         id="stop9464" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop9466" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8838">
+      <stop
+         style="stop-color:#20ff00;stop-opacity:1"
+         offset="0"
+         id="stop8834" />
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1"
+         offset="1"
+         id="stop8836" />
+    </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="#linearGradient8838"
+       id="linearGradient8840"
+       x1="1.7197917"
+       y1="1.5875001"
+       x2="2.778125"
+       y2="2.1166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9468"
+       id="linearGradient9470"
+       x1="2.6458335"
+       y1="2.9104168"
+       x2="2.2489583"
+       y2="2.6458335"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.5"
+       d="M 0.79375002,0 H 1.5875 V 0.52916666 L 2.6458333,0.79375002 3.175,1.8520833 2.9104166,2.1166667 H 3.96875 V 2.6458333 L 2.9104166,3.7041666 2.1166667,3.8364583 1.3229167,3.7041666 1.0583333,3.4395833 0.92604168,4.1010416 H 0 Z"
+       id="path1726" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#00cc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.4552084,3.1749998 C 1.4351575,2.8928624 2.1166668,2.2489581 2.1166668,2.2489581 L 3.1750001,2.6458331 2.7781251,3.1749997 2.2489585,3.4395832 H 1.7197918 c 0,0 -0.2445325,0.017554 -0.2645834,-0.2645834 z"
+       id="path4342"
+       sodipodi:nodetypes="zcccccz" />
+    <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:url(#linearGradient9470);fill-rule:evenodd;stroke:#00cc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 2.2489585,1.9843748 0.2645834,0.2645833 c 0,0 -0.2274383,0.5655248 -0.3968751,0.6614584 -0.1694368,0.095933 -0.2781483,-0.049178 -0.3968749,0 -0.1187266,0.049178 -0.2645833,0.1398575 -0.2645833,0.2645833 0,0.1247258 0.084746,0.1900922 0.2645833,0.2645833 0.1798374,0.074491 0.5423591,0.069631 0.79375,0 0.2513909,-0.069631 0.4583497,-0.2193674 0.6614583,-0.396875 0.2031086,-0.1775076 0.5291667,-0.6614582 0.5291667,-0.6614582 0,0 -0.5966172,0.1919787 -0.7937501,0.1322916 C 2.7132839,2.4538546 2.3812502,2.2489581 2.3812502,2.2489581 Z"
+       id="path2852"
+       sodipodi:nodetypes="cczzzzzzczcc" />
+    <path
+       style="fill:url(#linearGradient8840);fill-rule:evenodd;stroke:#00cc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.0583336,0.79374985 c 0.6614582,-1.1e-7 0.9260416,0.13229156 1.1906249,0.26458325 0.2645833,0.1322917 0.5291667,0.5291667 0.5291667,0.79375 -0.1322915,0.2645834 -0.6614583,1.0583334 -0.6614583,1.0583334 0,0 0.1775475,-0.2649752 0.1322917,-0.396875 C 2.197359,2.3631526 1.947209,2.3294132 1.7197918,2.3812498 1.4923746,2.4330863 1.4148473,2.4707659 1.1906252,2.6458332 0.96640314,2.8209005 0.66145849,3.1749998 0.66145849,3.1749998 L 1.0583336,0.79374979"
+       id="path1068"
+       sodipodi:nodetypes="ccccszzcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687529,4.1010415 1.1906252,0.13229144"
+       id="path1033" />
+  </g>
+</svg>
diff --git a/src/icons/svg/no_flag_16px.svg b/src/icons/svg/no_flag_16px.svg
new file mode 100644
index 000000000..6b5179aef
--- /dev/null
+++ b/src/icons/svg/no_flag_16px.svg
@@ -0,0 +1,144 @@
+<?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="no_flag_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="9.6525187"
+     inkscape:cy="12.004298"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="302"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9468">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop9464" />
+      <stop
+         style="stop-color:#7e7e7e;stop-opacity:1"
+         offset="1"
+         id="stop9466" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8838">
+      <stop
+         style="stop-color:#dedede;stop-opacity:1"
+         offset="0"
+         id="stop8834" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop8836" />
+    </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="#linearGradient8838"
+       id="linearGradient8840"
+       x1="1.7197917"
+       y1="1.5875001"
+       x2="2.778125"
+       y2="2.1166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9468"
+       id="linearGradient9470"
+       x1="2.6458335"
+       y1="2.9104168"
+       x2="2.2489583"
+       y2="2.6458335"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.5"
+       d="M 0.79375002,0 H 1.5875 V 0.52916666 L 2.6458333,0.79375002 3.175,1.8520833 2.9104166,2.1166667 H 3.96875 V 2.6458333 L 2.9104166,3.7041666 2.1166667,3.8364583 1.3229167,3.7041666 1.0583333,3.4395833 0.92604168,4.1010416 H 0 Z"
+       id="path1726" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:#808080;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.4552084,3.1749998 C 1.4351575,2.8928624 2.1166668,2.2489581 2.1166668,2.2489581 L 3.1750001,2.6458331 2.7781251,3.1749997 2.2489585,3.4395832 H 1.7197918 c 0,0 -0.2445325,0.017554 -0.2645834,-0.2645834 z"
+       id="path4342"
+       sodipodi:nodetypes="zcccccz" />
+    <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:url(#linearGradient9470);fill-rule:evenodd;stroke:#808080;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 2.2489585,1.9843748 0.2645834,0.2645833 c 0,0 -0.2274383,0.5655248 -0.3968751,0.6614584 -0.1694368,0.095933 -0.2781483,-0.049178 -0.3968749,0 -0.1187266,0.049178 -0.2645833,0.1398575 -0.2645833,0.2645833 0,0.1247258 0.084746,0.1900922 0.2645833,0.2645833 0.1798374,0.074491 0.5423591,0.069631 0.79375,0 0.2513909,-0.069631 0.4583497,-0.2193674 0.6614583,-0.396875 0.2031086,-0.1775076 0.5291667,-0.6614582 0.5291667,-0.6614582 0,0 -0.5966172,0.1919787 -0.7937501,0.1322916 C 2.7132839,2.4538546 2.3812502,2.2489581 2.3812502,2.2489581 Z"
+       id="path2852"
+       sodipodi:nodetypes="cczzzzzzczcc" />
+    <path
+       style="fill:url(#linearGradient8840);fill-rule:evenodd;stroke:#808080;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.0583336,0.79374985 c 0.6614582,-1.1e-7 0.9260416,0.13229156 1.1906249,0.26458325 0.2645833,0.1322917 0.5291667,0.5291667 0.5291667,0.79375 -0.1322915,0.2645834 -0.6614583,1.0583334 -0.6614583,1.0583334 0,0 0.1775475,-0.2649752 0.1322917,-0.396875 C 2.197359,2.3631526 1.947209,2.3294132 1.7197918,2.3812498 1.4923746,2.4330863 1.4148473,2.4707659 1.1906252,2.6458332 0.96640314,2.8209005 0.66145849,3.1749998 0.66145849,3.1749998 L 1.0583336,0.79374979"
+       id="path1068"
+       sodipodi:nodetypes="ccccszzcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687529,4.1010415 1.1906252,0.13229144"
+       id="path1033" />
+  </g>
+</svg>
diff --git a/src/icons/svg/red_flag_16px.svg b/src/icons/svg/red_flag_16px.svg
new file mode 100644
index 000000000..00d2501e8
--- /dev/null
+++ b/src/icons/svg/red_flag_16px.svg
@@ -0,0 +1,144 @@
+<?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="red_flag_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="10.347827"
+     inkscape:cy="8.1596504"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="385"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9468">
+      <stop
+         style="stop-color:#ff0700;stop-opacity:1"
+         offset="0"
+         id="stop9464" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop9466" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8838">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1"
+         offset="0"
+         id="stop8834" />
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1"
+         offset="1"
+         id="stop8836" />
+    </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="#linearGradient8838"
+       id="linearGradient8840"
+       x1="1.7197917"
+       y1="1.5875001"
+       x2="2.778125"
+       y2="2.1166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9468"
+       id="linearGradient9470"
+       x1="2.6458335"
+       y1="2.9104168"
+       x2="2.2489583"
+       y2="2.6458335"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.5"
+       d="M 0.79375002,0 H 1.5875 V 0.52916666 L 2.6458333,0.79375002 3.175,1.8520833 2.9104166,2.1166667 H 3.96875 V 2.6458333 L 2.9104166,3.7041666 2.1166667,3.8364583 1.3229167,3.7041666 1.0583333,3.4395833 0.92604168,4.1010416 H 0 Z"
+       id="path1726" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#ff0202;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.4552084,3.1749998 C 1.4351575,2.8928624 2.1166668,2.2489581 2.1166668,2.2489581 L 3.1750001,2.6458331 2.7781251,3.1749997 2.2489585,3.4395832 H 1.7197918 c 0,0 -0.2445325,0.017554 -0.2645834,-0.2645834 z"
+       id="path4342"
+       sodipodi:nodetypes="zcccccz" />
+    <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:url(#linearGradient9470);fill-rule:evenodd;stroke:#ff0202;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 2.2489585,1.9843748 0.2645834,0.2645833 c 0,0 -0.2274383,0.5655248 -0.3968751,0.6614584 -0.1694368,0.095933 -0.2781483,-0.049178 -0.3968749,0 -0.1187266,0.049178 -0.2645833,0.1398575 -0.2645833,0.2645833 0,0.1247258 0.084746,0.1900922 0.2645833,0.2645833 0.1798374,0.074491 0.5423591,0.069631 0.79375,0 0.2513909,-0.069631 0.4583497,-0.2193674 0.6614583,-0.396875 0.2031086,-0.1775076 0.5291667,-0.6614582 0.5291667,-0.6614582 0,0 -0.5966172,0.1919787 -0.7937501,0.1322916 C 2.7132839,2.4538546 2.3812502,2.2489581 2.3812502,2.2489581 Z"
+       id="path2852"
+       sodipodi:nodetypes="cczzzzzzczcc" />
+    <path
+       style="fill:url(#linearGradient8840);fill-rule:evenodd;stroke:#ff0202;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.0583336,0.79374985 c 0.6614582,-1.1e-7 0.9260416,0.13229156 1.1906249,0.26458325 0.2645833,0.1322917 0.5291667,0.5291667 0.5291667,0.79375 -0.1322915,0.2645834 -0.6614583,1.0583334 -0.6614583,1.0583334 0,0 0.1775475,-0.2649752 0.1322917,-0.396875 C 2.197359,2.3631526 1.947209,2.3294132 1.7197918,2.3812498 1.4923746,2.4330863 1.4148473,2.4707659 1.1906252,2.6458332 0.96640314,2.8209005 0.66145849,3.1749998 0.66145849,3.1749998 L 1.0583336,0.79374979"
+       id="path1068"
+       sodipodi:nodetypes="ccccszzcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687529,4.1010415 1.1906252,0.13229144"
+       id="path1033" />
+  </g>
+</svg>
diff --git a/src/icons/svg/yellow_flag_16px.svg b/src/icons/svg/yellow_flag_16px.svg
new file mode 100644
index 000000000..40894dc0d
--- /dev/null
+++ b/src/icons/svg/yellow_flag_16px.svg
@@ -0,0 +1,144 @@
+<?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="yellow_flag_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.5133186"
+     inkscape:cy="8.3641529"
+     inkscape:window-width="1535"
+     inkscape:window-height="1081"
+     inkscape:window-x="385"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     width="16px"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1074"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1008">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9468">
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="0"
+         id="stop9464" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop9466" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8838">
+      <stop
+         style="stop-color:#ffff01;stop-opacity:1"
+         offset="0"
+         id="stop8834" />
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1"
+         offset="1"
+         id="stop8836" />
+    </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="#linearGradient8838"
+       id="linearGradient8840"
+       x1="1.7197917"
+       y1="1.5875001"
+       x2="2.778125"
+       y2="2.1166668"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9468"
+       id="linearGradient9470"
+       x1="2.6458335"
+       y1="2.9104168"
+       x2="2.2489583"
+       y2="2.6458335"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.5"
+       d="M 0.79375002,0 H 1.5875 V 0.52916666 L 2.6458333,0.79375002 3.175,1.8520833 2.9104166,2.1166667 H 3.96875 V 2.6458333 L 2.9104166,3.7041666 2.1166667,3.8364583 1.3229167,3.7041666 1.0583333,3.4395833 0.92604168,4.1010416 H 0 Z"
+       id="path1726" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#cccc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.4552084,3.1749998 C 1.4351575,2.8928624 2.1166668,2.2489581 2.1166668,2.2489581 L 3.1750001,2.6458331 2.7781251,3.1749997 2.2489585,3.4395832 H 1.7197918 c 0,0 -0.2445325,0.017554 -0.2645834,-0.2645834 z"
+       id="path4342"
+       sodipodi:nodetypes="zcccccz" />
+    <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:url(#linearGradient9470);fill-rule:evenodd;stroke:#cccc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 2.2489585,1.9843748 0.2645834,0.2645833 c 0,0 -0.2274383,0.5655248 -0.3968751,0.6614584 -0.1694368,0.095933 -0.2781483,-0.049178 -0.3968749,0 -0.1187266,0.049178 -0.2645833,0.1398575 -0.2645833,0.2645833 0,0.1247258 0.084746,0.1900922 0.2645833,0.2645833 0.1798374,0.074491 0.5423591,0.069631 0.79375,0 0.2513909,-0.069631 0.4583497,-0.2193674 0.6614583,-0.396875 0.2031086,-0.1775076 0.5291667,-0.6614582 0.5291667,-0.6614582 0,0 -0.5966172,0.1919787 -0.7937501,0.1322916 C 2.7132839,2.4538546 2.3812502,2.2489581 2.3812502,2.2489581 Z"
+       id="path2852"
+       sodipodi:nodetypes="cczzzzzzczcc" />
+    <path
+       style="fill:url(#linearGradient8840);fill-rule:evenodd;stroke:#cccc00;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 1.0583336,0.79374985 c 0.6614582,-1.1e-7 0.9260416,0.13229156 1.1906249,0.26458325 0.2645833,0.1322917 0.5291667,0.5291667 0.5291667,0.79375 -0.1322915,0.2645834 -0.6614583,1.0583334 -0.6614583,1.0583334 0,0 0.1775475,-0.2649752 0.1322917,-0.396875 C 2.197359,2.3631526 1.947209,2.3294132 1.7197918,2.3812498 1.4923746,2.4330863 1.4148473,2.4707659 1.1906252,2.6458332 0.96640314,2.8209005 0.66145849,3.1749998 0.66145849,3.1749998 L 1.0583336,0.79374979"
+       id="path1068"
+       sodipodi:nodetypes="ccccszzcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0.39687529,4.1010415 1.1906252,0.13229144"
+       id="path1033" />
+  </g>
+</svg>
diff --git a/src/layui/layui/rdbMarkerBrowserPage.cc b/src/layui/layui/rdbMarkerBrowserPage.cc
index d2193c701..dfa3cb9c1 100644
--- a/src/layui/layui/rdbMarkerBrowserPage.cc
+++ b/src/layui/layui/rdbMarkerBrowserPage.cc
@@ -56,11 +56,11 @@ struct FlagDescriptor
 
 static FlagDescriptor flag_descriptors[] = 
 {
-  FlagDescriptor (":no_flag.png", tl::to_string (QObject::tr ("No flag")), ""),
-  FlagDescriptor (":red_flag.png", tl::to_string (QObject::tr ("Red flag")), "red"),
-  FlagDescriptor (":green_flag.png", tl::to_string (QObject::tr ("Green flag")), "green"),
-  FlagDescriptor (":blue_flag.png", tl::to_string (QObject::tr ("Blue flag")), "blue"),
-  FlagDescriptor (":yellow_flag.png", tl::to_string (QObject::tr ("Yellow flag")), "yellow")
+  FlagDescriptor (":no_flag_16px.png", tl::to_string (QObject::tr ("No flag")), ""),
+  FlagDescriptor (":red_flag_16px.png", tl::to_string (QObject::tr ("Red flag")), "red"),
+  FlagDescriptor (":green_flag_16px.png", tl::to_string (QObject::tr ("Green flag")), "green"),
+  FlagDescriptor (":blue_flag_16px.png", tl::to_string (QObject::tr ("Blue flag")), "blue"),
+  FlagDescriptor (":yellow_flag_16px.png", tl::to_string (QObject::tr ("Yellow flag")), "yellow")
 };
 
 // ----------------------------------------------------------------------------------