From ee547b56a06cb7ad573bd2f6383790b207e9098f Mon Sep 17 00:00:00 2001
From: cutefishd <cutefishos@foxmail.com>
Date: Thu, 18 Mar 2021 10:13:42 +0800
Subject: [PATCH] New window button icon

---
 config/kwinrc                                 |  3 ++
 .../decoration/images/dark/close_normal.svg   | 36 +++++++++++-------
 .../images/dark/maximize_normal.svg           | 19 ++++++----
 .../images/dark/minimize_normal.svg           | 16 ++++----
 .../decoration/images/dark/restore_normal.svg | 28 +++++++-------
 .../decoration/images/light/close_normal.svg  | 36 +++++++++++-------
 .../images/light/maximize_normal.svg          | 19 ++++++----
 .../images/light/minimize_normal.svg          | 16 ++++----
 .../images/light/restore_normal.svg           | 38 ++++++++++++-------
 9 files changed, 124 insertions(+), 87 deletions(-)

diff --git a/config/kwinrc b/config/kwinrc
index 1cc76d7..a7eb622 100644
--- a/config/kwinrc
+++ b/config/kwinrc
@@ -43,6 +43,9 @@ ShowDesktopMode=0
 ShowTabBox=true
 SwitchingMode=0
 
+[ElectricBorders]
+TopLeft=None
+
 [org.kde.kdecoration2]
 BorderSize=Normal
 ButtonsOnLeft=
diff --git a/plugins/decoration/images/dark/close_normal.svg b/plugins/decoration/images/dark/close_normal.svg
index 0bb6862..e5552e1 100644
--- a/plugins/decoration/images/dark/close_normal.svg
+++ b/plugins/decoration/images/dark/close_normal.svg
@@ -7,7 +7,7 @@
    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"
-   sodipodi:docname="close_normal.svg"
+   sodipodi:docname="close.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -19,18 +19,18 @@
   <sodipodi:namedview
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
-     inkscape:window-maximized="0"
-     inkscape:window-y="234"
-     inkscape:window-x="198"
-     inkscape:window-height="997"
-     inkscape:window-width="1623"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1304"
+     inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="13.467799"
-     inkscape:cx="-28.794643"
-     inkscape:zoom="11.2"
+     inkscape:cy="18.272706"
+     inkscape:cx="9.8768456"
+     inkscape:zoom="22.4"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -76,10 +76,18 @@
        x="0.86407435"
        y="289.91785"
        ry="6.5889685e-06" />
-    <polygon
-       style="fill:#cacbce;fill-opacity:1"
-       transform="matrix(0.39226266,0,0,0.393394,-3.9745689,285.065)"
-       points="24.146,17.063 20.958,20.25 24.146,23.438 24.5,23.792 23.792,24.5 23.438,24.146 20.25,20.958 17.063,24.146 16.708,24.5 16,23.792 16.354,23.438 19.542,20.25 16.354,17.063 16,16.708 16.708,16 17.063,16.354 20.25,19.542 23.438,16.354 23.792,16 24.5,16.708 "
-       id="polygon2562" />
+    <g
+       id="g6"
+       transform="matrix(0.0065117,0,0,0.00651172,2.3017515,291.36422)"
+       style="fill:#CACBCE;fill-opacity:1">
+      <g
+         id="g4"
+         style="fill:#CACBCE;fill-opacity:1">
+        <path
+           d="M 284.286,256.002 506.143,34.144 c 7.811,-7.811 7.811,-20.475 0,-28.285 -7.811,-7.81 -20.475,-7.811 -28.285,0 L 256,227.717 34.143,5.859 c -7.811,-7.811 -20.475,-7.811 -28.285,0 -7.81,7.811 -7.811,20.475 0,28.285 L 227.715,256.001 5.858,477.859 c -7.811,7.811 -7.811,20.475 0,28.285 3.905,3.905 9.024,5.857 14.143,5.857 5.119,0 10.237,-1.952 14.143,-5.857 L 256,284.287 477.857,506.144 c 3.905,3.905 9.024,5.857 14.143,5.857 5.119,0 10.237,-1.952 14.143,-5.857 7.811,-7.811 7.811,-20.475 0,-28.285 z"
+           id="path2-3"
+           style="fill:#CACBCE;fill-opacity:1" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/plugins/decoration/images/dark/maximize_normal.svg b/plugins/decoration/images/dark/maximize_normal.svg
index da4fce2..60fdc15 100644
--- a/plugins/decoration/images/dark/maximize_normal.svg
+++ b/plugins/decoration/images/dark/maximize_normal.svg
@@ -8,7 +8,7 @@
    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"
