Merge gitlab.com:inkscape/inkscape

31 files changed, 410 insertions, 928 deletions

diff --git a/share/extensions/jessyInk.js b/share/extensions/jessyInk.js
index 74e9c0b9c..d6adaa250 100644
--- a/share/extensions/jessyInk.js
+++ b/share/extensions/jessyInk.js
@@ -2721,3 +2721,7 @@ String.prototype.trim = function()
 	return this.replace(/^\s+|\s+$/g, '');
 }
 
+/** SVGElement.getTransformToElement polyfill */
+SVGElement.prototype.getTransformToElement = SVGElement.prototype.getTransformToElement || function(elem) {
+    return elem.getScreenCTM().inverse().multiply(this.getScreenCTM());
+};
diff --git a/share/icons/color-management.svg b/share/icons/color-management.svg
index 9ba40d525..7d5e91970 100644
--- a/share/icons/color-management.svg
+++ b/share/icons/color-management.svg
@@ -21,8 +21,11 @@
      gridoriginx="0pt"
   />
   <defs id="defs3">
-
+    <clipPath id="cieClip" clipPathUnits="userSpaceOnUse">
+      <path style="fill:none;stroke:#000000;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 8.36,47.76 C 7.751574,47.51528 7.222277,46.90182 6.784323,46.39273 5.608271,45.02566 4.964826,43.30281 4.38,41.63 3.446394,38.95956 2.627116,36.19922 2.114165,33.41042 1.415792,29.6135 0.6129846,25.78424 0.3959804,21.94278 0.2093634,18.63925 -0.036735,15.09899 0.67,11.99 1.021272,10.44473 2.335229,8.406245 3.57,7.98 4.66602,7.601652 6.456945,8.746987 7.698531,9.504755 9.584304,10.65569 11.33779,12.01369 12.9958,13.4917 17.54131,17.54374 21.81301,21.89176 26.1391,26.17398 29.19235,29.19627 32.22777,32.23682 35.27,35.27 26.3,39.43333 17.33,43.59667 8.36,47.76 Z" id="path2430" sodipodi:nodetypes="cssssssssscc" inkscape:connector-curvature="0" />
+    </clipPath>
   </defs>
+
 <g id="color-management" inkscape:label="#color_management" transform="matrix(0.33,0,0,0.33,0,0)">
   <rect height="48" id="rect8860" style="fill:none" width="48" x="0" y="0"/>
   <g id="g8862" transform="matrix(1.125,0,0,1.125,4.5,-7.3125)">
diff --git a/share/icons/draw-ellipse-arc.svg b/share/icons/draw-ellipse-arc.svg
index 9c86aad0a..bc4a99ff2 100644
--- a/share/icons/draw-ellipse-arc.svg
+++ b/share/icons/draw-ellipse-arc.svg
@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="draw-ellipse-arc" inkscape:label="#circle_open_arc" style="fill:none" transform="translate(40)">
-  <rect height="16" id="draw-ellipse-arc-rect" width="16" x="500" y="150"/>
-  <path d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 6,6 0 0 1 2.6382,-7.2483" id="draw-ellipse-arc-arc" sodipodi:arc-type="arc" sodipodi:cx="508" sodipodi:cy="158" sodipodi:end="4.18879" sodipodi:rx="6" sodipodi:ry="6" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5"/>
-</g>
+  <g id="draw-ellipse-arc" inkscape:label="#circle_open_arc">
+    <path d="m 14,8 a 6,6 0 0 1 -4.96,5.91 6,6 0 0 1 -6.68,-3.86 6,6 0 0 1 2.64,-7.25" style="fill:#b0c5da;stroke:blue"/>
+  </g>
 
 </svg>
diff --git a/share/icons/draw-ellipse-chord.svg b/share/icons/draw-ellipse-chord.svg
index 14ff3017f..6c06da965 100644
--- a/share/icons/draw-ellipse-chord.svg
+++ b/share/icons/draw-ellipse-chord.svg
@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="draw-ellipse-chord" inkscape:label="#circle_chord" style="fill:none" transform="translate(60)">
-  <rect height="16" id="draw-ellipse-chord-rect" width="16" x="500" y="150"/>
-  <path d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 6,6 0 0 1 2.6382,-7.2483" id="draw-ellipse-chord-arc" sodipodi:arc-type="chord" sodipodi:cx="508" sodipodi:cy="158" sodipodi:end="4.18879" sodipodi:rx="6" sodipodi:ry="6" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5"/>
+  <g id="draw-ellipse-chord" inkscape:label="#circle_chord">
+    <path d="m 14,8 a 6,6 0 0 1 -4.96,5.91 6,6 0 0 1 -6.68,-3.86 6,6 0 0 1 2.64,-7.25 z" style="fill:#b0c5da;stroke:blue"/>
 </g>
 
 </svg>
diff --git a/share/icons/draw-ellipse-segment.svg b/share/icons/draw-ellipse-segment.svg
index 6e34ecac0..fc98cfec7 100644
--- a/share/icons/draw-ellipse-segment.svg
+++ b/share/icons/draw-ellipse-segment.svg
@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="draw-ellipse-segment" inkscape:label="#circle_closed_arc" style="fill:none" transform="translate(20)">
-  <rect height="16" id="rect4316" width="16" x="500" y="150"/>
-  <path d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 A 6,6 0 0 1 505,152.8038 L 508,158 Z" id="path4318" sodipodi:arc-type="slice" sodipodi:cx="508" sodipodi:cy="158" sodipodi:end="4.18879" sodipodi:rx="6" sodipodi:ry="6" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5"/>
-</g>
+  <g id="draw-ellipse-segment" inkscape:label="#circle_closed_arc">
+    <path d="m 14,8 a 6,6 0 0 1 -4.96,5.91 6,6 0 0 1 -6.68,-3.86 6,6 0 0 1 2.64,-7.25 l 3,5.20 z" style="fill:#b0c5da;stroke:blue"/>
+  </g>
 
 </svg>
diff --git a/share/icons/draw-ellipse-whole.svg b/share/icons/draw-ellipse-whole.svg
index e9621a688..90d96ab2d 100644
--- a/share/icons/draw-ellipse-whole.svg
+++ b/share/icons/draw-ellipse-whole.svg
@@ -1,33 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="draw-ellipse-whole" inkscape:label="#reset_circle" style="fill:none" transform="translate(-500,-150)">
-  <rect height="16" id="rect4298" width="16" x="500" y="150"/>
-  <circle cx="508" cy="158" id="path4888" r="6" style="fill:#b0c5da"/>
-  <path d="M 514,158 508,158 511,153" id="path5285" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" style="color:#000000;stroke:#c80000;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:1, 1"/>
-  <circle cx="508" cy="158" id="path5292" r="6" style="stroke:#0000ff;stroke-miterlimit:1.5"/>
-</g>
+  <g id="draw-ellipse-whole" inkscape:label="#reset_circle">
+    <circle cx="8" cy="8" r="6"  style="fill:#b0c5da"/>
+    <path d="m 14,8 h -6 l 3,-5" style="fill:none;stroke:#c80000;stroke-linejoin:round;stroke-dasharray:1, 1;stroke-dashoffset:0.5"/>
+    <circle cx="8" cy="8" r="6"  style="fill:none;stroke:blue"/>
+  </g>
 
 </svg>
diff --git a/share/icons/draw-geometry-mirror.svg b/share/icons/draw-geometry-mirror.svg
index 25112fa1c..2a991d5c9 100644
--- a/share/icons/draw-geometry-mirror.svg
+++ b/share/icons/draw-geometry-mirror.svg
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="12.485376"
-   height="13.246259"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="draw-geometry-mirror" inkscape:label="mirror_symmetry" transform="rotate(64.5595,754.657,214.7116)">
-  <path d="M 674.8734,92.098 C 680.2873,97.30342 677.4429,84.32937 684.5965,91.3047" id="path4418-8-1-0-1-4-4-8" inkscape:connector-curvature="0" sodipodi:nodetypes="cs" style="fill:none;stroke:#da0000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.7254902"/>
-  <path d="M 673.2681,96.33213 687.9748,93.06472" id="path4418-8-1-0-1-4-4-6-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#5a5a5a;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <path d="M 676.5145,99.48186 C 679.1239,92.43934 681.9149,106.1419 685.614,95.96528" id="path4418-8-1-0-1-4-4-8-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cs" style="fill:none;stroke:#da0000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.7254902"/>
-</g>
+  <g id="draw-geometry-mirror" inkscape:label="#mirror_symmetry">
+    <g style="fill:none;stroke-linecap:round">
+      <path d="m 2,7 c 7,0 -4,6.5 7,6.5" style="stroke:#da0000;stroke-opacity:0.7"/>
+      <path d="m 2,2 12,12"              style="stroke:#5a5a5a"/>
+      <path d="m 7,2 c 0,7 6.5,-4 6.5,7" style="stroke:#da0000;stroke-opacity:0.7"/>
+    </g>
+  </g>
 
 </svg>
