diff --git a/icons/Color/scalable/gimp-detach.svg b/icons/Color/scalable/gimp-detach.svg
index 2755045b59..4aafa98810 100644
--- a/icons/Color/scalable/gimp-detach.svg
+++ b/icons/Color/scalable/gimp-detach.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="3.175mm"
    height="3.1750002mm"
    viewBox="0 0 3.175 3.1750002"
    version="1.1"
    id="svg8778"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="gimp-detach.svg">
+   inkscape:version="1.1.2 (1:1.1+202202050942+0a00cf5339)"
+   sodipodi:docname="gimp-detach.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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs8772" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="19.527006"
-     inkscape:cy="-4.4493518"
+     inkscape:zoom="22.4"
+     inkscape:cx="3.4598214"
+     inkscape:cy="4.375"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -35,11 +35,12 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1366"
-     inkscape:window-height="741"
+     inkscape:window-width="1274"
+     inkscape:window-height="1387"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0" />
   <metadata
      id="metadata8775">
     <rdf:RDF>
@@ -48,7 +49,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -57,43 +57,31 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-72.340327,-171.87482)">
-    <g
-       style="display:inline"
-       id="gimp-detach-12"
-       transform="matrix(0.2648149,0,0,0.26458333,-89.213604,131.31608)"
-       inkscape:label="gimp-detach-12"
-       inkscape:export-filename="/home/jehan/dev/src/gimp/icons/Color/24/gimp-detach.png"
-       inkscape:export-xdpi="192"
-       inkscape:export-ydpi="192">
-      <g
-         inkscape:export-ydpi="95.916092"
-         inkscape:export-xdpi="95.916092"
-         inkscape:export-filename="/home/aryeom/Desktop/Projects/GIMP-icon-attach_detach/detach12.png"
-         transform="translate(-91.924803,16.999992)"
-         id="g6185">
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path6179"
-           d="m 703.9867,143.2929 h 7.99301 l -3.99662,-7 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99956268px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path6181"
-           d="m 702.98758,146.2929 -10e-5,2 h 9.99135 v -2 z"
-           style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99956268px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-      <rect
-         inkscape:export-ydpi="95.916092"
-         inkscape:export-xdpi="95.916092"
-         inkscape:export-filename="/home/aryeom/Desktop/Projects/GIMP-icon-attach_detach/attach12.png"
-         y="153.29289"
-         x="610.0636"
-         height="12"
-         width="11.989507"
-         id="rect11899-9-8-7"
-         style="display:inline;fill:none;stroke:none;stroke-width:0.749672" />
-    </g>
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path6179"
+       d="m 72.869508,173.7269 h 2.116668 l -1.058365,-1.85208 z"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6181"
+       d="m 72.604926,174.52065 -2.7e-5,0.52917 h 2.645859 v -0.52917 z"
+       style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       inkscape:export-ydpi="95.916092"
+       inkscape:export-xdpi="95.916092"
+       inkscape:export-filename="/home/aryeom/Desktop/Projects/GIMP-icon-attach_detach/attach12.png"
+       y="171.87482"
+       x="72.340324"
+       height="3.175"
+       width="3.175"
+       id="rect11899-9-8-7"
+       style="display:inline;fill:none;stroke:none;stroke-width:0.198437" />
+    <path
+       id="path833"
+       style="fill-rule:evenodd;stroke-width:0.264583px"
+       d="m 73.927734,172.17773 -0.798828,1.39844 h 1.597656 z" />
   </g>
 </svg>
diff --git a/icons/Color/scalable/window-close.svg b/icons/Color/scalable/window-close.svg
index ebaf5898f8..e5aeca6905 100644
--- a/icons/Color/scalable/window-close.svg
+++ b/icons/Color/scalable/window-close.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    viewBox="0 0 16 16"
    id="svg30571"
    version="1.1"
-   inkscape:version="0.92pre1 unknown"
-   sodipodi:docname="gimp-quit.svg">
+   inkscape:version="1.1.2 (1:1.1+202202050942+0a00cf5339)"
+   sodipodi:docname="window-close.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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs30573" />
   <sodipodi:namedview
@@ -24,8 +24,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="-3.1642318"
-     inkscape:cy="5.0676358"
+     inkscape:cx="6.4302523"
+     inkscape:cy="9.6785241"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -45,13 +45,15 @@
      inkscape:snap-center="true"
      inkscape:snap-text-baseline="true"
      showborder="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="1274"
+     inkscape:window-height="1387"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="22"
      inkscape:window-maximized="1"
      inkscape:snap-global="false"
-     showguides="false">
+     showguides="false"
+     inkscape:pagecheckerboard="0"
+     inkscape:lockguides="true">
     <inkscape:grid
        type="xygrid"
        id="grid4237" />
@@ -71,7 +73,6 @@
             <dc:title>Klaus Staedtler       </dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -80,29 +81,23 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.260798;stroke-linecap:round;stroke-linejoin:miter;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"