-   sodipodi:docname="maximize_normal.svg"
+   sodipodi:docname="maximize.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -30,9 +30,9 @@
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="30"
+     inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1277"
+     inkscape:window-height="1304"
      inkscape:window-width="2160"
      units="px"
      showgrid="false"
@@ -86,10 +86,13 @@
        x="-12.230613"
        y="294.87387"
        ry="4.4795979e-06" />
-    <path
-       fill="#CACBCE"
-       d="m 2.3267492,293.77014 v -1.47781 -0.5747 h 0.5911203 2.1017611 0.5911202 v 0.5747 1.47781 0.5747 H 5.0196306 2.9178695 2.3267492 Z m 0.3284001,0.24629 h 2.6272015 v -1.9704 H 2.6551493 Z"
-       id="path4"
-       style="fill:#CACBCE;fill-opacity:1;fill-rule:evenodd;stroke-width:0.3284" />
+    <rect
+       style="opacity:0.9;fill:none;stroke:#CACBCE;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect837"
+       width="3.2839999"
+       height="2.6270001"
+       x="2.32675"
+       y="291.71774"
+       ry="0.45351759" />
   </g>
 </svg>
diff --git a/plugins/decoration/images/dark/minimize_normal.svg b/plugins/decoration/images/dark/minimize_normal.svg
index 15b9119..22f463d 100644
--- a/plugins/decoration/images/dark/minimize_normal.svg
+++ b/plugins/decoration/images/dark/minimize_normal.svg
@@ -7,7 +7,7 @@
    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"
-   sodipodi:docname="minimize_normal.svg"
+   sodipodi:docname="minimize.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -20,17 +20,17 @@
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="30"
+     inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1277"
+     inkscape:window-height="1304"
      inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="16.518502"
-     inkscape:cx="-30.012016"
-     inkscape:zoom="11.2"
+     inkscape:cy="19.593901"
+     inkscape:cx="3.0923684"
+     inkscape:zoom="31.678384"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -70,9 +70,9 @@
        id="4-7" />
     <polygon
        fill="#CACBCE"
-       points="25,19 24.529,19 15.471,19 15,19 15,20 15.471,20 24.529,20 25,20 "
+       points="25,20 25,19 24.529,19 15.471,19 15,19 15,20 15.471,20 24.529,20 "
        id="polygon2"
-       transform="matrix(0.36896569,0,0,0.36896569,-3.4105638,285.8364)"
+       transform="matrix(0.36896569,0,0,0.26458333,-3.4105638,287.87186)"
        style="fill:#CACBCE;fill-opacity:1" />
   </g>
 </svg>
diff --git a/plugins/decoration/images/dark/restore_normal.svg b/plugins/decoration/images/dark/restore_normal.svg
index a107b55..070d900 100644
--- a/plugins/decoration/images/dark/restore_normal.svg
+++ b/plugins/decoration/images/dark/restore_normal.svg
@@ -7,7 +7,7 @@
    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"
-   sodipodi:docname="restore_normal.svg"
+   sodipodi:docname="restore.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -20,17 +20,17 @@
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="30"
+     inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1277"
+     inkscape:window-height="1304"
      inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="13.315454"
-     inkscape:cx="-13.839286"
-     inkscape:zoom="11.2"
+     inkscape:cy="15.002062"
+     inkscape:cx="10.41859"
+     inkscape:zoom="31.678384"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -73,18 +73,18 @@
        inkscape:label="#g3842"
        id="4-75" />
     <g
-       id="g893"
-       transform="translate(-4.3922917,-1.50619)">
+       id="g886"
+       transform="translate(1.4056297,-1.99609)">
       <path
