From 4099c49ea06d440820fc7652a0699c1b847a9fca Mon Sep 17 00:00:00 2001
From: Jabiertxof <jabier.arraiza@marker.es>
Date: Fri, 21 Jun 2019 18:41:54 +0200
Subject: Refctor of Adam Belis icons to fit new system and fix bug compiling

---
 .../symbolic/actions/color-fill-symbolic.svg       |  18 +-
 .../symbolic/actions/color-gradient-symbolic.svg   | 415 ++++-----------------
 .../symbolic/actions/color-picker-symbolic.svg     | 130 ++-----
 .../actions/dialog-fill-and-stroke-symbolic.svg    | 102 ++---
 .../actions/dialog-path-effects-symbolic.svg       |  14 -
 .../actions/draw-calligraphic-symbolic.svg         | 111 +++---
 .../symbolic/actions/draw-connector-symbolic.svg   | 148 +++-----
 .../symbolic/actions/draw-cuboid-symbolic.svg      | 115 +++---
 .../symbolic/actions/draw-ellipse-symbolic.svg     |  86 ++---
 .../symbolic/actions/draw-eraser-symbolic.svg      |  55 +--
 .../symbolic/actions/draw-freehand-symbolic.svg    | 101 ++---
 .../symbolic/actions/draw-geometry-symbolic.svg    |  76 ++--
 .../symbolic/actions/draw-path-symbolic.svg        | 134 +++----
 .../actions/draw-polygon-star-symbolic.svg         |  89 ++---
 .../symbolic/actions/draw-rectangle-symbolic.svg   |  50 ++-
 .../symbolic/actions/draw-spiral-symbolic.svg      |  85 ++++-
 .../actions/draw-star-outline-symbolic.svg         |  67 ----
 .../symbolic/actions/draw-text-symbolic.svg        |  53 +--
 .../symbolic/actions/mesh-gradient-symbolic.svg    | 378 +++----------------
 .../symbolic/actions/object-group-symbolic.svg     |  15 -
 .../object-ungroup-pop-selection-symbolic.svg      |  35 --
 .../symbolic/actions/object-ungroup-symbolic.svg   | 101 -----
 .../path-effect-parameter-next-symbolic.svg        |  16 -
 .../symbolic/actions/tool-measure-symbolic.svg     | 207 ++++------
 .../symbolic/actions/tool-node-editor-symbolic.svg |  94 ++---
 .../symbolic/actions/tool-pointer-symbolic.svg     |  49 +--
 .../symbolic/actions/tool-spray-symbolic.svg       | 199 ++++------
 .../symbolic/actions/tool-tweak-symbolic.svg       |  78 ++--
 .../nextgen/symbolic/actions/zoom-symbolic.svg     |  82 +++-
 src/ui/dialog/inkscape-preferences.cpp             |   2 +-
 30 files changed, 1080 insertions(+), 2025 deletions(-)
 delete mode 100644 share/icons/nextgen/symbolic/actions/dialog-path-effects-symbolic.svg
 delete mode 100644 share/icons/nextgen/symbolic/actions/draw-star-outline-symbolic.svg
 delete mode 100644 share/icons/nextgen/symbolic/actions/object-group-symbolic.svg
 delete mode 100644 share/icons/nextgen/symbolic/actions/object-ungroup-pop-selection-symbolic.svg
 delete mode 100644 share/icons/nextgen/symbolic/actions/object-ungroup-symbolic.svg
 delete mode 100644 share/icons/nextgen/symbolic/actions/path-effect-parameter-next-symbolic.svg

diff --git a/share/icons/nextgen/symbolic/actions/color-fill-symbolic.svg b/share/icons/nextgen/symbolic/actions/color-fill-symbolic.svg
index 0121d6b0b..244d0064e 100644
--- a/share/icons/nextgen/symbolic/actions/color-fill-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/color-fill-symbolic.svg
@@ -14,14 +14,14 @@
    viewBox="0 0 16 16"
    sodipodi:docname="color-fill-symbolic.svg"
    inkscape:version="1.0alpha2 (2892b301b3, 2019-06-19)">
-  <style id="stylefornonsymbolic">
-     .base {}
-     .success {}
-     .warning {}
-     .error {}
-     .dark {}
+  <style id="s0">
+     .base {  }
+     .success {  }
+     .warning {  }
+     .error {  }
+     .dark {  }
   </style>
-  <style id="highlights"> 
+  <style id="s2"> 
      @import '../../highlights.css'; 
   </style>
   <metadata
@@ -142,9 +142,7 @@
        type="xygrid"
        id="grid" />
   </sodipodi:namedview>
-  <g
-     inkscape:label="gradient icon"
-     id="color-fill">
+  <g id="g0" inkscape:label="color-fill" >
     <path
        id="background"
        d="M 0,0 H 16 V 16 H 0 Z"
diff --git a/share/icons/nextgen/symbolic/actions/color-gradient-symbolic.svg b/share/icons/nextgen/symbolic/actions/color-gradient-symbolic.svg
index ea3c5eb5d..6e16f261b 100644
--- a/share/icons/nextgen/symbolic/actions/color-gradient-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/color-gradient-symbolic.svg
@@ -13,12 +13,17 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="color-gradient-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style id="s0">
+     .base {  }
+     .success {  }
+     .warning {  }
+     .error {  }
+     .dark {  }
+  </style>
+  <style id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -27,147 +32,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs850"><inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="0.1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect962"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="round"
-   line_width="1.3"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2960"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2942"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2933"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2924"
-   effect="join_type" />
-<inkscape:path-effect
-   effect="join_type"
-   id="path-effect2905"
-   is_visible="true"
-   linecap_type="butt"
-   line_width="1"
-   linejoin_type="extrp_arc"
-   miter_limit="100"
-   attempt_force_join="true" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2905-6"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2905-4"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2905-8"
-   effect="join_type" />
-<inkscape:path-effect
-   attempt_force_join="true"
-   miter_limit="100"
-   linejoin_type="extrp_arc"
-   line_width="1"
-   linecap_type="butt"
-   is_visible="true"
-   id="path-effect2905-7"
-   effect="join_type" />
-
-		
-	
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-	
-		
-	
-		
-	<clipPath
-   id="clipPath4797"
-   clipPathUnits="userSpaceOnUse">
-  <path
-     d="m 926.04,649.9 v 23.26 H 949.3 V 649.9 Z m 14.26513,12.68467 c 0.99812,-0.64743 2.21205,-0.84975 3.33156,-0.60696 0.0135,0 0.027,0 0.0405,0.0135 0.82277,0.16187 1.59159,0.56651 2.22554,1.20046 0.17535,0.17533 0.35069,0.37767 0.48557,0.57998 0.0135,0.0135 0.027,0.027 0.027,0.0405 0.51255,0.74185 0.7958,1.61858 0.7958,2.53577 0,0.48557 -0.0809,0.94417 -0.2158,1.38928 -0.0135,0.027 -0.027,0.0539 -0.027,0.0809 -0.2293,0.63394 -0.57999,1.21393 -1.06556,1.6995 -0.48557,0.48557 -1.06556,0.84975 -1.6995,1.06556 -0.027,0.0135 -0.0675,0.027 -0.0944,0.027 -0.43162,0.14838 -0.90371,0.21581 -1.37579,0.21581 -0.93068,0 -1.80741,-0.26977 -2.54926,-0.78231 -0.0135,-0.0135 -0.027,-0.0405 -0.027,-0.0405 -0.21581,-0.13488 -0.40465,-0.29672 -0.59348,-0.48556 -0.60697,-0.62045 -1.0251,-1.38928 -1.21393,-2.22554 v -0.027 c -0.0674,-0.29674 -0.0944,-0.60696 -0.0944,-0.91719 0,-0.86324 0.24279,-1.68602 0.71487,-2.40089 -2.35593,-2.35592 -1.36642,-1.12478 -3.72235,-3.48071 -0.60697,0.39116 -1.29486,0.62046 -2.03671,0.67441 -0.027,0.0135 -0.0405,0.0135 -0.0674,0.0135 -0.10791,0.0135 -0.31023,0.0135 -0.31023,0.0135 -1.133,0 -2.19856,-0.41813 -3.02134,-1.18695 -0.0135,0 -0.0135,-0.0135 -0.027,-0.027 -0.0405,-0.027 -0.0675,-0.0539 -0.10791,-0.0944 -0.83626,-0.83626 -1.28137,-1.90182 -1.30835,-2.99436 -0.0135,-0.0135 -0.0135,-0.0405 0,-0.0539 -0.0405,-1.18696 0.39116,-2.37391 1.29486,-3.27762 0.86324,-0.86324 2.06369,-1.29486 3.25064,-1.28137 h 0.0539 c 1.11952,0.0405 2.21206,0.4586 3.03483,1.28137 0.0405,0.0405 0.0674,0.0674 0.0944,0.10791 0.0135,0.0135 0.027,0.0135 0.027,0.027 0.76882,0.82278 1.18695,1.90183 1.18695,3.02134 0,0.10791 0,0.21581 -0.0135,0.32372 0,0.0135 0,0.0405 -0.0135,0.0539 -0.054,0.74185 -0.28325,1.42974 -0.6879,2.03671 z"
-     class="error"
-     id="path4799"
-     inkscape:connector-curvature="0"
-     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:2.2093"
-     sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc" />
-</clipPath>
-</defs>
+     id="defs850">
+    <clipPath
+       id="clipPath4797"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         d="m 926.04,649.9 v 23.26 H 949.3 V 649.9 Z m 14.26513,12.68467 c 0.99812,-0.64743 2.21205,-0.84975 3.33156,-0.60696 0.0135,0 0.027,0 0.0405,0.0135 0.82277,0.16187 1.59159,0.56651 2.22554,1.20046 0.17535,0.17533 0.35069,0.37767 0.48557,0.57998 0.0135,0.0135 0.027,0.027 0.027,0.0405 0.51255,0.74185 0.7958,1.61858 0.7958,2.53577 0,0.48557 -0.0809,0.94417 -0.2158,1.38928 -0.0135,0.027 -0.027,0.0539 -0.027,0.0809 -0.2293,0.63394 -0.57999,1.21393 -1.06556,1.6995 -0.48557,0.48557 -1.06556,0.84975 -1.6995,1.06556 -0.027,0.0135 -0.0675,0.027 -0.0944,0.027 -0.43162,0.14838 -0.90371,0.21581 -1.37579,0.21581 -0.93068,0 -1.80741,-0.26977 -2.54926,-0.78231 -0.0135,-0.0135 -0.027,-0.0405 -0.027,-0.0405 -0.21581,-0.13488 -0.40465,-0.29672 -0.59348,-0.48556 -0.60697,-0.62045 -1.0251,-1.38928 -1.21393,-2.22554 v -0.027 c -0.0674,-0.29674 -0.0944,-0.60696 -0.0944,-0.91719 0,-0.86324 0.24279,-1.68602 0.71487,-2.40089 -2.35593,-2.35592 -1.36642,-1.12478 -3.72235,-3.48071 -0.60697,0.39116 -1.29486,0.62046 -2.03671,0.67441 -0.027,0.0135 -0.0405,0.0135 -0.0674,0.0135 -0.10791,0.0135 -0.31023,0.0135 -0.31023,0.0135 -1.133,0 -2.19856,-0.41813 -3.02134,-1.18695 -0.0135,0 -0.0135,-0.0135 -0.027,-0.027 -0.0405,-0.027 -0.0675,-0.0539 -0.10791,-0.0944 -0.83626,-0.83626 -1.28137,-1.90182 -1.30835,-2.99436 -0.0135,-0.0135 -0.0135,-0.0405 0,-0.0539 -0.0405,-1.18696 0.39116,-2.37391 1.29486,-3.27762 0.86324,-0.86324 2.06369,-1.29486 3.25064,-1.28137 h 0.0539 c 1.11952,0.0405 2.21206,0.4586 3.03483,1.28137 0.0405,0.0405 0.0674,0.0674 0.0944,0.10791 0.0135,0.0135 0.027,0.0135 0.027,0.027 0.76882,0.82278 1.18695,1.90183 1.18695,3.02134 0,0.10791 0,0.21581 -0.0135,0.32372 0,0.0135 0,0.0405 -0.0135,0.0539 -0.054,0.74185 -0.28325,1.42974 -0.6879,2.03671 z"
+         class="error"
+         id="path4799"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc" />
+    </clipPath>
+  </defs>
   <sodipodi:namedview
      inkscape:snap-others="false"
      inkscape:snap-global="true"
@@ -176,283 +57,115 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="11.313709"
-     inkscape:cx="5.8263994"
-     inkscape:cy="6.084594"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="22.4"
+     inkscape:cx="-0.14620562"
+     inkscape:cy="11.420108"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid" />
-    <style
-       id="style862">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
   </sodipodi:namedview>
-  <g
-     inkscape:label="old gradient"
-     inkscape:highlight-color="7077887"
-     id="g4956">
+    <g id="g0" inkscape:label="color-gradient" >
     <path
-       sodipodi:nodetypes="cccccccccccsccsccsccscccccsccccccccsccsccsccsccsccccccc"
-       style="display:inline;stroke-width:2.2093"
        inkscape:connector-curvature="0"
-       id="path4672"
-       class="error"
-       d="m 926.04,649.9 v 23.26 H 949.3 V 649.9 Z m 12.42,11.43 1.67,1.67 0.02,0.02 0.66,0.66 c 0.74,-0.48 1.64,-0.63 2.47,-0.45 0.01,0 0.02,0 0.03,0.01 0.61,0.12 1.18,0.42 1.65,0.89 0.13,0.13 0.26,0.28 0.36,0.43 0.01,0.01 0.02,0.02 0.02,0.03 0.38,0.55 0.59,1.2 0.59,1.88 0,0.36 -0.06,0.7 -0.16,1.03 -0.01,0.02 -0.02,0.04 -0.02,0.06 -0.17,0.47 -0.43,0.9 -0.79,1.26 -0.36,0.36 -0.79,0.63 -1.26,0.79 -0.02,0.01 -0.05,0.02 -0.07,0.02 -0.32,0.11 -0.67,0.16 -1.02,0.16 -0.69,0 -1.34,-0.2 -1.89,-0.58 -0.01,-0.01 -0.02,-0.03 -0.02,-0.03 -0.16,-0.1 -0.3,-0.22 -0.44,-0.36 -0.45,-0.46 -0.76,-1.03 -0.9,-1.65 v -0.02 c -0.05,-0.22 -0.07,-0.45 -0.07,-0.68 0,-0.64 0.18,-1.25 0.53,-1.78 l -0.67,-0.67 -0.02,-0.02 -1.67,-1.67 -0.02,-0.02 -2.86,-2.86 c -0.45,0.29 -0.96,0.46 -1.51,0.5 -0.02,0.01 -0.03,0.01 -0.05,0.01 -0.08,0.01 -0.23,0.01 -0.23,0.01 -0.84,0 -1.63,-0.31 -2.24,-0.88 -0.01,0 -0.01,-0.01 -0.02,-0.02 -0.03,-0.02 -0.05,-0.04 -0.08,-0.07 -0.62,-0.62 -0.95,-1.41 -0.97,-2.22 -0.01,-0.01 -0.01,-0.03 0,-0.04 -0.03,-0.88 0.29,-1.76 0.96,-2.43 0.64,-0.64 1.53,-0.96 2.41,-0.95 h 0.04 c 0.83,0.03 1.64,0.34 2.25,0.95 0.03,0.03 0.05,0.05 0.07,0.08 0.01,0.01 0.02,0.01 0.02,0.02 0.57,0.61 0.88,1.41 0.88,2.24 0,0.08 0,0.16 -0.01,0.24 0,0.01 0,0.03 -0.01,0.04 -0.04,0.55 -0.21,1.06 -0.51,1.51 l 1.17,1.18 0.02,0.01 1.67,1.68 z"
-       inkscape:label="bg back up" />
-    <g
-       inkscape:groupmode="layer"
-       style="display:inline;stroke-width:2.2093"
-       id="gradient">
-	<polygon
-   id="polygon4508"
-   points="949.3,670.74 949.3,673.16 946.87,673.16 "
-   style="opacity:1;stroke-width:2.2093;stop-opacity:1" />
-
-	<polygon
-   id="polygon4512"
-   points="943.49,673.16 949.3,667.36 949.3,670.77 946.9,673.16 "
-   style="opacity:0.92;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4516"
-   d="m 949.3,663.97 v 3.42 l -5.77,5.77 h -3.43 l 3.53,-3.53 c 0.02,0 0.05,-0.01 0.07,-0.02 0.47,-0.16 0.9,-0.43 1.26,-0.79 0.36,-0.36 0.62,-0.79 0.79,-1.26 0,-0.02 0.01,-0.04 0.02,-0.06 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.88;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4520"
-   d="m 943.7,669.61 -3.56,3.55 h -3.42 l 3.98,-3.98 c 0,0 0.01,0.02 0.02,0.03 0.55,0.38 1.2,0.58 1.89,0.58 0.35,0 0.7,-0.05 1.02,-0.16 0.02,0 0.05,-0.01 0.07,-0.02 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.8;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4522"
-   d="m 949.3,660.59 v 3.42 l -3.55,3.55 c 0,-0.02 0.01,-0.04 0.02,-0.06 0.1,-0.33 0.16,-0.67 0.16,-1.03 0,-0.68 -0.21,-1.33 -0.59,-1.88 0,-0.01 -0.01,-0.02 -0.02,-0.03 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.8;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4526"
-   d="m 940.72,669.21 -3.95,3.95 h -3.43 l 6.02,-6.01 c 0,0.01 0,0.02 0,0.02 0.14,0.62 0.45,1.19 0.9,1.65 0.14,0.14 0.28,0.26 0.44,0.36 0,0 0.01,0.02 0.02,0.03 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.72;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4528"
-   d="m 949.3,657.22 v 3.41 l -3.96,3.96 c 0,-0.01 -0.01,-0.02 -0.02,-0.03 -0.1,-0.15 -0.23,-0.3 -0.36,-0.43 -0.47,-0.47 -1.04,-0.77 -1.65,-0.89 -0.01,-0.01 -0.02,-0.01 -0.03,-0.01 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.72;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4532"
-   d="m 939.29,666.47 c 0,0.23 0.02,0.46 0.07,0.68 0,0.01 0,0.02 0,0.02 l -5.99,5.99 h -3.41 l 9.17,-9.16 0.02,0.02 0.67,0.67 c -0.35,0.53 -0.53,1.14 -0.53,1.78 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.64;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4534"
-   d="m 949.3,653.84 v 3.41 l -5.99,5.99 c -0.01,-0.01 -0.02,-0.01 -0.03,-0.01 -0.83,-0.18 -1.73,-0.03 -2.47,0.45 l -0.66,-0.66 -0.02,-0.02 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.64;stroke-width:2.2093;stop-opacity:1" />
-
-	<polygon
-   id="polygon4538"
-   points="939.15,664.02 930,673.16 926.58,673.16 937.44,662.31 937.46,662.33 939.13,664 "
-   style="opacity:0.56;stroke-width:2.2093;stop-opacity:1" />
-<polygon
-   id="polygon4540"
-   points="949.3,650.46 949.3,653.87 940.15,663.02 940.13,663 938.46,661.33 938.44,661.31 "
-   style="opacity:0.56;stroke-width:2.2093;stop-opacity:1" />
-
-	<polygon
-   id="polygon4544"
-   points="937.46,662.33 926.62,673.16 926.04,673.16 926.04,670.33 935.75,660.62 937.44,662.31 "
-   style="opacity:0.48;stroke-width:2.2093;stop-opacity:1" />
-<polygon
-   id="polygon4546"
-   points="949.3,650.49 938.46,661.33 938.44,661.31 936.77,659.63 936.75,659.62 946.47,649.9 949.3,649.9 "
-   style="opacity:0.48;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4550"
-   d="m 935.77,660.64 -9.73,9.72 v -3.43 l 6.98,-6.97 c 0.02,0 0.03,0 0.05,-0.01 0.55,-0.04 1.06,-0.21 1.51,-0.5 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.4;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4552"
-   d="m 946.5,649.9 -9.73,9.73 -0.02,-0.01 -1.17,-1.18 c 0.3,-0.45 0.47,-0.96 0.51,-1.51 0.01,-0.01 0.01,-0.03 0.01,-0.04 l 6.99,-6.99 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.4;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4556"
-   d="m 933.07,659.95 -7.03,7.03 v -3.42 l 4.49,-4.49 c 0.01,0.01 0.01,0.02 0.02,0.02 0.61,0.57 1.4,0.88 2.24,0.88 0.08,0 0.15,0 0.23,-0.01 0.02,0 0.03,0 0.05,-0.01 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.32;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4558"
-   d="m 936.1,656.89 c 0.01,-0.08 0.01,-0.16 0.01,-0.24 0,-0.83 -0.31,-1.63 -0.88,-2.24 0,-0.01 -0.01,-0.01 -0.02,-0.02 l 4.49,-4.49 h 3.42 l -7.03,7.03 c 0.01,-0.01 0.01,-0.03 0.01,-0.04 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.32;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4562"
-   d="m 930.55,659.09 -4.51,4.51 v -3.43 l 3.44,-3.43 c -0.01,0.01 -0.01,0.03 0,0.04 0.02,0.81 0.35,1.6 0.97,2.22 0.03,0.03 0.05,0.05 0.08,0.07 0.01,0.01 0.01,0.02 0.02,0.02 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.24;stroke-width:2.2093;stop-opacity:1" />
-<path
-   id="path4564"
-   d="m 939.74,649.9 -4.51,4.51 c 0,-0.01 -0.01,-0.01 -0.02,-0.02 -0.02,-0.03 -0.04,-0.05 -0.07,-0.08 -0.61,-0.61 -1.42,-0.92 -2.25,-0.95 h -0.04 l 3.47,-3.46 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.24;stroke-width:2.2093;stop-opacity:1" />
-
-	<path
-   id="path4568"
-   d="m 936.36,649.9 -3.47,3.46 h -0.04 c -0.88,-0.01 -1.77,0.31 -2.41,0.95 -0.67,0.67 -0.99,1.55 -0.96,2.43 -0.01,0.01 -0.01,0.03 0,0.04 l -3.44,3.43 v -3.41 l 6.9,-6.9 z"
-   inkscape:connector-curvature="0"
-   style="opacity:0.16;stroke-width:2.2093;stop-opacity:1" />
-
-	<polygon
-   id="polygon4572"
-   points="926.04,653.42 929.55,649.9 932.98,649.9 926.04,656.83 "
-   style="opacity:0.0958466;stroke-width:2.2093;stop-opacity:1" />
-
-</g>
-  </g>
-  <g
-     inkscape:label="gradient icon"
-     style="display:inline"
-     inkscape:groupmode="layer"
-     id="g960">
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <!--Add this to all icons at dirst place and do not change the id or style-->
     <path
        sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc"