diff --git a/share/icons/object-fill.svg b/share/icons/object-fill.svg
index 5ddaedfc9..196c01f7b 100644
--- a/share/icons/object-fill.svg
+++ b/share/icons/object-fill.svg
@@ -1,38 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="12.024595"
-   height="12.000681"
+   width="12"
+   height="12"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="gradientVector">
+      <stop offset="0" style="stop-color:#98b6d3"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(714.9212,-135)" gradientUnits="userSpaceOnUse" id="linearGradient5619" inkscape:collect="always" x1="-29" x2="-40.94155" xlink:href="#linearGradient5740" y1="192.3364" y2="174.9988"/>
+    <linearGradient  id="fillGradient" gradientUnits="userSpaceOnUse" x1="0" x2="12" xlink:href="#gradientVector" y1="0" y2="12"/>
   </defs>
-<g id="object-fill" inkscape:label="#properties_fill" transform="matrix(1,0,0,0.923129,-669.92097,-36.92433)">
-  <g id="g5646" transform="matrix(0.751537,0,0,0.749817,166.4504,10.00731)">
-    <path d="M 669.9999,39.99979 685.8966,39.99881 685.9212,57.33638 669.9212,57.3354 669.9999,39.99979 Z" id="path11232" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" style="color:#000000;fill:url(#linearGradient5619);fill-rule:evenodd;stroke-width:1px"/>
-    <rect height="16" id="rect11240" style="color:#000000;fill:none" width="16" x="669.9212" y="40"/>
+
+  <g id="object-fill" inkscape:label="#properties_fill">
+    <rect width="12" height="12" style="fill:url(#fillGradient)"/>
   </g>
-</g>
 
 </svg>
diff --git a/share/icons/object-stroke-style.svg b/share/icons/object-stroke-style.svg
index b1969b0f7..61297e6f4 100644
--- a/share/icons/object-stroke-style.svg
+++ b/share/icons/object-stroke-style.svg
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="11.999961"
-   height="12.002015"
+   width="12"
+   height="12"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="object-stroke-style" inkscape:label="#properties_stroke" transform="matrix(0.733476,0,0,0.741921,-520.65273,-29.6768)">
-  <path d="M 709.8429,42.69565 722.1132,42.69565 722.1132,39.99995 726.2033,43.36958 722.1132,46.73921 722.1132,44.0435 709.8429,44.0435 709.8429,42.69565 Z" id="rect12874" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <path d="M 710.5245,50.10884 711.8879,50.10884" id="path10529" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1.35559px;stroke-linecap:square"/>
-  <path d="M 718.7054,50.10824 720.0688,50.10824" id="use10533" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1.35559px;stroke-linecap:square"/>
-  <path d="M 718.7054,50.10824 720.0688,50.10824" id="use10535" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1.35559px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-  <path d="M 710.5246,55.4991 725.5246,55.4991" id="path10541" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1.35559px;stroke-linecap:square"/>
-  <path d="M 710.5245,50.10884 711.8879,50.10884" id="use4611" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1.35559px;stroke-linecap:square" transform="matrix(1,0,0,1,0,0)"/>
-</g>
+  <g id="object-stroke-style" inkscape:label="#properties_stroke">
+    <path d="m 0,11.5 12,0" style="fill:none;stroke:black"/>
+    <path d="m 0, 7.5 12,0" style="fill:none;stroke:black;stroke-dasharray:2 1"/>
+    <path d="m 0,2 h 9 v -2 l 3,2.5 -3,2.5 v -2 h -9 z"/>
+  </g>
 
 </svg>
diff --git a/share/icons/object-stroke.svg b/share/icons/object-stroke.svg
index ad43a6a6a..fdf1abaee 100644
--- a/share/icons/object-stroke.svg
+++ b/share/icons/object-stroke.svg
@@ -1,94 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- 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: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"
-   width="3.1810141mm"
-   height="3.1694887mm"
-   viewBox="0 0 3.1810141 3.1694887"
-   version="1.1"
-   id="svg4291"
-   inkscape:version="0.92+devel unknown"
-   sodipodi:docname="object-stroke.svg">
-  <defs
-     id="defs4285">
-    <linearGradient
-       xlink:href="#BlackTransparent"
-       y2="521.09833"
-       x2="36.868641"
-       y1="509.99991"
-       x1="26.00001"
-       gradientTransform="matrix(0.26458333,0,0,0.26458333,-59.874436,-118.46864)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5617"
-       inkscape:collect="always" />
-    <linearGradient
-       id="BlackTransparent"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop12" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop14" />
+   width="12"
+   height="12"
+  >
+
+  <defs>
+
+    <linearGradient id="gradientVector">
+      <stop offset="0" style="stop-color:black;stop-opacity:1"/>
+      <stop offset="1" style="stop-color:black;stop-opacity:0"/>
     </linearGradient>
+    <linearGradient  id="strokeGradient" gradientUnits="userSpaceOnUse" x1="0" x2="12" xlink:href="#gradientVector" y1="0" y2="12"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="17.029075"
-     inkscape:cy="-3.3837381"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4288">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(52.995268,-16.468826)">
-    <rect
-       style="fill:none;stroke:url(#linearGradient5617);stroke-width:0.26458338"
-       id="object-stroke"
-       width="2.9164307"
-       height="2.9049053"
-       x="-52.862976"
-       y="16.601118"
-       inkscape:label="#properties_stroke_paint" />
+
+  <g id="object-stroke" inkscape:label="#properties_stroke">
+    <rect x="0.5" y="0.5" width="11" height="11" style="fill:none;stroke:url(#strokeGradient)"/>
   </g>
+
 </svg>
diff --git a/share/icons/object-tweak-rotate.svg b/share/icons/object-tweak-rotate.svg
index d7b1c4752..20a74d370 100644
--- a/share/icons/object-tweak-rotate.svg
+++ b/share/icons/object-tweak-rotate.svg
@@ -1,54 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="14.268322"
-   height="15.757991"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
+  <defs>
+    <!-- Rectangle centered around (0,0). -->
+    <rect id="TheRect" x="-0.7" y="-1.5" width="1.4" height="3" style="stroke:white;stroke-width:0.4"/>
   </defs>
-<g id="object-tweak-rotate" inkscape:label="#g5082-36" style="fill:#000000" transform="translate(-372.82195,-136.66881)">
-  <rect height="3.036042" id="use5086-1" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5088-9" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5090-9" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5092-7" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5094-1" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5096-08" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5098-0" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5100-2" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5103-7" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5106-2" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5108-6" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5110-65" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5112-8" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5114-5" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5116-6" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5118-0" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5120-1" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5122-0" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5124-4" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5126-7" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5128-0" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,12.10946)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5130-7" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5132-5" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,0,0)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="use5134-1" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" transform="matrix(1,0,0,1,11.81518,12.10946)" width="1.257945" x="373.4724" y="136.9544"/>
-  <rect height="3.036042" id="rect5405" style="color:#000000;stroke:#ffffff;stroke-width:0.3344132" width="1.257945" x="373.4724" y="136.9544"/>
-</g>
+
+  <g id="object-tweak-rotate" inkscape:label="#object_tweak_rotate">
+    <use xlink:href="#TheRect" transform="translate( 1.50,  1.50)"/>
+    <use xlink:href="#TheRect" transform="translate( 1.50,  4.75) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate( 1.50,  8.00) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate( 1.50, 11.25) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate( 1.50, 14.50)"/>
+
+    <use xlink:href="#TheRect" transform="translate( 4.75,  1.50) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate( 4.75,  4.75) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate( 4.75,  8.00) rotate(60)"/>
+    <use xlink:href="#TheRect" transform="translate( 4.75, 11.25) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate( 4.75, 14.50) rotate(10)"/>
+
+    <use xlink:href="#TheRect" transform="translate( 8.00,  1.50) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate( 8.00,  4.75) rotate(60)"/>
+    <use xlink:href="#TheRect" transform="translate( 8.00,  8.00) rotate(90)"/>
+    <use xlink:href="#TheRect" transform="translate( 8.00, 11.25) rotate(60)"/>
+    <use xlink:href="#TheRect" transform="translate( 8.00, 14.50) rotate(20)"/>
+
+    <use xlink:href="#TheRect" transform="translate(11.25,  1.50) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate(11.25,  4.75) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate(11.25,  8.00) rotate(60)"/>
+    <use xlink:href="#TheRect" transform="translate(11.25, 11.25) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate(11.25, 14.50) rotate(10)"/>
+
+    <use xlink:href="#TheRect" transform="translate(14.50,  1.50)"/>
+    <use xlink:href="#TheRect" transform="translate(14.50,  4.75) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate(14.50,  8.00) rotate(20)"/>
+    <use xlink:href="#TheRect" transform="translate(14.50, 11.25) rotate(10)"/>
+    <use xlink:href="#TheRect" transform="translate(14.50, 14.50)"/>
+  </g>
 
 </svg>