+       d="m 2.5859362,1037.3622 c -1.4445624,0.039 -2.13161577,1.845 -1.0722656,2.8477 l 4.2148437,4.0859 0.099609,0.098 -0.03125,0.031 -4.296875,4.1836 c -1.51372928,1.5566 0.7480915,3.7811 2.2617188,2.2246 l 4.3964843,-4.1699 4.0878912,4.1992 c 1.556547,1.5137 3.781158,-0.7481 2.224609,-2.2617 l -4.044922,-4.2656 0.03125,-0.031 4.072266,-4.1875 c 0.310975,-0.3108 0.48132,-0.7327 0.470703,-1.168 -0.0388,-1.4446 -1.845003,-2.1316 -2.847656,-1.0722 l -4.0546881,4.1836 -0.1582031,-0.1543 -4.1855469,-4.0723 c -0.3107221,-0.3111 -0.7326993,-0.4811 -1.1679687,-0.4707 z"
+       id="path6388-7-7-4-7" />
     <g
-       id="g4246">
-      <g
-         id="g4239">
-        <g
-           id="g7082"
-           transform="matrix(1.70995,-0.0450243,0.04544797,1.7064456,17.314404,-697.44834)">
-          <path
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26079771;stroke-linecap:round;stroke-linejoin:miter;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"
-             d="M 2.5859375 1 C 1.1413751 1.039061 0.45432169 2.8449876 1.5136719 3.8476562 L 5.7285156 7.9335938 L 5.828125 8.03125 L 5.796875 8.0625 L 1.5 12.246094 C -0.01372932 13.802694 2.2480915 16.027203 3.7617188 14.470703 L 8.1582031 10.300781 L 12.246094 14.5 C 13.802641 16.013652 16.027252 13.751934 14.470703 12.238281 L 10.425781 7.9726562 L 10.457031 7.9414062 L 14.529297 3.7539062 C 14.840272 3.4431063 15.010617 3.0212375 15 2.5859375 C 14.9612 1.1413375 13.154997 0.45427187 12.152344 1.5136719 L 8.0976562 5.6972656 L 7.9394531 5.5429688 L 3.7539062 1.4707031 C 3.4431841 1.1595556 3.0212069 0.98956361 2.5859375 1 z "
-             transform="matrix(0.5844026,0.01541937,-0.01556446,0.58560274,-37.104415,1015.0572)"
-             id="path6388-7-7-4-7" />
-          <g
-             id="g7078" />
-        </g>
-        <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:1;fill-rule:nonzero;stroke:none;stroke-width:0.4848485;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="rect3999"
-           width="16"
-           height="16"
-           x="0"
-           y="1036.3622" />
-      </g>
-    </g>
+       id="g7078"
+       transform="matrix(1.70995,-0.0450243,0.04544797,1.7064456,17.314404,-697.44834)" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.484848;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="rect3999"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622" />
+    <path
+       id="path939"
+       style="baseline-shift:baseline;display:inline;overflow:visible;stroke-width:0.260798;stroke-linecap:round;enable-background:accumulate"
+       d="m 2.5957031,1037.8633 c -1.0292074,0.032 -1.5003708,1.2611 -0.7382812,1.9824 a 0.50005,0.50005 0 0 1 0.00391,0 l 4.2148438,4.0859 a 0.50005,0.50005 0 0 1 0.00586,0.01 l 0.099609,0.1 a 0.50005,0.50005 0 0 1 -0.011719,0.7188 l -0.027344,0.025 -4.2832031,4.1718 c -0.2935856,0.3019 -0.3724667,0.5821 -0.3574219,0.8477 0.015045,0.2655 0.1424229,0.5287 0.34375,0.7265 0.2013272,0.1979 0.4662196,0.3211 0.7285157,0.3301 0.262296,0.01 0.5345702,-0.075 0.828125,-0.3769 a 0.50005,0.50005 0 0 1 0.015625,-0.016 l 4.3964843,-4.168 a 0.50005,0.50005 0 0 1 0.7011719,0.014 l 4.078125,4.1875 c 0.301885,0.2935 0.581789,0.3743 0.847656,0.3593 0.265868,-0.015 0.530495,-0.1445 0.728516,-0.3457 0.198021,-0.2011 0.318987,-0.4646 0.328125,-0.7265 0.0091,-0.262 -0.07312,-0.5346 -0.375,-0.8282 a 0.50005,0.50005 0 0 1 -0.01563,-0.016 l -4.044922,-4.2656 a 0.50005,0.50005 0 0 1 0.0098,-0.6973 l 0.0293,-0.029 4.06836,-4.1836 a 0.50005,0.50005 0 0 1 0.0059,-0.01 c 0.215075,-0.215 0.330936,-0.5044 0.324219,-0.8008 v -0 c -0.02932,-1.0311 -1.262451,-1.503 -1.984375,-0.7402 a 0.50005,0.50005 0 0 1 -0.0039,0 l -4.0546878,4.1836 a 0.50005,0.50005 0 0 1 -0.7089843,0.01 l -0.1582031,-0.1543 -4.1855469,-4.0723 a 0.50005,0.50005 0 0 1 -0.00391,-0 c -0.2151317,-0.2154 -0.5052557,-0.3313 -0.8027344,-0.3242 a 0.50005,0.50005 0 0 1 -0.00195,0 z" />
   </g>
 </svg>