-       style="display:inline;opacity:1;stroke-width:0.999999;stop-opacity:1"
        inkscape:connector-curvature="0"
        id="bg"
        class="error"
        d="M 2.72231,2.72231 V 13.25053 H 13.25052 V 2.72231 Z M 9.17916,8.4638 c 0.45178,-0.29305 1.00124,-0.38463 1.50797,-0.27473 0.006,0 0.0122,0 0.0183,0.006 0.37241,0.0733 0.72041,0.25642 1.00735,0.54336 0.0794,0.0794 0.15873,0.17094 0.21979,0.26252 0.006,0.006 0.0122,0.0122 0.0122,0.0183 0.23199,0.33579 0.3602,0.73262 0.3602,1.14777 0,0.21979 -0.0366,0.42736 -0.0977,0.62883 -0.006,0.0122 -0.0122,0.0244 -0.0122,0.0366 -0.10379,0.28694 -0.26252,0.54947 -0.48231,0.76925 -0.21978,0.21978 -0.48231,0.38462 -0.76925,0.48231 -0.0122,0.006 -0.0305,0.0122 -0.0427,0.0122 -0.19536,0.0672 -0.40904,0.0977 -0.62272,0.0977 -0.42126,0 -0.81809,-0.1221 -1.15388,-0.3541 -0.006,-0.006 -0.0122,-0.0183 -0.0122,-0.0183 C 9.01431,11.76041 8.92885,11.6872 8.84338,11.60172 8.56865,11.32089 8.37939,10.97289 8.29392,10.59437 v -0.0122 c -0.0305,-0.13431 -0.0427,-0.27473 -0.0427,-0.41515 0,-0.39073 0.1099,-0.76314 0.32357,-1.08671 C 7.50843,8.01394 7.95631,8.57119 6.88994,7.50483 6.61521,7.68188 6.30385,7.78567 5.96806,7.81009 c -0.0122,0.006 -0.0183,0.006 -0.0305,0.006 -0.0488,0.006 -0.14042,0.006 -0.14042,0.006 -0.51283,0 -0.99513,-0.18926 -1.36755,-0.53725 -0.006,0 -0.006,-0.006 -0.0122,-0.0122 C 4.39909,7.26044 4.38689,7.24824 4.36859,7.22994 3.99007,6.85141 3.7886,6.36911 3.77639,5.87459 c -0.006,-0.006 -0.006,-0.0183 0,-0.0244 C 3.75809,5.31294 3.95344,4.77569 4.36248,4.36664 4.75321,3.97591 5.29657,3.78054 5.83382,3.78665 h 0.0244 c 0.50673,0.0183 1.00125,0.20758 1.37366,0.57999 0.0183,0.0183 0.0305,0.0305 0.0427,0.0488 0.006,0.006 0.0122,0.006 0.0122,0.0122 0.34799,0.37242 0.53725,0.86083 0.53725,1.36756 0,0.0488 0,0.0977 -0.006,0.14652 0,0.006 0,0.0183 -0.006,0.0244 C 7.78763,6.3019 7.68382,6.61326 7.50066,6.888 Z" />
-    <g
-       sodipodi:insensitive="true"
-       style="opacity:1;stroke-width:2.2093;stop-opacity:1"
-       id="frame"
-       transform="matrix(0.4526317,0,0,0.4526317,-416.43275,-291.44303)">
-	<g
-   style="stroke-width:2.2093"
-   id="g4581">
-		<g
-   style="stroke-width:2.2093"
-   id="g4579">
-			<path
-   sodipodi:nodetypes="sssssssssccccc"
-   style="stroke-width:2.2093"
-   inkscape:connector-curvature="0"
-   d="m 951.86,645.98 h -28.32 c -0.78,0 -1.42,0.64 -1.42,1.42 v 28.33 c 0,0.78 0.64,1.41 1.42,1.41 h 28.32 c 0.78,0 1.42,-0.63 1.42,-1.41 V 647.4 c 0,-0.78 -0.64,-1.42 -1.42,-1.42 z m -0.90439,28.84581 h -26.51122 v -26.52162 h 26.51122 z"
-   id="path4577" />
-
-		</g>
-
-	</g>
-
-</g>
-    <circle
-       sodipodi:insensitive="true"
-       style="display:inline;opacity:1;stroke-width:0.999999;stop-opacity:1"
+    <path
+       class="base"
+       id="path4577"
+       d="M 14.40926,0.94799557 H 1.5907302 c -0.3530527,0 -0.642737,0.28968433 -0.642737,0.64273703 V 14.413789 c 0,0.353052 0.2896843,0.63821 0.642737,0.63821 H 14.40926 c 0.353053,0 0.642737,-0.285158 0.642737,-0.63821 V 1.5907326 c 0,-0.3530527 -0.289684,-0.64273703 -0.642737,-0.64273703 z M 13.999904,14.004524 H 2.0000858 V 1.9999976 H 13.999904 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssssccccc" />
+    <path
        id="start"
-       class="error"
-       cx="5.777585"
-       cy="5.7730641"
-       r="1" />
-    <circle
-       sodipodi:insensitive="true"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1"
+       d="m 6.777585,5.7730641 a 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1 1,1 0 0 1 1,1"
+       class="error" />
+    <path
+       class="base"
        id="end"
-       cx="10.222409"
-       cy="10.222404"
-       r="1" />
+       d="m 11.222409,10.222404 a 1,1 0 0 1 -1,1 1,1 0 0 1 -0.9999998,-1 1,1 0 0 1 0.9999998,-1.0000005 1,1 0 0 1 1,1.0000005" />
     <g
        inkscape:label="new gradeint"
-       clip-path="url(#clipPath4797)"
-       style="display:inline;opacity:1;stroke-width:2.2093;stop-opacity:1"
        id="g4791"
-       transform="matrix(0.4526317,0,0,0.4526317,-416.43275,-291.44303)">
+       transform="matrix(0.4526317,0,0,0.4526317,-416.43275,-291.44303)"
+       clip-path="url(#clipPath4797)">
       <rect
+         class="base"
          transform="rotate(45)"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0;"
          id="rect4807"
          width="5.0813942"
          height="37.68837"
          x="1113.2285"
          y="-215.56923" />
       <rect
+         class="base"
          transform="rotate(45)"
-         style="opacity:0.14;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0.14"
          id="rect4809"
          width="5.0813942"
          height="37.68837"
          x="1118.3229"
          y="-215.56923" />
       <rect
+         class="base "
          transform="rotate(45)"
-         style="opacity:0.24;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0.24"
          id="rect4811"
          width="5.0813942"
          height="37.68837"
          x="1123.4172"
          y="-215.56923" />
       <rect
+         class="base"
          transform="rotate(45)"
-         style="opacity:0.36;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0.36"
          id="rect4813"
          width="5.0813942"
          height="37.68837"
          x="1128.5116"
          y="-215.56923" />
       <rect
+         class="base"
          transform="rotate(45)"
-         style="opacity:0.537906;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0.537906"
          id="rect4815"
          width="5.0813942"
          height="37.68837"
          x="1133.606"
          y="-215.56923" />
       <rect
+         class="base"
          transform="rotate(45)"
-         style="opacity:0.703971;fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round"
+         style="opacity:0.703971"
          id="rect4817"
          width="5.0813942"
          height="37.68837"
          x="1138.7003"
          y="-215.56923" />
       <rect
+         class="base"
          transform="rotate(45)"
          y="-215.76451"
          x="1142.8401"
          height="37.68837"
          width="5.1918592"
          id="rect4803"
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:25.0504;stroke-linecap:round;stroke-linejoin:round" />
+         style="fill-opacity:1" />
     </g>
   </g>