diff --git a/share/icons/path-clip-edit.svg b/share/icons/path-clip-edit.svg
index d856597de..e5b9c0710 100644
--- a/share/icons/path-clip-edit.svg
+++ b/share/icons/path-clip-edit.svg
@@ -1,35 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.045805"
+   width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="path-clip-edit" inkscape:label="#g7356" transform="translate(-21)">
-  <path d="M 855,62 C 853,64 850,63.5 847,60.5" id="path4828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1px"/>
-  <path d="M 855,62 C 853,64 850,63.5 847,60.5" id="use4830" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#000000;stroke-width:1px" transform="matrix(0,1,1,0,785.5,-785)"/>
-  <path d="M 842.5,68.5 C 843.3058,62.01571 848.0747,58.5078 853.5,57.5" id="path4813" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#00ff00;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <rect height="16" id="rect4815" style="fill:none" width="16" x="839.9762" y="55.0535"/>
-  <rect height="2.026662" id="use4819" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,885.0318,-128.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-  <rect height="2.026662" id="use4821" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,873.0318,-116.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-</g>
+  <g id="path-clip-edit" inkscape:label="#path_clip_edit">
+    <path d="m 15,6.5 c -2,1.5 -5,1.5 -8,-1.5" style="fill:none;stroke:black"/>
+    <path d="m 6.5,15 c 1.5,-2 1.5,-5 -1.5,-8" style="fill:none;stroke:black"/>
+    <path d="m 2,13 c 1,-5 6,-10 11,-11"       style="fill:none;stroke:lime"/>
+    <circle cx="2" cy="14" r="1" style="fill:none;stroke:blue"/>
+    <circle cx="14" cy="2" r="1" style="fill:none;stroke:blue"/>
+  </g>
 
 </svg>
diff --git a/share/icons/path-effect-parameter-next.svg b/share/icons/path-effect-parameter-next.svg
index 51d31e7e5..5df826ea6 100644
--- a/share/icons/path-effect-parameter-next.svg
+++ b/share/icons/path-effect-parameter-next.svg
@@ -1,47 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.045805"
+   width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5845" inkscape:collect="always" x1="10.19293" x2="12.50002" xlink:href="#linearGradient5704" y1="249.821" y2="255.5"/>
-  </defs>
-<g id="path-effect-parameter-next" inkscape:label="#g10193" transform="translate(15.99998)">
-  <path d="m 761.9292,60.21135 c -1.3234,4.58045 0.575,6.56847 0.863,6.63113 0.6244,0.13585 3.6939,-0.81114 4.2558,-1.49894 -0.7024,-0.7668 -1.5244,-1.24741 -2.6209,-1.99655 -0.9558,-0.653 -2.1687,-1.54649 -2.4979,-3.13564 z m 2.5287,-1.19313 c -0.2505,0.79624 -0.1537,1.6448 0.242,2.34393 0.3352,0.59425 0.8545,1.02916 1.4624,1.31727 0.532,0.2465 1.1266,0.36704 1.7511,0.35988 -1.4671,-0.88543 -2.3354,-1.5733 -2.9025,-2.44951 -0.5203,-0.80386 -0.5573,-1.47454 -0.553,-1.57157 z m 2.7983,-1.0336 c -0.9659,2.04621 0.4165,2.77407 1.734,3.11108 -1.3117,-1.02013 -1.9104,-2.98174 -1.734,-3.11108 z m 3.5258,-2.20259 c -0.584,0.33612 -0.5086,1.38561 -0.778,1.76289 -0.5215,0.7302 -1.0601,0.85177 -0.7801,1.43544 0.3733,0.77825 0.5096,0.37663 1.516,0.47373 0.2938,0.0283 1.2635,0.96792 1.5502,0.91628 -0.9834,-1.54422 -1.5449,-2.97001 -1.5081,-4.58834 z" id="path9858" inkscape:connector-curvature="0" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linejoin:round">
-    <desc id="desc9858">
-inkscape:path-effect="#path-effect9860" striped for faster load
-</desc>
-  </path>
-  <path d="M 762.5,68.5 C 763.3058,62.01571 768.0747,58.5078 773.5,57.5" id="path9256" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#008000;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <rect height="16" id="rect9258" style="fill:none" width="16" x="759.9762" y="55.0535"/>
-  <g id="use9872" transform="matrix(1,0,0,1,760,-189)">
-    <path d="M 15.50002,251.5 15.50002,251.5 15.50002,259.5 15.50002,259.5 15.50002,255.5 9.50002,259.5 9.50002,251.5 15.50002,255.5 15.50002,251.5 Z" id="path3990" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccc" style="color:#000000;fill:#ffd400;fill-rule:evenodd;stroke:url(#linearGradient5845);stroke-width:1.0026059;stroke-linecap:round;stroke-linejoin:round"/>
-    <path d="M 10.43978,257.6603 13.68558,255.4375" id="path4191" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#ffffff;stroke-width:1.0026058px;stroke-linecap:round"/>
+  <g id="path-effect-parameter-next" inkscape:label="#path_effect_parameter_next">
+    <path d="m 2,5.2 c -1.3,4.6 0.6,6.6 0.9,6.6 0.6,0.1 3.7,-0.8 4.3,-1.5 -0.7,-0.8 -1.5,-1.2 -2.6,-2 -1,-0.7 -2.3,-1.5 -2.6,-3.1 z m 2.5,-1.2 c -0.3,0.8 -0.2,1.6 0.2,2.3 0.3,0.6 0.9,1 1.5,1.3 0.5,0.2 1.1,0.4 1.8,0.4 -1.5,-0.9 -2.3,-1.6 -2.9,-2.4 -0.5,-0.8 -0.6,-1.5 -0.6,-1.6 z m 2.8,-1 c -1,2 0.4,2.8 1.8,3.1 -1.3,-1 -1.9,-2.7 -1.8,-3.1 z m 3.5,-2.5 c -0.6,0.3 -0.5,1.1 -0.8,1.5 -0.5,0.7 -1,0.9 -0.8,1.4 0.4,0.8 0.5,0.4 1.5,0.5 0.3,0 1.3,1 1.6,0.9 -1,-1.5 -1.5,-2.7 -1.5,-4.3 z" style="fill:white;stroke:#4d4d4d;stroke-linejoin:round"/>
+    <path d="m 2,13 c 1,-5 6,-10 11,-11"       style="fill:none;stroke:green"/>
+
+    <circle cx="2" cy="14" r="1" style="fill:none;stroke:blue"/>
+    <circle cx="14" cy="2" r="1" style="fill:none;stroke:blue"/>
+
+    <!-- Triangle Arrow -->
+    <path d="m 15.5,7.5 v 0 8 0 -4 l -6,4 v -8 l 6,4 z" style="fill:#ffd400;stroke:#222222;stroke-linecap:round;stroke-linejoin:round"/>
+    <path d="m 10.5,13.6 3.2,-2.125" style="fill:none;stroke:white;stroke-linecap:round"/>
   </g>
-  <rect height="2.026662" id="use10185" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,805.0318,-128.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-  <rect height="2.026662" id="use10187" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,793.0318,-116.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-</g>
 
 </svg>
diff --git a/share/icons/path-mask-edit.svg b/share/icons/path-mask-edit.svg
index 0827d0239..ea1a1de12 100644
--- a/share/icons/path-mask-edit.svg
+++ b/share/icons/path-mask-edit.svg
@@ -1,40 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.045805"
+   width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient gradientUnits="userSpaceOnUse" id="BlackTransparent">
-      <stop id="stop12" offset="0" style="stop-color:black;stop-opacity:1"/>
-      <stop id="stop14" offset="1" style="stop-color:black;stop-opacity:0"/>
+  <defs>
+    <linearGradient id="BlackTransparentVector">
+      <stop offset="0" style="stop-color:black;stop-opacity:1"/>
+      <stop offset="1" style="stop-color:black;stop-opacity:0"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(20)" gradientUnits="userSpaceOnUse" id="linearGradient5824" inkscape:collect="always" x1="872" x2="865.5" xlink:href="#BlackTransparent" y1="66" y2="57.5"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="BlackTransparentStroke" x1="12" x2="3" xlink:href="#BlackTransparentVector" y1="12" y2="3"/>
   </defs>