-         d="m 7.2858878,293.50208 c -0.2647268,0 -0.4778461,0.23088 -0.4778461,0.51767 v 1.553 c 0,0.28679 0.2131193,0.51767 0.4778461,0.51767 h 1.6724616 c 0.2647268,0 0.4778461,-0.23088 0.4778461,-0.51767 v -1.553 c 0,-0.28679 -0.2131193,-0.51767 -0.4778461,-0.51767 z m 0,0.51767 h 1.6724616 c 0.1323634,0 0.2389231,0.11544 0.2389231,0.25883 v 1.29417 c 0,0.14339 -0.1065597,0.25883 -0.2389231,0.25883 H 7.2858878 c -0.1323634,0 -0.2389231,-0.11544 -0.2389231,-0.25883 v -1.29417 c 0,-0.14339 0.1065597,-0.25883 0.2389231,-0.25883 z"
-         fill="#cacbce"
+         d="m 1.4879664,293.99198 c -0.2647268,0 -0.4778461,0.23088 -0.4778461,0.51767 v 1.553 c 0,0.28679 0.2131193,0.51767 0.4778461,0.51767 H 3.160428 c 0.2647268,0 0.4778461,-0.23088 0.4778461,-0.51767 v -1.553 c 0,-0.28679 -0.2131193,-0.51767 -0.4778461,-0.51767 z m 0,0.51767 H 3.160428 c 0.1323634,0 0.2389231,0.11544 0.2389231,0.25883 v 1.29417 c 0,0.14339 -0.1065597,0.25883 -0.2389231,0.25883 H 1.4879664 c -0.1323634,0 -0.2389231,-0.11544 -0.2389231,-0.25883 v -1.29417 c 0,-0.14339 0.1065597,-0.25883 0.2389231,-0.25883 z"
+         fill="#CACBCE"
          id="path2"
-         style="fill:#cacbce;fill-opacity:1;stroke-width:0.248679" />
+         style="fill:#CACBCE;fill-opacity:1;stroke-width:0.248679" />
       <path
-         d="m 7.763734,292.98442 c -0.1770587,0 -0.3294749,0.10462 -0.4120468,0.25883 h 1.8455853 c 0.2647267,0 0.4778461,0.23088 0.4778461,0.51767 v 1.29416 0.44639 c 0.1423504,-0.0894 0.2389231,-0.25458 0.2389231,-0.44639 v -1.29416 c 0,-0.43018 -0.3196791,-0.7765 -0.7167692,-0.7765 z"
-         fill="#cacbce"
+         d="m 1.9658126,293.47432 c -0.1770587,0 -0.3294749,0.10462 -0.4120468,0.25883 h 1.8455853 c 0.2647267,0 0.4778461,0.23088 0.4778461,0.51767 v 1.29416 0.44639 c 0.1423504,-0.0894 0.2389231,-0.25458 0.2389231,-0.44639 v -1.29416 c 0,-0.43018 -0.3196791,-0.7765 -0.7167692,-0.7765 z"
+         fill="#CACBCE"
          id="path4-3"
-         style="fill:#cacbce;fill-opacity:1;stroke-width:0.248679" />
+         style="fill:#CACBCE;fill-opacity:1;stroke-width:0.248679" />
     </g>
   </g>
 </svg>
diff --git a/plugins/decoration/images/light/close_normal.svg b/plugins/decoration/images/light/close_normal.svg
index 15be335..489f7e2 100644
--- a/plugins/decoration/images/light/close_normal.svg
+++ b/plugins/decoration/images/light/close_normal.svg
@@ -7,7 +7,7 @@
    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"
-   sodipodi:docname="close_normal.svg"
+   sodipodi:docname="close.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -19,18 +19,18 @@
   <sodipodi:namedview
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
-     inkscape:window-maximized="0"
-     inkscape:window-y="234"
-     inkscape:window-x="198"
-     inkscape:window-height="997"
-     inkscape:window-width="1623"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1304"
+     inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="13.467799"
-     inkscape:cx="-28.794643"
-     inkscape:zoom="11.2"
+     inkscape:cy="18.272706"
+     inkscape:cx="9.8768456"
+     inkscape:zoom="22.4"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -76,10 +76,18 @@
        x="0.86407435"
        y="289.91785"
        ry="6.5889685e-06" />