-  <style
-     type="text/css"
-     id="style4505">
-	.st0{fill:#00B5FF;}
-	.st1{opacity:0.9231;}
-	.st2{opacity:0.8462;}
-	.st3{opacity:0.7692;}
-	.st4{opacity:0.6923;}
-	.st5{opacity:0.6154;}
-	.st6{opacity:0.5385;}
-	.st7{opacity:0.4615;}
-	.st8{opacity:0.3846;}
-	.st9{opacity:0.3077;}
-	.st10{opacity:0.2308;}
-	.st11{opacity:0.1538;}
-	.st12{opacity:0.0769;}
-</style>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/color-picker-symbolic.svg b/share/icons/nextgen/symbolic/actions/color-picker-symbolic.svg
index 05ec38343..f66cb8ad4 100644
--- a/share/icons/nextgen/symbolic/actions/color-picker-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/color-picker-symbolic.svg
@@ -13,12 +13,17 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="color-picker-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style id="s0">
+     .base {  }
+     .success {  }
+     .warning {  }
+     .error {  }
+     .dark {  }
+  </style>
+  <style id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -42,87 +47,6 @@
        is_visible="true"
        id="path-effect962"
        effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="1.3"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2960"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2942"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2933"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2924"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-6"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-4"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-8"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-7"
-       effect="join_type" />
   </defs>
   <sodipodi:namedview
      objecttolerance="10"
@@ -131,42 +55,40 @@
      id="namedview"
      showgrid="true"
      inkscape:zoom="31.678384"
-     inkscape:cx="-0.51008009"
+     inkscape:cx="12.006341"
      inkscape:cy="11.064379"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g960"
+     inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid" />
-    <style
-       id="style862">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
   </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="g960"
-     inkscape:label="color-picker">
+  <g inkscape:label="color-picker" id="g0">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <!--Add this to all icons at dirst place and do not change the id or style-->
     <path
+       class="base"
        inkscape:connector-curvature="0"
        id="path1170"
        d="M 13.223375,7.5828855 15.279988,5.526272 c 0.621035,-0.6210342 0.621035,-1.6335901 0,-2.2546242 v 0 c -0.621033,-0.6210344 -1.633591,-0.6210344 -2.254624,0 L 10.96875,5.3282611 10.037199,4.3967097 8.169595,6.2643128 12.282822,10.377541 14.150426,8.5099366 Z"
-       style="stroke-width:0.999997"
        inkscape:label="top" />
     <path
+       class="base"
        transform="matrix(1.1655157,0,0,1.1655157,-2.8688821,-0.66245096)"
        inkscape:original-d="m 5.5479517,13.40286 c -0.4633398,-0.46334 -0.4633398,-1.216267 0,-1.679607 L 10.397575,6.8736297 12.077182,8.5532364 7.2275584,13.40286 c -0.4633398,0.46334 -1.2162669,0.46334 -1.6796067,0 z"
        inkscape:path-effect="#path-effect962"
        inkscape:connector-curvature="0"
        id="path1168"
        d="M 5.9015051,12.076806 10.751128,7.2271831 a 0.5,0.5 0 0 0 -0.707106,0 l 1.679607,1.6796067 a 0.5,0.5 0 0 0 0,-0.7071068 l -4.8496241,4.849624 c -0.2658471,0.265847 -0.7066526,0.265847 -0.9724997,0 -0.2658473,-0.265848 -0.2658473,-0.706653 -1e-7,-0.972501 z M 7.5811118,13.756413 12.784289,8.5532364 10.397575,6.166523 5.1943982,11.3697 c -0.6608323,0.660832 -0.6608323,1.725881 0,2.386713 0.6608325,0.660833 1.7258812,0.660833 2.3867136,0 z"
-       class="st5"
        inkscape:label="bottom" />
     <path
        inkscape:connector-curvature="0"
diff --git a/share/icons/nextgen/symbolic/actions/dialog-fill-and-stroke-symbolic.svg b/share/icons/nextgen/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
index b868aeaa4..5d9d39505 100644
--- a/share/icons/nextgen/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
@@ -7,13 +7,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
-   sodipodi:docname="dialog-fill-and-stroke-symbolic.svg"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16"
+   version="1.1"
    id="svg1"
-   version="1.1">
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="dialog-fill-and-stroke-symbolic.svg"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
   <metadata
      id="metadata1160">
     <rdf:RDF>
@@ -26,59 +26,71 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <style id="s0">
+     .base {  }
+     .success {  }
+     .warning {  }
+     .error {  }
+     .dark {  }
+  </style>
+  <style id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <defs
      id="defs1158" />
   <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:current-layer="g3298"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="11.95595"
-     inkscape:cx="6.6159845"
-     inkscape:zoom="15.839192"
-     showgrid="true"
-     id="namedview"
-     guidetolerance="10"
+     objecttolerance="10"
      gridtolerance="10"
-     objecttolerance="10">
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="31.678384"
+     inkscape:cx="16.65179"
+     inkscape:cy="11.615726"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1"
+     inkscape:document-rotation="0">
     <inkscape:grid
-       id="grid"
-       type="xygrid" />
+       type="xygrid"
+       id="grid" />
   </sodipodi:namedview>
   <g
-     inkscape:label="brush"
-     style="stroke-width:2.19015"
-     transform="matrix(0.45658996,0,0,0.45658996,-420.29501,-121.35173)"
-     id="g3298">
+     id="g0"
+     inkscape:label="dialog-fill-and-stroke">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <!--Add this to all icons at dirst place and do not change the id or style-->
     <path
        inkscape:connector-curvature="0"
-       inkscape:label="tip"
-       style="opacity:1;fill:#008000"
+       id="path3292"
+       d="M 5.384614,12.785273 C 4.9111683,15.112517 1.9793067,15.483291 0,15.061183 1.8367031,14.599147 2.024933,11.370682 4.2323932,11.638763 Z"
        class="error"
-       d="m 932.83066,295.03582 c -1.08342,5.3256 -7.79261,6.17407 -12.322,5.20813 4.20306,-1.05731 4.6338,-8.44524 9.68529,-7.83177 z"
-       id="path3292" />
+       inkscape:label="tip" />
     <path
-       inkscape:label="mid"
-       id="polygon3296"
-       style="stroke-width:2.19016"
-       d="m 934.5749,286.10306 -2.14023,4.4357 2.48189,2.48189 4.43571,-2.1402 z"
+       sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 6.1468328,8.881729 5.2115696,10.820094 6.2961354,11.90466 8.2345047,10.96941 Z"
+       id="polygon3296"
+       inkscape:label="mid"
+       class="base" />
     <path
-       inkscape:label="top"
-       style="stroke-width:2.19015"
-       d="m 955.20167,271.54051 -13.80825,17.12157 -4.80348,-4.80344 16.82348,-14.0933 c 0.49604,-0.43074 1.24002,-0.3916 1.70991,0.0654 v 0 c 0.45683,0.46992 0.49604,1.21391 0.0784,1.70992 z"
-       id="path3290"
+       class="base"
+       sodipodi:nodetypes="cccccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path3290"
+       d="M 15.160564,2.5180128 9.1264707,10 7.0273889,7.9009357 14.379113,1.7422779 c 0.216766,-0.1882299 0.541879,-0.171126 0.747217,0.028579 v 0 c 0.199631,0.2053512 0.216765,0.5304688 0.03426,0.7472212 z"
+       inkscape:label="top" />
     <path
-       inkscape:connector-curvature="0"
-       transform="matrix(2.1901489,0,0,2.1901489,920.50866,265.77836)"
-       d="M 0,0 V 1 13 H 1 V 1 H 12 V 0 H 1 Z"
-       style="opacity:1;fill:#008000"
-       id="rect44369" />
+       class="base"
+       id="rect44369"
+       d="M 0,0 V 0.9570773 12.442005 H 0.95707778 V 0.9570773 H 11.484929 V 0 H 0.95707778 Z"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/dialog-path-effects-symbolic.svg b/share/icons/nextgen/symbolic/actions/dialog-path-effects-symbolic.svg
deleted file mode 100644
index 73cdbfb44..000000000
--- a/share/icons/nextgen/symbolic/actions/dialog-path-effects-symbolic.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="dialog-path-effects-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="translate(-165,-887.36218)" id="dialog-path-effects" inkscape:label="00389">
-      <path inkscape:connector-curvature="0" id="rect6476" d="m 165,887.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="path3123" style="opacity:1" d="m 178.4301,889.3087 c -5.5785,1.0362 -10.5734,4.7355 -11.4063,11.4375 a 0.50389111,0.50389111 0 1 0 1,0.125 c 0.7787,-6.2666 5.3216,-9.5832 10.5938,-10.5625 a 0.50871314,0.50871314 0 1 0 -0.1875,-1 z"/>
-      <path inkscape:connector-curvature="0" id="circle3125" d="m 180.0625,889.86218 a 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0 0 1 1.5,1.5 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="circle3127" d="m 169.0625,900.86218 a 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0 0 1 1.5,1.5 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="path3129" d="m 167.983,891.5712 c -1.2435,1.8693 -1.2766,4.2067 0.2444,5.615 1.4792,0.8068 2.9545,0.6486 4.7753,-0.9867 -3.248,0.4264 -4.9899,-1.103 -5.0197,-4.6283 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="path3131" style="opacity:1" d="m 173.9234,888.4745 c -1.5099,0.9137 -2.2988,2.505 -1.6614,3.9183 0.8042,0.9889 1.9214,1.3157 3.7716,0.7325 -2.4852,-0.6659 -3.2426,-2.2272 -2.1102,-4.6508 z"/>
-    </g>
-  </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-calligraphic-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-calligraphic-symbolic.svg
index 102911b33..c45b69717 100644
--- a/share/icons/nextgen/symbolic/actions/draw-calligraphic-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-calligraphic-symbolic.svg
@@ -7,13 +7,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
-   sodipodi:docname="draw-calligraphic-symbolic.svg"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16"
+   version="1.1"
    id="svg1"
-   version="1.1">
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="draw-calligraphic-symbolic.svg"
+   inkscape:version="1.0">
   <metadata
      id="metadata1160">
     <rdf:RDF>
@@ -26,61 +26,78 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <defs
      id="defs1158" />
   <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:current-layer="g3298"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="29.137275"
-     inkscape:cx="27.301568"
-     inkscape:zoom="15.839192"
-     showgrid="true"
-     id="namedview"
-     guidetolerance="10"
+     inkscape:snap-global="false"
+     objecttolerance="10"
      gridtolerance="10"
-     objecttolerance="10">
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="7.919596"
+     inkscape:cx="13.453635"
+     inkscape:cy="31.420339"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1"
+     inkscape:document-rotation="0">
     <inkscape:grid
-       id="grid"
-       type="xygrid" />
+       type="xygrid"
+       id="grid" />
   </sodipodi:namedview>
   <g
-     inkscape:label="brush"
-     style="stroke-width:2.19015"
-     transform="matrix(0.45658996,0,0,0.45658996,-420.29501,-121.35173)"
-     id="g3298">
+     id="g0"
+     inkscape:label="draw-calligraphic">
     <path
-       inkscape:label="tip"
-       style="opacity:1;fill:#008000"
-       class="success"
-       d="m 932.83066,295.03582 c -1.08342,5.3256 -7.79261,6.17407 -12.322,5.20813 4.20306,-1.05731 4.6338,-8.44524 9.68529,-7.83177 z"
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       inkscape:connector-curvature="0"
        id="path3292"
-       inkscape:connector-curvature="0" />
+       d="M 5.8671104,12.456846 C 5.4166091,14.671305 2.6268334,15.024111 0.74344921,14.62246 2.4911408,14.182815 2.6702485,11.11081 4.7707292,11.365899 Z"
+       class="success"
+       inkscape:label="tip"
+       style="stroke-width:0.415814" />
     <path
-       inkscape:label="mid"
-       id="polygon3296"
-       style="stroke-width:2.19016"
-       d="m 934.5749,286.10306 -2.14023,4.4357 2.48189,2.48189 4.43571,-2.1402 z"
+       class="base"
+       sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 6.59239,8.742478 5.7024522,10.586905 6.734457,11.61891 8.5788877,10.728984 Z"
+       id="polygon3296"
+       inkscape:label="mid"
+       style="stroke-width:0.415814" />
     <path
-       inkscape:label="top"
-       style="stroke-width:2.19015"
-       d="m 955.20167,271.54051 -13.80825,17.12157 -4.80348,-4.80344 16.82348,-14.0933 c 0.49604,-0.43074 1.24002,-0.3916 1.70991,0.0654 v 0 c 0.45683,0.46992 0.49604,1.21391 0.0784,1.70992 z"
-       id="path3290"
+       class="base"
+       sodipodi:nodetypes="cccccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path3290"
+       d="m 15.169291,2.6871646 -5.7416643,7.11939 -1.9973547,-1.997338 6.99544,-5.8601927 c 0.20626,-0.1791078 0.515618,-0.1628328 0.711004,0.027194 v 0 c 0.189957,0.1953994 0.206261,0.5047609 0.0326,0.7110088 z"
+       inkscape:label="top"
+       style="stroke-width:0.415814" />
     <path
-       inkscape:label="swush"
-       style="fill:#008000"
-       class="success"
-       d="m 925.64168,266.83983 c 12.64107,0.51969 11.82604,17.09086 1.46056,16.24039 -5.17733,-0.42479 -4.40344,4.59963 -4.40344,4.59963 -3.12819,-2.46332 -1.65601,-9.12079 4.17454,-8.63249 7.31435,0.61256 5.64011,-11.02709 -1.23166,-12.20753 z"
-       id="path3294"
+       sodipodi:nodetypes="cscsc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscsc" />
+       id="path3294"
+       d="M 2.8778312,0.73255557 C 8.1341662,0.94864999 7.7952653,7.839176 3.4851527,7.4855386 1.3323459,7.3089049 1.6541403,9.3981295 1.6541403,9.3981295 0.3533948,8.3738464 0.96554799,5.6055766 3.3899728,5.8086186 6.4313826,6.0633296 5.73521,1.2233992 2.8778312,0.73255557 Z"
+       class="success"
+       inkscape:label="swush"
+       style="stroke-width:0.415814" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-connector-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-connector-symbolic.svg
index 0fa8bf1b1..b777b4826 100644
--- a/share/icons/nextgen/symbolic/actions/draw-connector-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-connector-symbolic.svg
@@ -13,7 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="draw-connector-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1676">
     <rdf:RDF>
@@ -45,51 +56,6 @@
        is_visible="true"
        id="path-effect2329"
        effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="0.52104402"
-       linecap_type="round"
-       is_visible="true"
-       id="path-effect2320"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2301"
-       is_visible="true"
-       linecap_type="round"
-       line_width="0.52104402"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="0.52104402"
-       linecap_type="round"
-       is_visible="true"
-       id="path-effect2301-5"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="0.52104402"
-       linecap_type="round"
-       is_visible="true"
-       id="path-effect2301-9"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2329-6"
-       is_visible="true"
-       linecap_type="round"
-       line_width="0.52104402"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
   </defs>
   <sodipodi:namedview
      objecttolerance="10"
@@ -97,13 +63,13 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="22.4"
-     inkscape:cx="14.557794"
-     inkscape:cy="8.6440811"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="15.839192"
+     inkscape:cx="9.5439392"
+     inkscape:cy="9.8027341"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
@@ -111,42 +77,42 @@
        type="xygrid"
        id="grid" />
   </sodipodi:namedview>
-  <rect
-     style="opacity:1;stroke-width:0.521044;stop-opacity:1"
-     x="1"
-     y="10.425233"
-     width="4.8509212"
-     height="4.5747671"
-     id="rect1026" />
-  <rect
-     style="opacity:0.5;stroke-width:0.521044;stop-opacity:1"
-     x="8.9610987"
-     y="7.0661168"
-     class="st1"
-     width="6.0389013"
-     height="3.9338832"
-     id="rect1028" />
-  <rect
-     style="opacity:1;stroke-width:0.521044;stop-opacity:1"
-     x="0.9999975"
-     y="1.0000019"
-     width="4.1162486"
-     height="3.1106334"
-     id="rect1030" />
-  <path
-     id="line1036"
-     style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none;stroke-width:0.5;stop-opacity:1"
-     d="m 6.6632775,3.6066198 3.054903,2.0845255 A 0.5,0.5 0 1 0 10.281819,4.8651241 L 7.2269165,2.7805986 a 0.5,0.5 0 1 0 -0.563639,0.8260212 z"
-     inkscape:path-effect="#path-effect2329"
-     inkscape:original-d="M 6.945097,3.1936092 10,5.2781347"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     id="line2346"
-     style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none;stroke-width:0.5;stop-opacity:1"
-     d="M 2.5,5.2602893 V 9 a 0.5,0.5 0 1 0 1,0 V 5.2602893 a 0.5,0.5 0 1 0 -1,0 z"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc"
-     inkscape:original-d="M 3,5.2602893 V 9"
-     inkscape:path-effect="#path-effect2376" />
+  <g
+     inkscape:label="draw-connector"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       class="base"
+       d="M 1,10.425233 H 5.8509212 V 15 H 1 Z"
+       id="rect1026" />
+    <path
+       class="base"
+       d="M 8.9610987,7.0661168 H 15 V 11 H 8.9610987 Z"
+       style="opacity:0.5"
+       id="rect1028" />
+    <path
+       class="base"
+       d="M 0.9999975,1.0000019 H 5.1162461 V 4.1106353 H 0.9999975 Z"
+       id="rect1030" />
+    <path
+       class="base"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       inkscape:original-d="M 6.945097,3.1936092 10,5.2781347"
+       inkscape:path-effect="#path-effect2329"
+       d="m 6.6632775,3.6066198 3.054903,2.0845255 A 0.5,0.5 0 1 0 10.281819,4.8651241 L 7.2269165,2.7805986 a 0.5,0.5 0 1 0 -0.563639,0.8260212 z"
+       id="line1036" />
+    <path
+       class="base"
+       inkscape:path-effect="#path-effect2376"
+       inkscape:original-d="M 3,5.2602893 V 9"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       d="M 2.5,5.2602893 V 9 a 0.5,0.5 0 1 0 1,0 V 5.2602893 a 0.5,0.5 0 1 0 -1,0 z"
+       id="line2346" />
+  </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-cuboid-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-cuboid-symbolic.svg
index 3fec3f418..b9927c2e0 100644
--- a/share/icons/nextgen/symbolic/actions/draw-cuboid-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-cuboid-symbolic.svg
@@ -7,7 +7,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-cuboid-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
@@ -25,6 +25,17 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <defs
      id="defs1280">
     <inkscape:path-effect
@@ -36,63 +47,18 @@
        is_visible="true"
        id="path-effect979"
        effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect961"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect946"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect947"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1.83758"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect945"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1.83758"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect943"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1.83758"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
   </defs>
   <sodipodi:namedview
      inkscape:document-rotation="0"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="30.703057"
-     inkscape:cx="2.0681753"
-     inkscape:zoom="11.2"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="10.823388"
+     inkscape:cx="6.7490701"
+     inkscape:zoom="31.678384"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -104,31 +70,36 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="plates">
-    <polygon
+     id="g0"
+     inkscape:label="draw-cuboid">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       id="polygon1116"
+       style="opacity:0.4"
        inkscape:label="right"
-       style="display:inline;opacity:0.4;fill:#ff00ff;stroke-width:1.10829;stop-opacity:1"
-       class="warning"
        transform="matrix(0.49102052,0,0,0.49102052,-473.83817,-187.11363)"
-       id="polygon1116"
-       points="993.53,404.59 981.3,411.68 981.3,397.37 993.53,390.27 " />
-    <polygon
+       d="m 993.53,404.59 -12.23,7.09 v -14.31 l 12.23,-7.1 z"
+       class="warning" />
+    <path
+       id="polygon1118"
+       style="opacity:1"
        inkscape:label="left"
-       class="warning"
-       style="display:inline;opacity:1;fill:#ff00ff;stroke-width:1.10829;stop-opacity:1"
        transform="matrix(0.49102052,0,0,0.49102052,-473.83817,-187.11363)"
-       points="969.08,390.27 969.08,404.59 981.3,411.68 981.3,397.37 "
-       id="polygon1118" />
-    <polygon
+       d="m 969.08,390.27 v 14.32 l 12.22,7.09 v -14.31 z"
+       class="warning" />
+    <path
+       id="polygon1122"
+       style="opacity:0.2"
        inkscape:label="top"
-       class="warning"
-       style="display:inline;opacity:0.2;fill:#ff00ff;stroke-width:1.10829;stop-opacity:1"
        transform="matrix(0.49102052,0,0,0.49102052,-473.83817,-187.11363)"
-       id="polygon1122"
-       points="981.3,397.37 969.08,390.27 981.3,383.18 993.53,390.27 " />
+       d="m 981.3,397.37 -12.22,-7.1 12.22,-7.09 12.23,7.09 z"
+       class="warning" />
     <path
+       class="base"
        inkscape:label="outline"
        inkscape:original-d="M 8.0002664,8.0031909 14.005452,4.5169495 8.0002708,1.0356139 2,4.5169495 v 7.0314135 l 6.0002708,3.481335 6.0051812,-3.481335 V 4.5169495 L 8.0002664,8.0031909 2,4.5169495 8.0002708,8.0031952 v 7.0265028"
        inkscape:path-effect="#path-effect979"
diff --git a/share/icons/nextgen/symbolic/actions/draw-ellipse-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-ellipse-symbolic.svg
index 6074b0a5e..f1ba6bdfe 100644
--- a/share/icons/nextgen/symbolic/actions/draw-ellipse-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-ellipse-symbolic.svg
@@ -13,7 +13,7 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="draw-ellipse-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
   <metadata
      id="metadata1213">
     <rdf:RDF>
@@ -26,20 +26,22 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <defs
      id="defs1211">
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="2"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect951"
-       effect="join_type" />
     <inkscape:path-effect
        effect="join_type"
-       id="path-effect942"
+       id="path-effect950"
        is_visible="true"
        linecap_type="butt"
        line_width="2.5"
@@ -48,25 +50,10 @@
        attempt_force_join="true" />
     <inkscape:path-effect
        effect="join_type"
-       id="path-effect1229"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="clone_original"
-       linkeditem="#path1215"
-       method="d"
-       allow_transforms="true"
-       id="path-effect1225" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect1217"
+       id="path-effect942"
        is_visible="true"
        linecap_type="butt"
-       line_width="2.26772"
+       line_width="2.5"
        linejoin_type="extrp_arc"
        miter_limit="100"
        attempt_force_join="true" />
@@ -78,40 +65,43 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="22.4"
-     inkscape:cx="12.148845"
-     inkscape:cy="12.337385"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="14.555687"
+     inkscape:cx="2.1272764"
+     inkscape:cy="7.0793571"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="draw-ellipse"
-     inkscape:document-rotation="0">
+     inkscape:current-layer="svg1"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false">
     <inkscape:grid
        type="xygrid"
        id="grid" />
   </sodipodi:namedview>
   <g
-     style="stroke-width:1.70079;stroke-miterlimit:4;stroke-dasharray:none"
-     transform="matrix(0.666667,0,0,0.666667,-190,-434.24145)"
-     id="draw-ellipse"
-     inkscape:label="00129">
+     inkscape:label="draw-ellipse"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
     <path
-       transform="matrix(1.1290353,0,0,1.1290353,-38.323478,-85.597121)"
        sodipodi:nodetypes="sssss"
        inkscape:connector-curvature="0"
-       d="m 296.99985,672.66181 c -5.13625,0 -9.3,-4.16374 -9.3,-9.29999 0,-5.13625 4.16375,-9.3 9.3,-9.3 5.13625,0 9.29999,4.16375 9.29999,9.3 0,5.13624 -4.16375,9.29999 -9.29999,9.29999 z"
-       style="display:inline;fill:#ff00ff;fill-rule:nonzero;stroke:none;stroke-width:2.65714;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7.9999957,13.598599 c -3.092032,0 -5.598617,-2.506578 -5.598617,-5.5986123 0,-3.0920333 2.506585,-5.5986179 5.598617,-5.5986179 3.0920313,0 5.5986113,2.5065846 5.5986113,5.5986179 0,3.0920283 -2.506585,5.5986123 -5.5986113,5.5986123 z"
        id="path949"
        class="warning" />
     <path
+       class="base"
        id="path1215"
-       style="display:inline;fill:#000000;fill-rule:nonzero;stroke:none;stroke-width:1.70079;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 288.94985,663.36182 c 0,-4.43959 3.61041,-8.05 8.05,-8.05 4.43959,0 8.04999,3.61041 8.04999,8.05 0,4.43958 -3.61041,8.04999 -8.04999,8.04999 -4.43959,0 -8.05,-3.6104 -8.05,-8.04999 z m 18.59999,0 c 0,-5.83291 -4.71708,-10.55 -10.54999,-10.55 -5.83291,0 -10.55,4.71709 -10.55,10.55 0,5.83291 4.71709,10.54999 10.55,10.54999 5.8329,0 10.54999,-4.71709 10.54999,-10.54999 z"
+       d="m 2.2500002,8.0000038 c 0,-3.1693361 2.5806675,-5.7500036 5.7500036,-5.7500036 3.1693352,0 5.7499962,2.580666 5.7499962,5.7500036 C 13.75,11.169331 11.169331,13.75 8.0000038,13.75 4.8306662,13.75 2.2500002,11.169339 2.2500002,8.0000038 Z m 13.9999998,0 c 0,-4.5626556 -3.687339,-8.2500036 -8.2499962,-8.2500036 -4.5626571,0 -8.2500036,3.6873465 -8.2500036,8.2500036 0,4.5626572 3.687348,8.2499962 8.2500036,8.2499962 C 12.562655,16.25 16.25,12.562655 16.25,8.0000038 Z"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssss"
-       inkscape:path-effect="#path-effect942"
-       inkscape:original-d="m 296.99985,672.66181 c -5.13625,0 -9.3,-4.16374 -9.3,-9.29999 0,-5.13625 4.16375,-9.3 9.3,-9.3 5.13625,0 9.29999,4.16375 9.29999,9.3 0,5.13624 -4.16375,9.29999 -9.29999,9.29999 z" />
+       inkscape:path-effect="#path-effect950"
+       inkscape:original-d="M 8.0000038,15 C 4.1340072,15 1.0000002,11.866 1.0000002,8.0000038 c 0,-3.8659966 3.134007,-7.0000036 7.0000036,-7.0000036 C 11.866,1.0000002 15,4.1340072 15,8.0000038 15,11.865993 11.865993,15 8.0000038,15 Z"
+       transform="matrix(0.93309984,0,0,0.93309984,0.5352013,0.5352013)" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-eraser-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-eraser-symbolic.svg
index c00f03215..2baeae523 100644
--- a/share/icons/nextgen/symbolic/actions/draw-eraser-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-eraser-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-eraser-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1012">
     <rdf:RDF>
@@ -30,14 +41,14 @@
   <sodipodi:namedview
      inkscape:snap-bbox="true"
      inkscape:document-rotation="0"
-     inkscape:current-layer="draw-eraser"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="3.5629604"
-     inkscape:cx="2.7558553"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="8.2507014"
+     inkscape:cx="4.5550693"
      inkscape:zoom="32"
      showgrid="true"
      id="namedview"
@@ -49,37 +60,37 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     id="draw-eraser"
-     inkscape:label="00151"
-     transform="matrix(0.666667,0,0,0.666666,-190,-660.90757)">
+     id="g0"
+     inkscape:label="draw-eraser">
     <path
-       style="opacity:0;fill:none"
-       d="m 285,991.36218 h 24 v 24.00002 h -24 z"
-       id="rect29999"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
     <path
+       class="base"
        sodipodi:nodetypes="sccssss"
        id="path30001"
-       d="m 301.00776,993.28408 -6.02336,5.76562 6.0468,6.5153 6.2344,-5.8122 c 0.35589,-0.33179 0.28158,-1.03672 -0.1875,-1.5469 l -4.46854,-4.86007 c -0.61914,-0.67338 -1.1607,-0.48398 -1.6018,-0.0617 z"
-       style="opacity:1"
+       d="M 10.671831,1.2812656 6.6562611,5.1250091 10.687458,9.4685388 14.843721,5.593742 c 0.23726,-0.2211931 0.18772,-0.6911461 -0.125,-1.0312658 L 11.739697,1.3224322 C 11.326937,0.87351261 10.965898,0.99977917 10.671831,1.2812989 Z"
        inkscape:connector-curvature="0" />
     <path
+       class="base"
        sodipodi:nodetypes="csssscc"
        id="path30003"
-       d="m 293.25,1000.69 -3.30015,3.0831 c -0.50109,0.4682 -0.69828,1.0761 -0.24058,1.5957 l 4.38443,4.9782 c 0.51254,0.5819 1.18589,0.5869 1.6114,0.1874 l 3.5449,-3.3284 z"
+       d="M 5.4999954,6.2185415 3.2998973,8.2739398 C 2.9658375,8.5860728 2.8343776,8.9913392 3.1395107,9.3377389 l 2.9229509,3.3187971 c 0.3416931,0.387933 0.7905927,0.391266 1.0742658,0.124933 l 2.3632647,-2.218931 z"
        style="opacity:0.5"
        inkscape:connector-curvature="0" />
     <path
+       class="base"
        sodipodi:nodetypes="cscccc"
-       style="opacity:1"
-       d="m 298.49985,1011.8624 c -0.5817,0 -1.05,0.446 -1.05,1 0,0.554 0.4683,1 1.05,1 h 9 l 1.5e-4,-2 z"
+       d="m 8.9998925,13.666802 c -0.3877997,0 -0.6999994,0.297333 -0.6999994,0.666666 0,0.369333 0.3121997,0.666666 0.6999994,0.666666 h 5.9999955 l 10e-5,-1.333332 z"
        id="path30005"
        inkscape:connector-curvature="0" />
     <path
+       class="base"
        inkscape:connector-curvature="0"
        id="path30005-4"
-       d="m 290.18423,1013.8624 c 0.5817,0 1.05,-0.446 1.05,-1 0,-0.554 -0.4683,-1 -1.05,-1 l -3.68437,0 v 2 z"
-       style="opacity:1;stroke-width:1"
+       d="m 3.4561505,15.000134 c 0.3877996,0 0.6999994,-0.297333 0.6999994,-0.666666 0,-0.369333 -0.3121998,-0.666666 -0.6999994,-0.666666 H 0.99990583 v 1.333332 z"
        sodipodi:nodetypes="cscccc" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-freehand-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-freehand-symbolic.svg
index 6c80ebf0a..4154fde8b 100644
--- a/share/icons/nextgen/symbolic/actions/draw-freehand-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-freehand-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-freehand-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1621">
     <rdf:RDF>
@@ -40,15 +51,15 @@
   </defs>
   <sodipodi:namedview
      inkscape:document-rotation="0"
-     inkscape:current-layer="g2267"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="7.9700089"
-     inkscape:cx="11.700075"
-     inkscape:zoom="44.8"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="16.689066"
+     inkscape:cx="3.5769252"
+     inkscape:zoom="11.542719"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -60,80 +71,44 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     id="draw-freehand"
-     inkscape:label="00135"
-     transform="matrix(0.666666,0,0,0.661356,-160.51101,-491.62414)">
-    <g
-       transform="matrix(1.500002,0,0,1.507293,163.5014,476.6427)"
-       id="g18432"
-       inkscape:label="stock-tool-pencil">
-      <path
-         inkscape:connector-curvature="0"
-         id="path18434"
-         transform="translate(241.0002,217)"
-         d="m -146.8437,-39 -1.875,2 c 1.3287,0.02586 2.6651,1.21157 2.7187,2.4375 l 2,-2 c -0.0554,-1.26532 -1.4744,-2.4884 -2.8437,-2.4375 z"
-         style="opacity:1" />
-      <path
-         style="opacity:0;fill:none"
-         d="m 81.000198,177 h 16 v 16 h -16 z"
-         id="rect18437"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path18439"
-         d="m 83.63056,189.036 7.52022,-8.0345 c 1.36935,-0.0509 2.79406,1.1635 2.84942,2.4288 l -7.49004,7.794 L 82.0002,193 Z"
-         style="opacity:1" />
-    </g>
+     inkscape:label="draw-freehand"
+     id="g0">
     <path
-       style="opacity:1;stroke-linecap:round"
-       d="m 291.78516,743.42969 c -1.44922,-0.24244 -2.9001,0.15823 -3.90039,0.72265 -0.47842,0.26997 -1.05872,0.70003 -1.54102,1.31055 -0.4823,0.61052 -0.86942,1.43966 -0.7793,2.39453 0.13134,1.39258 1.08638,2.54159 2.02149,3.29102 0.38268,0.30677 0.87444,0.72729 1.11914,1.07422 0.12235,0.17346 0.17019,0.31495 0.17578,0.37304 0.006,0.0581 0.024,0.0505 -0.0664,0.15235 -0.12419,0.13984 -0.57117,0.34899 -1.125,0.4707 -0.55382,0.12171 -1.15554,0.17793 -1.67187,0.3125 -0.25817,0.0673 -0.54524,0.0838 -0.8418,0.49805 -0.14828,0.20713 -0.20801,0.56105 -0.13867,0.80468 0.0693,0.24364 0.19131,0.39012 0.3125,0.51563 0.48477,0.50202 1.22542,0.8763 2.69336,1.57422 a 0.76879815,0.76879815 0 1 0 0.66015,-1.38867 c -0.80441,-0.38246 -0.89621,-0.48231 -1.26953,-0.70704 0.22142,-0.038 0.34302,-0.0564 0.58399,-0.10937 0.66558,-0.14627 1.4028,-0.34031 1.94531,-0.95117 0.33128,-0.37299 0.48979,-0.87819 0.44727,-1.32031 -0.0425,-0.44213 -0.23217,-0.80361 -0.44922,-1.11133 -0.4341,-0.61545 -1.02395,-1.07399 -1.41406,-1.38672 -0.68849,-0.55178 -1.38826,-1.54851 -1.45313,-2.23633 -0.0441,-0.46702 0.13673,-0.89584 0.45508,-1.29883 0.31835,-0.40298 0.77221,-0.74349 1.09179,-0.92383 0.68051,-0.38397 1.9196,-0.70768 2.89258,-0.54492 0.56032,0.0937 1.18511,0.30905 1.70118,0.54883 0.51606,0.23979 0.94702,0.54215 1.02929,0.625 a 0.76856777,0.76856777 0 1 0 1.08985,-1.08398 c -0.36013,-0.36265 -0.85113,-0.64676 -1.47266,-0.93555 -0.62153,-0.28879 -1.35062,-0.54527 -2.0957,-0.66992 z"
-       id="path18441"
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
        inkscape:connector-curvature="0" />
-  </g>
-  <g
-     style="stroke-width:1.64656"
-     transform="matrix(0.60732688,0,0,0.60732688,-589.87677,-136.42083)"
-     id="g2267">
     <g
        style="stroke-width:1.60932"
        id="g2263"
-       transform="matrix(1.0231416,0,0,1.0231416,-23.492345,-4.3240454)">
-      <rect
+       transform="matrix(0.58899477,0,0,0.58899477,-572.27697,-131.55209)">
+      <path
+         class="base"
+         id="rect2253"
          style="stroke-width:1.60931"
-         x="522.29419"
-         y="862.97675"
          transform="rotate(-45)"
-         width="13.6437"
-         height="6.5947719"
-         id="rect2253" />
+         d="m 522.29419,862.97675 h 13.6437 v 6.59477 h -13.6437 z" />
       <path
+         class="base"
          style="stroke-width:1.60932"
          d="m 997.4363,232.32178 -1.98083,1.98083 -4.66624,-4.66624 1.98083,-1.98083 c 0.82788,-0.82788 2.17319,-0.82788 3.00107,0 l 1.66517,1.66517 c 0.82788,0.82788 0.82788,2.17319 0,3.00107 z"
          id="path2255"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="sccssss" />
-      <g
-         style="stroke-width:1.71063"
-         id="g2261"
-         transform="matrix(0.94077529,0,0,0.94077529,59.784387,13.393965)">
-        <path
-           class="success"
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           transform="matrix(1.6465598,0,0,1.6465598,971.26735,224.62505)"
-           d="M 2.8378906,11.488281 1.3349609,16.00293 5.8496094,14.5 Z"
-           style="stroke-width:1.03891"
-           id="polygon2257" />
-      </g>
+      <path
+         id="polygon2257"
+         d="m 977.92472,242.5115 -2.3281,6.99338 6.99339,-2.3281 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         class="success" />
     </g>
     <path
        inkscape:original-d="m 968.89943,243.72882 c 0.22462,-8.75257 14.06435,-9.63479 10.80057,-13.82882 -2.71274,-3.48593 -6.39464,5.28981 -11.02814,3.59989 -3.05772,-1.11521 -0.92991,-5.07532 1.70422,-4.71148"
        inkscape:path-effect="#path-effect3466"
-       style="fill:#00ff00;fill-rule:nonzero;stroke:none;stroke-width:1.64656"
        d="m 969.8991,243.75447 c 0.0971,-3.78488 3.18905,-5.9805 6.22139,-7.7909 3.01043,-1.79732 6.72554,-3.64913 4.3687,-6.67772 -1.97736,-2.54095 -4.38209,-0.57654 -6.22675,0.97538 -1.8423,1.54993 -3.51591,2.9309 -5.24794,2.29919 -2.00167,-0.73004 -0.11857,-2.96696 1.22475,-2.78141 l 0.27366,-1.9812 c -3.90399,-0.53923 -6.28032,5.14743 -2.18369,6.64155 2.90147,1.05821 5.38556,-1.10373 7.22077,-2.64771 1.83278,-1.54192 2.63257,-2.21332 3.36082,-1.2775 0.88797,1.14105 -0.6641,1.85067 -3.81557,3.73219 -3.12773,1.86736 -7.06799,4.48914 -7.19548,9.45683 z"
        id="path2265"
        inkscape:connector-curvature="0"
-       transform="translate(5.1693456,-1.8930715)"
+       transform="matrix(0.57567278,0,0,0.57567278,-555.77721,-130.15265)"
        sodipodi:nodetypes="cssc"
        class="success" />
   </g>
diff --git a/share/icons/nextgen/symbolic/actions/draw-geometry-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-geometry-symbolic.svg
index 00015f6a9..b97bfc872 100644
--- a/share/icons/nextgen/symbolic/actions/draw-geometry-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-geometry-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-geometry-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata978">
     <rdf:RDF>
@@ -22,72 +33,75 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs976">
-    <inkscape:path-effect
-       simplify_individual_paths="false"
-       helper_size="5"
-       smooth_angles="0"
-       threshold="0.002"
-       steps="1"
-       is_visible="true"
-       id="path-effect1001"
-       effect="simplify" />
-  </defs>
+     id="defs976" />
   <sodipodi:namedview
      inkscape:document-rotation="0"
-     inkscape:current-layer="draw-geometry"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="13.195701"
-     inkscape:cx="7.0214598"
-     inkscape:zoom="31.678384"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="17.861913"
+     inkscape:cx="5.3136301"
+     inkscape:zoom="22.4"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
      gridtolerance="10"
-     objecttolerance="10">
+     objecttolerance="10"
+     inkscape:snap-global="false">
     <inkscape:grid
        id="grid"
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     id="draw-geometry"
-     inkscape:label="geometry"
-     transform="matrix(0.666667,0,0,0.666667,-272,-392.90813)">
+     id="g0"
+     inkscape:label="draw-geometry">
     <path
-       d="m 426.35821,599.18555 -4.06922,-2.32335 -1.16264,1.16175 2.32527,2.9043 1.16265,6.9702 L 426,610.3622 v 3 l 1.5,-1.5 0.0208,-5.7063 z"
-       id="path25154" />
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       class="base"
+       d="m 11.99747,6.8013028 -2.5438501,-1.452429 -0.7268178,0.7262614 1.4536299,1.8156066 0.726824,4.3573812 0.866281,1.540199 v 1.875433 l 0.937716,-0.937716 0.013,-3.567261 z"
+       id="path25154"
+       inkscape:connector-curvature="0" />
     <path
+       class="base"
        inkscape:connector-curvature="0"
-       d="m 413.64566,599.18555 4.00978,-2.32335 1.14564,1.16175 -2.29129,2.9043 -1.14566,6.9702 L 414,610.3622 v 3 l -1.5,-1.5 v -5.7063 z"
+       d="M 4.0502913,6.8013028 6.5569825,5.3488738 7.2731728,6.0751352 5.8407859,7.8907418 5.1245831,12.248123 4.271805,13.788322 v 1.875433 L 3.3340885,14.726039 v -3.567261 z"
        id="path25156" />
     <path
+       class="base"
        inkscape:connector-curvature="0"
        id="rect25158"
-       d="m 419.25,589.36774 h 1.5 c 0.4155,0 0.75,0.2676 0.75,0.6 v 1.79449 c 0,0.3324 -0.3345,0.6 -0.75,0.6 h -1.5 c -0.4155,0 -0.75,-0.2676 -0.75,-0.6 v -1.79449 c 0,-0.3324 0.3345,-0.6 0.75,-0.6 z" />
+       d="M 7.5538126,0.66375479 H 8.491529 c 0.2597475,0 0.4688582,0.16728862 0.4688582,0.37508661 v 1.1218152 c 0,0.207798 -0.2091107,0.3750866 -0.4688582,0.3750866 H 7.5538126 c -0.2597475,0 -0.4688583,-0.1672886 -0.4688583,-0.3750866 V 1.0388414 c 0,-0.20779799 0.2091108,-0.37508661 0.4688583,-0.37508661 z" />
     <g
        style="opacity:0.5"
        inkscape:label="mid"
-       id="g997">
+       id="g997"
+       transform="matrix(0.6251443,0,0,0.6251443,-254.53793,-367.77614)">
       <path
+         class="base"
          d="m 410.12307,604.3622 h 19.68129 c 0.34519,0 0.62308,0.223 0.62308,0.5 v 0.50001 c 0,0.277 -0.27789,0.5 -0.62308,0.5 h -19.68129 c -0.34518,0 -0.62307,-0.223 -0.62307,-0.5 v -0.50001 c 0,-0.277 0.27789,-0.5 0.62307,-0.5 z"
          id="rect25152"
          inkscape:connector-curvature="0" />
       <path
+         class="base"
          d="m 419.55558,602.8622 h 0.88883 c 0.58479,0 1.05558,0.49332 1.05558,1.10609 v 2.28783 c 0,0.61278 -0.47079,1.10609 -1.05558,1.10609 h -0.88883 c -0.58479,0 -1.05558,-0.49331 -1.05558,-1.10609 v -2.28783 c 0,-0.61277 0.47079,-1.10609 1.05558,-1.10609 z"
          id="rect25160"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       d="m 420,590.8622 c -2.4852,0 -4.5,2.01473 -4.5,4.5 0,2.48528 2.0148,4.5 4.5,4.5 2.48535,0 4.5,-2.01472 4.5,-4.5 0,-2.48527 -2.01465,-4.5 -4.5,-4.5 z m 0,2.20313 c 1.2678,0 2.29695,1.0291 2.29695,2.29687 0,1.26777 -1.02915,2.29688 -2.29695,2.29688 -1.2678,0 -2.2968,-1.02911 -2.2968,-2.29688 0,-1.26777 1.029,-2.29687 2.2968,-2.29687 z"
+       class="base"
+       d="m 8.0226708,1.598008 c -1.5536086,0 -2.8131494,1.2594969 -2.8131494,2.8131493 0,1.5536587 1.2595408,2.8131494 2.8131494,2.8131494 1.5537021,0 2.8131492,-1.2594907 2.8131492,-2.8131494 0,-1.5536524 -1.2594471,-2.8131493 -2.8131492,-2.8131493 z m 0,1.3772741 c 0.7925579,0 1.4359251,0.643336 1.4359251,1.4358752 0,0.7925392 -0.6433672,1.4358815 -1.4359251,1.4358815 -0.792558,0 -1.4358314,-0.6433423 -1.4358314,-1.4358815 0,-0.7925392 0.6432734,-1.4358752 1.4358314,-1.4358752 z"
        id="path25162"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/share/icons/nextgen/symbolic/actions/draw-path-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-path-symbolic.svg
index 745960b6e..b4a968e77 100644
--- a/share/icons/nextgen/symbolic/actions/draw-path-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-path-symbolic.svg
@@ -13,9 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="draw-path-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
   <style
-     id="style3560" />
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata2927">
     <rdf:RDF>
@@ -30,33 +39,6 @@
   </metadata>
   <defs
      id="defs2925">
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect947"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="0.4"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect944"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="0.2"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect1632"
-       effect="join_type" />
     <inkscape:path-effect
        attempt_force_join="true"
        miter_limit="100"
@@ -73,13 +55,13 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="22.4"
-     inkscape:cx="11.298228"
-     inkscape:cy="11.819618"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="11.2"
+     inkscape:cx="18.45432"
+     inkscape:cy="20.532635"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg1"
      inkscape:document-rotation="0"
@@ -89,48 +71,40 @@
        id="grid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer 1"
-     style="display:inline"
-     inkscape:highlight-color="8519679" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path1021"
-     d="m 926.04996,243.32195 c -0.0458,-4.83381 4.62875,-17.36777 20.08641,-17.49932 l -0.0145,-1.69994 c -16.31548,0.13885 -21.82748,13.34625 -21.77187,19.21536 z"
-     class="st5"
-     style="opacity:0.5;fill:#000000;fill-rule:nonzero;stroke:none;stroke-width:2.1157;stop-opacity:1"
-     inkscape:path-effect="#path-effect2216"
-     inkscape:original-d="m 925.2,243.33 c -0.0507,-5.35146 5.04257,-18.22214 20.92914,-18.35734"
-     transform="matrix(0.47265641,0,0,0.47265641,-435.46146,-104.35914)"
-     sodipodi:nodetypes="cc" />
-  <rect
-     style="opacity:1;stroke-width:1;stop-opacity:1"
-     x="1.7965699"
-     y="1.9999998"
-     class="success"
-     width="0.62307298"
-     height="10.648046"
-     id="rect946" />
-  <rect
-     id="rect1023"
-     height="3.902128"
-     width="3.902128"
-     class="success"
-     y="8.7459183"
-     x="0.15704247"
-     style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-  <path
-     id="polygon1025"
-     style="opacity:1;stroke-width:0.999994;stop-opacity:1"
-     d="M 5.6986783,15.971348 13.178561,13.565393 14.545982,8.9992981 15.774274,7.7710084 14.810833,5.8965868 12.93897,4.930587 11.710679,6.158877 7.1394668,7.5262997 4.733513,15.00618 8.6666,11.073094 8.9059415,9.2927744 11.873548,8.8338792 11.412086,11.798918 9.631766,12.03826 Z"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccccccccc" />
-  <circle
-     id="circle1027"
-     r="1.9439304"
-     cy="2.0151236"
-     cx="2.1081064"
-     style="opacity:1;stroke-width:0.999999;stop-opacity:1"
-     class="success" />
+     inkscape:label="draw-path"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1021"
+       d="m 926.04996,243.32195 c -0.0458,-4.83381 4.62875,-17.36777 20.08641,-17.49932 l -0.0145,-1.69994 c -16.31548,0.13885 -21.82748,13.34625 -21.77187,19.21536 z"
+       class="st5  base"
+       style="opacity:0.5"
+       inkscape:path-effect="#path-effect2216"
+       inkscape:original-d="m 925.2,243.33 c -0.0507,-5.35146 5.04257,-18.22214 20.92914,-18.35734"
+       transform="matrix(0.47265641,0,0,0.47265641,-435.46146,-104.35914)"
+       sodipodi:nodetypes="cc" />
+    <path
+       id="rect1023"
+       d="M 0.15704247,8.7459183 H 4.0591705 V 12.648046 H 0.15704247 Z"
+       class="success" />
+    <path
+       id="rect946"
+       d="m 1.7965699,1.9999998 h 0.623073 V 12.648045 h -0.623073 z"
+       class="success" />
+    <path
+       class="base"
+       id="polygon1025"
+       d="M 5.6986783,15.971348 13.178561,13.565393 14.545982,8.9992981 15.774274,7.7710084 14.810833,5.8965868 12.93897,4.930587 11.710679,6.158877 7.1394668,7.5262997 4.733513,15.00618 8.6666,11.073094 8.9059415,9.2927744 11.873548,8.8338792 11.412086,11.798918 9.631766,12.03826 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccc" />
+    <path
+       id="circle1027"
+       d="M 4.0520368,2.0151236 A 1.9439304,1.9439304 0 0 1 2.1081064,3.959054 1.9439304,1.9439304 0 0 1 0.16417599,2.0151236 1.9439304,1.9439304 0 0 1 2.1081064,0.07119322 1.9439304,1.9439304 0 0 1 4.0520368,2.0151236"
+       class="success" />
+  </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-polygon-star-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-polygon-star-symbolic.svg
index 854dd9461..9f2f4a6a6 100644
--- a/share/icons/nextgen/symbolic/actions/draw-polygon-star-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-polygon-star-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-polygon-star-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1213">
     <rdf:RDF>
@@ -46,60 +57,18 @@
        is_visible="true"
        id="path-effect1916"
        effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect951"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="2"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="2.5"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect942"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect1229"
-       effect="join_type" />
-    <inkscape:path-effect
-       id="path-effect1225"
-       allow_transforms="true"
-       method="d"
-       linkeditem="#path1215"
-       effect="clone_original" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="2.26772"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect1217"
-       effect="join_type" />
   </defs>
   <sodipodi:namedview
      inkscape:document-rotation="0"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="12.237654"
-     inkscape:cx="10.851835"
-     inkscape:zoom="63.356768"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="13.62994"
+     inkscape:cx="9.8505052"
+     inkscape:zoom="31.678384"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -112,20 +81,24 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:label="polygon-star"
-     id="layer1"
-     inkscape:groupmode="layer">
+     id="g0"
+     inkscape:label="draw-poligon-star">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
     <path
        inkscape:label="poly"
        inkscape:connector-curvature="0"
        class="warning"
        d="M 9.0273366,7.7539255 10.156824,5.4662337 5.6340869,2.1734892 0.75240167,5.71989 2.6141424,11.458263 H 7.9600663 L 8.1132171,10.57286 5.7106623,8.232522 Z"
-       style="display:inline;opacity:0.4;fill:#ff00ff;fill-opacity:1;stroke-width:0.478596;stop-opacity:1"
+       style="opacity:0.4;"
        id="polygon1130" />
     <path
+       class="base"
        inkscape:label="poly out"
        inkscape:connector-curvature="0"
-       class="st16"
        d="m 937.55,406.41 a 1.5,1.5 0 0 0 1.47805,-1.24434 l 0.32,-1.85 a 1.5,1.5 0 0 0 -0.43139,-1.33014 l -5.02,-4.89 a 1.5,1.5 0 0 0 -0.83243,2.5591 l 6.93,-1 a 1.5,1.5 0 0 0 1.13077,-0.82056 l 2.36,-4.78 a 1.5,1.5 0 0 0 -0.46213,-1.87672 l -9.45,-6.88 a 1.5,1.5 0 0 0 -1.76449,-9.1e-4 l -10.2,7.41 a 1.5,1.5 0 0 0 -0.54517,1.67647 l 3.89,11.99 A 1.5,1.5 0 0 0 926.38,406.41 Z m -13.63321,-13.9529 a 1.5,1.5 0 0 0 -0.54517,1.67647 l 10.2,-7.41 a 1.5,1.5 0 0 0 -1.76449,-9.1e-4 l 9.45,6.88 a 1.5,1.5 0 0 0 -0.46213,-1.87672 l -2.36,4.78 a 1.5,1.5 0 0 0 1.13077,-0.82056 l -6.93,1 a 1.5,1.5 0 0 0 -0.83243,2.5591 l 5.02,4.89 a 1.5,1.5 0 0 0 -0.43139,-1.33014 l -0.32,1.85 A 1.5,1.5 0 0 0 937.55,403.41 h -11.17 a 1.5,1.5 0 0 0 1.42679,1.0371 z"
        transform="matrix(0.47859658,0,0,0.47859658,-440.74817,-182.33028)"
        id="polygon1132"
@@ -136,14 +109,14 @@
        inkscape:connector-curvature="0"
        class="warning"
        d="m 5.7106623,8.232522 3.3166743,-0.4785965 1.4836494,-3.0055867 1.483649,3.0055867 3.316675,0.4785965 -2.397769,2.340338 0.564744,3.302316 -2.967299,-1.55544 -2.9672988,1.55544 0.5695299,-3.302316 z"
-       style="display:inline;opacity:0.2;fill:#ff00ff;fill-opacity:1;stroke-width:0.478596;stop-opacity:1"
+       style="opacity:0.2;"
        id="polygon1136" />
     <path
+       class="base"
        inkscape:label="star out"
        inkscape:original-d="m 942.88,406.71 -6.2,3.25 1.19,-6.9 -5.02,-4.89 6.93,-1 3.1,-6.28 3.1,6.28 6.93,1 -5.01,4.89 1.18,6.9 z"
        inkscape:path-effect="#path-effect1916"
        inkscape:connector-curvature="0"
-       class="st18"
        d="m 935.98359,408.63146 a 1.5,1.5 0 0 0 2.17459,1.58347 l 1.19,-6.9 a 1.5,1.5 0 0 0 -0.43152,-1.32941 l -5.02,-4.89 a 1.5,1.5 0 0 0 -0.83243,2.5591 l 6.93,-1 a 1.5,1.5 0 0 0 1.13082,-0.82066 l 3.1,-6.28 a 1.5,1.5 0 0 0 -2.6901,0 l 3.1,6.28 a 1.5,1.5 0 0 0 1.13082,0.82066 l 6.93,1 a 1.5,1.5 0 0 0 -0.8335,-2.55806 l -5.01,4.89 a 1.5,1.5 0 0 0 -0.43081,1.32629 l 1.18,6.9 a 1.5,1.5 0 0 0 2.17495,-1.58139 l -6.2,-3.25 a 1.5,1.5 0 0 0 -1.39282,0 z m 12.4,2.65708 a 1.5,1.5 0 0 0 2.17495,-1.58139 l -1.18,-6.9 a 1.5,1.5 0 0 0 -0.43081,1.32629 l 5.01,-4.89 a 1.5,1.5 0 0 0 -0.8335,-2.55806 l -6.93,-1 a 1.5,1.5 0 0 0 1.13082,0.82066 l -3.1,-6.28 a 1.5,1.5 0 0 0 -2.6901,0 l -3.1,6.28 a 1.5,1.5 0 0 0 1.13082,-0.82066 l -6.93,1 a 1.5,1.5 0 0 0 -0.83243,2.5591 l 5.02,4.89 a 1.5,1.5 0 0 0 -0.43152,-1.32941 l -1.19,6.9 a 1.5,1.5 0 0 0 2.17459,1.58347 l 6.2,-3.25 a 1.5,1.5 0 0 0 -1.39282,0 z"
        transform="matrix(0.47859658,0,0,0.47859658,-440.74817,-182.33028)"
        id="polygon1138" />
diff --git a/share/icons/nextgen/symbolic/actions/draw-rectangle-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-rectangle-symbolic.svg
index d1dd613ba..5eec17dda 100644
--- a/share/icons/nextgen/symbolic/actions/draw-rectangle-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-rectangle-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="draw-rectangle-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1678">
     <rdf:RDF>
@@ -40,15 +51,15 @@
   <sodipodi:namedview
      inkscape:snap-global="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="draw-rectangle"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="15.643266"
-     inkscape:cx="16.396526"
-     inkscape:zoom="15.839192"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="10.361318"
+     inkscape:cx="4.468584"
+     inkscape:zoom="22.4"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -59,21 +70,28 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     id="draw-rectangle"
-     inkscape:label="rectangle"
-     transform="matrix(0.666667,0,0,0.666667,-190,-413.57479)">
+     inkscape:label="draw-rectangle"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
     <path
        class="warning"
-       d="m 288.69,624 h 16.62 v 16.62 H 288.7 Z"
+       d="M 1.7193115,1.6799758 H 14.280941 V 14.241606 H 1.7268697 Z"
        inkscape:label="fill"
-       style="opacity:0.6;fill:#ff00ff"
-       id="rect938" />
+       style="opacity:0.6"
+       id="rect938"
+       inkscape:connector-curvature="0" />
     <path
+       class="base"
        inkscape:label="stroke"
        inkscape:original-d="m 288.69,624.05206 h 16.61965 v 16.61965 H 288.69 Z"
        inkscape:path-effect="#path-effect4438"
        inkscape:connector-curvature="0"
        d="m 305.30965,625.30206 a 1.25,1.25 0 0 0 -1.25,-1.25 v 16.61965 a 1.25,1.25 0 0 0 1.25,-1.25 H 288.69 a 1.25,1.25 0 0 0 1.25,1.25 v -16.61965 a 1.25,1.25 0 0 0 -1.25,1.25 z M 287.44,640.67171 a 1.25,1.25 0 0 0 1.25,1.25 h 16.61965 a 1.25,1.25 0 0 0 1.25,-1.25 v -16.61965 a 1.25,1.25 0 0 0 -1.25,-1.25 H 288.69 a 1.25,1.25 0 0 0 -1.25,1.25 z"
-       id="rect939" />
+       id="rect939"
+       transform="matrix(0.75581407,0,0,0.75581407,-216.47665,-469.94801)" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-spiral-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-spiral-symbolic.svg
index 6a7ca9a05..51e1085ac 100644
--- a/share/icons/nextgen/symbolic/actions/draw-spiral-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-spiral-symbolic.svg
@@ -1,10 +1,77 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="draw-spiral-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="draw-spiral-symbolic.svg"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs335" />
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="10.24"
+     inkscape:cx="7.4759716"
+     inkscape:cy="22.664227"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid" />
   </sodipodi:namedview>
-  <g transform="matrix(0.666667,0,0,0.666666,-190,-474.90772)" inkscape:label="00133" id="draw-spiral">
-      <path inkscape:connector-curvature="0" id="rect14479" d="m 285,712.36218 h 24 v 24.00002 h -24 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="path225" d="m 298.24805,713.9668 c -4.41918,-0.64126 -9.06491,1.39688 -11.38086,5.73437 -2.67088,5.00245 -1.29439,11.70232 3.61719,14.59375 4.16364,2.45101 9.7888,1.06281 12.06835,-3.51758 1.87772,-3.77285 0.79581,-8.77796 -3.0039,-10.80078 -3.01479,-1.60484 -7.05533,-0.51497 -8.50195,2.88477 -0.54027,1.26988 -0.59942,2.69957 -0.20313,3.98828 0.39629,1.2887 1.29332,2.46691 2.66406,3.01758 0.93748,0.37654 1.9858,0.36557 2.91602,-0.0234 0.93022,-0.38901 1.75207,-1.23019 1.99609,-2.38477 0.14447,-0.68359 0.0472,-1.35985 -0.29101,-2.0039 -0.1691,-0.32203 -0.41697,-0.64329 -0.79688,-0.8711 -0.37991,-0.2278 -0.90008,-0.31557 -1.37109,-0.20507 a 1.0001,1.0001 0 0 0 0.37109,1.96289 c 0.0114,0.0132 0.004,0.002 0.0254,0.043 0.0866,0.16499 0.1284,0.55164 0.10547,0.66015 -0.10608,0.50192 -0.38749,0.77816 -0.81055,0.95508 -0.42305,0.17692 -0.97951,0.17998 -1.39843,0.0117 -0.74386,-0.29883 -1.24471,-0.92616 -1.49805,-1.75 -0.25334,-0.82385 -0.21138,-1.81277 0.13086,-2.61719 0.98338,-2.31106 3.67924,-2.9901 5.72266,-1.90234 2.69549,1.43498 3.57418,5.29158 2.15429,8.14453 -1.76964,3.55581 -6.05567,4.57514 -9.26562,2.68555 -3.86543,-2.27557 -5.04831,-7.84258 -2.86719,-11.92774 2.55686,-4.78867 8.44487,-6.13795 12.8125,-3.42969 5.02495,3.11571 6.50945,10.39923 3.55664,15.71289 -0.009,0.0166 -0.0182,0.0349 -0.0293,0.0547 a 1.0001,1.0001 0 1 0 1.7461,0.97461 c 0.01,-0.0178 0.0194,-0.0373 0.0312,-0.0586 3.46198,-6.22994 1.78869,-14.63732 -4.25196,-18.38282 -1.32819,-0.82358 -2.77499,-1.33507 -4.24804,-1.54882 z" style="opacity:1;stroke-linecap:round"/>
-    </g>
-    </svg>
+  <g
+     id="g0"
+     inkscape:label="draw-spiral">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       class="base"
+       inkscape:connector-curvature="0"
+       id="path225"
+       d="M 8.8439134,0.59809189 C 5.7879939,0.15465238 2.575412,1.5640523 0.97390296,4.5634822 -0.87304479,8.0227404 0.07881569,12.655787 3.4752362,14.655247 6.3544466,16.350153 10.244317,15.390195 11.820654,12.222796 13.119122,9.6138215 12.370967,6.1527238 9.7434194,4.7539179 7.6586536,3.6441505 4.8645684,4.3978096 3.8642121,6.7487733 3.4906085,7.6269116 3.4497055,8.6155605 3.7237452,9.50672 c 0.2740395,0.891153 0.8943473,1.7059 1.8422315,2.086696 0.6482795,0.260382 1.3732062,0.252796 2.0164652,-0.01618 C 8.225701,11.308229 8.7940208,10.726542 8.9627637,9.9281348 9.0626666,9.4554235 8.9954031,8.9877811 8.7615266,8.5424123 8.6445918,8.3197244 8.4731865,8.097569 8.2104739,7.9400354 7.9477613,7.7825089 7.588057,7.7218147 7.2623476,7.7982269 a 0.69158196,0.69158196 0 0 0 0.2566135,1.3573636 c 0.00788,0.00913 0.00276,0.00138 0.017564,0.029735 0.059885,0.1140927 0.08879,0.3814661 0.072934,0.4565021 C 7.5361037,9.9889119 7.3415051,10.179935 7.0489536,10.302278 6.7564091,10.424621 6.37161,10.426737 6.0819214,10.310369 5.5675326,10.103724 5.2211884,9.669917 5.0460006,9.1002211 4.8708127,8.5305183 4.8998286,7.8466674 5.136492,7.2904007 5.8165119,5.6922732 7.6807336,5.2227083 9.0937847,5.9749082 10.95775,6.9672153 11.565376,9.6341035 10.583504,11.606956 9.3597751,14.065844 6.3959304,14.770724 4.1762089,13.464048 1.5032145,11.890462 0.68523785,8.0408027 2.1935103,5.2158623 3.9616117,1.9044356 8.0332461,0.97139125 11.053518,2.8441877 c 3.474818,2.1545534 4.501368,7.1912003 2.459462,10.8656653 -0.0062,0.01148 -0.01258,0.02414 -0.02026,0.03782 a 0.69158196,0.69158196 0 1 0 1.20745,0.673955 c 0.0069,-0.01231 0.01342,-0.0258 0.02158,-0.04052 C 17.115749,10.073028 15.958647,4.2592166 11.78146,1.6691553 10.862999,1.0996392 9.8625187,0.74593733 8.8438858,0.59812646 Z"
+       style="opacity:1" />
+  </g>
+</svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-star-outline-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-star-outline-symbolic.svg
deleted file mode 100644
index 5aa4591a1..000000000
--- a/share/icons/nextgen/symbolic/actions/draw-star-outline-symbolic.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   sodipodi:docname="draw-star-outline-symbolic.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="27.166187"
-     inkscape:cx="9.3879532"
-     inkscape:cy="7.3166036"
-     inkscape:window-width="1280"
-     inkscape:window-height="960"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid" />
-  </sodipodi:namedview>
-  <g
-     transform="matrix(1.000006,0,0,1.002537,-348.99376,-684.09339)"
-     id="draw-star-outline"
-     inkscape:label="00174">
-    <path
-       inkscape:connector-curvature="0"
-       id="rect19962"
-       d="m 349,682.36218 h 15.97919 v 15.9375 H 349 Z"
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;stroke-width:0.98073399"
-       d="M 7.9609375 0 L 5.7460938 5.4824219 L 0.37695312 6.1855469 L 4.3945312 10.181641 L 3.3417969 16.054688 L 8.0449219 13.064453 L 12.785156 15.990234 L 12.669922 15.380859 L 11.658203 10.130859 L 15.625 6.078125 L 10.244141 5.4511719 L 7.9609375 0 z M 7.9726562 2.5019531 L 9.578125 6.328125 L 13.402344 6.7714844 L 10.580078 9.65625 L 11.376953 13.787109 L 8.0351562 11.724609 L 4.7207031 13.833984 L 5.4628906 9.6914062 L 2.6015625 6.8476562 L 6.421875 6.3496094 L 7.9726562 2.5019531 z "
-       transform="matrix(0.999994,0,0,0.99746942,348.99167,682.36224)"
-       id="path822" />
-  </g>
-</svg>
diff --git a/share/icons/nextgen/symbolic/actions/draw-text-symbolic.svg b/share/icons/nextgen/symbolic/actions/draw-text-symbolic.svg
index fcbc3c4ba..3f0c80375 100644
--- a/share/icons/nextgen/symbolic/actions/draw-text-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/draw-text-symbolic.svg
@@ -13,7 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="draw-text-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1053">
     <rdf:RDF>
@@ -33,36 +44,36 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="44.8"
-     inkscape:cx="7.6039887"
-     inkscape:cy="6.4334239"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="31.678384"
+     inkscape:cx="12.62107"
+     inkscape:cy="11.836159"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g1721"
+     inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid" />
   </sodipodi:namedview>
   <g
-     id="g1721"
-     transform="matrix(0.49833642,0,0,0.49833642,-481.02421,-133.21522)"
-     style="stroke-width:2.00668">
+     inkscape:label="draw-text"
+     id="g0">
     <path
-       style="opacity:1;stroke-width:2.00668;stop-opacity:1"
-       d="m 984.4948,290.10777 h -8.75 l -1.28334,3.29888 h -5.86666 l 8.775,-20.06676 h 5.59167 l 8.74999,20.06676 h -5.925 z m -4.35834,-11.1444 -2.51666,6.39265 h 5 z"
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       class="base"
+       d="M 8.8419145,11.835478 H 3.9760811 L 3.2624218,13.71428 H 0 L 4.8797359,2.2857133 H 7.989237 L 12.855065,13.71428 H 9.5602006 Z M 6.4182624,5.4884385 5.0187597,9.1292269 H 7.799236 Z"
        id="path1713"
        inkscape:connector-curvature="0" />
-    <rect
+    <path
        id="rect1717"
-       height="28.093475"
-       width="2.8921192"
-       class="success"
-       y="269.32654"
-       x="994.47473"
-       style="stroke-width:2.00668" />
+       d="M 14.391706,0 H 16 v 16 h -1.608294 z"
+       class="success" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/mesh-gradient-symbolic.svg b/share/icons/nextgen/symbolic/actions/mesh-gradient-symbolic.svg
index f1eec6e5a..952af761a 100644
--- a/share/icons/nextgen/symbolic/actions/mesh-gradient-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/mesh-gradient-symbolic.svg
@@ -7,7 +7,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="mesh-gradient-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
@@ -15,10 +15,16 @@
    id="svg1"
    version="1.1">
   <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
 </style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -27,7 +33,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -42,24 +48,6 @@
        is_visible="true"
        id="path-effect3215"
        effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="0"
-       linecap_type="round"
-       is_visible="true"
-       id="path-effect3213"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect6787"
-       is_visible="true"
-       linecap_type="round"
-       line_width="0.8"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
     <inkscape:path-effect
        effect="join_type"
        id="path-effect6778"
@@ -78,244 +66,15 @@
        linejoin_type="round"
        miter_limit="100"
        attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect6020"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="2.8299999"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="2.8299999"
-       linecap_type="round"
-       is_visible="true"
-       id="path-effect6006"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect5987"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="2.8299999"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect962"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="0.1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2960"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1.3"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2942"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2933"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2924"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905-6"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905-4"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905-8"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905-7"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4797">
-      <path
-         sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc"
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:2.2093"
-         inkscape:connector-curvature="0"
-         id="path4799"
-         class="error"
-         d="m 926.04,649.9 v 23.26 H 949.3 V 649.9 Z m 14.26513,12.68467 c 0.99812,-0.64743 2.21205,-0.84975 3.33156,-0.60696 0.0135,0 0.027,0 0.0405,0.0135 0.82277,0.16187 1.59159,0.56651 2.22554,1.20046 0.17535,0.17533 0.35069,0.37767 0.48557,0.57998 0.0135,0.0135 0.027,0.027 0.027,0.0405 0.51255,0.74185 0.7958,1.61858 0.7958,2.53577 0,0.48557 -0.0809,0.94417 -0.2158,1.38928 -0.0135,0.027 -0.027,0.0539 -0.027,0.0809 -0.2293,0.63394 -0.57999,1.21393 -1.06556,1.6995 -0.48557,0.48557 -1.06556,0.84975 -1.6995,1.06556 -0.027,0.0135 -0.0675,0.027 -0.0944,0.027 -0.43162,0.14838 -0.90371,0.21581 -1.37579,0.21581 -0.93068,0 -1.80741,-0.26977 -2.54926,-0.78231 -0.0135,-0.0135 -0.027,-0.0405 -0.027,-0.0405 -0.21581,-0.13488 -0.40465,-0.29672 -0.59348,-0.48556 -0.60697,-0.62045 -1.0251,-1.38928 -1.21393,-2.22554 v -0.027 c -0.0674,-0.29674 -0.0944,-0.60696 -0.0944,-0.91719 0,-0.86324 0.24279,-1.68602 0.71487,-2.40089 -2.35593,-2.35592 -1.36642,-1.12478 -3.72235,-3.48071 -0.60697,0.39116 -1.29486,0.62046 -2.03671,0.67441 -0.027,0.0135 -0.0405,0.0135 -0.0674,0.0135 -0.10791,0.0135 -0.31023,0.0135 -0.31023,0.0135 -1.133,0 -2.19856,-0.41813 -3.02134,-1.18695 -0.0135,0 -0.0135,-0.0135 -0.027,-0.027 -0.0405,-0.027 -0.0675,-0.0539 -0.10791,-0.0944 -0.83626,-0.83626 -1.28137,-1.90182 -1.30835,-2.99436 -0.0135,-0.0135 -0.0135,-0.0405 0,-0.0539 -0.0405,-1.18696 0.39116,-2.37391 1.29486,-3.27762 0.86324,-0.86324 2.06369,-1.29486 3.25064,-1.28137 h 0.0539 c 1.11952,0.0405 2.21206,0.4586 3.03483,1.28137 0.0405,0.0405 0.0674,0.0674 0.0944,0.10791 0.0135,0.0135 0.027,0.0135 0.027,0.027 0.76882,0.82278 1.18695,1.90183 1.18695,3.02134 0,0.10791 0,0.21581 -0.0135,0.32372 0,0.0135 0,0.0405 -0.0135,0.0539 -0.054,0.74185 -0.28325,1.42974 -0.6879,2.03671 z" />
-    </clipPath>
-    <style
-       id="style5963">
-      .cls-1, .cls-4 {
-        fill: none;
-      }
-
-      .cls-1, .cls-2, .cls-4 {
-        stroke: #000;
-        stroke-width: 2.83px;
-      }
-
-      .cls-1 {
-        stroke-miterlimit: 10;
-      }
-
-      .cls-2, .cls-3 {
-        fill: #00b5ff;
-      }
-
-      .cls-3 {
-        opacity: 0.5;
-      }
-
-      .cls-4 {
-        stroke-linecap: round;
-      }
-    </style>
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="round"
-       line_width="2.8299999"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect5987-5"
-       effect="join_type" />
-    <style
-       id="style6720">
-      .cls-1 {
-        fill: none;
-        stroke: #000;
-        stroke-linecap: round;
-        stroke-linejoin: round;
-        stroke-width: 2.83px;
-      }
-
-      .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7 {
-        fill: #00b5ff;
-      }
-
-      .cls-2 {
-        opacity: 0.11;
-      }
-
-      .cls-3 {
-        opacity: 0.22;
-      }
-
-      .cls-4 {
-        opacity: 0.33;
-      }
-
-      .cls-5 {
-        opacity: 0.44;
-      }
-
-      .cls-6 {
-        opacity: 0.56;
-      }
-
-      .cls-7 {
-        opacity: 0.67;
-      }
-    </style>
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect6006-9"
-       is_visible="true"
-       linecap_type="round"
-       line_width="2.8299999"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect6006-7"
-       is_visible="true"
-       linecap_type="round"
-       line_width="2.8299999"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect6006-74"
-       is_visible="true"
-       linecap_type="round"
-       line_width="2.8299999"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
   </defs>
   <sodipodi:namedview
      inkscape:document-rotation="0"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
      inkscape:cy="9.0174941"
      inkscape:cx="27.937164"
      inkscape:zoom="16"
@@ -329,108 +88,69 @@
     <inkscape:grid
        id="grid"
        type="xygrid" />
-    <style
-       id="style862">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
   </sodipodi:namedview>
-  <style
-     id="style4505"
-     type="text/css">
-	.st0{fill:#00B5FF;}
-	.st1{opacity:0.9231;}
-	.st2{opacity:0.8462;}
-	.st3{opacity:0.7692;}
-	.st4{opacity:0.6923;}
-	.st5{opacity:0.6154;}
-	.st6{opacity:0.5385;}
-	.st7{opacity:0.4615;}
-	.st8{opacity:0.3846;}
-	.st9{opacity:0.3077;}
-	.st10{opacity:0.2308;}
-	.st11{opacity:0.1538;}
-	.st12{opacity:0.0769;}
-</style>
   <g
-     inkscape:groupmode="layer"
-     id="layer2"
+     id="g0"
      inkscape:label="mesh-gradient">
     <path
+       inkscape:connector-curvature="0"
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       class="base"
        inkscape:original-d="M 1.7157897,1.6615351 H 14.432215 V 14.37796 H 1.7157897 Z"
        inkscape:path-effect="#path-effect3215"
-       style="stroke-width:1;fill:#000000;fill-rule:nonzero;stroke:none"
-       class="cls-1"
        d="m 14.432215,2.3115351 a 0.65,0.65 0 0 0 -0.65,-0.65 V 14.37796 a 0.65,0.65 0 0 0 0.65,-0.65 H 1.7157897 a 0.65,0.65 0 0 0 0.65,0.65 V 1.6615351 a 0.65,0.65 0 0 0 -0.65,0.65 z M 1.0657897,14.37796 a 0.65,0.65 0 0 0 0.65,0.65 H 14.432215 a 0.65,0.65 0 0 0 0.65,-0.65 V 1.6615351 a 0.65,0.65 0 0 0 -0.65,-0.65 H 1.7157897 a 0.65,0.65 0 0 0 -0.65,0.65 z"
        inkscape:label="frame"
        id="frame-0" />
     <g
        inkscape:label="gradeint"
        id="g3210">
-      <circle
-         r="5.1323709"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
+      <path
          id="g1"
-         style="display:inline;opacity:1;fill:#cc0000;fill-opacity:0.169355;stroke-width:0.449026;stop-opacity:1" />
-      <circle
-         r="4.4947534"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
-         data-name="g1"
+         style="opacity:0.169355;"
+         d="M 13.206373,8.0197477 A 5.1323709,5.1323709 0 0 1 8.0740023,13.152119 5.1323709,5.1323709 0 0 1 2.9416313,8.0197477 5.1323709,5.1323709 0 0 1 8.0740023,2.8873768 5.1323709,5.1323709 0 0 1 13.206373,8.0197477"
+         class="error" />
+      <path
          id="g1-2"
-         style="display:inline;opacity:1;fill:#cc0000;fill-opacity:0.237903;stroke:none;stroke-width:0.449026;stop-opacity:1" />
-      <circle
-         r="3.8526456"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
-         data-name="g1"
+         style="opacity:0.237903"
+         d="M 12.568756,8.0197477 A 4.4947534,4.4947534 0 0 1 8.0740023,12.514501 4.4947534,4.4947534 0 0 1 3.5792489,8.0197477 4.4947534,4.4947534 0 0 1 8.0740023,3.5249944 4.4947534,4.4947534 0 0 1 12.568756,8.0197477"
+         class="error" />
+      <path
          id="g1-3"
-         style="display:inline;opacity:1;fill:#cc0000;fill-opacity:0.237903;stroke:none;stroke-width:0.449026;stop-opacity:1" />
-      <circle
-         r="3.2195187"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
-         data-name="g1"
+         style="opacity:0.237903"
+         d="M 11.926648,8.0197477 A 3.8526456,3.8526456 0 0 1 8.0740023,11.872393 3.8526456,3.8526456 0 0 1 4.2213566,8.0197477 3.8526456,3.8526456 0 0 1 8.0740023,4.1671021 3.8526456,3.8526456 0 0 1 11.926648,8.0197477"
+         class="error" />
+      <path
          id="g1-4"
-         style="display:inline;opacity:1;fill:#cc0000;fill-opacity:0.33871;stroke-width:0.449026;stop-opacity:1" />
-      <circle
-         r="2.5863917"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
-         data-name="g1"
+         style="opacity:0.33871"
+         d="M 11.293521,8.0197477 A 3.2195187,3.2195187 0 0 1 8.0740023,11.239266 3.2195187,3.2195187 0 0 1 4.8544836,8.0197477 3.2195187,3.2195187 0 0 1 8.0740023,4.8002291 3.2195187,3.2195187 0 0 1 11.293521,8.0197477"
+         class="error" />
+      <path
          id="g1-5"
-         style="display:inline;opacity:1;fill:#cc0000;fill-opacity:0.645161;stroke-width:0.449026;stop-opacity:1" />
-      <circle
-         r="1.9622449"
-         cy="8.0197477"
-         cx="8.0740023"
-         class="error"
-         data-name="g1"
+         style="opacity:0.645161"
+         d="M 10.660394,8.0197477 A 2.5863917,2.5863917 0 0 1 8.0740023,10.606139 2.5863917,2.5863917 0 0 1 5.4876106,8.0197477 2.5863917,2.5863917 0 0 1 8.0740023,5.433356 2.5863917,2.5863917 0 0 1 10.660394,8.0197477"
+         class="error" />
+      <path
          id="g1-6"
-         style="opacity:1;fill:#cc0000;fill-opacity:1;stroke-width:0.449026;stop-opacity:1" />
+         d="M 10.036247,8.0197477 A 1.9622449,1.9622449 0 0 1 8.0740023,9.9819926 1.9622449,1.9622449 0 0 1 6.1117574,8.0197477 1.9622449,1.9622449 0 0 1 8.0740023,6.0575029 1.9622449,1.9622449 0 0 1 10.036247,8.0197477"
+         class="error" />
     </g>
     <path
-       style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none;stop-opacity:1"
        inkscape:original-d="m 957.14,521.56 c 0,0 6.47,7.7 14.16,0 7.69,-7.7 14.17,0 14.17,0"
        inkscape:path-effect="#path-effect6769"
        inkscape:connector-curvature="0"
        id="H"
-       class="cls-1"
-       d="m 956.05667,522.47028 c 1.84495,2.1957 4.78478,3.30289 4.78478,3.30289 3.07557,1.14793 7.23118,1.02081 11.45976,-3.21326 2.76892,-2.77253 5.25429,-3.21684 7.089,-2.92847 0,0 3.07006,0.54976 4.99715,2.83967 a 1.4150021,1.4150021 0 1 0 2.16528,-1.82222 c -1.8495,-2.1977 -4.78951,-3.30222 -4.78951,-3.30222 -3.07764,-1.14759 -7.23549,-1.02092 -11.46434,3.21342 -2.76913,2.77274 -5.25296,3.21673 -7.08531,2.9285 0,0 -3.06667,-0.54972 -4.99015,-2.83887 a 1.4149999,1.4149999 0 1 0 -2.16666,1.82056 z"
+       class="cls-1  base"
+       d="m 956.05667,522.47028 c 1.84495,2.1957 4.78478,3.30289 4.78478,3.30289 3.07557,1.14793 7.23118,1.02081 11.45976,-3.21326 2.76892,-2.77253 5.25429,-3.21684 7.089,-2.92847 0,0 3.07006,0.54976 4.99715,2.83967 a 1.415,1.415 0 1 0 2.16528,-1.82222 c -1.8495,-2.1977 -4.78951,-3.30222 -4.78951,-3.30222 -3.07764,-1.14759 -7.23549,-1.02092 -11.46434,3.21342 -2.76913,2.77274 -5.25296,3.21673 -7.08531,2.9285 0,0 -3.06667,-0.54972 -4.99015,-2.83887 a 1.4149999,1.4149999 0 1 0 -2.16666,1.82056 z"
        transform="matrix(0.44902631,0,0,0.44902631,-428.06974,-226.17441)" />
     <path
-       style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none;stop-opacity:1"
        inkscape:original-d="m 971.3,507.4 c 0,0 -7.46,6.7 0,14.16 7.46,7.46 0,14.17 0,14.17"
        inkscape:path-effect="#path-effect6778"
        inkscape:connector-curvature="0"
        id="V"
-       class="cls-1"
+       class="cls-1  base"
        d="m 970.35451,506.34726 c -2.16308,1.94271 -3.18437,4.85876 -3.18437,4.85876 -1.10343,3.08544 -0.99636,7.22887 3.1293,11.35454 2.66725,2.66724 3.10697,5.13268 2.82426,6.99796 0,0 -0.53597,3.11003 -2.76997,5.11944 a 1.415,1.415 0 1 0 1.89254,2.10408 c 2.16511,-1.94743 3.18374,-4.86346 3.18374,-4.86346 1.10311,-3.08752 0.99649,-7.23319 -3.12945,-11.35914 -2.66747,-2.66747 -3.10687,-5.13134 -2.82428,-6.99427 0,0 0.53603,-3.10675 2.76921,-5.11243 a 1.415,1.415 0 1 0 -1.89098,-2.10548 z"
        transform="matrix(0.44902631,0,0,0.44902631,-428.06974,-226.17441)" />
   </g>
diff --git a/share/icons/nextgen/symbolic/actions/object-group-symbolic.svg b/share/icons/nextgen/symbolic/actions/object-group-symbolic.svg
deleted file mode 100644
index 49fa2090e..000000000
--- a/share/icons/nextgen/symbolic/actions/object-group-symbolic.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="object-group-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(1,0,0,0.999999,-135,-587.36145)" inkscape:label="00058" id="object-group">
-      <path inkscape:connector-curvature="0" id="rect11195" d="m 135,75 h 16 v 16 h -16 z" style="opacity:0;fill:none" transform="translate(0,512.3622)"/>
-      <path inkscape:connector-curvature="0" id="rect11965" d="m 135,587.36218 h 3 v 3 h -3 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect11967" d="m 148,587.36218 h 3 v 3 h -3 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect11969" d="m 135,600.36218 h 3 v 3.00001 h -3 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect11971" d="m 148,600.36218 h 3 v 3.00001 h -3 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="path11973" d="M 144,82.5 A 3.5,3.5 0 0 1 140.5,86 3.5,3.5 0 0 1 137,82.5 3.5,3.5 0 0 1 140.5,79 3.5,3.5 0 0 1 144,82.5 Z" style="opacity:1" transform="translate(0,512.3622)"/>
-      <path inkscape:connector-curvature="0" style="opacity:1" d="m 144.9375,82 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.31351 -1.7539,4.18511 -4,4.4375 V 88 h 6 v -6 z" transform="translate(0,512.3622)" id="rect11975"/>
-    </g>
-    </svg>
diff --git a/share/icons/nextgen/symbolic/actions/object-ungroup-pop-selection-symbolic.svg b/share/icons/nextgen/symbolic/actions/object-ungroup-pop-selection-symbolic.svg
deleted file mode 100644
index 0efa30c66..000000000
--- a/share/icons/nextgen/symbolic/actions/object-ungroup-pop-selection-symbolic.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1" width="13.8222" height="14.345885" version="1.1" sodipodi:docname="object-ungroup-pop-selection-symbolic.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-<metadata id="metadata31">
-<rdf:RDF>
-<cc:Work rdf:about="">
-<dc:format>image/svg+xml</dc:format>
-<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<sodipodi:namedview id="base" showgrid="true" inkscape:zoom="16.45071" inkscape:cx="4.905107" inkscape:cy="6.929792" inkscape:window-width="1280" inkscape:window-height="960" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg1">
-<inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
-</sodipodi:namedview>
-<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 id="linearGradient24464">
-<stop id="stop24466" offset="0" style="stop-color:#499204;stop-opacity:1" />
-<stop id="stop24468" offset="1" style="stop-color:#a7e26e;stop-opacity:1" />
-</linearGradient>
-<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>
-</defs>
-<g id="object-ungroup-pop-selection" inkscape:label="#object-ungroup-pop-selection" transform="translate(-355.5,-252.15412)">
-<g id="g6068-8">
-<path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.36;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 356,258.5 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 7 a 0.50005,0.50005 0 0 0 0.5,0.5 h 9 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -7 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m 0.5,1 h 8 v 6 h -8 z" id="rect9496-1" inkscape:connector-curvature="0" />
-</g>
-<path style="color:#000000;fill:#000000;fill-rule:evenodd;stroke-width:1.0000006" d="M 2.822266 0 L 2.822266 2 L 4.822266 2 L 4.822266 0 L 2.822266 0 z M 11.82227 0 L 11.82227 2 L 13.82227 2 L 13.82227 0 L 11.82227 0 z M 8.326172 1 C 5.845172 1 3.822266 3.023712 3.822266 5.507812 C 3.822266 7.991812 5.845172 10.01562 8.326172 10.01562 C 10.80727 10.01562 12.82812 7.991813 12.82812 5.507812 C 12.82812 3.023712 10.80727 1 8.326172 1 z M 8.326172 2 C 10.26707 2 11.83008 3.564513 11.83008 5.507812 C 11.83008 7.451012 10.26707 9.017578 8.326172 9.017578 C 6.385372 9.017578 4.820312 7.451013 4.820312 5.507812 C 4.820312 3.564513 6.385372 2 8.326172 2 z M 11.5 8.845703 L 11.5 10.8457 L 13.5 10.8457 L 13.5 8.845703 L 11.5 8.845703 z M 2.822266 9 L 2.822266 11 L 4.822266 11 L 4.822266 9 L 2.822266 9 z " transform="translate(355.5,252.1541)" id="use8598-1" />
-<g id="use10425-1" transform="matrix(1,0,0,1,-0.0348992,-0.0284392)" />
-</g>
-</svg>
diff --git a/share/icons/nextgen/symbolic/actions/object-ungroup-symbolic.svg b/share/icons/nextgen/symbolic/actions/object-ungroup-symbolic.svg
deleted file mode 100644
index 5f0b2d782..000000000
--- a/share/icons/nextgen/symbolic/actions/object-ungroup-symbolic.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
-   sodipodi:docname="object-ungroup-symbolic.svg"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16"
-   id="svg1"
-   version="1.1">
-  <metadata
-     id="metadata1770">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1768" />
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:current-layer="svg1"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="8.5811497"
-     inkscape:cx="13.464185"
-     inkscape:zoom="38.41879"
-     showgrid="true"
-     id="namedview"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10">
-    <inkscape:grid
-       id="grid"
-       type="xygrid" />
-  </sodipodi:namedview>
-  <g
-     id="object-ungroup"
-     inkscape:label="00059"
-     transform="translate(-135,-607.36218)">
-    <path
-       style="opacity:0;fill:none"
-       d="m 135,607.36218 h 16 v 16 h -16 z"
-       id="rect12011"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 136,608.36218 h 2 v 2 h -2 z"
-       id="rect12013"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 148,610.36218 h 2 v 2 h -2 z"
-       id="rect12015"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 148,620.36218 h 2 v 2.00001 h -2 z"
-       id="rect12019"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(0.5,531.3622)"
-       style="opacity:1"
-       d="M 144,82.5 A 3.5,3.5 0 0 1 140.5,86 3.5,3.5 0 0 1 137,82.5 3.5,3.5 0 0 1 140.5,79 3.5,3.5 0 0 1 144,82.5 Z"
-       id="path12021"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.8"
-       d="m 145.9375,613.3622 c 0.0187,0.1667 0.0625,0.3282 0.0625,0.5 0,2.3135 -1.7539,4.1851 -4,4.4375 v 1.0625 h 6 v -6 z"
-       id="path12023"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 144,608.36218 h 2 v 2 h -2 z"
-       id="rect12039"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 136,617.36218 h 2 v 2 h -2 z"
-       id="rect12041"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5"
-       d="m 140,620.36218 h 2 v 2 h -2 z"
-       id="rect12043"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/share/icons/nextgen/symbolic/actions/path-effect-parameter-next-symbolic.svg b/share/icons/nextgen/symbolic/actions/path-effect-parameter-next-symbolic.svg
deleted file mode 100644
index db7dbe00c..000000000
--- a/share/icons/nextgen/symbolic/actions/path-effect-parameter-next-symbolic.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="path-effect-parameter-next-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="translate(-768.9375,-558.36218)" id="path-effect-parameter-next" inkscape:label="00208">
-      <path inkscape:connector-curvature="0" id="rect9258" d="m 768.9375,558.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="path9256" d="m 782.3676,560.3087 c -5.5785,1.0362 -10.5734,4.7355 -11.4063,11.4375 a 0.50389111,0.50389111 0 1 0 1,0.125 c 0.7787,-6.2666 5.3216,-9.5832 10.5938,-10.5625 a 0.50871314,0.50871314 0 1 0 -0.1875,-1 z" style="opacity:1"/>
-      <path style="opacity:1" d="m 777.9902,55.05469 0.053,6.06445 3.9024,-3.16406 z" id="path17065" inkscape:connector-curvature="0" transform="translate(0,512.3622)"/>
-      <path inkscape:connector-curvature="0" id="rect17067" d="m 783,567.36218 h 0.94922 v 6 H 783 Z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="path17075" d="M 784,48.5 A 1.5,1.5 0 0 1 782.5,50 1.5,1.5 0 0 1 781,48.5 1.5,1.5 0 0 1 782.5,47 1.5,1.5 0 0 1 784,48.5 Z" style="opacity:1" transform="translate(0,512.3622)"/>
-      <path inkscape:connector-curvature="0" id="path17077" d="m 773,60 a 1.5,1 0 0 1 -1.5,1 1.5,1 0 0 1 -1.5,-1 1.5,1 0 0 1 1.5,-1 1.5,1 0 0 1 1.5,1 z" style="opacity:1" transform="matrix(1,0,0,1.5,0,481.8622)"/>
-      <path style="opacity:1" d="m 771.9205,562.5712 c -1.2435,1.8693 -1.2766,4.2067 0.2444,5.615 1.4792,0.8068 2.9545,0.6486 4.7753,-0.9867 -3.248,0.4264 -4.9899,-1.103 -5.0197,-4.6283 z" id="path17141" inkscape:connector-curvature="0"/>
-      <path inkscape:connector-curvature="0" id="path17143" d="m 777.8609,559.4745 c -1.5099,0.9137 -2.2988,2.505 -1.6614,3.9183 0.8042,0.9889 1.9214,1.3157 3.7716,0.7325 -2.4852,-0.6659 -3.2426,-2.2272 -2.1102,-4.6508 z" style="opacity:1"/>
-    </g>
-    </svg>
diff --git a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
index 8dead5784..2b1b8248e 100644
--- a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
@@ -13,12 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="tool-measure-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
   <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
 </style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -78,89 +84,9 @@
        is_visible="true"
        id="path-effect2960"
        effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2942"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2933"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2924"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2905"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-6"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-4"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-8"
-       effect="join_type" />
-    <inkscape:path-effect
-       attempt_force_join="true"
-       miter_limit="100"
-       linejoin_type="extrp_arc"
-       line_width="1"
-       linecap_type="butt"
-       is_visible="true"
-       id="path-effect2905-7"
-       effect="join_type" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect2237-8"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="1"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
   </defs>
   <sodipodi:namedview
+     inkscape:snap-global="true"
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
@@ -168,13 +94,13 @@
      showgrid="true"
      inkscape:zoom="22.4"
      inkscape:cx="1.2078875"
-     inkscape:cy="4.6128175"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:cy="8.1842461"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g2995"
+     inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
@@ -186,52 +112,57 @@
 </style>
   </sodipodi:namedview>
   <g
-     id="g2903"
-     transform="translate(0.32769535,-0.24741635)">
-    <g
-       id="g2995"
-       transform="translate(0.01116085,-0.01576085)">
-      <path
-         inkscape:original-d="M 3.3173706,14.7777 V 1.7486544 H 9.679796 c 1.70233,0 2.322953,0.6103244 2.323221,2.1446499 l 0.0019,10.8843957 z"
-         inkscape:path-effect="#path-effect2960"
-         sodipodi:nodetypes="ccsscc"
-         inkscape:connector-curvature="0"
-         class="st5"
-         d="m 3.9673706,1.7486544 a 0.65,0.65 0 0 0 -0.65,0.65 H 9.679796 c 1.35277,0 1.673022,0.3547503 1.673221,1.4947634 l 0.0019,10.8843952 a 0.65,0.65 0 0 0 0.65,-0.650113 H 3.3173706 a 0.65,0.65 0 0 0 0.65,0.65 z M 12.004917,15.4277 a 0.65,0.65 0 0 0 0.65,-0.650113 L 12.653017,3.8931908 C 12.65268,1.9645529 11.731686,1.0986544 9.679796,1.0986544 H 3.3173706 a 0.65,0.65 0 0 0 -0.65,0.65 V 14.7777 a 0.65,0.65 0 0 0 0.65,0.65 z"
-         id="path1224"
-         style="fill:#000000;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round" />
-      <path
-         inkscape:original-d="M 3.5024044,9.6305532 H 7.5547829"
-         inkscape:path-effect="#path-effect2258"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         d="m 3.5024044,10.130553 h 4.0523785 a 0.5,0.5 0 1 0 0,-0.9999998 H 3.5024044 a 0.5,0.5 0 1 0 0,0.9999998 z"
-         class="st23"
-         id="line1228" />
-      <path
-         inkscape:original-d="M 3.5024044,6.9836273 H 5.8857365"
-         inkscape:path-effect="#path-effect2256"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         d="m 3.5024044,7.4836273 h 2.3833321 a 0.5,0.5 0 1 0 0,-1 H 3.5024044 a 0.5,0.5 0 1 0 0,1 z"
-         class="st23"
-         id="line1230" />
-      <path
-         inkscape:original-d="M 3.5916902,12.277479 H 5.9750223"
-         inkscape:path-effect="#path-effect2237"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         d="m 3.5916902,12.777479 h 2.3833321 a 0.5,0.5 0 1 0 0,-1 H 3.5916902 a 0.5,0.5 0 1 0 0,1 z"
-         class="st23"
-         id="line1232" />
-      <path
-         inkscape:original-d="M 3.5024044,4.3367019 H 7.5547829"
-         inkscape:path-effect="#path-effect2260"
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         d="m 3.5024044,4.8367019 h 4.0523785 a 0.5,0.5 0 1 0 0,-1 H 3.5024044 a 0.5,0.5 0 1 0 0,1 z"
-         class="st23"
-         id="line1226" />
-    </g>
+     inkscape:label="tool-measure"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="translate(0.3388562,-0.2631772)"
+       inkscape:original-d="M 3.3173706,14.7777 V 1.7486544 H 9.679796 c 1.70233,0 2.322953,0.6103244 2.323221,2.1446499 l 0.0019,10.8843957 z"
+       inkscape:path-effect="#path-effect2960"
+       sodipodi:nodetypes="ccsscc"
+       inkscape:connector-curvature="0"
+       class="st5  base"
+       d="m 3.9673706,1.7486544 a 0.65,0.65 0 0 0 -0.65,0.65 H 9.679796 c 1.35277,0 1.673022,0.3547503 1.673221,1.4947634 l 0.0019,10.8843952 a 0.65,0.65 0 0 0 0.65,-0.650113 l -8.6875464,0 a 0.65,0.65 0 0 0 0.65,0.65 z M 12.004917,15.4277 a 0.65,0.65 0 0 0 0.65,-0.650113 L 12.653017,3.8931908 C 12.65268,1.9645529 11.731686,1.0986544 9.679796,1.0986544 H 3.3173706 a 0.65,0.65 0 0 0 -0.65,0.65 V 14.7777 a 0.65,0.65 0 0 0 0.65,0.65 z"
+       id="path1224" />
+    <path
+       transform="translate(0.3388562,-0.2631772)"
+       inkscape:original-d="M 3.5024044,9.6305532 H 7.5547829"
+       inkscape:path-effect="#path-effect2258"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       d="m 3.5024044,10.130553 h 4.0523785 a 0.5,0.5 0 1 0 0,-0.9999998 H 3.5024044 a 0.5,0.5 0 1 0 0,0.9999998 z"
+       class="st23  base"
+       id="line1228" />
+    <path
+       transform="translate(0.3388562,-0.2631772)"
+       inkscape:original-d="M 3.5024044,6.9836273 H 5.8857365"
+       inkscape:path-effect="#path-effect2256"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       d="m 3.5024044,7.4836273 h 2.3833321 a 0.5,0.5 0 1 0 0,-1 H 3.5024044 a 0.5,0.5 0 1 0 0,1 z"
+       class="st23  base"
+       id="line1230" />
+    <path
+       transform="translate(0.3388562,-0.2631772)"
+       inkscape:original-d="M 3.5916902,12.277479 H 5.9750223"
+       inkscape:path-effect="#path-effect2237"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       d="m 3.5916902,12.777479 h 2.3833321 a 0.5,0.5 0 1 0 0,-1 H 3.5916902 a 0.5,0.5 0 1 0 0,1 z"
+       class="st23  base"
+       id="line1232" />
+    <path
+       transform="translate(0.3388562,-0.2631772)"
+       inkscape:original-d="M 3.5024044,4.3367019 H 7.5547829"
+       inkscape:path-effect="#path-effect2260"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       d="m 3.5024044,4.8367019 h 4.0523785 a 0.5,0.5 0 1 0 0,-1 H 3.5024044 a 0.5,0.5 0 1 0 0,1 z"
+       class="st23  base"
+       id="line1226" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/tool-node-editor-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-node-editor-symbolic.svg
index 4fab7e855..7a6f11b47 100644
--- a/share/icons/nextgen/symbolic/actions/tool-node-editor-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-node-editor-symbolic.svg
@@ -13,7 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="tool-node-editor-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1609">
     <rdf:RDF>
@@ -34,14 +45,14 @@
      id="namedview"
      showgrid="true"
      inkscape:zoom="13.583094"
-     inkscape:cx="7.978469"
-     inkscape:cy="23.410824"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:cx="6.0002594"
+     inkscape:cy="19.572714"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g986"
+     inkscape:current-layer="svg1"
      inkscape:document-rotation="0"
      inkscape:snap-global="true">
     <inkscape:grid
@@ -49,44 +60,37 @@
        id="grid" />
   </sodipodi:namedview>
   <g
-     inkscape:label="edit-paths"
-     id="g986"
-     transform="matrix(0.43312848,0,0,0.43312848,-416.83976,-62.667691)"
-     style="stroke-width:2.30878">
-    <g
-       inkscape:label="PATH"
-       id="g982"
-       style="display:inline;stroke-width:2.30878"
-       transform="translate(-1.7847355)">
-      <g
-         inkscape:label="path"
-         id="g978"
-         style="display:inline;opacity:0.5;stroke-width:2.30117"
-         transform="matrix(1.0033091,0,0,1.0033091,-3.1982322,-0.58179758)">
-        <path
-           inkscape:connector-curvature="0"
-           id="path974"
-           d="m 971.66,159.44 c -3.24,4.65 -5.15,10.29 -5.15,16.38 h 1.7 c 0,-5.03 1.39,-9.75 3.8,-13.79 z"
-           style="opacity:1;stroke-width:2.30117" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path976"
-           d="m 979.99,151.49 2.21,0.67 c 3.87,-2.14 8.32,-3.37 13.05,-3.37 v -1.7 c -5.61,0 -10.84,1.61 -15.26,4.4 z"
-           style="opacity:1;stroke-width:2.30117" />
-      </g>
-      <path
-         inkscape:label="node"
-         inkscape:connector-curvature="0"
-         id="path980"
-         d="m 982.64787,163.15642 h -12.43514 v -12.43514 h 12.43514 z m -9.79371,-2.63212 h 7.16159 v -7.1616 h -7.16159 z"
-         style="display:inline;stroke-width:2.30878" />
-    </g>
+     id="g0"
+     inkscape:label="tool-node-editor">
     <path
-       inkscape:label="cursor"
-       id="polygon984"
-       style="display:inline;stroke-width:2.30878"
-       d="m 985.53237,164.58 v 14.65 l 4.44763,-5.38 7.05,-1.63 z"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
+    <path
+       class="base"
+       style="opacity:0.5"
+       d="M 3.24824,6.3668414 C 1.8402599,8.3875536 1.010247,10.838482 1.010247,13.484963 h 0.738755 c 0,-2.185846 0.6040408,-4.2369772 1.6513346,-5.9926066 z"
+       id="path974"
+       inkscape:connector-curvature="0" />
+    <path
+       class="base"
+       style="opacity:0.5"
+       d="M 6.8681394,2.9120755 7.8285209,3.2032319 C 9.5102748,2.2732697 11.444075,1.7387588 13.499552,1.7387588 v -0.738755 c -2.437892,0 -4.7106497,0.6996444 -6.6314126,1.9120717 z"
+       id="path976"
+       inkscape:connector-curvature="0" />
+    <path
+       class="base"
+       inkscape:label="node"
+       inkscape:connector-curvature="0"
+       id="path980"
+       d="M 7.9999983,8.0000012 H 2.613985 V 2.6139879 H 7.9999983 Z M 3.7580636,6.8599551 H 6.8599522 V 3.7580621 H 3.7580636 Z" />
+    <path
+       class="base"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       d="m 10.022377,8.6165942 v 6.3453318 l 1.926396,-2.330231 3.053555,-0.705999 z"
+       id="polygon984"
+       inkscape:label="cursor" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/tool-pointer-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-pointer-symbolic.svg
index f5210a705..fe421bcf0 100644
--- a/share/icons/nextgen/symbolic/actions/tool-pointer-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-pointer-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="tool-pointer-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata1072">
     <rdf:RDF>
@@ -30,15 +41,15 @@
   <sodipodi:namedview
      inkscape:snap-nodes="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="tool-pointer"
+     inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="9.7768583"
-     inkscape:cx="10.200115"
-     inkscape:zoom="38.41879"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="10.963079"
+     inkscape:cx="-5.0287986"
+     inkscape:zoom="27.166187"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -49,23 +60,17 @@
        type="xygrid" />
   </sodipodi:namedview>
   <g
-     id="tool-pointer"
-     inkscape:label="00121"
-     transform="matrix(0.666667,0,0,0.666667,-189.97921,-351.55391)">
+     inkscape:label="tool-pointer-symbolic"
+     id="g0">
     <path
-       style="opacity:0;fill:none"
-       d="m 284.96881,527.33087 h 24 v 24 h -24 z"
-       id="rect10522"
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
        inkscape:connector-curvature="0" />
     <path
+       class="base"
        inkscape:connector-curvature="0"
-       id="path8245"
-       d="m 314.96866,530.7715 v 15.118 h 1.2962 l 2.5925,-5.2529 5.1113,8.7256 h 4 l -6.5188,-9.9266 h 6.1177 v -1.6176 l -12.5989,-8.4558 z"
-       style="opacity:1" />
-    <path
-       style="stroke-width:1.5"
-       d="m 304.70105,536.56307 -12.20893,-7.52389 c -0.58895,-0.36395 -1.32347,-0.37057 -1.91903,-0.0265 -0.59556,0.3441 -0.9595,0.98598 -0.93965,1.67418 l 0.36395,14.42573 c 0.0198,0.761 0.4963,1.43595 1.21097,1.70727 0.71467,0.27131 1.52198,0.0794 2.03813,-0.48307 l 2.2168,-2.39545 2.89177,4.96297 c 0.25144,0.43013 0.66173,0.74114 1.14478,0.86687 0.15883,0.0397 0.31764,0.0595 0.47644,0.0595 0.33088,0 0.65512,-0.086 0.94629,-0.25807 l 2.40208,-1.40287 c 0.89334,-0.52278 1.19774,-1.66756 0.67497,-2.56751 l -2.87191,-4.92991 3.00425,-0.6948 c 0.74114,-0.17206 1.30361,-0.77424 1.42935,-1.52198 0.13234,-0.74777 -0.21176,-1.49551 -0.86026,-1.89255 z m -6.47173,2.85867 4.15567,7.12683 -2.40209,1.40288 -4.16889,-7.15331 -3.9373,4.26155 -0.36396,-14.42573 12.20894,7.52388 z"
        id="path1684"
-       inkscape:connector-curvature="0" />
+       d="M 13.154925,6.1549822 5.0156342,1.139053 C 4.6230006,0.89641956 4.1333204,0.89200622 3.7362802,1.1213863 3.33924,1.3507865 3.0966132,1.7787067 3.1098465,2.2375069 L 3.35248,11.854665 c 0.0132,0.507334 0.3308668,0.957301 0.8073137,1.138181 0.4764469,0.180873 1.0146539,0.05293 1.358754,-0.322047 l 1.4778675,-1.596968 1.9278476,3.308649 c 0.1676267,0.286753 0.4411535,0.494093 0.763187,0.577913 0.1058868,0.02647 0.2117601,0.03967 0.3176272,0.03967 0.220586,0 0.436747,-0.05733 0.63086,-0.172047 l 1.601387,-0.935247 c 0.595561,-0.34852 0.798494,-1.111707 0.449981,-1.711674 L 10.772697,8.8944836 12.775531,8.4312833 C 13.269625,8.3165766 13.644605,7.9151231 13.728432,7.4166295 13.816659,6.9181159 13.587258,6.4196223 13.154925,6.1549289 Z M 8.8404361,8.0607631 11.610884,12.811986 10.00949,13.747239 7.2302286,8.9783636 4.6053606,11.819398 4.3627205,2.2022402 12.502018,7.2181627 Z" />
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
index 2ab83e369..518af5b0d 100644
--- a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
@@ -7,13 +7,24 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
    sodipodi:docname="tool-spray-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
    width="16"
    id="svg1"
    version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <metadata
      id="metadata2833">
     <rdf:RDF>
@@ -31,12 +42,12 @@
      inkscape:document-rotation="0"
      inkscape:current-layer="svg1"
      inkscape:window-maximized="1"
-     inkscape:window-y="-8"
-     inkscape:window-x="54"
-     inkscape:window-height="1177"
-     inkscape:window-width="1858"
-     inkscape:cy="5.7403935"
-     inkscape:cx="10.079103"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="9.89555"
+     inkscape:cx="-0.80500256"
      inkscape:zoom="31.678384"
      showgrid="true"
      id="namedview"
@@ -47,126 +58,74 @@
        id="grid"
        type="xygrid" />
   </sodipodi:namedview>
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
   <g
-     inkscape:label="00153"
-     id="tool-spray"
-     transform="matrix(0.666667,0,0,0.666667,-169.95536,-681.79788)">
-    <path
-       id="path5769"
-       d="m 285,1022.362 h 24 v 24 h -24 z"
-       style="opacity:0;fill:none"
-       inkscape:connector-curvature="0" />
+     id="g0"
+     inkscape:label="tool-spray">
     <path
        inkscape:connector-curvature="0"
-       style="opacity:1"
-       d="m 303,1029.362 v -2 c -0.5069,-1.555 -3,-1 -3,0 v 2 z"
-       id="path6331-0" />
+       style="opacity:0"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       id="background" />
     <path
-       sodipodi:nodetypes="ccccccc"
+       class="base"
        inkscape:connector-curvature="0"
-       id="path6315-8"
-       d="M 306.9558,1035.246 306,1034.362 h -9 l -0.9712,1.413 -9.52894,8.524 20.49994,0.063 z"
-       style="opacity:1" />
+       id="path2411"
+       d="M 13.247345,8.0130065 H 8.2786374 c -0.9478462,0 -1.7268007,0.7682705 -1.7210889,1.7210875 L 6.5891158,15 H 15 L 14.968433,9.734094 C 14.962721,8.781277 14.195191,8.0130065 13.247345,8.0130065 Z"
+       sodipodi:nodetypes="sssccss" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:1"
-       d="m 306,1033.362 -2,-3 h -5 l -2,3 z"
-       id="path5211-1" />
+       class="base"
+       id="polygon2413"
+       transform="matrix(0.49886622,0,0,0.49886622,-461.04309,-311.95964)"
+       d="m 951.44,639.44 -1.33,-4.08 h -8.59 l -1.32,4.08 z" />
     <path
+       class="base"
        inkscape:connector-curvature="0"
-       id="use30430"
-       d="m 295.69202,1028.8909 a 0.4268517,0.4268517 0 0 1 -0.42685,0.427 0.4268517,0.4268517 0 0 1 -0.42685,-0.427 0.4268517,0.4268517 0 0 1 0.42685,-0.4268 0.4268517,0.4268517 0 0 1 0.42685,0.4268 z m -4.85558,2.0489 a 0.58746276,0.58746276 0 0 1 -0.58746,0.5876 0.58746276,0.58746276 0 0 1 -0.58746,-0.5876 0.58746276,0.58746276 0 0 1 0.58746,-0.5874 0.58746276,0.58746276 0 0 1 0.58746,0.5874 z m -0.69239,-4.1136 a 0.58746276,0.58746276 0 0 1 -0.58746,0.5876 0.58746276,0.58746276 0 0 1 -0.58746,-0.5876 0.58746276,0.58746276 0 0 1 0.58746,-0.5874 0.58746276,0.58746276 0 0 1 0.58746,0.5874 z m 3.23692,3.3646 a 0.40320532,0.40320532 0 0 1 -0.40321,0.4033 0.40320532,0.40320532 0 0 1 -0.4032,-0.4033 0.40320532,0.40320532 0 0 1 0.4032,-0.4032 0.40320532,0.40320532 0 0 1 0.40321,0.4032 z m -0.44802,-2.6881 a 0.40320532,0.40320532 0 0 1 -0.40321,0.4033 0.40320532,0.40320532 0 0 1 -0.4032,-0.4033 0.40320532,0.40320532 0 0 1 0.4032,-0.4032 0.40320532,0.40320532 0 0 1 0.40321,0.4032 z m -3.73326,1.3041 a 1.3102136,1.3102136 0 0 1 -1.31023,1.3104 1.3102136,1.3102136 0 0 1 -1.31021,-1.3104 1.3102136,1.3102136 0 0 1 1.31021,-1.31 1.3102136,1.3102136 0 0 1 1.31023,1.31 z m 0.97627,-4.0155 a 1.3102134,1.3102134 0 0 1 -1.3102,1.3105 1.3102134,1.3102134 0 0 1 -1.3102,-1.3105 1.3102134,1.3102134 0 0 1 1.3102,-1.31 1.3102134,1.3102134 0 0 1 1.3102,1.31 z m 0.71993,8.6872 a 1.3102134,1.3102134 0 0 1 -1.31021,1.3108 1.3102134,1.3102134 0 0 1 -1.3102,-1.3108 1.3102134,1.3102134 0 0 1 1.3102,-1.3101 1.3102134,1.3102134 0 0 1 1.31021,1.3101 z m 1.3326,-4.6721 a 0.88191682,0.88191682 0 0 1 -0.88193,0.882 0.88191682,0.88191682 0 0 1 -0.88191,-0.882 0.88191682,0.88191682 0 0 1 0.88191,-0.8818 0.88191682,0.88191682 0 0 1 0.88193,0.8818 z m 0.68938,-2.9065 a 0.88191672,0.88191672 0 0 1 -0.88191,0.8821 0.88191672,0.88191672 0 0 1 -0.88191,-0.8821 0.88191672,0.88191672 0 0 1 0.88191,-0.8818 0.88191672,0.88191672 0 0 1 0.88191,0.8818 z m 0.62291,5.8894 a 0.88191672,0.88191672 0 0 1 -0.88191,0.8823 0.88191672,0.88191672 0 0 1 -0.88191,-0.8823 0.88191672,0.88191672 0 0 1 0.88191,-0.8818 0.88191672,0.88191672 0 0 1 0.88191,0.8818 z m 0.70395,-2.9833 a 0.58746283,0.58746283 0 0 1 -0.58747,0.5875 0.58746283,0.58746283 0 0 1 -0.58746,-0.5875 0.58746283,0.58746283 0 0 1 0.58746,-0.5874 0.58746283,0.58746283 0 0 1 0.58747,0.5874 z m 0.62388,-1.9798 a 0.58746276,0.58746276 0 0 1 -0.58746,0.5876 0.58746276,0.58746276 0 0 1 -0.58746,-0.5876 0.58746276,0.58746276 0 0 1 0.58746,-0.5874 0.58746276,0.58746276 0 0 1 0.58746,0.5874 z m 0.3318,3.9721 a 0.58746276,0.58746276 0 0 1 -0.58746,0.5877 0.58746276,0.58746276 0 0 1 -0.58746,-0.5877 0.58746276,0.58746276 0 0 1 0.58746,-0.5874 0.58746276,0.58746276 0 0 1 0.58746,0.5874 z m 1.22645,-3.0714 a 0.4268517,0.4268517 0 0 1 -0.42685,0.427 0.4268517,0.4268517 0 0 1 -0.42685,-0.427 0.4268517,0.4268517 0 0 1 0.42685,-0.4268 0.4268517,0.4268517 0 0 1 0.42685,0.4268 z m 0,2.2082 a 0.4268517,0.4268517 0 0 1 -0.42685,0.427 0.4268517,0.4268517 0 0 1 -0.42685,-0.427 0.4268517,0.4268517 0 0 1 0.42685,-0.4268 0.4268517,0.4268517 0 0 1 0.42685,0.4268 z m 0.74191,-1.1291 a 0.40320532,0.40320532 0 0 1 -0.40321,0.4033 0.40320532,0.40320532 0 0 1 -0.4032,-0.4033 0.40320532,0.40320532 0 0 1 0.4032,-0.4032 0.40320532,0.40320532 0 0 1 0.40321,0.4032 z"
-       class="success" />
-  </g>
-  <path
-     inkscape:connector-curvature="0"
-     id="path2411"
-     d="M 13.247345,8.0130065 H 8.2786374 c -0.9478462,0 -1.7268007,0.7682705 -1.7210889,1.7210875 L 6.5891158,15 H 15 L 14.968433,9.734094 C 14.962721,8.781277 14.195191,8.0130065 13.247345,8.0130065 Z"
-     style="stroke-width:0.999999"
-     sodipodi:nodetypes="sssccss" />
-  <polygon
-     id="polygon2413"
-     points="951.44,639.44 950.11,635.36 941.52,635.36 940.2,639.44 "
-     transform="matrix(0.49886622,0,0,0.49886622,-461.04309,-311.95964)"
-     style="stroke-width:2.00455" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path2415"
-     d="m 12.041102,2.6359435 c 0.02057,-0.847823 -2.3741056,-0.8428357 -2.3945573,0 L 9.6130626,4.0157834 H 12.00762 Z"
-     style="stroke-width:0.999999"
-     sodipodi:nodetypes="ssccs" />
-  <g
-     style="opacity:0.5"
-     class="#g1009"
-     id="g1009">
-    <circle
-       id="circle2419"
-       r="0.33070573"
-       cy="3.9836175"
-       cx="7.1802354"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2421"
-       r="0.71652919"
-       cy="4.2277079"
-       cx="4.9912791"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2423"
-       r="1.1062895"
-       cy="4.4718223"
-       cx="2.1960375"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2427"
-       r="0.33070573"
-       cy="2.6844211"
-       cx="7.9912505"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2429"
-       r="0.71652919"
-       cy="2.5269566"
-       cx="6.4243431"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2431"
-       r="1.1062895"
-       cy="2.1056976"
-       cx="3.7117627"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2435"
-       r="0.33070573"
-       cy="5.2906957"
-       cx="7.7550421"
-       class="st1"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2437"
-       r="0.82676435"
-       cy="6.2749386"
-       cx="5.9834042"
-       class="st1"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       id="circle2439"
-       r="1.318886"
-       cy="7.5938392"
-       cx="3.514914"
-       class="st1"
-       style="opacity:1;stroke-width:0.999999;stop-opacity:1" />
-    <circle
-       style="stroke-width:0.999999"
-       class="st1"
-       cx="8.4203825"
-       cy="3.8733892"
-       r="0.21259658"
-       id="circle2443" />
+       id="path2415"
+       d="m 12.041102,2.6359435 c 0.02057,-0.847823 -2.3741056,-0.8428357 -2.3945573,0 L 9.6130626,4.0157834 H 12.00762 Z"
+       sodipodi:nodetypes="ssccs" />
+    <g
+       style="opacity:0.5"
+       id="g1009">
+      <path
+         class="base"
+         id="circle2419"
+         d="M 7.5109411,3.9836175 A 0.33070573,0.33070573 0 0 1 7.1802354,4.3143233 0.33070573,0.33070573 0 0 1 6.8495297,3.9836175 0.33070573,0.33070573 0 0 1 7.1802354,3.6529118 0.33070573,0.33070573 0 0 1 7.5109411,3.9836175" />
+      <path
+         class="base"
+         id="circle2421"
+         d="M 5.7078083,4.2277079 A 0.71652919,0.71652919 0 0 1 4.9912791,4.9442371 0.71652919,0.71652919 0 0 1 4.2747499,4.2277079 0.71652919,0.71652919 0 0 1 4.9912791,3.5111787 0.71652919,0.71652919 0 0 1 5.7078083,4.2277079" />
+      <path
+         class="base"
+         id="circle2423"
+         d="M 3.302327,4.4718223 A 1.1062895,1.1062895 0 0 1 2.1960375,5.5781118 1.1062895,1.1062895 0 0 1 1.089748,4.4718223 1.1062895,1.1062895 0 0 1 2.1960375,3.3655328 1.1062895,1.1062895 0 0 1 3.302327,4.4718223" />
+      <path
+         class="base"
+         id="circle2427"
+         d="M 8.3219562,2.6844211 A 0.33070573,0.33070573 0 0 1 7.9912505,3.0151268 0.33070573,0.33070573 0 0 1 7.6605448,2.6844211 0.33070573,0.33070573 0 0 1 7.9912505,2.3537153 0.33070573,0.33070573 0 0 1 8.3219562,2.6844211" />
+      <path
+         class="base"
+         id="circle2429"
+         d="M 7.1408723,2.5269566 A 0.71652919,0.71652919 0 0 1 6.4243431,3.2434857 0.71652919,0.71652919 0 0 1 5.7078139,2.5269566 0.71652919,0.71652919 0 0 1 6.4243431,1.8104274 0.71652919,0.71652919 0 0 1 7.1408723,2.5269566" />
+      <path
+         class="base"
+         id="circle2431"
+         d="M 4.8180522,2.1056976 A 1.1062895,1.1062895 0 0 1 3.7117627,3.2119871 1.1062895,1.1062895 0 0 1 2.6054732,2.1056976 1.1062895,1.1062895 0 0 1 3.7117627,0.99940813 1.1062895,1.1062895 0 0 1 4.8180522,2.1056976" />
+      <path
+         id="circle2435"
+         d="M 8.0857478,5.2906957 A 0.33070573,0.33070573 0 0 1 7.7550421,5.6214014 0.33070573,0.33070573 0 0 1 7.4243363,5.2906957 0.33070573,0.33070573 0 0 1 7.7550421,4.9599899 0.33070573,0.33070573 0 0 1 8.0857478,5.2906957"
+         class="st1  base" />
+      <path
+         id="circle2437"
+         d="M 6.8101685,6.2749386 A 0.82676435,0.82676435 0 0 1 5.9834042,7.1017029 0.82676435,0.82676435 0 0 1 5.1566398,6.2749386 0.82676435,0.82676435 0 0 1 5.9834042,5.4481742 0.82676435,0.82676435 0 0 1 6.8101685,6.2749386"
+         class="st1  base" />
+      <path
+         id="circle2439"
+         d="M 4.8338001,7.5938392 A 1.318886,1.318886 0 0 1 3.514914,8.9127252 1.318886,1.318886 0 0 1 2.196028,7.5938392 1.318886,1.318886 0 0 1 3.514914,6.2749531 1.318886,1.318886 0 0 1 4.8338001,7.5938392"
+         class="st1  base" />
+      <path
+         id="circle2443"
+         d="M 8.6329791,3.8733892 A 0.21259658,0.21259658 0 0 1 8.4203825,4.0859858 0.21259658,0.21259658 0 0 1 8.2077859,3.8733892 0.21259658,0.21259658 0 0 1 8.4203825,3.6607927 0.21259658,0.21259658 0 0 1 8.6329791,3.8733892"
+         class="st1  base" />
+    </g>
   </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
index 3f1dce421..4f79cf83f 100644
--- a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
@@ -13,7 +13,18 @@
    height="16"
    viewBox="0 0 16 16"
    sodipodi:docname="tool-tweak-symbolic.svg"
-   inkscape:version="1.0alpha2 (2892b30, 2019-06-19)">
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
   <title
      id="title3468">symbolic icons</title>
   <metadata
@@ -29,35 +40,7 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs941">
-    <inkscape:path-effect
-       id="path-effect1605"
-       allow_transforms="false"
-       method="bsplinespiro"
-       linkeditem="#path945"
-       effect="clone_original" />
-    <inkscape:path-effect
-       id="path-effect1601"
-       allow_transforms="false"
-       method="bsplinespiro"
-       linkeditem="#path945"
-       effect="clone_original" />
-    <inkscape:path-effect
-       effect="clone_original"
-       linkeditem="#path945"
-       method="bsplinespiro"
-       allow_transforms="false"
-       id="path-effect949" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect947"
-       is_visible="true"
-       linecap_type="butt"
-       line_width="5.4"
-       linejoin_type="round"
-       miter_limit="100"
-       attempt_force_join="true" />
-  </defs>
+     id="defs941" />
   <sodipodi:namedview
      inkscape:snap-global="true"
      objecttolerance="10"
@@ -65,13 +48,13 @@
      guidetolerance="10"
      id="namedview"
      showgrid="true"
-     inkscape:zoom="22.4"
-     inkscape:cx="-3.5945637"
-     inkscape:cy="11.467773"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
+     inkscape:zoom="44.8"
+     inkscape:cx="4.7025426"
+     inkscape:cy="10.042447"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg1"
      inkscape:document-rotation="0">
@@ -83,12 +66,17 @@
        spacingy="0.5"
        empspacing="4" />
   </sodipodi:namedview>
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
-  <path
-     id="path1702"
-     d="M 0.5,15 0.5446353,9.3298225 c 0,0 1.7452285,-0.05625 3.1927949,-1.0204006 C 6.206793,6.664704 5.1119198,3.3735133 8.7560327,2.1882189 11.32823,1.3515789 13.617319,2.803097 13.814229,4.8532869 13.857136,5.300032 13.514545,5.5660383 13.085395,5.2953538 12.291964,4.7949001 11.198867,4.946675 10.65436,5.7842873 c -1.0542341,1.6217231 0.211599,3.2069115 2.031348,3.5926018 1.330726,0.2820433 2.858928,-0.047333 2.858928,-0.047333 L 15.5,15 Z" />
+  <g
+     inkscape:label="tool-tweak"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       class="base"
+       id="path1702"
+       d="M 0.5,15 0.5446353,9.3298225 c 0,0 1.7452285,-0.05625 3.1927949,-1.0204006 C 6.206793,6.664704 5.1119198,3.3735133 8.7560327,2.1882189 11.32823,1.3515789 13.617319,2.803097 13.814229,4.8532869 13.857136,5.300032 13.514545,5.5660383 13.085395,5.2953538 12.291964,4.7949001 11.198867,4.946675 10.65436,5.7842873 c -1.0542341,1.6217231 0.211599,3.2069115 2.031348,3.5926018 1.330726,0.2820433 2.858928,-0.047333 2.858928,-0.047333 L 15.5,15 Z" />
+  </g>
 </svg>
diff --git a/share/icons/nextgen/symbolic/actions/zoom-symbolic.svg b/share/icons/nextgen/symbolic/actions/zoom-symbolic.svg
index 841638ab5..18210d012 100644
--- a/share/icons/nextgen/symbolic/actions/zoom-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/zoom-symbolic.svg
@@ -1,10 +1,74 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="zoom-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)"
+   sodipodi:docname="zoom-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <style
+     id="s0">.base {  }
+.success {  }
+.warning {  }
+.error {  }
+.dark {  }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata1254">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1252" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="23.738424"
+     inkscape:cx="26.835744"
+     inkscape:zoom="13.583094"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
   </sodipodi:namedview>
-  <g transform="matrix(0.666667,0,0,0.666667,-190,-392.90812)" inkscape:label="00125" id="zoom">
-      <path inkscape:connector-curvature="0" id="rect14085" d="m 285,589.36218 h 24 v 24 h -24 z" style="opacity:0;fill:none"/>
-      <path id="path14089" d="m 296.4611,591.3622 c -5.2682,0 -9.5389,4.1724 -9.5389,9.299 0,5.1268 4.2707,9.26 9.5389,9.26 1.8739,0 3.6132,-0.5373 5.0874,-1.4455 L 305,612.3622 c 0.6588,0.6397 1.6958,0.6101 2.345,-0.039 l 0.3179,-0.3126 c 0.6492,-0.6492 0.6588,-1.7046 0,-2.3442 l -3.372,-3.7695 c 1.0675,-1.499 1.7091,-3.2737 1.7091,-5.2357 0,-5.1267 -4.2707,-9.2989 -9.5389,-9.2989 z m 0,2.5006 c 3.8633,0 6.9952,3.0787 6.9952,6.8766 0,3.7978 -3.1319,6.8766 -6.9952,6.8766 -3.8633,0 -6.9952,-3.0788 -6.9952,-6.8766 0,-3.7979 3.1319,-6.8766 6.9952,-6.8766 z" style="opacity:1" inkscape:connector-curvature="0"/>
-    </g>
-    </svg>
+  <g
+     inkscape:label="zoom"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 7.6407333,1.3333467 c -3.5121333,0 -6.3592666,2.7816 -6.3592666,6.1993333 0,3.417867 2.8471333,6.173333 6.3592666,6.173333 1.2492667,0 2.4087997,-0.3582 3.3915997,-0.963666 l 2.301,2.591 c 0.4392,0.426466 1.130534,0.406733 1.563334,-0.026 l 0.211933,-0.2084 c 0.4328,-0.4328 0.4392,-1.1364 0,-1.5628 l -2.248,-2.513 C 13.572267,10.023813 14,8.84068 14,7.53268 14,4.11488 11.152867,1.3334133 7.6407333,1.3334133 Z m 0,1.6670666 c 2.5755337,0 4.6634667,2.0524667 4.6634667,4.5844 0,2.5318667 -2.087933,4.5843997 -4.6634667,4.5843997 -2.5755333,0 -4.6634666,-2.052533 -4.6634666,-4.5843997 0,-2.5319333 2.0879333,-4.5844 4.6634666,-4.5844 z"
+       id="path14089" />
+  </g>
+</svg>
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index bfb4b7cd5..723d69500 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -691,7 +691,7 @@ void InkscapePreferences::resetIconsColors()
         prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess);
         prefs->setInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning);
         prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror);
-        if (prefs->getBool("/theme/symbolicDefaultColors", true) {
+        if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
             _symbolic_base_color.setSensitive(false);
             _symbolic_success_color.setSensitive(false);
             _symbolic_warning_color.setSensitive(false);
-- 
cgit v1.2.3