Improvements to temming allow diferent on dark themes

9 files changed, 461 insertions, 366 deletions

diff --git a/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg b/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg
index 62ea80d4e..911996f7e 100644
--- a/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg
+++ b/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg
@@ -1,20 +1,91 @@
-<?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-align-and-distribute-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 (a0e047e17e, 2019-06-20, custom)"
+   sodipodi:docname="dialog-align-and-distribute-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <metadata
+     id="metadata21">
+    <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="defs19" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="dialog-align-and-distribute"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="17.841732"
+     inkscape:cx="-5.4727695"
+     inkscape:zoom="15.839192"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
   </sodipodi:namedview>
-   <style id="style226">
-      .base {fill: #000000;}
-      .success { fill:#4AD589; }
-      .warning { fill:#F57900; }
-      .error { fill:#cc0000; }
-   </style>
-   <style id="highlights"> @import "../../highlights.css"; </style> 
-  <g transform="translate(-135,-807.36218)" inkscape:label="00069" id="dialog-align-and-distribute">
-      <path inkscape:connector-curvature="0" id="rect18735" d="m 135,807.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="rect18737" d="m 136,808.36218 h 1 v 13 h -1 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect18739" d="m 139,808.36218 h 7 v 3 h -7 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect18741" d="m 139,813.36218 h 10 v 3 h -10 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" id="rect18743" d="m 139,-821.36218 h 6 v 3 h -6 z" style="opacity:1" transform="scale(1,-1)"/>
-    </g>
-    </svg>
+  <style
+     id="style226">.base { fill: #333333; }
+.success { fill:#d54ac9; }
+.warning { fill:#177579; }
+.error { fill:#457211; }
+.dark {  }
+</style>
+  <style
+     id="highlights"> @import '../../highlights.css'; </style>
+  <g
+     id="dialog-align-and-distribute">
+    <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
+       style="opacity:1"
+       d="M 2,2 H 3 V 15 H 2 Z"
+       id="rect18737"
+       inkscape:connector-curvature="0"
+       class="base" />
+    <path
+       style="opacity:1"
+       d="m 5,2 h 7 V 5 H 5 Z"
+       class="success"
+       id="rect18739"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1"
+       d="m 5,7 h 10 v 3 H 5 Z"
+       class="warning"
+       id="rect18741"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1"
+       d="m 5,12 h 6 v 3 H 5 Z"
+       class="error"
+       id="rect18743"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/share/icons/nextgen/highlights.css b/share/icons/nextgen/highlights.css
index e171edde0..64031dfdc 100644
--- a/share/icons/nextgen/highlights.css
+++ b/share/icons/nextgen/highlights.css
@@ -1,15 +1,43 @@
+/*
+* Change only colors, do not add more class, order or remove 
+* also dont chage selectors definition
+*/
+
 .base {
     fill: #333333;
 }
 
 .success {
-    fill: rgb(213, 74, 201);
+    fill: #d54ac9;
 }
 
 .warning {
-    fill: rgb(9, 61, 63);
+    fill: #177579;
 }
 
 .error {
-    fill: #6dcc00;
+    fill: #457211;
+}
+
+.dark .base {
+    fill: #CCCCCC;
+}
+
+.dark .success {
+    fill: #fa85f2;
+}
+
+.dark .warning {
+    fill: #8fecf0;
+}
+
+.dark .error {
+    fill: #c1f08c;
+}
+
+
+/* do not change */
+
+.dark #background {
+    opacity: 0.8 !important;
 }
\ No newline at end of file
diff --git a/share/icons/nextgen/scalable/actions/tool-measure.svg b/share/icons/nextgen/scalable/actions/tool-measure.svg
index 1005334cc..94f8b4d5e 100644
--- a/share/icons/nextgen/scalable/actions/tool-measure.svg
+++ b/share/icons/nextgen/scalable/actions/tool-measure.svg
@@ -7,20 +7,22 @@
    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"
+   inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)"
    sodipodi:docname="tool-measure-symbolic.svg"
-   inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)">
-   <style id="style226">
-      .base {fill: #000000;}
-      .success { fill:#4AD589; }
-      .warning { fill:#F57900; }
-      .error { fill:#cc0000; }
-   </style>
-   <style id="highlights"> @import "../../highlights.css"; </style> 
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <style
+     id="style226">.base { fill: #333333; }
+.success { fill:#d54ac9; }
+.warning { fill:#177579; }
+.error { fill:#457211; }
+.dark {  }
+</style>
+  <style
+     id="highlights"> @import '../../highlights.css'; </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -35,103 +37,111 @@
   <defs
      id="defs850" />
   <sodipodi:namedview
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="31.678384"
-     inkscape:cx="7.969267"
-     inkscape:cy="7.571171"
-     inkscape:window-width="1360"
-     inkscape:window-height="704"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
      inkscape:current-layer="svg1"
-     inkscape:document-rotation="0">
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="14.577103"
+     inkscape:cx="16.362103"
+     inkscape:zoom="15.839192"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
     <inkscape:grid
-       type="xygrid"
-       id="grid" />
+       id="grid"
+       type="xygrid" />
     <style
        id="style862">.success { fill:#25FF4E; }
 .error { fill:#CC0000; }
 .warning { fill:#FF25CE; }
 </style>
   </sodipodi:namedview>
-  <rect
-     style="opacity:0.60953183"
-     ry="0"
-     rx="0"
-     y="2"
-     x="8.0427818"
-     height="12.666823"
-     width="3.0714278"
-     id="rect878"
-     class="error" />
-  <rect
-     style="opacity:0.78496546"
-     class="error"
-     id="rect856"
-     width="3.0714278"
-     height="12.666823"
-     x="5"
-     y="2"
-     rx="0"
-     ry="0" />
   <g
-     transform="matrix(0.666667,0,0,0.666667,-189.69806,-598.89953)"
-     id="tool-measure"
-     inkscape:label="00336">
+     id="tool-measure">
     <path
        inkscape:connector-curvature="0"
-       id="rect13362"
-       d="m 284.54709,898.3493 h 24 v 24 h -24 z"
-       style="opacity:0;fill:none" />
+       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-->
+    <rect
+       style="opacity:0.609532;stroke-width:0.683764"
+       ry="0"
+       rx="0"
+       y="1.4478827"
+       x="8.5445757"
+       height="12.991673"
+       width="3.150197"
+       id="rect878"
+       class="error" />
+    <rect
+       style="opacity:0.784965;stroke-width:0.683764"
+       class="error"
+       id="rect856"
+       width="3.150197"
+       height="12.991673"
+       x="5.4237542"
+       y="1.4478827"
+       rx="0"
+       ry="0" />
     <path
-       style="opacity:1"
-       d="m 290.6066,900.4247 v 20.9959 h 11.9246 v -17.1209 c 0,-1.8792 -1.1179,-3.875 -3.6875,-3.875 z m 2,2 h 6.1216 c 1.3125,0 1.8125,0.8107 1.8125,1.9375 v 15.0312 h -7.9341 z"
+       class="base"
+       inkscape:connector-curvature="0"
        id="path13364"
-       inkscape:connector-curvature="0" />
+       d="M 4.4389041,0.81600537 V 15.172249 H 12.592518 V 3.4655915 c 0,-1.2849296 -0.76438,-2.64958613 -2.52138,-2.64958613 z M 5.8064324,2.1835337 h 4.1857307 c 0.8974399,0 1.2393219,0.5543276 1.2393219,1.3247931 V 13.786122 H 5.8064324 Z"
+       style="opacity:1" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8428019,2.8245489 h 2.2222403 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8428019 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13370"
-       d="m 292.65979,903.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8428019,8.2946622 h 2.2222403 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8428019 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13372"
-       d="m 292.65979,911.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,12.397247 h 0.8119768 c 0.1894027,0 0.3418821,0.152479 0.3418821,0.341882 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.189403 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13376"
-       d="m 292.72229,917.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,11.029718 h 0.8119768 c 0.1894027,0 0.3418821,0.15248 0.3418821,0.341883 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.189403 0.1524794,-0.341883 0.3418821,-0.341883 z"
        id="rect13378"
-       d="m 292.72229,915.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,9.6621905 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418825 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.1894031 0.1524794,-0.3418825 0.3418821,-0.3418825 z"
        id="rect13380"
-       d="m 292.72229,913.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,6.9271339 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894026 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.341882 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13382"
-       d="m 292.72229,909.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,5.5596056 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.341882 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894026 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13384"
-       d="m 292.72229,907.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,4.1920773 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.341882 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894026 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13386"
-       d="m 292.72229,905.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
   </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 1005334cc..94f8b4d5e 100644
--- a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
@@ -7,20 +7,22 @@
    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"
+   inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)"
    sodipodi:docname="tool-measure-symbolic.svg"
-   inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)">
-   <style id="style226">
-      .base {fill: #000000;}
-      .success { fill:#4AD589; }
-      .warning { fill:#F57900; }
-      .error { fill:#cc0000; }
-   </style>
-   <style id="highlights"> @import "../../highlights.css"; </style> 
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <style
+     id="style226">.base { fill: #333333; }
+.success { fill:#d54ac9; }
+.warning { fill:#177579; }
+.error { fill:#457211; }
+.dark {  }
+</style>
+  <style
+     id="highlights"> @import '../../highlights.css'; </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
@@ -35,103 +37,111 @@
   <defs
      id="defs850" />
   <sodipodi:namedview
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="31.678384"
-     inkscape:cx="7.969267"
-     inkscape:cy="7.571171"
-     inkscape:window-width="1360"
-     inkscape:window-height="704"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
      inkscape:current-layer="svg1"
-     inkscape:document-rotation="0">
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="14.577103"
+     inkscape:cx="16.362103"
+     inkscape:zoom="15.839192"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
     <inkscape:grid
-       type="xygrid"
-       id="grid" />
+       id="grid"
+       type="xygrid" />
     <style
        id="style862">.success { fill:#25FF4E; }
 .error { fill:#CC0000; }
 .warning { fill:#FF25CE; }
 </style>
   </sodipodi:namedview>
-  <rect
-     style="opacity:0.60953183"
-     ry="0"
-     rx="0"
-     y="2"
-     x="8.0427818"
-     height="12.666823"
-     width="3.0714278"
-     id="rect878"
-     class="error" />
-  <rect
-     style="opacity:0.78496546"
-     class="error"
-     id="rect856"
-     width="3.0714278"
-     height="12.666823"
-     x="5"
-     y="2"
-     rx="0"
-     ry="0" />
   <g
-     transform="matrix(0.666667,0,0,0.666667,-189.69806,-598.89953)"
-     id="tool-measure"
-     inkscape:label="00336">
+     id="tool-measure">
     <path
        inkscape:connector-curvature="0"
-       id="rect13362"
-       d="m 284.54709,898.3493 h 24 v 24 h -24 z"
-       style="opacity:0;fill:none" />
+       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-->
+    <rect
+       style="opacity:0.609532;stroke-width:0.683764"
+       ry="0"
+       rx="0"
+       y="1.4478827"
+       x="8.5445757"
+       height="12.991673"
+       width="3.150197"
+       id="rect878"
+       class="error" />
+    <rect
+       style="opacity:0.784965;stroke-width:0.683764"
+       class="error"
+       id="rect856"
+       width="3.150197"
+       height="12.991673"
+       x="5.4237542"
+       y="1.4478827"
+       rx="0"
+       ry="0" />
     <path
-       style="opacity:1"
-       d="m 290.6066,900.4247 v 20.9959 h 11.9246 v -17.1209 c 0,-1.8792 -1.1179,-3.875 -3.6875,-3.875 z m 2,2 h 6.1216 c 1.3125,0 1.8125,0.8107 1.8125,1.9375 v 15.0312 h -7.9341 z"
+       class="base"
+       inkscape:connector-curvature="0"
        id="path13364"
-       inkscape:connector-curvature="0" />
+       d="M 4.4389041,0.81600537 V 15.172249 H 12.592518 V 3.4655915 c 0,-1.2849296 -0.76438,-2.64958613 -2.52138,-2.64958613 z M 5.8064324,2.1835337 h 4.1857307 c 0.8974399,0 1.2393219,0.5543276 1.2393219,1.3247931 V 13.786122 H 5.8064324 Z"
+       style="opacity:1" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8428019,2.8245489 h 2.2222403 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8428019 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13370"
-       d="m 292.65979,903.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8428019,8.2946622 h 2.2222403 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8428019 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13372"
-       d="m 292.65979,911.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,12.397247 h 0.8119768 c 0.1894027,0 0.3418821,0.152479 0.3418821,0.341882 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.189403 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13376"
-       d="m 292.72229,917.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,11.029718 h 0.8119768 c 0.1894027,0 0.3418821,0.15248 0.3418821,0.341883 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.189403 0.1524794,-0.341883 0.3418821,-0.341883 z"
        id="rect13378"
-       d="m 292.72229,915.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,9.6621905 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418825 0,0.189402 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.15248 -0.3418821,-0.341882 0,-0.1894031 0.1524794,-0.3418825 0.3418821,-0.3418825 z"
        id="rect13380"
-       d="m 292.72229,913.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,6.9271339 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.3418821 0,0.1894026 -0.1524794,0.341882 -0.3418821,0.341882 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.341882 0,-0.1894027 0.1524794,-0.3418821 0.3418821,-0.3418821 z"
        id="rect13382"
-       d="m 292.72229,909.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,5.5596056 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.341882 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894026 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13384"
-       d="m 292.72229,907.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
+       class="base"
+       style="opacity:1"
+       d="m 5.8855371,4.1920773 h 0.8119768 c 0.1894027,0 0.3418821,0.1524794 0.3418821,0.341882 0,0.1894027 -0.1524794,0.3418821 -0.3418821,0.3418821 H 5.8855371 c -0.1894027,0 -0.3418821,-0.1524794 -0.3418821,-0.3418821 0,-0.1894026 0.1524794,-0.341882 0.3418821,-0.341882 z"
        id="rect13386"
-       d="m 292.72229,905.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
-       style="opacity:1" />
+       inkscape:connector-curvature="0" />
   </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 28c6d443e..c787b0d20 100644
--- a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-spray-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"
-   version="1.1"
-   id="svg1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)"
    sodipodi:docname="tool-spray-symbolic.svg"
-   inkscape:version="1.0alpha2 (33a359e035, 2019-06-16, custom)">
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
   <metadata
      id="metadata2833">
     <rdf:RDF>
@@ -28,59 +28,67 @@
   <defs
      id="defs2831" />
   <sodipodi:namedview
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="12.342567"
-     inkscape:cx="15.844289"
-     inkscape:cy="14.659999"
-     inkscape:window-width="1360"
-     inkscape:window-height="704"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g264"
      inkscape:window-maximized="1"
-     inkscape:current-layer="tool-spray"
-     inkscape:document-rotation="0">
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="15.435688"
+     inkscape:cx="12.187594"
+     inkscape:zoom="24.685134"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
     <inkscape:grid
-       type="xygrid"
-       id="grid" />
+       id="grid"
+       type="xygrid" />
   </sodipodi:namedview>
-   <style id="style226">
-      .base {fill: #000000;}
-      .success { fill:#4AD589; }
-      .warning { fill:#F57900; }
-      .error { fill:#cc0000; }
-   </style>
-   <style id="highlights"> @import "../../highlights.css"; </style> 
+  <style
+     id="style226">.base { fill: #333333; }
+.success { fill:#d54ac9; }
+.warning { fill:#177579; }
+.error { fill:#457211; }
+.dark {  }
+</style>
+  <style
+     id="highlights"> @import '../../highlights.css'; </style>
   <g
-     transform="matrix(0.666667,0,0,0.666667,-190,-681.57467)"
-     id="tool-spray"
-     inkscape:label="00153">
+     id="tool-spray">
+    <g
+       id="g264">
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0;fill:none"
-       d="m 285,1022.362 h 24 v 24 h -24 z"
-       id="path5769" />
-    <path
-       id="path6331-0"
-       d="m 303,1029.362 v -2 c -0.5069,-1.555 -3,-1 -3,0 v 2 z"
-       style="opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1"
-       d="M 306.9558,1035.246 306,1034.362 h -9 l -0.9712,1.413 -0.029,6.587 c 2.8952,1.823 3.7348,4.575 11,2 z"
-       id="path6315-8"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5211-1"
-       d="m 306,1033.362 -2,-3 h -5 l -2,3 z"
-       style="opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       class="success"
-       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"
-       id="use30430" />
+       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
+         id="path6331-0"
+         d="M 11.076424,4.621605 V 3.4036338 c -0.308695,-0.9469725 -1.8269569,-0.6089855 -1.8269569,0 V 4.621605 Z"
+         style="opacity:1"
+         inkscape:connector-curvature="0"
+         class="base" />
+      <path
+         class="base"
+         style="opacity:1"
+         d="M 13.485449,8.2048762 12.903381,7.6665329 H 7.4225103 L 6.8310635,8.5270296 6.8134029,12.538417 c 1.7631351,1.110181 2.2744394,2.786109 6.6988421,1.217971 z"
+         id="path6315-8"
+         inkscape:connector-curvature="0" />
+      <path
+         class="base"
+         id="path5211-1"
+         d="M 12.903381,7.0575473 11.68541,5.2305906 H 8.6404815 L 7.4225103,7.0575473 Z"
+         style="opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         class="success"
+         d="M 6.6259693,4.3347119 A 0.25994653,0.25994653 0 0 1 6.3660238,4.5947487 0.25994653,0.25994653 0 0 1 6.1060784,4.3347119 0.25994653,0.25994653 0 0 1 6.3660238,4.0747969 0.25994653,0.25994653 0 0 1 6.6259693,4.3347119 Z M 3.6689911,5.5824625 A 0.35775635,0.35775635 0 0 1 3.3112365,5.9403024 0.35775635,0.35775635 0 0 1 2.9534818,5.5824625 0.35775635,0.35775635 0 0 1 3.3112365,5.2247443 0.35775635,0.35775635 0 0 1 3.6689911,5.5824625 Z M 3.2473356,3.0773394 A 0.35775635,0.35775635 0 0 1 2.8895809,3.4351793 0.35775635,0.35775635 0 0 1 2.5318263,3.0773394 0.35775635,0.35775635 0 0 1 2.8895809,2.7196212 0.35775635,0.35775635 0 0 1 3.2473356,3.0773394 Z M 5.2185732,5.1263323 A 0.24554623,0.24554623 0 0 1 4.9730241,5.3719361 0.24554623,0.24554623 0 0 1 4.7274812,5.1263323 0.24554623,0.24554623 0 0 1 4.9730241,4.8807893 0.24554623,0.24554623 0 0 1 5.2185732,5.1263323 Z M 4.9457355,3.4893181 A 0.24554623,0.24554623 0 0 1 4.7001864,3.734922 0.24554623,0.24554623 0 0 1 4.4546434,3.4893181 0.24554623,0.24554623 0 0 1 4.7001864,3.2437751 0.24554623,0.24554623 0 0 1 4.9457355,3.4893181 Z M 2.672234,4.2834962 A 0.79790119,0.79790119 0 0 1 1.8743228,5.0815109 0.79790119,0.79790119 0 0 1 1.0764238,4.2834962 0.79790119,0.79790119 0 0 1 1.8743228,3.4857251 0.79790119,0.79790119 0 0 1 2.672234,4.2834962 Z M 3.2667683,1.8381146 A 0.79790107,0.79790107 0 0 1 2.4688754,2.6361902 0.79790107,0.79790107 0 0 1 1.6709825,1.8381146 0.79790107,0.79790107 0 0 1 2.4688754,1.0403435 0.79790107,0.79790107 0 0 1 3.2667683,1.8381146 Z m 0.438427,5.2903796 A 0.79790107,0.79790107 0 0 1 2.9072963,7.9267525 0.79790107,0.79790107 0 0 1 2.1094034,7.1284942 0.79790107,0.79790107 0 0 1 2.9072963,6.3306622 0.79790107,0.79790107 0 0 1 3.7051953,7.1284942 Z M 4.5167295,4.2832526 A 0.53707463,0.53707463 0 0 1 3.9796469,4.8203779 0.53707463,0.53707463 0 0 1 3.4425764,4.2832526 0.53707463,0.53707463 0 0 1 3.9796469,3.7462491 0.53707463,0.53707463 0 0 1 4.5167295,4.2832526 Z M 4.936552,2.513236 A 0.53707457,0.53707457 0 0 1 4.3994815,3.0504222 0.53707457,0.53707457 0 0 1 3.862411,2.513236 0.53707457,0.53707457 0 0 1 4.3994815,1.9762325 0.53707457,0.53707457 0 0 1 4.936552,2.513236 Z M 5.3158952,6.0997957 A 0.53707457,0.53707457 0 0 1 4.7788247,6.6371037 0.53707457,0.53707457 0 0 1 4.2417543,6.0997957 0.53707457,0.53707457 0 0 1 4.7788247,5.5627922 0.53707457,0.53707457 0 0 1 5.3158952,6.0997957 Z M 5.7445906,4.283009 A 0.35775639,0.35775639 0 0 1 5.3868298,4.6407881 0.35775639,0.35775639 0 0 1 5.0290752,4.283009 0.35775639,0.35775639 0 0 1 5.3868298,3.9252909 0.35775639,0.35775639 0 0 1 5.7445906,4.283009 Z M 6.1245245,3.0773394 A 0.35775635,0.35775635 0 0 1 5.7667699,3.4351793 0.35775635,0.35775635 0 0 1 5.4090152,3.0773394 0.35775635,0.35775635 0 0 1 5.7667699,2.7196212 0.35775635,0.35775635 0 0 1 6.1245245,3.0773394 Z M 6.3265859,5.496291 A 0.35775635,0.35775635 0 0 1 5.9688313,5.8541918 0.35775635,0.35775635 0 0 1 5.6110766,5.496291 0.35775635,0.35775635 0 0 1 5.9688313,5.1385729 0.35775635,0.35775635 0 0 1 6.3265859,5.496291 Z M 7.0734763,3.6258527 A 0.25994653,0.25994653 0 0 1 6.8135308,3.8858895 0.25994653,0.25994653 0 0 1 6.5535853,3.6258527 0.25994653,0.25994653 0 0 1 6.8135308,3.3659376 0.25994653,0.25994653 0 0 1 7.0734763,3.6258527 Z m 0,1.344762 A 0.25994653,0.25994653 0 0 1 6.8135308,5.2306515 0.25994653,0.25994653 0 0 1 6.5535853,4.9706147 0.25994653,0.25994653 0 0 1 6.8135308,4.7106996 0.25994653,0.25994653 0 0 1 7.0734763,4.9706147 Z M 7.5252888,4.283009 A 0.24554623,0.24554623 0 0 1 7.2797397,4.5286129 0.24554623,0.24554623 0 0 1 7.0341967,4.283009 0.24554623,0.24554623 0 0 1 7.2797397,4.037466 0.24554623,0.24554623 0 0 1 7.5252888,4.283009 Z"
+         id="use30430" />
+    </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 a8e997ee3..f69251303 100644
--- a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-tweak-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 (33a359e035, 2019-06-16, custom)"
+   inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)"
    sodipodi:docname="tool-tweak-symbolic.svg"
    viewBox="0 0 16 16"
    height="16"
@@ -28,32 +28,34 @@
   <defs
      id="defs941">
     <inkscape:path-effect
-       id="path-effect949"
-       allow_transforms="false"
-       method="bsplinespiro"
-       linkeditem="#path945"
-       effect="clone_original" />
-    <inkscape:path-effect
        attempt_force_join="true"
        miter_limit="100"
        linejoin_type="extrp_arc"
-       line_width="2"
+       line_width="1"
        linecap_type="butt"
        is_visible="true"
-       id="path-effect947"
+       id="path-effect23"
        effect="join_type" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect949"
+       allow_transforms="false"
+       method="bsplinespiro"
+       linkeditem="#path945"
+       effect="clone_original" />
   </defs>
   <sodipodi:namedview
+     inkscape:snap-global="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="tool-tweak"
+     inkscape:current-layer="g269"
      inkscape:window-maximized="1"
      inkscape:window-y="27"
      inkscape:window-x="0"
-     inkscape:window-height="704"
-     inkscape:window-width="1360"
-     inkscape:cy="14.485603"
-     inkscape:cx="8.5107553"
-     inkscape:zoom="15.84375"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:cy="15.022115"
+     inkscape:cx="-1.7982182"
+     inkscape:zoom="11.2"
      showgrid="true"
      id="namedview"
      guidetolerance="10"
@@ -63,37 +65,40 @@
        id="grid"
        type="xygrid" />
   </sodipodi:namedview>
-   <style id="style226">
-      .base {fill: #000000;}
-      .success { fill:#4AD589; }
-      .warning { fill:#F57900; }
-      .error { fill:#cc0000; }
-   </style>
-   <style id="highlights"> @import "../../highlights.css"; </style> 
+  <style
+     id="style226">.base { fill: #333333; }
+.success { fill:#d54ac9; }
+.warning { fill:#177579; }
+.error { fill:#457211; }
+.dark {  }
+</style>
+  <style
+     id="highlights"> @import '../../highlights.css'; </style>
   <g
-     inkscape:label="00155"
-     id="tool-tweak"
-     transform="matrix(0.666667,0,0,0.666667,-190,-702.2414)">
-    <path
-       style="opacity:0;fill:none"
-       d="m 285,1053.3621 h 24 v 24 h -24 z"
-       id="rect4400"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(0.45564625,-0.53843343)"
-       inkscape:original-d="m 299.1929,1056.371 c -1.0952,-0.05 -2.1049,0.13 -2.7404,0.528 -5.4824,3.44 -2.3872,12.059 -10.4395,10.501 l -0.044,9.025 h 21.0312 l 0.044,-9.025 c -5.4826,1.244 -7.7633,-0.221 -8.8391,-2.661 -0.9536,-2.163 -0.193,-4.085 1.0834,-4.316 2.5235,-0.459 2.2613,1.245 3.7602,1.673 1.4248,0.407 1.8586,-0.955 0.8603,-3.083 -0.8381,-1.786 -2.8906,-2.557 -4.716,-2.642 z"
-       inkscape:path-effect="#path-effect947"
-       d="m 295.921,1056.0519 c -3.61141,2.2661 -3.9697,6.5991 -5.20799,8.8302 -0.70199,1.2649 -1.69758,2.0803 -4.51005,1.5361 a 12.437438,12.437438 0 0 1 -1.18377,-0.2899 l -0.0551,11.2967 h 23.03123 l 0.0552,-11.3117 a 24.948496,24.948496 0 0 1 -1.22757,0.3115 c -5.14723,1.1679 -6.85331,-0.1625 -7.7028,-2.0892 -0.79144,-1.7952 -0.0697,-2.8533 0.34733,-2.9287 2.08613,-0.3795 1.06949,1.0119 3.30658,1.6506 2.59277,0.7407 3.25967,-1.87 2.04025,-4.4693 -1.04408,-2.225 -3.51886,-3.1204 -5.57477,-3.2161 a 8.1529359,8.1529359 0 0 0 -0.024,-0 l -0.0226,0 a 1,1 0 0 0 0.0456,10e-4 c -1.1981,-0.055 -2.46463,0.1458 -3.31751,0.6799 z m 3.272,1.3191 a 1,1 0 0 0 -0.0465,-0 c 1.59489,0.074 3.22511,0.7209 3.85718,2.0678 0.45528,0.9705 0.49384,1.547 0.42371,1.7879 0,0 0.0649,-0.059 0.0649,-0.059 -0.0168,-0 -0.038,-0 -0.0644,-0.01 -0.0293,-0.01 -0.0641,-0.013 -0.10462,-0.025 -0.84047,-0.24 -1.30016,-2.2252 -4.21285,-1.6954 -2.13664,0.3867 -2.9361,3.1726 -1.82033,5.7034 1.3021,2.9533 4.15742,4.5529 9.97539,3.2328 a 1,1 0 0 0 -1.22127,-0.9801 l -0.044,9.025 a 1,1 0 0 0 0.99999,-0.9951 H 285.969 a 1,1 0 0 0 0.99999,1.0049 l 0.044,-9.025 a 1,1 0 0 0 -1.18995,0.9769 c 3.62937,0.7022 5.50842,-0.4926 6.63869,-2.5291 1.51008,-2.7208 1.5548,-6.2447 4.52155,-8.1062 0.41884,-0.2623 1.17171,-0.4218 2.16401,-0.3765 a 7.6406572,7.6406572 0 0 1 0.0221,0 z"
-       id="path945"
-       inkscape:connector-curvature="0" />
+     id="tool-tweak">
+    <g
+       id="g269">
     <path
-       class="warning"
-       style=""
        inkscape:connector-curvature="0"
-       transform="translate(0.45564625,-0.53843343)"
-       inkscape:original-d="M 0,0"
-       inkscape:path-effect="#path-effect949"
-       id="path951"
-       d="m 299.1929,1056.371 c -1.0952,-0.05 -2.1049,0.13 -2.7404,0.528 -5.4824,3.44 -2.3872,12.059 -10.4395,10.501 l -0.044,9.025 h 21.0312 l 0.044,-9.025 c -5.4826,1.244 -7.7633,-0.221 -8.8391,-2.661 -0.9536,-2.163 -0.193,-4.085 1.0834,-4.316 2.5235,-0.459 2.2613,1.245 3.7602,1.673 1.4248,0.407 1.8586,-0.955 0.8603,-3.083 -0.8381,-1.786 -2.8906,-2.557 -4.716,-2.642 z" />
+       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
+         inkscape:original-d="M 9.8882531,2.1152806 C 9.1952472,2.0836423 8.556343,2.1975403 8.15422,2.4493813 4.6851415,4.626098 6.64368,10.079911 1.5484551,9.0940611 L 1.5206134,14.804778 H 14.82845 L 14.85629,9.0940611 C 11.387086,9.8812219 9.9439359,8.9542198 9.2632063,7.4102702 8.6598004,6.0415964 9.1410824,4.8254194 9.9487453,4.6792504 11.545532,4.3888106 11.37962,5.4670446 12.328074,5.7378686 13.229639,5.9954045 13.504133,5.1335766 12.872443,3.7870498 12.342121,2.6569286 11.043368,2.1690657 9.8883165,2.1152806 Z"
+         inkscape:path-effect="#path-effect23"
+         id="path945"
+         d="M 7.888471,2.0258516 C 5.6460395,3.4328932 5.4401394,6.1209853 4.6385466,7.565277 4.1659225,8.4168403 3.4773001,8.9579907 1.6434361,8.6031654 A 7.9041946,7.9041946 0 0 1 1.0515169,8.4648304 L 1.0181698,15.304778 H 15.326018 l 0.0334,-6.8506343 A 15.712505,15.712505 0 0 1 14.745652,8.6064554 C 11.444132,9.3555688 10.28829,8.4958688 9.7207171,7.2085678 9.1983906,6.023802 9.6602439,5.239585 10.038222,5.1711791 c 1.382934,-0.251542 0.843126,0.673572 2.152518,1.0474591 1.486455,0.4246123 1.876762,-1.0614368 1.134344,-2.643995 C 12.69177,2.225047 11.18188,1.6749737 9.9115739,1.6158218 a 5.0616307,5.0616307 0 0 0 -0.011925,-5.412e-4 l -0.011396,0 a 0.5,0.5 0 0 0 0.022803,5.203e-4 C 9.1666004,1.5818137 8.3992814,1.7059417 7.888471,2.0258516 Z m 1.9998455,0.589429 a 0.5,0.5 0 0 0 -0.023257,-5.412e-4 c 1.0397969,0.048418 2.1274129,0.4740708 2.5547199,1.3846667 0.29391,0.6265055 0.331925,1.0305961 0.275382,1.2248114 -0.01073,0.03685 -0.01075,0.09544 -0.229803,0.032867 C 11.84655,5.0803887 11.651341,3.8613613 9.8597029,4.1872428 8.6219209,4.4112538 8.1212102,6.0593908 8.8057009,7.611985 9.5995818,9.4125708 11.33004,10.406875 14.966928,9.5816668 A 0.5,0.5 0 0 0 14.356296,9.0916236 l -0.02784,5.7107174 A 0.5,0.5 0 0 0 14.82845,14.304778 H 1.5206134 a 0.5,0.5 0 0 0 0.4999941,0.502438 L 2.0484492,9.0964987 A 0.5,0.5 0 0 0 1.4534741,9.5849568 C 3.69579,10.018811 4.8261432,9.2879496 5.5129072,8.0505537 6.4503965,6.3614067 6.4995063,4.0779294 8.419609,2.8731368 8.7134046,2.6891389 9.223894,2.5854709 9.86545,2.6147603 a 4.8775646,4.8775646 0 0 1 0.011117,5.203e-4 z"
+         class="base "
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccc" />
+      <path
+         d="M 9.8882531,2.1152806 C 9.1952472,2.0836423 8.556343,2.1975403 8.15422,2.4493813 4.6851415,4.626098 6.64368,10.079911 1.5484551,9.0940611 L 1.5206134,14.804778 H 14.82845 L 14.85629,9.0940611 C 11.387086,9.8812219 9.9439359,8.9542198 9.2632063,7.4102702 8.6598004,6.0415964 9.1410824,4.8254194 9.9487453,4.6792504 11.545532,4.3888106 11.37962,5.4670446 12.328074,5.7378686 13.229639,5.9954045 13.504133,5.1335766 12.872443,3.7870498 12.342121,2.6569286 11.043368,2.1690657 9.8883165,2.1152806 Z"
+         id="path951"
+         inkscape:connector-curvature="0"
+         class="warning"
+         inkscape:original-d="M 0,0"
+         inkscape:path-effect="#path-effect949"
+         style="" />
+    </g>
   </g>
 </svg>
diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index 3b93ff190..dc9712938 100644
--- a/src/object/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
@@ -203,14 +203,14 @@ import_style_cb (CRDocHandler *a_handler,
     CRStatus const parse_status =
         cr_parser_parse_file (parser, reinterpret_cast<const guchar *>(import_file.c_str()), CR_UTF_8);
     if (parse_status == CR_OK) {
-        if (!document->getStyleSheet()) {
+        if(!document->getStyleSheet()) {
             // if the style is the first style sheet that we've seen, set the document's
             // first style sheet to this style and create a cascade object with it.
             document->setStyleSheet(stylesheet);
-            cr_cascade_set_sheet(document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR);
+            cr_cascade_set_sheet (document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR);
         } else {
             // If not the first, then chain up this style_sheet
-            cr_stylesheet_append_import(document->getStyleSheet(), stylesheet);
+            cr_stylesheet_append_import (document->getStyleSheet(), stylesheet);
         }
     } else {
         std::cerr << "import_style_cb: Could not parse: " << import_file << std::endl;
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 669d39c2d..50edd7622 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -628,16 +628,15 @@ void InkscapePreferences::symbolicThemeCheck()
             _symbolic_base_colors.get_parent()->hide();
             _symbolic_base_color.get_parent()->get_parent()->hide();
             _symbolic_success_color.get_parent()->get_parent()->hide();
-            _theme_decide_color.get_parent()->hide();
         }
         else {
             _symbolic_icons.get_parent()->show();
             _symbolic_base_colors.get_parent()->show();
             _symbolic_base_color.get_parent()->get_parent()->show();
             _symbolic_success_color.get_parent()->get_parent()->show();
-            _theme_decide_color.get_parent()->show();
         }
     }
+    changeIconsColors();
 }
 
 void InkscapePreferences::resetIconsColors()
@@ -649,7 +648,6 @@ void InkscapePreferences::resetIconsColors()
         _symbolic_success_color.setSensitive(false);
         _symbolic_warning_color.setSensitive(false);
         _symbolic_error_color.setSensitive(false);
-        _theme_decide_color.set_sensitive(false);
     } else if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
         Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
         Gdk::RGBA normal_color = _symbolic_base_color.get_style_context()->get_color();
@@ -664,6 +662,7 @@ void InkscapePreferences::resetIconsColors()
         guint32 colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha());
         guint32 colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha());
         guint32 colorseterror = error_color_sp.toRGBA32(error_color.get_alpha());
+        get_highlight_colors(colorsetbase, colorsetsuccess, colorsetwarning, colorseterror);
         _symbolic_base_color.setRgba32(colorsetbase);
         _symbolic_success_color.setRgba32(colorsetsuccess);
         _symbolic_warning_color.setRgba32(colorsetwarning);
@@ -672,21 +671,16 @@ void InkscapePreferences::resetIconsColors()
         prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess);
         prefs->setInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning);
         prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror);
-        auto const screen = Gdk::Screen::get_default();
-        if (INKSCAPE.colorizeprovider) {
-            Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
-        }
         _symbolic_base_color.setSensitive(false);
         _symbolic_success_color.setSensitive(false);
         _symbolic_warning_color.setSensitive(false);
         _symbolic_error_color.setSensitive(false);
-        _theme_decide_color.set_sensitive(false);
+        changeIconsColors();
     } else {
         _symbolic_base_color.setSensitive(true);
         _symbolic_success_color.setSensitive(true);
         _symbolic_warning_color.setSensitive(true);
         _symbolic_error_color.setSensitive(true);
-        _theme_decide_color.set_sensitive(true);
     }
 }
 
@@ -700,12 +694,16 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c
     if (themeiconname == prefs->getString("/theme/defaultIconTheme")) {
         themeiconname = "hicolor";
     }
+    Glib::ustring prefix = "";
+    if (prefs->getBool("/theme/darkTheme", false)) {
+        prefix = ".dark ";
+    }
     Glib::ustring higlight = get_filename(ICONS, Glib::ustring(themeiconname + "/highlights.css").c_str(), false, true);
     if (!higlight.empty()) {
         std::ifstream ifs(higlight);
         std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
         Glib::ustring result;
-        size_t startpos = content.find(".base");
+        size_t startpos = content.find(prefix + ".base");
         size_t endpos = content.find("}");
         if (startpos != std::string::npos) {
             result = content.substr(startpos, endpos - startpos);
@@ -717,8 +715,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c
             SPColor base_color_sp(base_color.get_red(), base_color.get_green(), base_color.get_blue());
             colorsetbase = base_color_sp.toRGBA32(base_color.get_alpha());
         }
-        content.erase(startpos, endpos - startpos + 1);
-        startpos = content.find(".success");
+        content.erase(0, endpos + 1);
+        startpos = content.find(prefix + ".success");
         endpos = content.find("}");
         if (startpos != std::string::npos) {
             result = content.substr(startpos, endpos - startpos);
@@ -730,8 +728,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c
             SPColor success_color_sp(success_color.get_red(), success_color.get_green(), success_color.get_blue());
             colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha());
         }
-        content.erase(startpos, endpos - startpos + 1);
-        startpos = content.find(".warning");
+        content.erase(0, endpos + 1);
+        startpos = content.find(prefix + ".warning");
         endpos = content.find("}");
         if (startpos != std::string::npos) {
             result = content.substr(startpos, endpos - startpos);
@@ -743,8 +741,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c
             SPColor warning_color_sp(warning_color.get_red(), warning_color.get_green(), warning_color.get_blue());
             colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha());
         }
-        content.erase(startpos, endpos - startpos + 1);
-        startpos = content.find(".error");
+        content.erase(0, endpos + 1);
+        startpos = content.find(prefix + ".error");
         endpos = content.find("}");
         if (startpos != std::string::npos) {
             result = content.substr(startpos, endpos - startpos);
@@ -759,67 +757,35 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c
     }
 }
 
-void InkscapePreferences::themeIconsColors()
-{
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (!prefs->getBool("/theme/symbolicDefaultColors", true)) {
-        Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-        Gdk::RGBA normal_color = _symbolic_base_color.get_style_context()->get_color();
-        Gdk::RGBA success_color = _symbolic_success_color.get_style_context()->get_color();
-        Gdk::RGBA warning_color = _symbolic_warning_color.get_style_context()->get_color();
-        Gdk::RGBA error_color = _symbolic_error_color.get_style_context()->get_color();
-        SPColor normal_color_sp(normal_color.get_red(), normal_color.get_green(), normal_color.get_blue());
-        SPColor success_color_sp(success_color.get_red(), success_color.get_green(), success_color.get_blue());
-        SPColor warning_color_sp(warning_color.get_red(), warning_color.get_green(), warning_color.get_blue());
-        SPColor error_color_sp(error_color.get_red(), error_color.get_green(), error_color.get_blue());
-        guint32 colorsetbase = normal_color_sp.toRGBA32(normal_color.get_alpha());
-        guint32 colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha());
-        guint32 colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha());
-        guint32 colorseterror = error_color_sp.toRGBA32(error_color.get_alpha());
-        get_highlight_colors(colorsetbase, colorsetsuccess, colorsetwarning, colorseterror);
-        _symbolic_base_color.setRgba32(colorsetbase);
-        _symbolic_success_color.setRgba32(colorsetsuccess);
-        _symbolic_warning_color.setRgba32(colorsetwarning);
-        _symbolic_error_color.setRgba32(colorseterror);
-        prefs->setInt("/theme/" + themeiconname + "/symbolicBaseColor", colorsetbase);
-        prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess);
-        prefs->setInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning);
-        prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror);
-        changeIconsColors();
-    }
-}
-
 void InkscapePreferences::changeIconsColors()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (!prefs->getBool("/theme/symbolicDefaultColors", true)) {
-        Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-        guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff);
-        guint32 colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff);
-        guint32 colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff);
-        guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff);
-        _symbolic_base_color.setRgba32(colorsetbase);
-        _symbolic_success_color.setRgba32(colorsetsuccess);
-        _symbolic_warning_color.setRgba32(colorsetwarning);
-        _symbolic_error_color.setRgba32(colorseterror);
-        auto const screen = Gdk::Screen::get_default();
-        if (INKSCAPE.colorizeprovider) {
-            Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
-        }
-        Gtk::CssProvider::create();
-        Glib::ustring css_str = "";
-        if (prefs->getBool("/theme/symbolicIcons", false)) {
-            css_str = INKSCAPE.get_symbolic_colors();
-        }
-        try {
-            INKSCAPE.colorizeprovider->load_from_data(css_str);
-        } catch (const Gtk::CssProviderError &ex) {
-            g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(),
-                       ex.what().c_str());
-        }
-        Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider,
-                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
+    guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff);
+    guint32 colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff);
+    guint32 colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff);
+    guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff);
+    _symbolic_base_color.setRgba32(colorsetbase);
+    _symbolic_success_color.setRgba32(colorsetsuccess);
+    _symbolic_warning_color.setRgba32(colorsetwarning);
+    _symbolic_error_color.setRgba32(colorseterror);
+    auto const screen = Gdk::Screen::get_default();
+    if (INKSCAPE.colorizeprovider) {
+        Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
+    }
+    Gtk::CssProvider::create();
+    Glib::ustring css_str = "";
+    if (prefs->getBool("/theme/symbolicIcons", false)) {
+        css_str = INKSCAPE.get_symbolic_colors();
     }
+    try {
+        INKSCAPE.colorizeprovider->load_from_data(css_str);
+    } catch (const Gtk::CssProviderError &ex) {
+        g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(),
+                    ex.what().c_str());
+    }
+    Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider,
+                                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 void InkscapePreferences::toggleSymbolic()
@@ -866,12 +832,15 @@ void InkscapePreferences::themeChange()
             }
         }
         if (dark) {
+            prefs->setBool("/theme/darkTheme", true);
             window->get_style_context()->add_class("dark");
             window->get_style_context()->remove_class("bright");
         } else {
+            prefs->setBool("/theme/darkTheme", false);
             window->get_style_context()->add_class("bright");
             window->get_style_context()->remove_class("dark");
         }
+        resetIconsColors();
         INKSCAPE.signal_change_theme.emit();
     }
 }
@@ -1145,10 +1114,6 @@ void InkscapePreferences::initPageUI()
                          _("Highlights colors, some symbolic icon themes use it. Some icons changes need reload"),
                          false);
     Gtk::Box *icon_buttons_def = Gtk::manage(new Gtk::Box());
-    _theme_decide_color.set_label(_("Theme default colors"));
-    _theme_decide_color.set_tooltip_text(_("Defaul colors from theme)"));
-    _theme_decide_color.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::themeIconsColors));
-    icon_buttons_def->pack_start(_theme_decide_color, true, true, 4);
     resetIconsColors();
     _page_theme.add_line(false, "", *icon_buttons_def, "",
                          _("Reset theme colors, some symbolic icon themes use it. Some icons changes need reload"),
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 592877796..c0b7f3938 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -250,7 +250,6 @@ protected:
     UI::Widget::PrefColorPicker _symbolic_warning_color;
     UI::Widget::PrefColorPicker _symbolic_error_color;
     UI::Widget::PrefColorPicker _symbolic_success_color;
-    Gtk::Button _theme_decide_color;
     UI::Widget::PrefCombo _misc_small_toolbar;
     UI::Widget::PrefCombo _misc_small_secondary;
     UI::Widget::PrefCombo _misc_small_tools;
@@ -597,7 +596,6 @@ private:
   void toggleSymbolic();
   void changeIconsColors();
   void resetIconsColors();
-  void themeIconsColors();
   void changeIconsColor(guint32 /*color*/) { changeIconsColors(); }
   void get_highlight_colors(guint32 &colorsetbase, guint32 &colorsetsuccess, guint32 &colorsetwarning,
                             guint32 &colorseterror);