-    <polygon
-       style="fill:#383838;fill-opacity:1"
-       transform="matrix(0.39226266,0,0,0.393394,-3.9745689,285.065)"
-       points="24.146,17.063 20.958,20.25 24.146,23.438 24.5,23.792 23.792,24.5 23.438,24.146 20.25,20.958 17.063,24.146 16.708,24.5 16,23.792 16.354,23.438 19.542,20.25 16.354,17.063 16,16.708 16.708,16 17.063,16.354 20.25,19.542 23.438,16.354 23.792,16 24.5,16.708 "
-       id="polygon2562" />
+    <g
+       id="g6"
+       transform="matrix(0.0065117,0,0,0.00651172,2.3017515,291.36422)"
+       style="fill:#383838;fill-opacity:1">
+      <g
+         id="g4"
+         style="fill:#383838;fill-opacity:1">
+        <path
+           d="M 284.286,256.002 506.143,34.144 c 7.811,-7.811 7.811,-20.475 0,-28.285 -7.811,-7.81 -20.475,-7.811 -28.285,0 L 256,227.717 34.143,5.859 c -7.811,-7.811 -20.475,-7.811 -28.285,0 -7.81,7.811 -7.811,20.475 0,28.285 L 227.715,256.001 5.858,477.859 c -7.811,7.811 -7.811,20.475 0,28.285 3.905,3.905 9.024,5.857 14.143,5.857 5.119,0 10.237,-1.952 14.143,-5.857 L 256,284.287 477.857,506.144 c 3.905,3.905 9.024,5.857 14.143,5.857 5.119,0 10.237,-1.952 14.143,-5.857 7.811,-7.811 7.811,-20.475 0,-28.285 z"
+           id="path2-3"
+           style="fill:#383838;fill-opacity:1" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/plugins/decoration/images/light/maximize_normal.svg b/plugins/decoration/images/light/maximize_normal.svg
index dc20649..a892d59 100644
--- a/plugins/decoration/images/light/maximize_normal.svg
+++ b/plugins/decoration/images/light/maximize_normal.svg
@@ -8,7 +8,7 @@
    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"
-   sodipodi:docname="maximize_normal.svg"
+   sodipodi:docname="maximize.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -30,9 +30,9 @@
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="30"
+     inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1277"
+     inkscape:window-height="1304"
      inkscape:window-width="2160"
      units="px"
      showgrid="false"
@@ -86,10 +86,13 @@
        x="-12.230613"
        y="294.87387"
        ry="4.4795979e-06" />
-    <path
-       fill="#303030"
-       d="m 2.3267492,293.77014 v -1.47781 -0.5747 h 0.5911203 2.1017611 0.5911202 v 0.5747 1.47781 0.5747 H 5.0196306 2.9178695 2.3267492 Z m 0.3284001,0.24629 h 2.6272015 v -1.9704 H 2.6551493 Z"
-       id="path4"
-       style="fill:#383838;fill-opacity:1;fill-rule:evenodd;stroke-width:0.3284" />
+    <rect
+       style="opacity:0.9;fill:none;stroke:#383838;stroke-width:0.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect837"
+       width="3.2839999"
+       height="2.6270001"
+       x="2.32675"
+       y="291.71774"
+       ry="0.45351759" />
   </g>
 </svg>
diff --git a/plugins/decoration/images/light/minimize_normal.svg b/plugins/decoration/images/light/minimize_normal.svg
index 40d3d59..96da84d 100644
--- a/plugins/decoration/images/light/minimize_normal.svg
+++ b/plugins/decoration/images/light/minimize_normal.svg
@@ -7,7 +7,7 @@
    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"
-   sodipodi:docname="minimize_normal.svg"
+   sodipodi:docname="minimize.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -20,17 +20,17 @@
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="30"
+     inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1277"
+     inkscape:window-height="1304"
      inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="16.518502"
-     inkscape:cx="-30.012016"
-     inkscape:zoom="11.2"
+     inkscape:cy="19.593901"
+     inkscape:cx="3.0923684"
+     inkscape:zoom="31.678384"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -70,9 +70,9 @@
        id="4-7" />
     <polygon
        fill="#303030"
-       points="25,19 24.529,19 15.471,19 15,19 15,20 15.471,20 24.529,20 25,20 "
+       points="25,20 25,19 24.529,19 15.471,19 15,19 15,20 15.471,20 24.529,20 "
        id="polygon2"
-       transform="matrix(0.36896569,0,0,0.36896569,-3.4105638,285.8364)"
+       transform="matrix(0.36896569,0,0,0.26458333,-3.4105638,287.87186)"
        style="fill:#383838;fill-opacity:1" />
   </g>
 </svg>
diff --git a/plugins/decoration/images/light/restore_normal.svg b/plugins/decoration/images/light/restore_normal.svg
index 486d913..4a087cf 100644
--- a/plugins/decoration/images/light/restore_normal.svg
+++ b/plugins/decoration/images/light/restore_normal.svg
@@ -8,7 +8,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="restore_normal.svg"
+   sodipodi:docname="restore.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    id="svg8"
    version="1.1"