-<g id="path-mask-edit" inkscape:label="#g7344" transform="translate(-40)">
-  <path d="M 895,62 C 893,64 889,63 885,58" id="use4911" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:url(#linearGradient5824);stroke-width:1px" transform="matrix(0,1,1,0,825.5171,-825.2431)"/>
-  <path d="M 895,62 C 893,64 889,63 885,58" id="path4893" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:url(#linearGradient5824);stroke-width:1px"/>
-  <path d="M 882.5,68.5 C 883.3058,62.01571 888.0747,58.5078 893.5,57.5" id="path4899" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:none;stroke:#0000ff;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <rect height="16" id="rect4901" style="fill:none" width="16" x="879.9762" y="55.0535"/>
-  <rect height="2.026662" id="use4903" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,925.0318,-128.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-  <rect height="2.026662" id="use4905" rx="1.011026" ry="1.011026" style="color:#000000;fill:#ffffff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,913.0318,-116.6983)" width="2.022052" x="-31.53185" y="185.1983"/>
-</g>
+
+  <g id="path-mask-edit" inkscape:label="#path_mask_edit">
+    <path d="m 15,6.5 c -3,2.5 -7,0.5 -11,-4.5" style="fill:none;stroke:url(#BlackTransparentStroke)"/>
+    <path d="m 6.5,15 c 2.5,-3 0.5,-7 -4.5,-11" style="fill:none;stroke:url(#BlackTransparentStroke)"/>
+    <path d="m 2,13 c 1,-5 6,-10 11,-11"       style="fill:none;stroke:blue"/>
+    <circle cx="2" cy="14" r="1" style="fill:none;stroke:blue"/>
+    <circle cx="14" cy="2" r="1" style="fill:none;stroke:blue"/>
+  </g>
 
 </svg>
diff --git a/share/icons/path-reverse.svg b/share/icons/path-reverse.svg
index 36759e297..f56b3c464 100644
--- a/share/icons/path-reverse.svg
+++ b/share/icons/path-reverse.svg
@@ -1,33 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="16"
    height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="path-reverse" inkscape:label="#selection_reverse" transform="translate(-384.5,-149.5)">
-  <path d="M 385,165 C 385,160 387.5,157.5 392.5,157.5 396.5,157.5 400,155 400,150" id="path10967" inkscape:connector-curvature="0" sodipodi:nodetypes="csc" style="fill:none;stroke:#646464;stroke-width:1px;stroke-linecap:round"/>
-  <path d="M 386.5,151.5 393.5,151.5 393.5,149.5 396.5,152 393.5,154.5 393.5,152.5 386.5,152.5 386.5,151.5 Z" id="path10971" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#000000;fill-rule:evenodd"/>
-  <rect height="3.023564" id="use5704" style="color:#000000;fill:#6464ff;fill-opacity:0.3921569;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.0000025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,430.4721,-19.53415)" width="3.009614" x="-178.495" y="-39.5126"/>
-  <path d="M 386.5,151.5 393.5,151.5 393.5,149.5 396.5,152 393.5,154.5 393.5,152.5 386.5,152.5 386.5,151.5 Z" id="use3760" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#000000;fill-rule:evenodd" transform="matrix(1,0,0,1,0,0)"/>
-</g>
+  <g id="path-reverse" inkscape:label="#selection_reverse">
+    <g style="stroke-linecap:round;stroke-linejoin:round">
+      <path d="m 0.5,15.5 c 0,-5 2.5,-7.5 7.5,-7.5 4,0 7.5,-2.5 7.5,-7.5" style="fill:none;stroke:#646464"/>
+      <rect x="6.5" y="6.5" width ="3" height="3" style="fill:#6464ff;fill-opacity:0.4;stroke:blue"/>
+
+      <!-- Arrows -->
+      <path d="m 2,2 h 7 v -2 l 3,2.5 -3,2.5 v -2 h -7 z"/>
+      <path d="m 14,14 h -7 v 2 l -3,-2.5 3,-2.5 v 2 h 7 z"/>
+    </g>
+  </g>
 
 </svg>
diff --git a/share/icons/selection-bottom.svg b/share/icons/selection-bottom.svg
index 917b23a4c..fc98bb37e 100644
--- a/share/icons/selection-bottom.svg
+++ b/share/icons/selection-bottom.svg
@@ -1,47 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.040272"
-   height="16.048326"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient gradientTransform="translate(-8.989043)" gradientUnits="userSpaceOnUse" id="linearGradient5835" inkscape:collect="always" x1="-37.77876" x2="-29.01316" xlink:href="#linearGradient5704" y1="175.9908" y2="175.9908"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(1,0,0,0.957993,-0.0384184,13.49742)" gradientUnits="userSpaceOnUse" id="linearGradient5831" inkscape:collect="always" x1="-47.74164" x2="-24.43123" xlink:href="#linearGradient6684" y1="179.493" y2="179.493"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.963346,-0.0384184,12.50071)" gradientUnits="userSpaceOnUse" id="linearGradient5833" inkscape:collect="always" x1="-44.41746" x2="-29.50463" xlink:href="#linearGradient5704" y1="181.0886" y2="181.0886"/>
-    <linearGradient id="linearGradient6684">
-      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1"/>
-      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffbf00"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill" x1="-3" x2="19" xlink:href="#linearGradientVector" y1="0" y2="0"/>
   </defs>
-<g id="selection-bottom" inkscape:label="#selection_bot" transform="translate(45.04027,-174.95167)">
-  <rect height="16" id="rect6698" style="color:#000000;fill:none" width="16" x="-45" y="175"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7653" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.934884,-0.0391259)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7655" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.9612,2.960874)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7657" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.9612,5.960874)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7659" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.934884,8.960874)"/>
-  <rect height="2.002599" id="use8586" style="color:#000000;fill:url(#linearGradient5831);fill-rule:evenodd;stroke:url(#linearGradient5833);stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,0,2.999993)" width="14.99927" x="-44.54027" y="184.4491"/>
-  <path d="M -31,189.9908 -32,189.9908 -32,181.9908 -34,181.9908 -31.5,178.9908 -29,181.9908 -31,181.9908 -31,189.9908 Z" id="use4704" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#000000;fill-rule:evenodd" transform="matrix(1,0,0,-1,-10,364.9817)"/>
-</g>
+
+<g id="selection-bottom" inkscape:label="#selection_bot">
+    <g style="fill:none;stroke:#222222;stroke-width:2px;stroke-linecap:round">
+      <path d="m 10,1  5,0"/>
+      <path d="m 10,4  5,0"/>
+      <path d="m 10,7  5,0"/>
+      <path d="m 10,10 5,0"/>
+    </g>
+
+    <rect x="0.5" y="12.5" width="15" height="2" style="fill:url(#linearGradientFill);stroke:#222222;stroke-linejoin:round"/>
+
+    <path d="m 4,0 h -1 v 8 h -2 l 2.5,3 2.5,-3 h -2 z"/>
+  </g>
 
 </svg>
diff --git a/share/icons/selection-lower.svg b/share/icons/selection-lower.svg
index 4a71173e1..23eaf6f7c 100644
--- a/share/icons/selection-lower.svg
+++ b/share/icons/selection-lower.svg
@@ -1,48 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.040272"
-   height="16.04832"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient gradientTransform="matrix(1,0,0,0.963346,-0.0384184,12.50071)" gradientUnits="userSpaceOnUse" id="linearGradient5833" inkscape:collect="always" x1="-44.41746" x2="-29.50463" xlink:href="#linearGradient5704" y1="181.0886" y2="181.0886"/>
-    <linearGradient id="linearGradient6684">
-      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1"/>
-      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(1.592997,0,0,1,11.72818,4)" gradientUnits="userSpaceOnUse" id="linearGradient5842" inkscape:collect="always" x1="-37.50076" x2="-29.00001" xlink:href="#linearGradient5704" y1="181.9908" y2="181.9908"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffbf00"/>
+      <stop offset="1" style="stop-color:#ffffff"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-8.989043)" gradientUnits="userSpaceOnUse" id="linearGradient5835" inkscape:collect="always" x1="-37.77876" x2="-29.01316" xlink:href="#linearGradient5704" y1="175.9908" y2="175.9908"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.957993,-0.0384184,13.49742)" gradientUnits="userSpaceOnUse" id="linearGradient5831" inkscape:collect="always" x1="-47.74164" x2="-24.43123" xlink:href="#linearGradient6684" y1="179.493" y2="179.493"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill" x1="-3" x2="19" xlink:href="#linearGradientVector" y1="0" y2="0"/>
   </defs>
-<g id="selection-lower" inkscape:label="#selection_down" transform="translate(45.04027,-174.95168)">
-  <rect height="16" id="rect10501" style="color:#000000;fill:none" width="16" x="-45" y="175"/>
-  <path d="M -42,177.9908 -41,177.9908 -41,178.9908 -42,178.9908 -42,179.9908 -40,179.9908 -42.5,182.9908 -45,179.9908 -43,179.9908 -43,178.9908 -42,177.9908 Z" id="path10505" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" style="fill:#000000;fill-rule:evenodd"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7638" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.934884,-0.0391201)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7641" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.9612,5.96088)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7643" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,8.934884,12.96088)"/>
-  <rect height="2.002599" id="rect8574" style="color:#000000;fill:url(#linearGradient5831);fill-rule:evenodd;stroke:url(#linearGradient5833);stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="14.99927" x="-44.54027" y="184.4491"/>
-  <path d="M -44.00221,185.9908 C -36.06173,185.9908 -36.06173,185.9908 -36.06173,185.9908" id="use8589" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,5.961212,-7.03912)"/>
-</g>
+
+  <g id="selection-lower" inkscape:label="#selection_down">
+    <g style="fill:none;stroke:#222222;stroke-width:2px;stroke-linecap:round">
+      <path d="m 10,1  5,0"/>
+      <path d="m  7,4  8,0"/>
+      <path d="m 10,7  5,0"/>
+      <path d="m 10,14 5,0"/>
+    </g>
+
+    <rect x="0.5" y="9.5" width="15" height="2" style="fill:url(#linearGradientFill);stroke:#222222;stroke-linejoin:round"/>
+
+    <path d="m 3,3 h 1 v 1 h -1 v 1 h 2 l -2.5,3 -2.5,-3 h 2 v -1 z"/>
+  </g>
 
 </svg>
diff --git a/share/icons/selection-raise.svg b/share/icons/selection-raise.svg
index 3589d9fdd..526fbd667 100644
--- a/share/icons/selection-raise.svg
+++ b/share/icons/selection-raise.svg
@@ -1,48 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.01468"
-   height="16.0092"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient gradientTransform="matrix(1.592997,0,0,1,11.72818,4)" gradientUnits="userSpaceOnUse" id="linearGradient5842" inkscape:collect="always" x1="-37.50076" x2="-29.00001" xlink:href="#linearGradient5704" y1="181.9908" y2="181.9908"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.963346,0,6.51247)" gradientUnits="userSpaceOnUse" id="linearGradient5839" inkscape:collect="always" x1="-44.36454" x2="-29.63546" xlink:href="#linearGradient5704" y1="181.5494" y2="181.645"/>
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-8.989043)" gradientUnits="userSpaceOnUse" id="linearGradient5835" inkscape:collect="always" x1="-37.77876" x2="-29.01316" xlink:href="#linearGradient5704" y1="175.9908" y2="175.9908"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.957993,0,7.509185)" gradientUnits="userSpaceOnUse" id="linearGradient5837" inkscape:collect="always" x1="-48.42912" x2="-27.0385" xlink:href="#linearGradient5740" y1="179.493" y2="179.493"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill" x1="-3" x2="19" xlink:href="#linearGradientVector" y1="0" y2="0"/>
   </defs>
-<g id="selection-raise" inkscape:label="#selection_up" transform="translate(45.01468,-174.9908)">
-  <rect height="16" id="rect10473" style="color:#000000;fill:none" width="16" x="-45" y="175"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="path10475" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <rect height="2.002599" id="rect10479" style="color:#000000;fill:url(#linearGradient5837);fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" width="14.99927" x="-44.50185" y="178.4609"/>
-  <path d="M -44.00221,185.9908 C -36.06173,185.9908 -36.06173,185.9908 -36.06173,185.9908" id="path10483" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7634" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,6.97005)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7636" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,12.97005)"/>
-  <path d="M -42,177.9908 -41,177.9908 -41,178.9908 -42,178.9908 -42,179.9908 -40,179.9908 -42.5,182.9908 -45,179.9908 -43,179.9908 -43,178.9908 -42,177.9908 Z" id="use5413" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" style="fill:#000000;fill-rule:evenodd" transform="matrix(1,0,0,1,0,0)"/>
-</g>
+
+  <g id="selection-raise" inkscape:label="#selection_up">
+    <g style="fill:none;stroke:#222222;stroke-width:2px;stroke-linecap:round">
+      <path d="m 1,1  5,0"/>
+      <path d="m 1,8  5,0"/>
+      <path d="m 1,11 8,0"/>
+      <path d="m 1,14 5,0"/>
+    </g>
+    <rect x="0.5" y="3.5" width="15" height="2" style="fill:url(#linearGradientFill);stroke:#222222;stroke-linejoin:round"/>
+
+    <path d="m 13,12 h -1 v -1 h 1 v -1 H 11 L 13.5,7 16,10 h -2 v 1 z"/>
+  </g>
 
 </svg>
diff --git a/share/icons/selection-top.svg b/share/icons/selection-top.svg
index 464dbedf9..3002bf141 100644
--- a/share/icons/selection-top.svg
+++ b/share/icons/selection-top.svg
@@ -1,47 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="16.040269"
-   height="16.041688"
+   width="16"
+   height="16"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientTransform="translate(-8.989043)" gradientUnits="userSpaceOnUse" id="linearGradient5835" inkscape:collect="always" x1="-37.77876" x2="-29.01316" xlink:href="#linearGradient5704" y1="175.9908" y2="175.9908"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.957993,0,7.509185)" gradientUnits="userSpaceOnUse" id="linearGradient5837" inkscape:collect="always" x1="-48.42912" x2="-27.0385" xlink:href="#linearGradient5740" y1="179.493" y2="179.493"/>
-    <linearGradient gradientTransform="matrix(1,0,0,0.963346,0,6.51247)" gradientUnits="userSpaceOnUse" id="linearGradient5839" inkscape:collect="always" x1="-44.36454" x2="-29.63546" xlink:href="#linearGradient5704" y1="181.5494" y2="181.645"/>
-    <linearGradient id="linearGradient5740">
-      <stop id="stop5742" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop5744" offset="1" style="stop-color:#98b6d3;stop-opacity:1"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#98b6d3"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientFill" x1="-3" x2="19" xlink:href="#linearGradientVector" y1="0" y2="0"/>
   </defs>