@@ -233,22 +233,34 @@
        y1="79"
        x2="248.63158"
        y2="58" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath909">
+      <rect
+         style="opacity:0.9;fill:none;stroke:#383838;stroke-width:0.0270433;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect911"
+         width="2.6010628"
+         height="2.5613754"
+         x="0.94119698"
+         y="289.28452"
+         ry="0.26458332" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      inkscape:document-rotation="0"
      inkscape:pagecheckerboard="false"
-     inkscape:window-maximized="0"
-     inkscape:window-y="308"
-     inkscape:window-x="388"
-     inkscape:window-height="997"
-     inkscape:window-width="1623"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1304"
+     inkscape:window-width="2160"
      units="px"
      showgrid="false"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="13.315454"
-     inkscape:cx="-13.839286"
-     inkscape:zoom="11.2"
+     inkscape:cy="15.002062"
+     inkscape:cx="10.41859"
+     inkscape:zoom="31.678384"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -291,15 +303,15 @@
        inkscape:label="#g3842"
        id="4-75" />
     <g
-       id="g893"
-       transform="translate(9.5961343,-0.11487)">
+       id="g886"
+       transform="translate(1.4056297,-1.99609)">
       <path
-         d="m -6.7025382,292.11076 c -0.2647268,0 -0.4778461,0.23088 -0.4778461,0.51767 v 1.553 c 0,0.28679 0.2131193,0.51767 0.4778461,0.51767 h 1.6724616 c 0.2647268,0 0.4778461,-0.23088 0.4778461,-0.51767 v -1.553 c 0,-0.28679 -0.2131193,-0.51767 -0.4778461,-0.51767 z m 0,0.51767 h 1.6724616 c 0.1323634,0 0.2389231,0.11544 0.2389231,0.25883 v 1.29417 c 0,0.14339 -0.1065597,0.25883 -0.2389231,0.25883 h -1.6724616 c -0.1323634,0 -0.2389231,-0.11544 -0.2389231,-0.25883 v -1.29417 c 0,-0.14339 0.1065597,-0.25883 0.2389231,-0.25883 z"
+         d="m 1.4879664,293.99198 c -0.2647268,0 -0.4778461,0.23088 -0.4778461,0.51767 v 1.553 c 0,0.28679 0.2131193,0.51767 0.4778461,0.51767 H 3.160428 c 0.2647268,0 0.4778461,-0.23088 0.4778461,-0.51767 v -1.553 c 0,-0.28679 -0.2131193,-0.51767 -0.4778461,-0.51767 z m 0,0.51767 H 3.160428 c 0.1323634,0 0.2389231,0.11544 0.2389231,0.25883 v 1.29417 c 0,0.14339 -0.1065597,0.25883 -0.2389231,0.25883 H 1.4879664 c -0.1323634,0 -0.2389231,-0.11544 -0.2389231,-0.25883 v -1.29417 c 0,-0.14339 0.1065597,-0.25883 0.2389231,-0.25883 z"
          fill="#363636"
          id="path2"
          style="fill:#383838;fill-opacity:1;stroke-width:0.248679" />
       <path
-         d="m -6.224692,291.5931 c -0.1770587,0 -0.3294749,0.10462 -0.4120468,0.25883 h 1.8455853 c 0.2647267,0 0.4778461,0.23088 0.4778461,0.51767 v 1.29416 0.44639 c 0.1423504,-0.0894 0.2389231,-0.25458 0.2389231,-0.44639 v -1.29416 c 0,-0.43018 -0.3196791,-0.7765 -0.7167692,-0.7765 z"
+         d="m 1.9658126,293.47432 c -0.1770587,0 -0.3294749,0.10462 -0.4120468,0.25883 h 1.8455853 c 0.2647267,0 0.4778461,0.23088 0.4778461,0.51767 v 1.29416 0.44639 c 0.1423504,-0.0894 0.2389231,-0.25458 0.2389231,-0.44639 v -1.29416 c 0,-0.43018 -0.3196791,-0.7765 -0.7167692,-0.7765 z"
          fill="#363636"
          id="path4-3"
          style="fill:#383838;fill-opacity:1;stroke-width:0.248679" />