-<g id="selection-top" inkscape:label="#selection_top" transform="translate(45.04027,-174.95831)">
-  <rect height="16" id="rect10445" style="color:#000000;fill:none" width="16" x="-45" y="175"/>
-  <path d="M -31,189.9908 -32,189.9908 -32,181.9908 -34,181.9908 -31.5,178.9908 -29,181.9908 -31,181.9908 -31,189.9908 Z" id="path10449" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#000000;fill-rule:evenodd"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7645" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,3.97005)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7647" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,6.97005)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7649" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,9.97005)"/>
-  <path d="M -43.97588,175.9908 C -39.0022,175.9908 -39.0022,175.9908 -39.0022,175.9908" id="use7651" inkscape:connector-curvature="0" style="fill:none;stroke:url(#linearGradient5835);stroke-width:1.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0387999,12.97005)"/>
-  <rect height="2.002599" id="use8534" style="color:#000000;fill:url(#linearGradient5837);fill-rule:evenodd;stroke:url(#linearGradient5839);stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" transform="matrix(1,0,0,1,-0.0384184,-3.002595)" width="14.99927" x="-44.50185" y="178.4609"/>
-</g>
+
+  <g id="selection-top" inkscape:label="#selection_top">
+    <g style="fill:none;stroke:#222222;stroke-width:2px;stroke-linecap:round">
+      <path d="m 1,5  5,0"/>
+      <path d="m 1,8  5,0"/>
+      <path d="m 1,11 5,0"/>
+      <path d="m 1,14 5,0"/>
+    </g>
+    <rect x="0.5" y="0.5" width="15" height="2" style="fill:url(#linearGradientFill);stroke:#222222;stroke-linejoin:round"/>
+
+    <path d="m 14,15 h -1 v -8 h -2 l 2.5,-3 2.5,3 h -2 z"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-cap-butt.svg b/share/icons/stroke-cap-butt.svg
index e51ecd565..9b2eb6bae 100644
--- a/share/icons/stroke-cap-butt.svg
+++ b/share/icons/stroke-cap-butt.svg
@@ -1,35 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="stroke-cap-butt" inkscape:label="#cap_butt" transform="translate(-899.5,-158.25)">
-  <rect height="24" id="rect3854" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 903,181.7114 903,167.7887 920,167.7887 920,181.7114" id="path3844" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:#99b6d4;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000001px;stroke-linecap:square"/>
-  <rect height="2" id="use5734" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,1)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5736" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,5)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5738" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,9)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5741" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,13)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-cap-butt" inkscape:label="#cap_butt">
+    <path d="m 3.5,24 0,-14.5 17,0 0,14.5" style="fill:#99b6d4;stroke:black"/>
+    <path d="m 12,24 0,-14" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-cap-round.svg b/share/icons/stroke-cap-round.svg
index 13a456f46..6cfab8638 100644
--- a/share/icons/stroke-cap-round.svg
+++ b/share/icons/stroke-cap-round.svg
@@ -1,35 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
-   height="24.001536"
+   height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="stroke-cap-round" inkscape:label="#cap_round" transform="translate(-899.5,-158.25)">
-  <rect height="24" id="rect3904" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 902.94,181.75 902.98,168.75 C 902.98,162.75 905.48,158.75 911.48,158.75 917.48,158.75 919.98,162.75 920.02,168.75 L 919.98,181.75" id="path3906" inkscape:connector-curvature="0" sodipodi:nodetypes="ccscc" style="fill:#99b6d4;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <rect height="2" id="use5753" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,13)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5755" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,9)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5759" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,5)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5761" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,1)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-cap-round" inkscape:label="#cap_round">
+    <path d="m 3.5,24 0,-14.5 a 8.5,8.5 0 0 1 17,0 l 0,14.5" style="fill:#99b6d4;stroke:black"/>
+    <path d="m 12,24 0,-14" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-cap-square.svg b/share/icons/stroke-cap-square.svg
index 0a19da12f..b8a7d3bae 100644
--- a/share/icons/stroke-cap-square.svg
+++ b/share/icons/stroke-cap-square.svg
@@ -1,35 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
-   height="24.000869"
+   height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="stroke-cap-square" inkscape:label="#cap_square" transform="translate(-899.5,-158.25)">
-  <rect height="24" id="rect3876" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 902.98,181.75 902.94,158.75 919.98,158.75 920.02,181.75" id="path3878" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:#99b6d4;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <rect height="2" id="use5743" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,13)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5746" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,9)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5748" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,5)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5751" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-9.999997,1)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-cap-square" inkscape:label="#cap_square">
+    <path d="m 3.5,24 0,-23.5 17,0 0,23.5" style="fill:#99b6d4;stroke:black"/>
+    <path d="m 12,24 0,-14" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-join-bevel.svg b/share/icons/stroke-join-bevel.svg
index 3756c17cf..2784c7070 100644
--- a/share/icons/stroke-join-bevel.svg
+++ b/share/icons/stroke-join-bevel.svg
@@ -1,39 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="24.000767"
-   height="24.001901"
+   width="24"
+   height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-  </defs>
-<g id="stroke-join-bevel" inkscape:label="#join_bevel" transform="translate(-899.49923,-158.25)">
-  <path d="M 900.04,181.75 900,171.25 912,158.75 923,158.75 923,176.25 917,176.25 917,181.75" id="path3939" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" style="fill:#99b6d4;fill-rule:evenodd"/>
-  <rect height="24" id="rect3918" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 900.04,181.75 900,171.25 912,158.75 923,158.75 M 917,181.75 917,175.75 923,175.75" id="path3920" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <rect height="2" id="use5703" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5705" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5707" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5709" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5711" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,4)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5713" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,8)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5715" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,12)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-join-bevel" inkscape:label="#join_bevel">
+    <!-- Corner exagerated -->
+    <path d="m 0.5,24 0,-13 10.5,-10.5 13,0   0,17 -6.5,0 0,6.5 z" style="fill:#99b6d4"/>
+    <path d="m 0.5,24 0,-13 10.5,-10.5 13,0 m 0,17 -6.5,0 0,6.5  " style="fill:none;stroke:black"/>
+    <path d="m 9,24 0,-15 15,0" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2;stroke-dashoffset:2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-join-miter.svg b/share/icons/stroke-join-miter.svg
index 9f21bd726..89c5071ba 100644
--- a/share/icons/stroke-join-miter.svg
+++ b/share/icons/stroke-join-miter.svg
@@ -1,39 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="24.00087"
-   height="24.000869"
+   width="24"
+   height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="stroke-join-miter" inkscape:label="#join_miter" transform="translate(-899.49913,-158.25)">
-  <path d="M 900.04,181.75 900,158.75 923,158.75 923,176.25 917,176.25 917,181.75" id="path4023" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" style="fill:#99b6d4;fill-rule:evenodd"/>
-  <rect height="24" id="rect4025" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 900.04,181.75 900,158.75 923,158.75 M 917,181.75 917,175.75 923,175.75" id="path4027" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <rect height="2" id="use5673" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5689" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5691" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5693" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5696" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,4)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5698" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,8)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5700" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,12)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-join-miter" inkscape:label="#join_miter">
+    <path d="m 0.5,24 0,-23.5 23.5,0   0,17 -6.5,0 0,6.5 z" style="fill:#99b6d4"/>
+    <path d="m 0.5,24 0,-23.5 23.5,0 m 0,17 -6.5,0 0,6.5  " style="fill:none;stroke:black"/>
+    <path d="m 9,24 0,-15 15,0" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2;stroke-dashoffset:2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/stroke-join-round.svg b/share/icons/stroke-join-round.svg
index c04e578d0..d604d2f0a 100644
--- a/share/icons/stroke-join-round.svg
+++ b/share/icons/stroke-join-round.svg
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
-   height="24.006622"
+   height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="stroke-join-round" inkscape:label="#join_round" transform="translate(-899.5,-158.25)">
-  <path d="M 900.04,181.75 900,178.75 C 900,166.25 907,158.75 919.5,158.75 L 923,158.75 923,176.25 917,176.25 917,181.75" id="path3949" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" style="fill:#99b6d4;fill-rule:evenodd"/>
-  <rect height="24" id="rect3951" style="color:#000000;fill:none;stroke-width:9" width="24" x="899.5" y="158.25"/>
-  <path d="M 900.04,181.75 900,178.75 C 900,166.25 907,158.75 919.5,158.75 L 923,158.75 M 917,181.75 917,175.75 923,175.75" id="path3953" inkscape:connector-curvature="0" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square"/>
-  <rect height="2" id="use5718" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5720" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5722" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5724" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,0,0)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5726" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,4)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5728" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,8)" width="2" x="920.5246" y="167.2491"/>
-  <rect height="2" id="use5731" style="color:#000000;fill:#ffffff;fill-rule:evenodd;stroke-width:9" transform="matrix(1,0,0,1,-12,12)" width="2" x="920.5246" y="167.2491"/>
-</g>
+  <g id="stroke-join-round" inkscape:label="#join_round">
+    <!-- Corner exagerated -->
+    <path d="m 0.5,24 0,-11 a 12.5,12.5 0 0 1 12.5,-12.5 l 11,0   0,17 -6.5,0 0,6.5 z" style="fill:#99b6d4"/>
+    <path d="m 0.5,24 0,-11 a 12.5,12.5 0 0 1 12.5,-12.5 l 11,0 m 0,17 -6.5,0 0,6.5  " style="fill:none;stroke:black"/>
+    <path d="m 9,24 0,-15 15,0" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2;stroke-dashoffset:2"/>
+  </g>
 
 </svg>
diff --git a/share/icons/text_horz_kern.svg b/share/icons/text_horz_kern.svg
index b117ab946..23e6cd18f 100644
--- a/share/icons/text_horz_kern.svg
+++ b/share/icons/text_horz_kern.svg
@@ -1,61 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="27.999998"
-   height="27.99999"
+   width="28"
+   height="28"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
+
   <defs id="defs3">
 
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient id="vectorGradientBlack">
+      <stop offset="0" style="stop-color:#5a5a5a"/>
+      <stop offset="1" style="stop-color:black"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient5859" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient5704" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient12388" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient4698" y1="132.9464" y2="138.5"/>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient12392" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient4698" y1="137.5165" y2="137.4738"/>
-    <radialGradient cx="35.25" cy="142.5244" fx="35.25" fy="142.5244" gradientTransform="matrix(1,0,0,0.153846,0,120.5976)" gradientUnits="userSpaceOnUse" id="radialGradient12390" inkscape:collect="always" r="3.25" xlink:href="#linearGradient4698"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5857" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient5704" y1="132.9464" y2="138.5"/>
-    <linearGradient id="linearGradient4698">
-      <stop id="stop4700-5" offset="0" style="stop-color:#a2d3ff;stop-opacity:1"/>
-      <stop id="stop4702-2" offset="1" style="stop-color:#004c91;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlack" x1="4" x2="8" xlink:href="#vectorGradientBlack" y1="8" y2="16"/>
+
+    <linearGradient id="vectorGradientBlue">
+      <stop offset="0" style="stop-color:#a2d3ff"/>
+      <stop offset="1" style="stop-color:#004c91"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlue" x1="4" x2="8" xlink:href="#vectorGradientBlue" y1="8" y2="16"/>
+
   </defs>
-<g id="text_horz_kern" transform="translate(-1268.47221,-85.4363)">
-  <g id="g7628" transform="translate(0.437484)">
-    <path d="M 1283.273,89.56319 1283.273,110.3093" id="path2219" inkscape:connector-curvature="0" style="color:#000000;fill:none;stroke:#000000;stroke-width:1.1457608;stroke-linecap:square" transform="translate(-1.25,-0.5)"/>
-    <g id="use11389" transform="matrix(0.942859,0,0,0.942859,32.60846,37.50304)">
-      <g id="use11377" transform="matrix(0.725688590088,0,0,0.725688590088,1292.241722076,-35.3386891056)">
-        <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="text2410" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient5857);stroke:#000000"/>
-        <path d="M 33.5,130.5 28,146" id="path5817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#646464;stroke-width:1.0000002px;stroke-linecap:round"/>
-        <path d="M 38,142.5244 32.5,142.5244" id="path5828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.0000002px;stroke-linecap:round"/>
-      </g>
-      <g id="use11379" transform="matrix(0.725676923444,0,0,0.725676923444,1307.090700668,-35.33727048544)">
-        <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="path3815" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient12388);stroke:#000000"/>
-        <path d="M 33.5,130.5 28,146" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#b2dafe;stroke-width:1.0000002px;stroke-linecap:round"/>
-        <path d="M 38,142.5244 32.5,142.5244" id="path3819" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:url(#radialGradient12390);fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient12392);stroke-width:1.0000002px;stroke-linecap:round"/>
-      </g>
+
+  <g id="text_horz_kern">
+
+    <!-- Black Letter -->
+    <g style="stroke-width:0.7px">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlack);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+    </g>
+
+    <!-- Blue Letter -->
+    <g style="stroke-width:0.7px" transform="translate(14,0)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlue);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
     </g>
-  </g>
-  <g id="g7662-8" transform="matrix(0.935775,0,0,0.933333,42.8409,7.095812)">
-    <g id="g6738-8" transform="translate(0.232684,0.559354)"/>
-    <rect height="30" id="rect6736-4" style="fill:none" width="29.92172" x="1309.75" y="83.93627"/>
-  </g>
-</g>
 
+    <g style="fill:none;stroke:black;stroke-width:1.2px">
+      <path d="m 14,2  0,24"/>
+    </g>
+
+  </g>
 </svg>
diff --git a/share/icons/text_letter_spacing.svg b/share/icons/text_letter_spacing.svg
index c0364d0ee..eda5bbab0 100644
--- a/share/icons/text_letter_spacing.svg
+++ b/share/icons/text_letter_spacing.svg
@@ -1,57 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="28.000007"
-   height="27.999999"
+   width="28"
+   height="28"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
+
   <defs id="defs3">
 
-    <linearGradient id="linearGradient4698">
-      <stop id="stop4700-5" offset="0" style="stop-color:#a2d3ff;stop-opacity:1"/>
-      <stop id="stop4702-2" offset="1" style="stop-color:#004c91;stop-opacity:1"/>
+    <linearGradient id="vectorGradientBlack">
+      <stop offset="0" style="stop-color:#5a5a5a"/>
+      <stop offset="1" style="stop-color:black"/>
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient12388" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient4698" y1="132.9464" y2="138.5"/>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient12392" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient4698" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5857" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient5704" y1="132.9464" y2="138.5"/>
-    <radialGradient cx="35.25" cy="142.5244" fx="35.25" fy="142.5244" gradientTransform="matrix(1,0,0,0.153846,0,120.5976)" gradientUnits="userSpaceOnUse" id="radialGradient12390" inkscape:collect="always" r="3.25" xlink:href="#linearGradient4698"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlack" x1="4" x2="8" xlink:href="#vectorGradientBlack" y1="8" y2="16"/>
+
+    <linearGradient id="vectorGradientBlue">
+      <stop offset="0" style="stop-color:#a2d3ff"/>
+      <stop offset="1" style="stop-color:#004c91"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient5859" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient5704" y1="137.5165" y2="137.4738"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlue" x1="4" x2="8" xlink:href="#vectorGradientBlue" y1="8" y2="16"/>
+
   </defs>
-<g id="text_letter_spacing" transform="matrix(0.942859,0,0,0.942859,-1235.40264,-48.07579)">
-  <g id="g7621" transform="matrix(0.992487,0,0,0.989897,10.11498,1.557598)">
-    <rect height="30" id="rect6706" style="fill:none" width="29.92172" x="1310" y="49.93628"/>
-  </g>
-  <g id="g11383" transform="translate(-0.306361)">
-    <g id="use11377" transform="matrix(0.725688590088,0,0,0.725688590088,1292.241722076,-35.3386891056)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="text2410" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient5857);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path5817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#646464;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path5828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+  <g id="text_letter_spacing">
+
+    <!-- Black Letter -->
+    <g style="stroke-width:0.7px">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlack);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#646464;stroke-linecap:round"/>
     </g>
-    <g id="use11379" transform="matrix(0.725676923444,0,0,0.725676923444,1307.090700668,-35.33727048544)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="path3815" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient12388);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#b2dafe;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path3819" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:url(#radialGradient12390);fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient12392);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+    <!-- Blue Letter -->
+    <g style="stroke-width:0.7px" transform="translate(14,0)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlue);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
     </g>
-  </g>
-</g>
 
+  </g>
 </svg>
diff --git a/share/icons/text_line_spacing.svg b/share/icons/text_line_spacing.svg
index b564267d8..381035c16 100644
--- a/share/icons/text_line_spacing.svg
+++ b/share/icons/text_line_spacing.svg
@@ -1,55 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="28"
    height="28"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
+
   <defs id="defs3">
 
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient5859" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient5704" y1="137.5165" y2="137.4738"/>
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient id="vectorGradientBlack">
+      <stop offset="0" style="stop-color:#5a5a5a"/>
+      <stop offset="1" style="stop-color:black"/>
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5857" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient5704" y1="132.9464" y2="138.5"/>
-    <radialGradient cx="35.25" cy="142.5244" fx="35.25" fy="142.5244" gradientTransform="matrix(1,0,0,0.153846,0,120.5976)" gradientUnits="userSpaceOnUse" id="radialGradient12390" inkscape:collect="always" r="3.25" xlink:href="#linearGradient4698"/>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient12392" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient4698" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient12388" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient4698" y1="132.9464" y2="138.5"/>
-    <linearGradient id="linearGradient4698">
-      <stop id="stop4700-5" offset="0" style="stop-color:#a2d3ff;stop-opacity:1"/>
-      <stop id="stop4702-2" offset="1" style="stop-color:#004c91;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlack" x1="4" x2="8" xlink:href="#vectorGradientBlack" y1="8" y2="16"/>
+
+    <linearGradient id="vectorGradientBlue">
+      <stop offset="0" style="stop-color:#a2d3ff"/>
+      <stop offset="1" style="stop-color:#004c91"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlue" x1="4" x2="8" xlink:href="#vectorGradientBlue" y1="8" y2="16"/>
+
   </defs>
-<g id="text_line_spacing" transform="translate(-480.0508118,-321.9877062)">
-  <rect height="28" id="rect6696" style="fill:none" width="28" x="480.0508" y="321.9877"/>
-  <g id="g7600" transform="translate(-787.9306,270.3015)">
-    <g id="use3810" transform="matrix(0.684222,0,0,0.684222,1257.669,-36.0664)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="text2410" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient5857);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path5817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#646464;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path5828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+  <g id="text_line_spacing">
+
+    <!-- Black Letter -->
+    <g style="stroke-width:0.7px" transform="translate(7,-6)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlack);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#646464;stroke-linecap:round"/>
     </g>
-    <g id="g3813" transform="matrix(0.684211,0,0,0.684211,1257.617,-22.11736)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="path3815" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient12388);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#b2dafe;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path3819" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:url(#radialGradient12390);fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient12392);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+    <!-- Blue Letter -->
+    <g style="stroke-width:0.7px" transform="translate(7,8)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlue);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
     </g>
-  </g>
-</g>
 
+  </g>
 </svg>
diff --git a/share/icons/text_rotation.svg b/share/icons/text_rotation.svg
index 8ec02441f..1a8080bf1 100644
--- a/share/icons/text_rotation.svg
+++ b/share/icons/text_rotation.svg
@@ -1,62 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="28.182023"
-   height="27.999996"
+   width="28"
+   height="28"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
+
   <defs id="defs3">
 
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient id="vectorGradientBlack">
+      <stop offset="0" style="stop-color:#5a5a5a"/>
+      <stop offset="1" style="stop-color:black"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient5859" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient5704" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient12392" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient4698" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient12388" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient4698" y1="132.9464" y2="138.5"/>
-    <radialGradient cx="35.25" cy="142.5244" fx="35.25" fy="142.5244" gradientTransform="matrix(1,0,0,0.153846,0,120.5976)" gradientUnits="userSpaceOnUse" id="radialGradient12390" inkscape:collect="always" r="3.25" xlink:href="#linearGradient4698"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5857" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient5704" y1="132.9464" y2="138.5"/>
-    <linearGradient id="linearGradient4698">
-      <stop id="stop4700-5" offset="0" style="stop-color:#a2d3ff;stop-opacity:1"/>
-      <stop id="stop4702-2" offset="1" style="stop-color:#004c91;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlack" x1="4" x2="8" xlink:href="#vectorGradientBlack" y1="8" y2="16"/>
+
+    <linearGradient id="vectorGradientBlue">
+      <stop offset="0" style="stop-color:#a2d3ff"/>
+      <stop offset="1" style="stop-color:#004c91"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlue" x1="4" x2="8" xlink:href="#vectorGradientBlue" y1="8" y2="16"/>
+
   </defs>
-<g id="text_rotation" transform="translate(-1354.42645,-85.64368)">
-  <g id="g7699" transform="matrix(0.935775,0,0,0.933333,88.85183,7.069861)">
-    <g id="g6769" transform="translate(-0.990112,0.559353)"/>
-    <rect height="30" id="rect6775" style="fill:none" width="29.92172" x="1352.59" y="84.18627"/>
-  </g>
-  <g id="g7685" transform="matrix(0.9996731,0,0,1,2.594501,1.121155e-6)">
-    <path d="M 1366.121,88.83886 1366.121,110.0337 M 1378.044,110.0737 1366.419,103.4487" id="path3005" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="color:#000000;fill:none;stroke:#000000;stroke-width:1.1707308;stroke-linecap:square"/>
-    <g id="use11398" transform="matrix(0.684222018361782,0,0,0.684222018361782,1334.62939783486,2.18385792858308)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="text2410" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient5857);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path5817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#646464;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path5828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+  <g id="text_rotation">
+
+    <!-- Black Letter -->
+    <g style="stroke-width:0.7px">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlack);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#646464;stroke-linecap:round"/>
     </g>
-    <g id="use3744" transform="matrix(0.684211,0,0,0.684211,1257.617,-22.11736)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="path3815" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient12388);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#b2dafe;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path3819" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:url(#radialGradient12390);fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient12392);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+    <!-- Blue Letter -->
+    <g style="stroke-width:0.7px" transform="rotate(30,7,46)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlue);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
     </g>
-  </g>
-  <g id="g7641" transform="matrix(0.935775,0,0,0.933333,167.3071,6.369855)">
-    <rect height="30" id="rect15695" style="fill:none" width="29.92172" x="1268.75" y="84.93627"/>
-  </g>
-</g>
 
+    <g style="fill:none;stroke:black;stroke-width:1.2px">
+      <path d="m 14,2  0,24"/>
+      <path d="m 14,20.4 12.1,7"/>
+    </g>
+
+  </g>
 </svg>
diff --git a/share/icons/text_vert_kern.svg b/share/icons/text_vert_kern.svg
index 9868420da..0088ec008 100644
--- a/share/icons/text_vert_kern.svg
+++ b/share/icons/text_vert_kern.svg
@@ -1,58 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="27.999998"
-   height="27.99999"
+   width="28"
+   height="28"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
+
   <defs id="defs3">
 
-    <linearGradient id="linearGradient5704">
-      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1"/>
-      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+    <linearGradient id="vectorGradientBlack">
+      <stop offset="0" style="stop-color:#5a5a5a"/>
+      <stop offset="1" style="stop-color:black"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient5859" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient5704" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientTransform="translate(-1.5,7.5244)" gradientUnits="userSpaceOnUse" id="linearGradient12392" inkscape:collect="always" x1="34.5194" x2="42.18301" xlink:href="#linearGradient4698" y1="137.5165" y2="137.4738"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient12388" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient4698" y1="132.9464" y2="138.5"/>
-    <radialGradient cx="35.25" cy="142.5244" fx="35.25" fy="142.5244" gradientTransform="matrix(1,0,0,0.153846,0,120.5976)" gradientUnits="userSpaceOnUse" id="radialGradient12390" inkscape:collect="always" r="3.25" xlink:href="#linearGradient4698"/>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5857" inkscape:collect="always" x1="31.37247" x2="36.18673" xlink:href="#linearGradient5704" y1="132.9464" y2="138.5"/>
-    <linearGradient id="linearGradient4698">
-      <stop id="stop4700-5" offset="0" style="stop-color:#a2d3ff;stop-opacity:1"/>
-      <stop id="stop4702-2" offset="1" style="stop-color:#004c91;stop-opacity:1"/>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlack" x1="4" x2="8" xlink:href="#vectorGradientBlack" y1="8" y2="16"/>
+
+    <linearGradient id="vectorGradientBlue">
+      <stop offset="0" style="stop-color:#a2d3ff"/>
+      <stop offset="1" style="stop-color:#004c91"/>
     </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradientBlue" x1="4" x2="8" xlink:href="#vectorGradientBlue" y1="8" y2="16"/>
+
   </defs>
-<g id="text_vert_kern" transform="translate(-1311.48375,-85.43628)">
-  <g id="g7662" transform="matrix(0.935775,0,0,0.933333,85.72702,7.095784)">
-    <rect height="30" id="rect6736" style="fill:none" width="29.92172" x="1309.884" y="83.93627"/>
-  </g>
-  <g id="g7648">
-    <path d="M 1324.696,87.52091 1324.696,109.2329 M 1338.079,101.3851 1324.888,101.3851 M 1324.388,105.8851 1311.388,105.8851" id="path2221" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" style="color:#000000;fill:none;stroke:#000000;stroke-width:1.199;stroke-linecap:square" transform="translate(0.755145,1.059354)"/>
-    <g id="use11392" transform="matrix(0.684222018361782,0,0,0.684222018361782,1293.97780783486,5.18385892858308)">
-      <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="text2410" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient5857);stroke:#000000"/>
-      <path d="M 33.5,130.5 28,146" id="path5817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#646464;stroke-width:1.0000002px;stroke-linecap:round"/>
-      <path d="M 38,142.5244 32.5,142.5244" id="path5828" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.0000002px;stroke-linecap:round"/>
+
+  <g id="text_vert_kern">
+
+    <!-- Black Letter -->
+    <g style="stroke-width:0.7px" transform="translate(0,2)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlack);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#646464;stroke-linecap:round"/>
+    </g>
+
+    <!-- Blue Letter -->
+    <g style="stroke-width:0.7px" transform="translate(14,-2)">
+      <path d="m 5.29,7.21 h 3.42 l 4.49,12.29 h -2.8 l -0.66,-1.7 h -5.48 l -0.68,1.7 h -2.738 z m 3.76,8.19 -2.05,-5.79 -2.05,5.79 z" style="fill:url(#linearGradientBlue);stroke:black"/>
+      <path d="m 5.8,7.9 -4,10.9" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
+      <path d="m 9.3,16.1 -4.6,0" style="fill:none;stroke:#b2dafe;stroke-linecap:round"/>
     </g>
-  </g>
-  <g id="use3728" transform="matrix(0.684211,0,0,0.684211,1308.155,0.673039999999997)">
-    <path d="M 33,129.5 38,129.5 44.5,147.5 40.5,147.5 39.5,145 31.5,145 30.5,147.5 26.5,147.5 33,129.5 Z M 38.5,141.5 35.5,133 32.5,141.5 38.5,141.5 Z" id="path3815" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient12388);stroke:#000000"/>
-    <path d="M 33.5,130.5 28,146" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#b2dafe;stroke-width:1.0000002px;stroke-linecap:round"/>
-    <path d="M 38,142.5244 32.5,142.5244" id="path3819" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" style="fill:url(#radialGradient12390);fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient12392);stroke-width:1.0000002px;stroke-linecap:round"/>
-  </g>
-</g>
 
+    <g style="fill:none;stroke:black;stroke-width:1.2px">
+      <path d="m 14,2  0,24"/>
+      <path d="m  0,22.4 14,0"/>
+      <path d="m 14,18.4 14,0"/>
+    </g>
+
+  </g>
 </svg>
diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui
index c9f488b87..1d20b8301 100644
--- a/share/ui/select-toolbar.ui
+++ b/share/ui/select-toolbar.ui
@@ -301,9 +301,7 @@
     <toolitem action='TextRotationAction' />
     <separator />
     <toolitem action='TextWritingModeAction' />
-    <separator />
     <toolitem action='TextOrientationAction' />
-    <separator />
     <toolitem action='TextDirectionAction' />
   </toolbar>