From 20ac6bcc7e949b6db8cf5b0af4327051ecea8119 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Tue, 3 Dec 2019 01:31:27 +0100
Subject: [PATCH] Add a try to move multicolor theme to more standar wey using
 themes on icons

---
 share/icons/multicolor-beta/highlights.css    |  50 +---
 .../align-horizontal-baseline-symbolic.svg    |   8 +-
 .../align-horizontal-center-symbolic.svg      |   8 +-
 .../align-horizontal-left-symbolic.svg        |   8 +-
 ...ign-horizontal-left-to-anchor-symbolic.svg |  10 +-
 .../align-horizontal-node-symbolic.svg        |   8 +-
 .../align-horizontal-right-symbolic.svg       |   8 +-
 ...gn-horizontal-right-to-anchor-symbolic.svg |  10 +-
 .../actions/align-on-canvas-symbolic.svg      |   8 +-
 .../actions/align-sel-as-group-symbolic.svg   |  14 +-
 .../align-vertical-baseline-symbolic.svg      |   8 +-
 .../align-vertical-bottom-symbolic.svg        |   8 +-
 ...ign-vertical-bottom-to-anchor-symbolic.svg |  10 +-
 .../align-vertical-center-symbolic.svg        |   8 +-
 .../actions/align-vertical-node-symbolic.svg  |   8 +-
 .../actions/align-vertical-top-symbolic.svg   |   8 +-
 .../align-vertical-top-to-anchor-symbolic.svg |  10 +-
 .../actions/boundingbox_bottom-symbolic.svg   |   8 +-
 .../boundingbox_bottom_left-symbolic.svg      |   8 +-
 .../boundingbox_bottom_right-symbolic.svg     |   8 +-
 .../actions/boundingbox_left-symbolic.svg     |   8 +-
 .../actions/boundingbox_right-symbolic.svg    |   8 +-
 .../actions/boundingbox_top-symbolic.svg      |   8 +-
 .../actions/boundingbox_top_left-symbolic.svg |   8 +-
 .../boundingbox_top_right-symbolic.svg        |   8 +-
 .../symbolic/actions/color-fill-symbolic.svg  |  14 +-
 .../actions/color-gradient-symbolic.svg       |  12 +-
 .../actions/color-management-symbolic.svg     |  10 +-
 .../actions/color-picker-symbolic.svg         |   8 +-
 .../dialog-align-and-distribute-symbolic.svg  |  10 +-
 .../dialog-fill-and-stroke-symbolic.svg       |   8 +-
 .../distribute-graph-directed-symbolic.svg    |  14 +-
 .../actions/distribute-graph-symbolic.svg     |   6 +-
 ...istribute-horizontal-baseline-symbolic.svg |  10 +-
 .../distribute-horizontal-center-symbolic.svg |  10 +-
 .../distribute-horizontal-gaps-symbolic.svg   |   6 +-
 .../distribute-horizontal-left-symbolic.svg   |  10 +-
 .../distribute-horizontal-node-symbolic.svg   |  14 +-
 .../distribute-horizontal-right-symbolic.svg  |  10 +-
 .../actions/distribute-randomize-symbolic.svg |   6 +-
 .../distribute-remove-overlaps-symbolic.svg   |   6 +-
 .../actions/distribute-unclump-symbolic.svg   |   6 +-
 .../distribute-vertical-baseline-symbolic.svg |  10 +-
 .../distribute-vertical-bottom-symbolic.svg   |  10 +-
 .../distribute-vertical-center-symbolic.svg   |  10 +-
 .../distribute-vertical-gaps-symbolic.svg     |   6 +-
 .../distribute-vertical-node-symbolic.svg     |  14 +-
 .../distribute-vertical-top-symbolic.svg      |  10 +-
 .../actions/draw-calligraphic-symbolic.svg    |  10 +-
 .../actions/draw-connector-symbolic.svg       |   6 +-
 .../symbolic/actions/draw-cuboid-symbolic.svg |  12 +-
 .../actions/draw-ellipse-symbolic.svg         |   8 +-
 .../symbolic/actions/draw-eraser-symbolic.svg |   6 +-
 .../actions/draw-freehand-symbolic.svg        |  12 +-
 .../actions/draw-geometry-symbolic.svg        |   6 +-
 .../symbolic/actions/draw-path-symbolic.svg   |  12 +-
 .../actions/draw-polygon-star-symbolic.svg    |  10 +-
 .../actions/draw-rectangle-symbolic.svg       |   8 +-
 .../symbolic/actions/draw-spiral-symbolic.svg |   6 +-
 .../symbolic/actions/draw-text-symbolic.svg   |   8 +-
 .../actions/grid-rectangular-symbolic.svg     |   6 +-
 .../symbolic/actions/guides-symbolic.svg      |   6 +-
 .../actions/mesh-gradient-symbolic.svg        |  18 +-
 .../symbolic/actions/node-add-symbolic.svg    |   8 +-
 .../symbolic/actions/node-break-symbolic.svg  |  10 +-
 .../actions/node-delete-segment-symbolic.svg  |   6 +-
 .../symbolic/actions/node-delete-symbolic.svg |   6 +-
 .../actions/node-join-segment-symbolic.svg    |  10 +-
 .../symbolic/actions/node-join-symbolic.svg   |  10 +-
 .../actions/node-segment-curve-symbolic.svg   |   6 +-
 .../actions/node-segment-line-symbolic.svg    |   6 +-
 .../actions/node-transform-symbolic.svg       |   6 +-
 .../node-type-auto-smooth-symbolic.svg        |   8 +-
 .../actions/node-type-cusp-symbolic.svg       |   8 +-
 .../actions/node-type-smooth-symbolic.svg     |   8 +-
 .../actions/node-type-symmetric-symbolic.svg  |  16 +-
 .../actions/node_insert_max_x-symbolic.svg    |   6 +-
 .../actions/node_insert_max_y-symbolic.svg    |   6 +-
 .../actions/node_insert_min_x-symbolic.svg    |   6 +-
 .../actions/node_insert_min_y-symbolic.svg    |   6 +-
 .../snap-bounding-box-center-symbolic.svg     |  10 +-
 .../snap-bounding-box-corners-symbolic.svg    |   8 +-
 .../snap-bounding-box-edges-symbolic.svg      |  10 +-
 .../snap-bounding-box-midpoints-symbolic.svg  |  12 +-
 .../actions/snap-bounding-box-symbolic.svg    |   8 +-
 ...snap-grid-guide-intersections-symbolic.svg |   8 +-
 .../actions/snap-nodes-center-symbolic.svg    |  10 +-
 .../actions/snap-nodes-cusp-symbolic.svg      |   8 +-
 .../snap-nodes-intersection-symbolic.svg      |   8 +-
 .../actions/snap-nodes-midpoint-symbolic.svg  |   8 +-
 .../actions/snap-nodes-path-symbolic.svg      |   8 +-
 .../snap-nodes-rotation-center-symbolic.svg   |   8 +-
 .../actions/snap-nodes-smooth-symbolic.svg    |   8 +-
 .../symbolic/actions/snap-nodes-symbolic.svg  |  16 +-
 .../symbolic/actions/snap-page-symbolic.svg   |   6 +-
 .../symbolic/actions/snap-symbolic.svg        |   8 +-
 .../actions/snap-text-baseline-symbolic.svg   |  10 +-
 .../actions/tool-measure-symbolic.svg         |   6 +-
 .../actions/tool-node-editor-symbolic.svg     |   6 +-
 .../actions/tool-pointer-symbolic.svg         |   6 +-
 .../symbolic/actions/tool-spray-symbolic.svg  |   6 +-
 .../symbolic/actions/tool-tweak-symbolic.svg  |   6 +-
 .../symbolic/actions/zoom-symbolic.svg        |   6 +-
 src/inkscape.cpp                              |  86 ++----
 src/ui/dialog/inkscape-preferences.cpp        | 276 ++++++------------
 src/ui/dialog/inkscape-preferences.h          |  12 +-
 src/ui/icon-loader.cpp                        |  26 +-
 107 files changed, 562 insertions(+), 770 deletions(-)

diff --git a/share/icons/multicolor-beta/highlights.css b/share/icons/multicolor-beta/highlights.css
index e232f30f79..688a387f21 100755
--- a/share/icons/multicolor-beta/highlights.css
+++ b/share/icons/multicolor-beta/highlights.css
@@ -1,43 +1,11 @@
-/*
-* Change only colors, do not add more class, order or remove 
-* also dont chage selectors definition
-*/
+@define-color symbolicColor1 #222222; /*base color bright*/
+@define-color symbolicColor2 #efefef; /*base color dark*/
+@define-color symbolicColor3 #009909; /*create*/
+@define-color symbolicColor4 #00AAFF; /*color*/
+@define-color symbolicColor5 #FF1990; /*shape*/
+@define-color symbolicColor6 #00AAFF; /*select*/
+.dark image{-gtk-icon-theme: @base @symbolicColor2, @create symbolicColor2, @color @symbolicColor3, @select @symbolicColor4;}
+.bright image{-gtk-icon-theme: @base @symbolicColor1, @create symbolicColor2, @color @symbolicColor3, @select @symbolicColor4;}
 
-.base {
-    fill: #000000;
-}
 
-.success {
-    fill: #009909;
-}
-
-.warning {
-    fill: #FF1990;
-}
-
-.error {
-    fill: #00AAFF;
-}
-
-.dark .base {
-    fill: #ffffff;
-}
-
-.dark .success {
-    fill: #00990A;
-}
-
-.dark .warning {
-    fill: #FF1990;
-}
-
-.dark .error {
-    fill: #00AAFF;
-}
-
-
-/* do not change */
-
-.dark #background {
-    opacity: 0.8 !important;
-}
+}
\ No newline at end of file
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-baseline-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-baseline-symbolic.svg
index 0747598d1b..b08ab5736c 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-baseline-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-baseline-symbolic.svg
@@ -17,9 +17,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -94,7 +94,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <path
-       class="success"
+       class="create"
        style="opacity:1;fill-opacity:1"
        d="m 1048.4995,670.36207 h 1.5 v 24 h -1.5 z"
        id="rect22505"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-center-symbolic.svg
index 5b24cb97fa..8bcad0da14 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-center-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -73,7 +73,7 @@
        id="rect22219"
        d="m 1132.7494,595.36218 h -1.5 v 24 h 1.5 z"
        style="opacity:1;fill-opacity:1"
-       class="success" />
+       class="create" />
     <path
        d="m 1123.9994,607.3622 v 4 h 6 v -4 z m 9.95,0 v 4 h 6 v -4 z m -7.95,-5 v 3 h 4 v -3 z m 7.95,0 v 3 h 4 v -3 z m -10.95,-7 v 5 h 7 v -5 z m 10.95,0 v 5 h 7 v -5 z"
        style="opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-symbolic.svg
index d269527135..c70f3a5fa2 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
          id="rect22115"
          d="m 1085.4495,595.36218 h -1.5 v 24 h 1.5 z"
          style="opacity:1;fill-opacity:1"
-         class="success" />
+         class="create" />
       <path
          inkscape:connector-curvature="0"
          id="rect22117"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-to-anchor-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-to-anchor-symbolic.svg
index ff1f0685df..1836f2a1b9 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-to-anchor-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-left-to-anchor-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -76,13 +76,13 @@
          id="rect22388"
          d="m 1064,595.36218 h 4 v 4 h -4 z"
          style="opacity:0.5;fill-opacity:1"
-         class="success" />
+         class="create" />
       <path
          inkscape:connector-curvature="0"
          id="rect22390"
          d="m 1061.5,595.36218 h 1.5 v 24 h -1.5 z"
          style="opacity:1;fill-opacity:1;"
-         class="success" />
+         class="create" />
       <path
          inkscape:connector-curvature="0"
          id="rect22392"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-node-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-node-symbolic.svg
index 79674c5afd..2bcc631d14 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-node-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-node-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -106,6 +106,6 @@
        d="m 1054.7678,861.35742 v 24.00492 h 1.5 v -24.00492 z"
        style="opacity:1;fill-opacity:1;"
        sodipodi:nodetypes="ccccc"
-       class="success" />
+       class="create" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-symbolic.svg
index 7a6b20b17c..bf2b8b7684 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -85,7 +85,7 @@
            id="rect22333"
            inkscape:connector-curvature="0" />
         <path
-           class="success"
+           class="create"
            style="opacity:1;fill-opacity:1"
            d="m 1086,595.36218 h -1.5 v 24 h 1.5 z"
            id="rect22335"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-to-anchor-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-to-anchor-symbolic.svg
index 8f7ee9ead2..773ee28198 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-to-anchor-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-horizontal-right-to-anchor-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -68,13 +68,13 @@
      id="rect22388"
      d="m 13.33334,0 h 2.666668 V 2.666668 H 13.33334 Z"
      style="opacity:0.5;fill-opacity:1;"
-     class="success" />
+     class="create" />
   <path
      inkscape:connector-curvature="0"
      id="rect22390"
      d="m 11.666673,0 h 1 v 16.000008 h -1 z"
      style="opacity:1;fill-opacity:1;"
-     class="success" />
+     class="create" />
   <path
      inkscape:connector-curvature="0"
      id="rect22392"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-on-canvas-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-on-canvas-symbolic.svg
index 75b2bbcdee..3308af4c7c 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-on-canvas-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-on-canvas-symbolic.svg
@@ -38,9 +38,9 @@
   </sodipodi:namedview>
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -114,7 +114,7 @@ Jabier Arraiza</dc:title>
        d="M 0,0 H 16 V 16 H 0 Z"
        style="opacity:0;fill:none" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        d="M 1.0390625,1.078125 V 1.6367188 3.0546875 H 2.1542969 V 2.1933594 H 3.0253906 V 1.078125 Z m 3.4160156,0 V 2.1933594 H 5.8828125 V 1.078125 Z m 2.8574219,0 V 2.1933594 H 8.7402344 V 1.078125 Z m 2.857422,0 v 1.1152344 h 1.429687 V 1.078125 Z m 2.857422,0 v 1.1152344 h 0.871094 v 0.8613281 h 1.115234 V 1.078125 Z M 1.0390625,4.4726562 V 5.890625 H 2.1542969 V 4.4726562 Z m 12.8593755,0 V 5.890625 h 1.115234 V 4.4726562 Z M 1.0390625,7.3105469 V 8.7285156 H 2.1542969 V 7.3105469 Z m 12.8593755,0 v 1.4179687 h 1.115234 V 7.3105469 Z M 1.0390625,10.146484 v 1.417969 h 1.1152344 v -1.417969 z m 12.8593755,0 v 1.417969 h 1.115234 V 10.146484 Z M 1.0390625,12.982422 v 1.976562 H 3.0253906 V 13.84375 H 2.1542969 v -0.861328 z m 12.8593755,0 v 0.861328 h -0.871094 v 1.115234 h 1.986328 V 12.982422 Z M 4.4550781,13.84375 v 1.115234 H 5.8828125 V 13.84375 Z m 2.8574219,0 v 1.115234 H 8.7402344 V 13.84375 Z m 2.857422,0 v 1.115234 h 1.429687 V 13.84375 Z"
        style="opacity:1;fill-opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-sel-as-group-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-sel-as-group-symbolic.svg
index d14ad1563b..98c5d50ed2 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-sel-as-group-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-sel-as-group-symbolic.svg
@@ -15,9 +15,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -109,19 +109,19 @@
        d="m 1044,595.36218 h 24 v 24 h -24 z"
        style="opacity:0;fill:none" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;"
        d="m 1064,595.36218 h 4 v 3.99999 h -4 z"
        id="path983"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;"
        d="m 1044,595.36218 h 4 v 4 h -4 z"
        id="path985"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;"
        d="m 1064,615.36218 h 4 v 3.99999 h -4 z"
        id="path987"
@@ -131,7 +131,7 @@
        id="rect22038"
        d="m 1044,615.36217 h 4 v 4 h -4 z"
        style="opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22042"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-baseline-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-baseline-symbolic.svg
index b8b9216a09..e0fe74c55d 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-baseline-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-baseline-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -85,6 +85,6 @@
        id="rect17564"
        d="m 1106,684.36218 v 1.5 h -24 v -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-symbolic.svg
index 90c6a535bb..882a3e2033 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
            id="rect22333"
            inkscape:connector-curvature="0" />
         <path
-           class="success"
+           class="create"
            style="opacity:1;fill-opacity:1"
            d="m 1086,595.36218 h -1.5 v 24 h 1.5 z"
            id="rect22335"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-to-anchor-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-to-anchor-symbolic.svg
index cde5ace020..942f05d9a8 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-to-anchor-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-bottom-to-anchor-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,13 +72,13 @@
        id="rect22388"
        d="m 1098.0001,648.4886 v 4 h -4 v -4 z"
        style="opacity:0.5;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22390"
        d="m 1098.0001,645.9886 v 1.5 h -24 v -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22392"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-center-symbolic.svg
index ab09b44835..7584e32068 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-center-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -69,7 +69,7 @@
        id="rect22217"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;fill-opacity:1"
        d="m 1132.7494,595.36218 h -1.5 v 24 h 1.5 z"
        id="rect22219"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-node-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-node-symbolic.svg
index cd8ae5d97b..10e8121979 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-node-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-node-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -115,7 +115,7 @@
            transform="matrix(0.86350874,0,0,0.86368623,213.4531,670.61281)"
            sodipodi:nodetypes="csssc" />
         <path
-           class="success"
+           class="create"
            sodipodi:nodetypes="ccccc"
            style="opacity:1;fill-opacity:1;"
            d="m 1054.7678,861.35742 v 24.00492 h 1.5 v -24.00492 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-symbolic.svg
index f94009a35d..99d9257eb1 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
            id="rect22333"
            inkscape:connector-curvature="0" />
         <path
-           class="success"
+           class="create"
            style="opacity:1;fill-opacity:1"
            d="m 1086,595.36218 h -1.5 v 24 h 1.5 z"
            id="rect22335"
diff --git a/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-to-anchor-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-to-anchor-symbolic.svg
index 54681bd700..16785337ac 100755
--- a/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-to-anchor-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/align-vertical-top-to-anchor-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -73,13 +73,13 @@
        id="rect22388"
        d="m 1098.0001,648.4886 v 4 h -4 v -4 z"
        style="opacity:0.5;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22390"
        d="m 1098.0001,645.9886 v 1.5 h -24 v -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22392"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom-symbolic.svg
index 687d3c8045..805ccb1eef 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -77,7 +77,7 @@
          id="path40608"
          d="M 0,4 H 16 V 6 H 0 Z" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 8,0 C 5.2444986,0 3,2.2444986 3,5 3,7.7555014 5.2444986,10 8,10 10.755501,10 13,7.7555014 13,5 13,2.2444986 10.755501,0 8,0 Z m 0,1 c 2.215061,0 4,1.7849387 4,4 C 12,7.2150613 10.215061,9 8,9 5.7849387,9 4,7.2150613 4,5 4,2.7849387 5.7849387,1 8,1 Z"
          id="circle40606"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_left-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_left-symbolic.svg
index fef8edf713..7ab1aa0330 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_left-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_left-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -76,7 +76,7 @@
          id="path40620"
          d="M 4,14 V 4 H 14 V 6 H 6 v 8 z" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 5,0 C 2.2444986,0 0,2.2444986 0,5 0,7.7555014 2.2444986,10 5,10 7.7555014,10 10,7.7555014 10,5 10,2.2444986 7.7555014,0 5,0 Z M 5,1 C 7.2150613,1 9,2.7849387 9,5 9,7.2150613 7.2150613,9 5,9 2.7849387,9 1,7.2150613 1,5 1,2.7849387 2.7849387,1 5,1 Z"
          id="circle40618"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_right-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_right-symbolic.svg
index 07faad0083..a37b5fdac1 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_right-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_bottom_right-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -76,7 +76,7 @@
          id="path40596"
          inkscape:connector-curvature="0" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 5,0 C 2.2444986,0 0,2.2444986 0,5 0,7.7555014 2.2444986,10 5,10 7.7555014,10 10,7.7555014 10,5 10,2.2444986 7.7555014,0 5,0 Z M 5,1 C 7.2150613,1 9,2.7849387 9,5 9,7.2150613 7.2150613,9 5,9 2.7849387,9 1,7.2150613 1,5 1,2.7849387 2.7849387,1 5,1 Z"
          id="circle40594"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_left-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_left-symbolic.svg
index 399aa3db09..527c6844f8 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_left-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_left-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -77,7 +77,7 @@
          id="path40644"
          inkscape:connector-curvature="0" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 8,0 C 5.2444986,0 3,2.2444986 3,5 3,7.7555014 5.2444986,10 8,10 10.755501,10 13,7.7555014 13,5 13,2.2444986 10.755501,0 8,0 Z m 0,1 c 2.215061,0 4,1.7849387 4,4 C 12,7.2150613 10.215061,9 8,9 5.7849387,9 4,7.2150613 4,5 4,2.7849387 5.7849387,1 8,1 Z"
          id="circle40642"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_right-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_right-symbolic.svg
index 6e8184e745..c382f3c1d0 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_right-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_right-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -77,7 +77,7 @@
          id="path40632"
          inkscape:connector-curvature="0" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 8,0 C 5.2444986,0 3,2.2444986 3,5 3,7.7555014 5.2444986,10 8,10 10.755501,10 13,7.7555014 13,5 13,2.2444986 10.755501,0 8,0 Z m 0,1 c 2.215061,0 4,1.7849387 4,4 C 12,7.2150613 10.215061,9 8,9 5.7849387,9 4,7.2150613 4,5 4,2.7849387 5.7849387,1 8,1 Z"
          id="circle40630"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top-symbolic.svg
index 25640ec5cc..526c96f102 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
        id="path40666"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="stroke-linecap:butt;"
        d="M 8,0 C 5.2444986,0 3,2.2444986 3,5 3,7.7555014 5.2444986,10 8,10 10.755501,10 13,7.7555014 13,5 13,2.2444986 10.755501,0 8,0 Z m 0,1 c 2.215061,0 4,1.7849387 4,4 C 12,7.2150613 10.215061,9 8,9 5.7849387,9 4,7.2150613 4,5 4,2.7849387 5.7849387,1 8,1 Z"
        id="circle40664"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_left-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_left-symbolic.svg
index e4f5619abc..292315a3d3 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_left-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_left-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
        id="path40676"
        d="M 4,14 V 4 H 14 V 6 H 6 v 8 z" />
     <path
-       class="success"
+       class="create"
        style="stroke-linecap:butt;"
        d="M 5,0 C 2.2444986,0 0,2.2444986 0,5 0,7.7555014 2.2444986,10 5,10 7.7555014,10 10,7.7555014 10,5 10,2.2444986 7.7555014,0 5,0 Z M 5,1 C 7.2150613,1 9,2.7849387 9,5 9,7.2150613 7.2150613,9 5,9 2.7849387,9 1,7.2150613 1,5 1,2.7849387 2.7849387,1 5,1 Z"
        id="circle40674"
diff --git a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_right-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_right-symbolic.svg
index c4b5773d2a..9d068e6954 100755
--- a/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_right-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/boundingbox_top_right-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -78,7 +78,7 @@
          id="path40656"
          d="M 4,14 V 4 H 14 V 6 H 6 v 8 z" />
       <path
-         class="success"
+         class="create"
          style="stroke-linecap:butt;"
          d="M 5,0 C 2.2444986,0 0,2.2444986 0,5 0,7.7555014 2.2444986,10 5,10 7.7555014,10 10,7.7555014 10,5 10,2.2444986 7.7555014,0 5,0 Z M 5,1 C 7.2150613,1 9,2.7849387 9,5 9,7.2150613 7.2150613,9 5,9 2.7849387,9 1,7.2150613 1,5 1,2.7849387 2.7849387,1 5,1 Z"
          id="circle40654"
diff --git a/share/icons/multicolor-beta/symbolic/actions/color-fill-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/color-fill-symbolic.svg
index 97abdd9521..f6c79335ed 100755
--- a/share/icons/multicolor-beta/symbolic/actions/color-fill-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/color-fill-symbolic.svg
@@ -15,11 +15,11 @@
    sodipodi:docname="color-fill-symbolic.svg"
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
   <style id="s0">
-     .base {  }
-     .success {  }
-     .warning {  }
-     .error {  }
-     .dark {  }
+   .base    { fill: #000000; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
+   .dark    {  }
   </style>
   <style id="s2"> 
      @import '../../highlights.css'; 
@@ -163,7 +163,7 @@
     <path
        sodipodi:nodetypes="ssscs"
        inkscape:connector-curvature="0"
-       class="error"
+       class="color"
        d="M 8.4791854,11.827011 C 7.9548819,12.309757 6.3188036,11.385797 4.8249024,9.7632894 3.3310011,8.1407816 2.5449871,6.4341367 3.0692913,5.9513917 3.5935951,5.4686465 5.2296732,6.3926063 6.7235742,8.0151137 8.2174752,9.6376211 9.0034891,11.344266 8.4791854,11.827011 Z"
        id="fillinside" />
     <path
@@ -186,7 +186,7 @@
        inkscape:original-d="m -1.122064,10.885752 c -1e-7,2.259207 -0.5918222,4.090656 -1.3218716,4.090656 -0.7300495,0 -1.3218716,-1.831449 -1.3218717,-4.090656 0,-2.2592076 0.5918221,-4.0906572 1.3218717,-4.090657 0.7300496,0 1.3218716,1.8314496 1.3218716,4.090657 z" />
     <path
        d="M 8,13 V 11.204015 L 6,9.7727955 V 13.01308 c -2.0097929,0.104632 -3.9774967,0.467562 -3.9774967,0.951482 0,0.566752 2.3923967,1.071389 5.0926543,1.071389 C 9.815417,15.035951 12.007463,14.578147 12,14.011437 11.993397,13.509946 10.079547,13.095913 8,13 Z"
-       class="error"
+       class="color"
        id="pure"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccsssc" />
diff --git a/share/icons/multicolor-beta/symbolic/actions/color-gradient-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/color-gradient-symbolic.svg
index b166aeab76..4102713784 100755
--- a/share/icons/multicolor-beta/symbolic/actions/color-gradient-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/color-gradient-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -43,7 +43,7 @@
        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"
+         class="color"
          id="path4799"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc" />
@@ -82,7 +82,7 @@
        sodipodi:nodetypes="ccccccccsccsccsccscccccsccccsccsccsccsccscccc"
        inkscape:connector-curvature="0"
        id="bg"
-       class="error"
+       class="color"
        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" />
     <path
        class="base"
@@ -93,7 +93,7 @@
     <path
        id="start"
        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" />
+       class="color" />
     <path
        class="base"
        id="end"
diff --git a/share/icons/multicolor-beta/symbolic/actions/color-management-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/color-management-symbolic.svg
index 9bf403f1e4..6a5b4de005 100755
--- a/share/icons/multicolor-beta/symbolic/actions/color-management-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/color-management-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -87,12 +87,12 @@
          id="path8593"
          inkscape:connector-curvature="0" />
       <path
-         class="success"
+         class="create"
          d="m 41,-8.000001 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 z"
          id="path14494"
          inkscape:connector-curvature="0" />
       <path
-         class="warning"
+         class="shape"
          style="opacity:1"
          d="m 49,-8 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 z"
          id="path14496"
diff --git a/share/icons/multicolor-beta/symbolic/actions/color-picker-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/color-picker-symbolic.svg
index e103be9840..56081b6c4a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/color-picker-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/color-picker-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0alpha2 (119fb3b5e8, 2019-06-21, custom)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -94,7 +94,7 @@
        inkscape:connector-curvature="0"
        id="path1172"
        d="M 6,5 C 6,6.367167 4.8888363,7.4783307 3.5216693,7.4783307 2.1545023,7.4783307 1.0433386,6.367167 1.0433386,5 c 0,-1.3671671 2.4783307,-4.1995449 2.4783307,-4.1995449 C 3.5216693,0.8004551 6,3.6328329 6,5 Z"
-       class="error"
+       class="color"
        inkscape:label="drop" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/dialog-align-and-distribute-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/dialog-align-and-distribute-symbolic.svg
index 91d101e565..eedc921331 100755
--- a/share/icons/multicolor-beta/symbolic/actions/dialog-align-and-distribute-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/dialog-align-and-distribute-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -68,7 +68,7 @@
        inkscape:connector-curvature="0" />
     <path
        style="opacity:1;fill-opacity:1"
-       class="success"
+       class="create"
        d="m 136,808.36218 h 1 v 13 h -1 z"
        id="rect18737"
        inkscape:connector-curvature="0" />
@@ -92,7 +92,7 @@
        style="fill:#00990a"
        id="rect1023"
        d="m 157.15704,808.1081 h 3.90213 v 3.90213 h -3.90213 z"
-       class="success"
+       class="create"
        inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/dialog-fill-and-stroke-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
index 99275b0108..d6b36c3814 100755
--- a/share/icons/multicolor-beta/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/dialog-fill-and-stroke-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -69,7 +69,7 @@
     <!--Add this to all icons at dirst place and do not change the id or style-->
     <path
        inkscape:label="tip"
-       class="error"
+       class="color"
        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"
        id="path3292"
        inkscape:connector-curvature="0" />
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-graph-directed-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-graph-directed-symbolic.svg
index b68b082e93..2e86bb80f8 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-graph-directed-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-graph-directed-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -95,19 +95,19 @@
        id="path19480"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;fill-opacity:1"
        d="m 1209.72,826.5042 1.176,1.2264 -2.248,2.1781 1.475,1.4485 -4.123,0.005 v 0 l -0.01,-4.1231 1.477,1.443 z"
        id="path19568"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;fill-opacity:1"
        d="m 1205,837.3622 h -2 v 2 h -2 l 3,3 v 0 l 3.064,-2.9298 -2.064,-0.0702 z"
        id="path19570"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        id="path19572"
        d="m 1198.28,826.5042 -1.176,1.2264 2.248,2.1781 -1.475,1.4485 4.123,0.005 v 0 l 0.01,-4.1231 -1.477,1.443 z"
@@ -118,5 +118,5 @@
      id="rect22390"
      d="M 35.460611,7.6666615 V 8.666662 H 19.460603 V 7.6666615 Z"
      style="opacity:1;fill-opacity:1;"
-     class="success" />
+     class="create" />
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-graph-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-graph-symbolic.svg
index 35fd3ec14e..3ab5be1190 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-graph-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-graph-symbolic.svg
@@ -18,9 +18,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-baseline-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-baseline-symbolic.svg
index 9cf0095a5e..c04ffa2814 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-baseline-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-baseline-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -84,13 +84,13 @@
        id="rect18981"
        d="m 1056.46,785.36218 h 1.5 v 24 h -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect18969"
        d="m 1043.9995,785.36218 h 1.5 v 24 h -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        style="opacity:0.5;"
        d="m 1049.4246,786.11179 -2.9795,3.00001 2.9795,2.99999 v -2.25 h 0.7617 1.1836 0.7617 v 2.25 l 2.9824,-2.99999 -2.9824,-3.00001 v 2.25 h -0.7617 -1.1836 -0.7617 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-center-symbolic.svg
index 63fcba0dfb..13f446e2e8 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-center-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -67,7 +67,7 @@
        style="opacity:1;fill-opacity:0.89019608;"
        d="m 1087.6053,708.3622 v 0.4615 11.0769 0.4616 h 1.5 v -0.4616 -11.0769 -0.4615 z"
        id="path18673"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        style="opacity:1"
@@ -88,7 +88,7 @@
        d="m 1100.3285,708.3622 v 0.4615 11.0769 0.4616 h 1.5 v -0.4616 -11.0769 -0.4615 z"
        style="opacity:1;fill-opacity:0.89019608;"
        inkscape:connector-curvature="0"
-       class="success" />
+       class="create" />
     <path
        style="opacity:0.5;"
        d="m 1093.3786,709.29716 -2.9795,3.00007 2.9795,3.00006 v -2.25005 h 0.7617 1.1836 0.7617 v 2.25005 l 2.9824,-3.00006 -2.9824,-3.00007 v 2.25005 h -0.7617 -1.1836 -0.7617 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-gaps-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-gaps-symbolic.svg
index 60e62f6e8d..66c7203b9a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-gaps-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-gaps-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-left-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-left-symbolic.svg
index 84bb9bf254..0d6cccba30 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-left-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-left-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -74,14 +74,14 @@
        style="opacity:1;fill-opacity:0.89019608;"
        d="m 1058.8264,708.36164 v 0.69234 16.61564 0.69234 h 1.5 v -0.69234 -16.61564 -0.69234 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        id="path5265"
        d="m 1045.4995,708.36206 v 0.9231 22.1538 0.9231 h 1.5 v -0.9231 -22.1538 -0.9231 z"
        style="opacity:1;fill-opacity:0.89019608;"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        style="opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-node-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-node-symbolic.svg
index b365feb512..88e136da1c 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-node-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-node-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -111,17 +111,17 @@
        d="m 1052.639,861.35742 v 24.00492 h 1.5 v -24.00492 z"
        style="opacity:0;fill-opacity:1;"
        sodipodi:nodetypes="ccccc"
-       class="success" />
+       class="create" />
     <path
        sodipodi:nodetypes="ccccccccc"
-       class="success"
+       class="create"
        id="path1584"
        d="m 1068,865.30705 h -5.5242 -3.1125 -0.5587 l -1.3983,-1.50031 h 1.957 3.1125 5.5242 z"
        style="opacity:1;fill-opacity:1;"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cccccccccc"
-       class="success"
+       class="create"
        id="path1586"
        d="m 1068,874.09797 h -5.5242 -3.1125 -2.1604 l 1.6017,-1.50031 h 0.5587 3.1125 5.5242 v 0.75015 z"
        style="opacity:1;fill-opacity:1;"
@@ -131,7 +131,7 @@
        style="opacity:1;fill-opacity:1;"
        d="m 1068,882.88889 h -5.5242 -3.1125 -0.1835 l -1.3301,-1.5003 h 1.5136 3.1125 5.5242 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <rect
        transform="rotate(90)"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-right-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-right-symbolic.svg
index 615f6c5fe8..2842feee10 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-right-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-horizontal-right-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -66,14 +66,14 @@
        style="opacity:1;fill-opacity:0.89019608;"
        d="m 1058.8264,708.36164 v 0.69234 16.61564 0.69234 h 1.5 v -0.69234 -16.61564 -0.69234 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        id="path5265"
        d="m 1045.4995,708.36206 v 0.9231 22.1538 0.9231 h 1.5 v -0.9231 -22.1538 -0.9231 z"
        style="opacity:1;fill-opacity:0.89019608;"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        style="opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-randomize-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-randomize-symbolic.svg
index 154e4548b0..134268a2a7 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-randomize-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-randomize-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-remove-overlaps-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-remove-overlaps-symbolic.svg
index a9855e3a8a..c41e873a59 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-remove-overlaps-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-remove-overlaps-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-unclump-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-unclump-symbolic.svg
index d6c2ec5c01..7f3f179382 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-unclump-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-unclump-symbolic.svg
@@ -18,9 +18,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-baseline-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-baseline-symbolic.svg
index 06765a2ba3..01ac698577 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-baseline-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-baseline-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -82,13 +82,13 @@
        id="rect19009"
        d="m 1106,804.2552 v 1.5 h -24 v -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect19011"
        d="m 1106,793.25764 v 1.5 h -24 v -1.5 z"
        style="opacity:1;fill-opacity:1;"
-       class="success" />
+       class="create" />
     <path
        style="opacity:0.5;"
        d="m 1089.5866,798.15147 -3.0001,-2.9795 -2.9999,2.9795 h 2.25 v 0.7617 1.1836 0.7617 h -2.25 l 2.9999,2.9824 3.0001,-2.9824 h -2.25 v -0.7617 -1.1836 -0.7617 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-bottom-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-bottom-symbolic.svg
index 0f1f96baa2..7fb7f3b90e 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-bottom-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-bottom-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -67,14 +67,14 @@
        style="opacity:1;fill-opacity:0.89019608;"
        d="m 1058.8264,708.36164 v 0.69234 16.61564 0.69234 h 1.5 v -0.69234 -16.61564 -0.69234 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        id="path5265"
        d="m 1045.4995,708.36206 v 0.9231 22.1538 0.9231 h 1.5 v -0.9231 -22.1538 -0.9231 z"
        style="opacity:1;fill-opacity:0.89019608;"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        style="opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-center-symbolic.svg
index 5cca241eb0..af6060f730 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-center-symbolic.svg
@@ -17,9 +17,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -81,7 +81,7 @@
        id="g872"
        transform="translate(-0.277841,-0.81367018)">
       <path
-         class="success"
+         class="create"
          id="path18673"
          d="m 1082.2783,765.57099 h 0.4615 11.0766 0.4616 v -1.5 h -0.4616 -11.0766 -0.4615 z"
          style="opacity:1;fill-opacity:0.89019608;"
@@ -102,7 +102,7 @@
          id="rect18679"
          inkscape:connector-curvature="0" />
       <path
-         class="success"
+         class="create"
          inkscape:connector-curvature="0"
          style="opacity:1;fill-opacity:0.89019608;"
          d="m 1082.2783,752.84779 h 0.4615 11.0766 0.4616 v -1.5 h -0.4616 -11.0766 -0.4615 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-gaps-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-gaps-symbolic.svg
index 1c5be1ccd2..1fa8f7a730 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-gaps-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-gaps-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-node-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-node-symbolic.svg
index 75f4cb62ee..95fb81840f 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-node-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-node-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -119,17 +119,17 @@
        d="m 1052.639,861.35742 v 24.00492 h 1.5 v -24.00492 z"
        style="opacity:0;fill-opacity:1;"
        sodipodi:nodetypes="ccccc"
-       class="success" />
+       class="create" />
     <path
        sodipodi:nodetypes="ccccccccc"
-       class="success"
+       class="create"
        id="path1584"
        d="m 1068,865.30705 h -5.5242 -3.1125 -0.5587 l -1.3983,-1.50031 h 1.957 3.1125 5.5242 z"
        style="opacity:1;fill-opacity:1;"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cccccccccc"
-       class="success"
+       class="create"
        id="path1586"
        d="m 1068,874.09797 h -5.5242 -3.1125 -2.1604 l 1.6017,-1.50031 h 0.5587 3.1125 5.5242 v 0.75015 z"
        style="opacity:1;fill-opacity:1;"
@@ -139,7 +139,7 @@
        style="opacity:1;fill-opacity:1;"
        d="m 1068,882.88889 h -5.5242 -3.1125 -0.1835 l -1.3301,-1.5003 h 1.5136 3.1125 5.5242 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <rect
        transform="rotate(90)"
diff --git a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-top-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-top-symbolic.svg
index b2c7c51e10..089259f1bd 100755
--- a/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-top-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/distribute-vertical-top-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -67,14 +67,14 @@
        style="opacity:1;fill-opacity:0.89019608;"
        d="m 1058.8264,708.36164 v 0.69234 16.61564 0.69234 h 1.5 v -0.69234 -16.61564 -0.69234 z"
        id="use5269"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        id="path5265"
        d="m 1045.4995,708.36206 v 0.9231 22.1538 0.9231 h 1.5 v -0.9231 -22.1538 -0.9231 z"
        style="opacity:1;fill-opacity:0.89019608;"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccccccc" />
     <path
        style="opacity:1"
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-calligraphic-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-calligraphic-symbolic.svg
index 558d713d11..cfd915a597 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-calligraphic-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-calligraphic-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        inkscape:connector-curvature="0"
        id="path3292"
        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"
+       class="create"
        inkscape:label="tip"
        style="fill-opacity:1;"/>
     <path
@@ -94,7 +94,7 @@
        inkscape:connector-curvature="0"
        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"
+       class="create"
        inkscape:label="swush"
        style="fill-opacity:1;"/>
   </g>
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-connector-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-connector-symbolic.svg
index cfc61d8154..44dc014cd7 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-connector-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-connector-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-cuboid-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-cuboid-symbolic.svg
index 748d84cd49..dfe3613479 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-cuboid-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-cuboid-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -78,7 +78,7 @@
        style="opacity:0"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        d="m 993.53,404.59 -12.23,7.09 v -14.31 l 12.23,-7.1 z"
        transform="matrix(0.49102052,0,0,0.49102052,-473.83817,-187.11363)"
        inkscape:label="right"
@@ -86,7 +86,7 @@
        id="polygon1116"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        d="m 969.08,390.27 v 14.32 l 12.22,7.09 v -14.31 z"
        transform="matrix(0.49102052,0,0,0.49102052,-473.83817,-187.11363)"
        inkscape:label="left"
@@ -100,7 +100,7 @@
        style="display:inline;opacity:0.15"
        id="polygon1122"
        inkscape:connector-curvature="0"
-       class="warning" />
+       class="shape" />
     <path
        sodipodi:nodetypes="cccccccccccc"
        inkscape:connector-curvature="0"
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-ellipse-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-ellipse-symbolic.svg
index c6d1e7db9b..84bbf895ef 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-ellipse-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-ellipse-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -101,7 +101,7 @@
        inkscape:connector-curvature="0"
        d="m 7.9999953,14.058221 c -3.3458752,0 -6.0582406,-2.712357 -6.0582406,-6.0582348 0,-3.3458766 2.7123654,-6.0582415 6.0582406,-6.0582415 3.3458737,0 6.0582337,2.7123649 6.0582337,6.0582415 0,3.3458708 -2.712365,6.0582348 -6.0582337,6.0582348 z"
        id="path949"
-       class="warning" />
+       class="shape" />
     <path
        id="path990"
        d="m 3.2763787,7.9999867 c 0,-2.6043712 2.1192473,-4.7236179 4.723617,-4.7236179 2.6043693,0 4.7236113,2.1192458 4.7236113,4.7236179 0,2.6043653 -2.119248,4.7236123 -4.7236113,4.7236123 -2.604371,0 -4.723617,-2.11924 -4.723617,-4.7236123 z m 11.1972283,0 c 0,-3.5796945 -2.893918,-6.4736179 -6.4736113,-6.4736179 -3.5796943,0 -6.473617,2.8939225 -6.473617,6.4736179 0,3.5796963 2.893924,6.4736123 6.473617,6.4736123 3.5796893,0 6.4736113,-2.893921 6.4736113,-6.4736123 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-eraser-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-eraser-symbolic.svg
index 40ea31b220..17c09e1ef9 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-eraser-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-eraser-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-freehand-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-freehand-symbolic.svg
index da19a54e4f..474bcef7c2 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-freehand-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-freehand-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -97,9 +97,9 @@
          style="fill-opacity:1"
          id="polygon2257"
          d="m 977.92472,242.5115 -2.3281,6.99338 6.99339,-2.3281 z"
-         class="success" />
+         class="create" />
       <path
-         class="success"
+         class="create"
          style="opacity:1;fill-opacity:1;"
          d="m 1005.39,233.88555 h 1.6978 v 27.1649 h -1.6978 z"
          id="rect22335"
@@ -114,6 +114,6 @@
        inkscape:connector-curvature="0"
        transform="matrix(0.57567278,0,0,0.57567278,-555.77721,-130.15265)"
        sodipodi:nodetypes="cssssc"
-       class="success" />
+       class="create" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-geometry-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-geometry-symbolic.svg
index 8af82df9d1..40a10bc902 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-geometry-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-geometry-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-path-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-path-symbolic.svg
index 226cf5db8d..b2303bf2dd 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-path-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-path-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -90,14 +90,14 @@
     <path
        style="fill-opacity:1;stroke-width:1.02509"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        d="m 0,9 h 4 v 4 H 0 Z"
        id="rect1023" />
     <path
        sodipodi:nodetypes="ccccc"
        style="fill-opacity:1;stroke-width:1.15169"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        d="m 1.5639419,2 h 0.8 v 11 h -0.8 z"
        id="rect946" />
     <path
@@ -109,7 +109,7 @@
     <path
        style="fill-opacity:1"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        d="M 3.9078723,1.9670688 A 1.9439304,1.9439304 0 0 1 1.9639419,3.9109992 1.9439304,1.9439304 0 0 1 0.0200115,1.9670688 1.9439304,1.9439304 0 0 1 1.9639419,0.02313839 1.9439304,1.9439304 0 0 1 3.9078723,1.9670688"
        id="circle1027" />
   </g>
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-polygon-star-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-polygon-star-symbolic.svg
index feba80aec0..e730c035a3 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-polygon-star-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-polygon-star-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -91,7 +91,7 @@
     <path
        inkscape:label="poly"
        inkscape:connector-curvature="0"
-       class="warning"
+       class="shape"
        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="opacity:0.4;"
        id="polygon1130" />
@@ -107,7 +107,7 @@
     <path
        inkscape:label="star"
        inkscape:connector-curvature="0"
-       class="warning"
+       class="shape"
        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="opacity:0.2;"
        id="polygon1136" />
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-rectangle-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-rectangle-symbolic.svg
index c239349f96..87e035967c 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-rectangle-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-rectangle-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -93,7 +93,7 @@
        style="opacity:0"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        d="M 1.7193115,1.6799758 H 14.280941 V 14.241606 H 1.7268697 Z"
        inkscape:label="fill"
        style="opacity:0.6"
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-spiral-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-spiral-symbolic.svg
index 34db94461d..d275f81739 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-spiral-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-spiral-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/draw-text-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/draw-text-symbolic.svg
index 163ab3d9ae..bec3004253 100755
--- a/share/icons/multicolor-beta/symbolic/actions/draw-text-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/draw-text-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -92,7 +92,7 @@
     <path
        style="stroke-width:1.12034"
        inkscape:connector-curvature="0"
-       class="success"
+       class="create"
        d="M 13.981332,0 H 16 v 16 h -2.018668 z"
        id="rect1717" />
   </g>
diff --git a/share/icons/multicolor-beta/symbolic/actions/grid-rectangular-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/grid-rectangular-symbolic.svg
index 9cadddede5..e5f89ce22e 100755
--- a/share/icons/multicolor-beta/symbolic/actions/grid-rectangular-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/grid-rectangular-symbolic.svg
@@ -3,9 +3,9 @@
 <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="grid-rectangular-symbolic.svg">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/guides-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/guides-symbolic.svg
index 17c2308fd7..80619531f5 100755
--- a/share/icons/multicolor-beta/symbolic/actions/guides-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/guides-symbolic.svg
@@ -3,9 +3,9 @@
 <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="guides-symbolic.svg">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/mesh-gradient-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/mesh-gradient-symbolic.svg
index 47147316e0..e1cd4e938f 100755
--- a/share/icons/multicolor-beta/symbolic/actions/mesh-gradient-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/mesh-gradient-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -111,31 +111,31 @@
          id="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" />
+         class="color" />
       <path
          id="g1-2"
          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" />
+         class="color" />
       <path
          id="g1-3"
          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" />
+         class="color" />
       <path
          id="g1-4"
          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" />
+         class="color" />
       <path
          id="g1-5"
          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" />
+         class="color" />
       <path
          id="g1-6"
          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" />
+         class="color" />
     </g>
     <path
        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"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-add-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-add-symbolic.svg
index 13a2415f7b..1b27952681 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-add-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-add-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        id="path10583"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 383,569.36218 h 6 v 5 h -6 z"
        id="rect10585"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-break-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-break-symbolic.svg
index 3ce16b14ee..bf2039d53b 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-break-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-break-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -96,13 +96,13 @@
        transform="translate(0,512.3622)" />
   </g>
   <path
-     class="success"
+     class="create"
      style="opacity:1;fill:#00990a"
      d="m 2,12 h 4 v 4 H 2 Z"
      id="rect19510"
      inkscape:connector-curvature="0" />
   <path
-     class="success"
+     class="create"
      style="opacity:1;fill:#00990a"
      d="m 10,12 h 4 v 4 h -4 z"
      id="rect19518"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-delete-segment-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-delete-segment-symbolic.svg
index 4a4fc96e6e..c2b363e19b 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-delete-segment-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-delete-segment-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-delete-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-delete-symbolic.svg
index 62bb11bfaf..3a91759497 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-delete-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-delete-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
   <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-join-segment-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-join-segment-symbolic.svg
index b381c383c7..0897ca556d 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-join-segment-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-join-segment-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        id="rect19610"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        id="path19612"
        d="m 535,563.3622 h 2 l 0.006,3.0058 h 2 l -3,2.9883 -3,-2.9883 h 2 z"
@@ -113,7 +113,7 @@
        d="m 538,571.36218 h 6 v 1 h -6 z"
        style="opacity:1;stroke-width:0.612372" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;stroke-width:0.707106"
        d="m 534,571.36218 h 4 v 2 h -4 z"
        id="rect19624"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-join-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-join-symbolic.svg
index 69d407edf8..c49e38849b 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-join-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-join-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -94,7 +94,7 @@
        inkscape:connector-curvature="0" />
   </g>
   <path
-     class="success"
+     class="create"
      style="opacity:1;fill:#00990a;stroke-width:0.864555"
      d="m 6,12.262691 h 4 V 16 H 6 Z"
      id="path1662"
@@ -104,5 +104,5 @@
      id="path19516"
      d="m 7,5.0117 h 2 v 3 h 2 L 8,11 5,8.0117 h 2 z"
      style="opacity:1"
-     class="success" />
+     class="create" />
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-segment-curve-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-segment-curve-symbolic.svg
index 117ef1a0e8..1c21e45cd4 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-segment-curve-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-segment-curve-symbolic.svg
@@ -3,9 +3,9 @@
 <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="node-segment-curve-symbolic.svg">
 <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-segment-line-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-segment-line-symbolic.svg
index 72fb20d94d..16cf3b2df6 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-segment-line-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-segment-line-symbolic.svg
@@ -3,9 +3,9 @@
 <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="node-segment-line-symbolic.svg">
 <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-transform-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-transform-symbolic.svg
index dd7a0cd1b1..a7fa504caf 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-transform-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-transform-symbolic.svg
@@ -3,9 +3,9 @@
 <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="node-transform-symbolic.svg">
 <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-type-auto-smooth-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-type-auto-smooth-symbolic.svg
index d842396389..69adfd1f49 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-type-auto-smooth-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-type-auto-smooth-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        d="m 664.3125,559.2812 a 0.5140439,0.5140439 0 0 0 -0.4063,0.5938 c 0.2334,1.6021 -0.061,3.7479 -1.125,5.4375 -1.0643,1.6896 -2.8444,2.9687 -5.875,2.9687 -3.034,0 -4.799,-1.2228 -5.8125,-2.875 -1.0134,-1.6521 -1.2297,-3.7672 -0.9687,-5.375 a 0.52410303,0.52410303 0 1 0 -1.0313,-0.1875 c -0.2977,1.834 -0.053,4.1734 1.125,6.0938 1.178,1.9204 3.3613,3.375 6.6875,3.375 3.3297,0 5.5234,-1.4902 6.75,-3.4375 1.2267,-1.9473 1.518,-4.2854 1.25,-6.125 a 0.5140439,0.5140439 0 0 0 -0.5937,-0.4688 z"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        transform="matrix(1.5,0,0,1.5,-328.5,482.8622)"
        style="opacity:1"
        d="m 659,57 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-type-cusp-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-type-cusp-symbolic.svg
index 2ca98cddaf..217f6f0553 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-type-cusp-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-type-cusp-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -74,7 +74,7 @@
        style="opacity:1;stroke-width:0.998328"
        id="path3226" />
     <path
-       class="warning"
+       class="shape"
        style="opacity:1;stroke-width:1.1071"
        d="m 563.61633,569.80593 2.84413,-2.79136 2.87359,2.82029 -2.84412,2.79138 z"
        id="rect3224"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-type-smooth-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-type-smooth-symbolic.svg
index 664343d1e6..53c39d7ffa 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-type-smooth-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-type-smooth-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        d="m 604.3125,559.2812 a 0.5140439,0.5140439 0 0 0 -0.4063,0.5938 c 0.2334,1.6021 -0.061,3.7479 -1.125,5.4375 -1.0643,1.6896 -2.8444,2.9687 -5.875,2.9687 -3.034,0 -4.799,-1.2228 -5.8125,-2.875 -1.0134,-1.6521 -1.2297,-3.7672 -0.9687,-5.375 a 0.52410303,0.52410303 0 1 0 -1.0313,-0.1875 c -0.2977,1.834 -0.053,4.1734 1.125,6.0938 1.178,1.9204 3.3613,3.375 6.6875,3.375 3.3297,0 5.5234,-1.4902 6.75,-3.4375 1.2267,-1.9473 1.518,-4.2854 1.25,-6.125 a 0.5140439,0.5140439 0 0 0 -0.5937,-0.4688 z"
        style="opacity:1" />
     <path
-       class="warning"
+       class="shape"
        style="opacity:1"
        d="m 595,566.36218 h 4 v 5 h -4 z"
        id="rect16754"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node-type-symmetric-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node-type-symmetric-symbolic.svg
index 2d148634eb..f9107e906a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node-type-symmetric-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node-type-symmetric-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -73,32 +73,32 @@
        style="opacity:1"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        style="opacity:1"
        d="m 625,566.36218 h 4 v 5 h -4 z"
        id="rect16760"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        style="opacity:1"
        d="m 630,569.36218 h 2 v 1 h -2 z"
        id="rect16762"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        style="opacity:1"
        d="m 622,569.36218 h 2 v 1 h -2 z"
        id="rect16764"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        transform="matrix(1,0,0,1.010417,-0.5000034,512.8205)"
        style="opacity:1"
        d="M 635,56.5 A 1.5,1.5 0 0 1 633.5,58 1.5,1.5 0 0 1 632,56.5 1.5,1.5 0 0 1 633.5,55 1.5,1.5 0 0 1 635,56.5 Z"
        id="path16766"
        inkscape:connector-curvature="0" />
     <path
-       class="warning"
+       class="shape"
        transform="matrix(1,0,0,1.010417,-12.5,512.7893)"
        style="opacity:1"
        d="M 635,56.5 A 1.5,1.5 0 0 1 633.5,58 1.5,1.5 0 0 1 632,56.5 1.5,1.5 0 0 1 633.5,55 1.5,1.5 0 0 1 635,56.5 Z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/node_insert_max_x-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node_insert_max_x-symbolic.svg
index 21d950a51a..e15be48a48 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node_insert_max_x-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node_insert_max_x-symbolic.svg
@@ -4,9 +4,9 @@
 
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node_insert_max_y-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node_insert_max_y-symbolic.svg
index 6d225f8c8e..772f67d478 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node_insert_max_y-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node_insert_max_y-symbolic.svg
@@ -4,9 +4,9 @@
 
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node_insert_min_x-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node_insert_min_x-symbolic.svg
index 6ef461a2b6..cf5cca555a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node_insert_min_x-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node_insert_min_x-symbolic.svg
@@ -4,9 +4,9 @@
 
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/node_insert_min_y-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/node_insert_min_y-symbolic.svg
index 3b65458006..6713faf164 100755
--- a/share/icons/multicolor-beta/symbolic/actions/node_insert_min_y-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/node_insert_min_y-symbolic.svg
@@ -4,9 +4,9 @@
 
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-center-symbolic.svg
index cb3c306b7d..64328c640f 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-center-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1b5d333, 2019-09-08)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -82,13 +82,13 @@
        id="rect22604"
        d="m 715.9377,518.42468 h 2.00001 v -8 h -2.00001 z"
        style="opacity:1;stroke-width:0.897915"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        id="rect22614"
        d="m 712.9377,513.42468 h 8.00002 v 2 h -8.00002 z"
        style="opacity:1;stroke-width:0.897933"
-       class="success" />
+       class="create" />
     <path
        inkscape:connector-curvature="0"
        transform="matrix(1.000004,0,0,1,708.93768,506.42468)"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-corners-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-corners-symbolic.svg
index 04e666f073..63ba1fbcd4 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-corners-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-corners-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -96,7 +96,7 @@
        id="path22512"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="matrix(0.687668,0.7260253,-0.7260156,0.6876782,0,0)"
        style="opacity:1"
        d="m 831.24652,-125.2675 h 3.53681 v 3.53681 h -3.53681 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-edges-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-edges-symbolic.svg
index 9a7ca6355a..bd73657048 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-edges-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-edges-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -68,7 +68,7 @@
        id="rect22470"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 619,511.36221 h 2 v 10 h -2 z"
        id="rect22474"
@@ -81,7 +81,7 @@
        style="opacity:0.5;stroke-width:0.999027"
        id="rect22476" />
     <path
-       class="success"
+       class="create"
        transform="rotate(90)"
        style="opacity:1"
        d="m 505.36221,-635 h 2 v 10 h -2 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-midpoints-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-midpoints-symbolic.svg
index a58aa9e51d..6d3b2ace8f 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-midpoints-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-midpoints-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -79,13 +79,13 @@
        d="m 686,508.4169 v -1.99222 h 3 v 1.99222 z"
        style="opacity:1" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        id="path2943"
        d="m 686,508.4169 v -1.99222 h 3 v 1.99222 z"
        style="opacity:1" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 686,520.43246 v 1.99222 h 3 v -1.99222 z"
        id="rect22541"
@@ -104,7 +104,7 @@
        d="m 688,511.4052 v 5.9767 l 4,-2.9884 z"
        style="opacity:1" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;stroke-width:1.00195"
        d="m 693,512.42468 h 2 v 4 h -2 z"
        id="rect22646"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-symbolic.svg
index 74249bebb7..77e8aaaa48 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-bounding-box-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -89,7 +89,7 @@
        id="rect22462"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;stroke-width:1.00293"
        d="m 588.96905,505.36199 h 4.0078 v 4.01562 h -4.0078 z"
        id="rect22464"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-grid-guide-intersections-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-grid-guide-intersections-symbolic.svg
index dd10cbcfd3..c43f183a98 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-grid-guide-intersections-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-grid-guide-intersections-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -83,6 +83,6 @@
        id="path16610"
        d="m 1015.6251,534.86217 a 2.125008,2.124992 0 0 1 -2.125,2.12499 2.125008,2.124992 0 0 1 -2.125,-2.12499 2.125008,2.124992 0 0 1 2.125,-2.12499 2.125008,2.124992 0 0 1 2.125,2.12499 z"
        style="opacity:1;stroke-width:1.0625"
-       class="success" />
+       class="create" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-center-symbolic.svg
index ee99e0e044..365b99e527 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-center-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -68,13 +68,13 @@
        id="rect22833"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 927,506.36221 h 1 v 15 h -1 z"
        id="rect22858"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 920,513.36218 h 15 v 1 h -15 z"
        id="rect22860"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-cusp-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-cusp-symbolic.svg
index 28cd128174..aea311b722 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-cusp-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-cusp-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -76,7 +76,7 @@
        style="opacity:1"
        id="path17721" />
     <path
-       class="success"
+       class="create"
        transform="rotate(135.0001)"
        style="opacity:1"
        d="m -190.606,-954.81677 h 4.13284 v 4.17568 h -4.13284 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-intersection-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-intersection-symbolic.svg
index 7153691431..a3ceeb2b14 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-intersection-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-intersection-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -81,7 +81,7 @@
        style="opacity:1"
        id="path22823" />
     <path
-       class="success"
+       class="create"
        style="opacity:1;stroke-width:1.15749"
        d="m 899.31528,514.36224 a 2.3149964,2.3149563 0 0 1 -2.315,2.31496 2.3149964,2.3149563 0 0 1 -2.31499,-2.31496 2.3149964,2.3149563 0 0 1 2.31499,-2.31496 2.3149964,2.3149563 0 0 1 2.315,2.31496 z"
        id="path22825"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-midpoint-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-midpoint-symbolic.svg
index ee47bec640..6291feb69f 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-midpoint-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-midpoint-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -103,7 +103,7 @@
        id="rect22813"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        style="opacity:1"
        d="m 875,514.39363 a 2.5,2.5 0 0 1 -2.5,2.5 2.5,2.5 0 0 1 -2.5,-2.5 2.5,2.5 0 0 1 2.5,-2.5 2.5,2.5 0 0 1 2.5,2.5 z"
        id="path22815"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-path-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-path-symbolic.svg
index 60ac985e52..369770b67a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-path-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-path-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        id="rect22695"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        id="path22693"
        d="m 784.3125,522.3622 a 0.5140439,0.5121131 0 0 1 -0.4063,-0.5938 c 0.2334,-1.5961 -0.061,-3.723 -1.125,-5.4062 -0.6325,-1.0004 -1.5307,-1.8452 -2.7812,-2.375 v -1.125 c 1.6552,0.5943 2.8607,1.6793 3.6562,2.9375 1.2267,1.9399 1.518,4.2611 1.25,6.0937 a 0.5140439,0.5121131 0 0 1 -0.5937,0.4688 z m -14.7188,-0.125 a 0.5240784,0.52211 0 0 1 -0.5,-0.4375 c -0.2977,-1.8271 -0.053,-4.1494 1.125,-6.0625 0.7918,-1.286 2.0393,-2.37 3.7813,-2.9375 v 1.0625 c -1.3469,0.5015 -2.2728,1.3775 -2.9063,2.4062 -1.0134,1.646 -1.2297,3.7421 -0.9687,5.3438 a 0.5240784,0.52211 0 0 1 -0.5313,0.625 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-rotation-center-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-rotation-center-symbolic.svg
index 6def5dec83..02e59bdb85 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-rotation-center-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-rotation-center-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -89,7 +89,7 @@
        style="opacity:1;fill-opacity:1"
        d="m 952,506.3622 v 5 l 4,1.9e-4 -1.16556,-1.53953 c 0.34776,-0.46047 1.36078,-1.58546 2.60306,-1.58546 1.4929,0 2.5625,1.0047 2.5625,2.0625 v 1.06249 h 2 c 0,0 0.0121,-0.42166 -0.005,-0.97046 -0.0718,-2.25466 -2.18403,-4.02953 -4.55713,-4.02953 -1.5399,0 -3.06023,0.88639 -3.86043,1.99999 z"
        id="path2899"
-       class="success"
+       class="create"
        sodipodi:nodetypes="ccccssccsscc" />
   </g>
 </svg>
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-smooth-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-smooth-symbolic.svg
index b1da4fdae1..de56a99079 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-smooth-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-smooth-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -75,7 +75,7 @@
        id="path22717"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="matrix(0.8,0,0,0.8,167.8,511.9622)"
        style="opacity:1"
        d="M 839,0.5 A 2.5,2.5 0 0 1 836.5,3 2.5,2.5 0 0 1 834,0.5 2.5,2.5 0 0 1 836.5,-2 2.5,2.5 0 0 1 839,0.5 Z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-symbolic.svg
index e076e75c22..2886c1c145 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-nodes-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-nodes-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,35 +72,35 @@
        id="path22658"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="scale(1,-1)"
        style="opacity:1"
        d="m 745,-514.35577 h 4 v 5 h -4 z"
        id="rect22662"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="scale(1,-1)"
        style="opacity:1"
        d="m 750,-511.3558 h 2 v 1 h -2 z"
        id="rect22664"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="scale(1,-1)"
        style="opacity:1"
        d="m 742,-511.3558 h 2 v 1 h -2 z"
        id="rect22666"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="matrix(1,0,0,-1.010417,119.5,567.8975)"
        style="opacity:1"
        d="M 635,56.5 A 1.5,1.5 0 0 1 633.5,58 1.5,1.5 0 0 1 632,56.5 1.5,1.5 0 0 1 633.5,55 1.5,1.5 0 0 1 635,56.5 Z"
        id="path22668"
        inkscape:connector-curvature="0" />
     <path
-       class="success"
+       class="create"
        transform="matrix(1,0,0,-1.010417,107.5,567.9287)"
        style="opacity:1"
        d="M 635,56.5 A 1.5,1.5 0 0 1 633.5,58 1.5,1.5 0 0 1 632,56.5 1.5,1.5 0 0 1 633.5,55 1.5,1.5 0 0 1 635,56.5 Z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-page-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-page-symbolic.svg
index 050e4209f3..bcd8826f5c 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-page-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-page-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-symbolic.svg
index 0a9d019c49..e72fdadedb 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -72,7 +72,7 @@
        d="m 559,505.3627 h 16 v 16 h -16 z"
        style="opacity:0;fill:none" />
     <path
-       class="success"
+       class="create"
        inkscape:connector-curvature="0"
        id="rect22373"
        d="m 562.5,505.36209 c 0.831,0 1.5,0.669 1.5,1.5 0,0.831 -0.669,1.5 -1.5,1.5 -0.831,0 -1.5,-0.669 -1.5,-1.5 0,-0.831 0.669,-1.5 1.5,-1.5 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/snap-text-baseline-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/snap-text-baseline-symbolic.svg
index 75dec4b923..a4580e2ebf 100755
--- a/share/icons/multicolor-beta/symbolic/actions/snap-text-baseline-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/snap-text-baseline-symbolic.svg
@@ -16,9 +16,9 @@
    version="1.1">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
@@ -68,14 +68,14 @@
     <g
        id="g948">
       <path
-         class="success"
+         class="create"
          inkscape:connector-curvature="0"
          id="rect48149"
          d="m 8.9601545,4.717515 h 4.0000005 v 4 H 8.9601545 Z"
          style="opacity:1"
          transform="rotate(45)" />
       <path
-         class="success"
+         class="create"
          inkscape:connector-curvature="0"
          id="path48151"
          d="m 2,12 v 1 h 14 v -1 z"
diff --git a/share/icons/multicolor-beta/symbolic/actions/tool-measure-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/tool-measure-symbolic.svg
index cc6ccb4ac4..be7a3fc62b 100755
--- a/share/icons/multicolor-beta/symbolic/actions/tool-measure-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/tool-measure-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/tool-node-editor-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/tool-node-editor-symbolic.svg
index 1f65d430a0..71a8e7d4a5 100755
--- a/share/icons/multicolor-beta/symbolic/actions/tool-node-editor-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/tool-node-editor-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/tool-pointer-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/tool-pointer-symbolic.svg
index 6a185c1f8a..463c57ae17 100755
--- a/share/icons/multicolor-beta/symbolic/actions/tool-pointer-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/tool-pointer-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/tool-spray-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/tool-spray-symbolic.svg
index 11de0a7df8..fde770a141 100755
--- a/share/icons/multicolor-beta/symbolic/actions/tool-spray-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/tool-spray-symbolic.svg
@@ -16,9 +16,9 @@
    inkscape:version="1.0beta0 (1d85f8e, 2019-09-11)">
    <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/tool-tweak-symbolic.svg
index 559df0a54d..2c410c0c0a 100755
--- a/share/icons/multicolor-beta/symbolic/actions/tool-tweak-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/tool-tweak-symbolic.svg
@@ -19,9 +19,9 @@
      id="title3468">symbolic icons</title>
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/share/icons/multicolor-beta/symbolic/actions/zoom-symbolic.svg b/share/icons/multicolor-beta/symbolic/actions/zoom-symbolic.svg
index 24ab436279..e1cfff2d38 100755
--- a/share/icons/multicolor-beta/symbolic/actions/zoom-symbolic.svg
+++ b/share/icons/multicolor-beta/symbolic/actions/zoom-symbolic.svg
@@ -17,9 +17,9 @@
 
      <style id="s0">
    .base    { fill: #000000; }
-   .success { fill: #009909; }
-   .warning { fill: #FF1990; }
-   .error   { fill: #00AAFF; }
+   .create { fill: #009909; }
+   .shape { fill: #FF1990; }
+   .color   { fill: #00AAFF; }
    .dark    {  }
   </style>
   <style id="s2"> 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index fa88f035a3..0305a2aeba 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -493,62 +493,6 @@ Application::~Application()
 }
 
 
-Glib::ustring Application::get_symbolic_colors()
-{
-    Glib::ustring css_str;
-    gchar colornamed[64];
-    gchar colornamedsuccess[64];
-    gchar colornamedwarning[64];
-    gchar colornamederror[64];
-    gchar colornamed_inverse[64];
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-    guint32 colorsetbase = 0x2E3436ff;
-    guint32 colorsetbase_inverse = colorsetbase ^ 0xffffff00;
-    guint32 colorsetsuccess = 0x4AD589ff;
-    guint32 colorsetwarning = 0xF57900ff;
-    guint32 colorseterror = 0xcc0000ff;
-    colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", colorsetbase);
-    colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess);
-    colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning);
-    colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror);
-    sp_svg_write_color(colornamed, sizeof(colornamed), colorsetbase);
-    sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
-    sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
-    sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
-    colorsetbase_inverse = colorsetbase ^ 0xffffff00;
-    sp_svg_write_color(colornamed_inverse, sizeof(colornamed_inverse), colorsetbase_inverse);
-    css_str += "*{-gtk-icon-palette: success ";
-    css_str += colornamedsuccess;
-    css_str += ", warning ";
-    css_str += colornamedwarning;
-    css_str += ", error ";
-    css_str += colornamederror;
-    css_str += ";}";
-    css_str += "#InkRuler,";
-    /* ":not(.rawstyle) > image" works only on images in first level of widget container
-    if in the future we use a complex widget with more levels and we dont want to tweak the color
-    here, retaining default we can add more lines like ":not(.rawstyle) > > image" */
-    css_str += ":not(.rawstyle) > image";
-    css_str += "{color:";
-    css_str += colornamed;
-    css_str += ";}";
-    css_str += ".dark .forcebright :not(.rawstyle) > image,";
-    css_str += ".dark .forcebright image:not(.rawstyle),";
-    css_str += ".bright .forcedark :not(.rawstyle) > image,";
-    css_str += ".bright .forcedark image:not(.rawstyle),";
-    css_str += ".dark :not(.rawstyle) > image.forcebright,";
-    css_str += ".dark image.forcebright:not(.rawstyle),";
-    css_str += ".bright :not(.rawstyle) > image.forcedark,";
-    css_str += ".bright image.forcedark:not(.rawstyle),";
-    css_str += ".inverse :not(.rawstyle) > image,";
-    css_str += ".inverse image:not(.rawstyle)";
-    css_str += "{color:";
-    css_str += colornamed_inverse;
-    css_str += ";}";
-    return css_str;
-}
-
 /**
  * \brief Add our CSS style sheets
  */
@@ -600,6 +544,16 @@ void Application::add_gtk_css()
         }
         Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
+    using namespace Inkscape::IO::Resource;
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
+    if (themeiconname == prefs->getString("/theme/defaultIconTheme")) {
+        themeiconname = "hicolor";
+    }
+    Glib::ustring prefix = "";
+    if (prefs->getBool("/theme/darkTheme", false)) {
+        prefix = ".dark ";
+    }
 
     Glib::ustring gtkthemename = prefs->getString("/theme/gtkTheme");
     gtkthemename += ".css";
@@ -619,20 +573,20 @@ void Application::add_gtk_css()
         }
         Gtk::StyleContext::add_provider_for_screen(screen, themeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
-
     if (!colorizeprovider) {
         colorizeprovider = Gtk::CssProvider::create();
     }
-    Glib::ustring css_str = "";
-    if (prefs->getBool("/theme/symbolicIcons", false)) {
-        css_str = get_symbolic_colors();
-    }
-    try {
-        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());
+    Glib::ustring highlight = get_filename(ICONS, Glib::ustring(themeiconname + "/highlights.css").c_str(), false, true);
+    if (!highlight.empty()) {
+        colorizeprovider = Gtk::CssProvider::create();
+        try {
+            colorizeprovider->load_from_path(highlight);
+        } catch (const Gtk::CssProviderError &ex) {
+            g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
+                       ex.what().c_str());
+        }
+        Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
-    Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 void Application::readStyleSheets(bool forceupd)
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 803490065e..2543412981 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -565,136 +565,33 @@ static void _inkscape_fill_gtk(const gchar *path, GHashTable *t)
     g_dir_close(dir);
 }
 
-void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &colorsetsuccess,
-                                               guint32 &colorsetwarning, guint32 &colorseterror)
-{
-    using namespace Inkscape::IO::Resource;
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-    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(prefix + ".base");
-        size_t endpos = content.find("}");
-        if (startpos != std::string::npos) {
-            result = content.substr(startpos, endpos - startpos);
-            size_t startposin = result.find("fill:");
-            size_t endposin = result.find(";");
-            result = result.substr(startposin + 5, endposin - (startposin + 5));
-            REMOVE_SPACES(result);
-            Gdk::RGBA base_color = Gdk::RGBA(result);
-            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(0, endpos + 1);
-        startpos = content.find(prefix + ".success");
-        endpos = content.find("}");
-        if (startpos != std::string::npos) {
-            result = content.substr(startpos, endpos - startpos);
-            size_t startposin = result.find("fill:");
-            size_t endposin = result.find(";");
-            result = result.substr(startposin + 5, endposin - (startposin + 5));
-            REMOVE_SPACES(result);
-            Gdk::RGBA success_color = Gdk::RGBA(result);
-            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(0, endpos + 1);
-        startpos = content.find(prefix + ".warning");
-        endpos = content.find("}");
-        if (startpos != std::string::npos) {
-            result = content.substr(startpos, endpos - startpos);
-            size_t startposin = result.find("fill:");
-            size_t endposin = result.find(";");
-            result = result.substr(startposin + 5, endposin - (startposin + 5));
-            REMOVE_SPACES(result);
-            Gdk::RGBA warning_color = Gdk::RGBA(result);
-            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(0, endpos + 1);
-        startpos = content.find(prefix + ".error");
-        endpos = content.find("}");
-        if (startpos != std::string::npos) {
-            result = content.substr(startpos, endpos - startpos);
-            size_t startposin = result.find("fill:");
-            size_t endposin = result.find(";");
-            result = result.substr(startposin + 5, endposin - (startposin + 5));
-            REMOVE_SPACES(result);
-            Gdk::RGBA error_color = Gdk::RGBA(result);
-            SPColor error_color_sp(error_color.get_red(), error_color.get_green(), error_color.get_blue());
-            colorseterror = error_color_sp.toRGBA32(error_color.get_alpha());
-        }
-    }
-}
-
 void InkscapePreferences::resetIconsColors(bool themechange)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
     if (!prefs->getBool("/theme/symbolicIcons", false)) {
-        _symbolic_base_colors.set_sensitive(false);
-        _symbolic_base_color.setSensitive(false);
-        _symbolic_success_color.setSensitive(false);
-        _symbolic_warning_color.setSensitive(false);
-        _symbolic_error_color.setSensitive(false);
+        _symbolic_default_colors.set_sensitive(false);
+        _symbolic_color_1.setSensitive(false);
+        _symbolic_color_2.setSensitive(false);
+        _symbolic_color_3.setSensitive(false);
+        _symbolic_color_4.setSensitive(false);
+        _symbolic_color_5.setSensitive(false);
+        _symbolic_color_6.setSensitive(false);
         return;
     }
-    if (prefs->getBool("/theme/symbolicDefaultColors", true) ||
-        !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) {
+    if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
         auto const screen = Gdk::Screen::get_default();
         if (INKSCAPE.colorizeprovider) {
             Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
         }
-        // This colors are setted on style.css of inkscape
-        Gdk::RGBA base_color = _symbolic_base_color.get_style_context()->get_color();
-        // This is a hack to fix a proble style is not updated enoght fast on
-        // chage from dark to bright themes
-        if (themechange) {
-            base_color = _symbolic_base_color.get_style_context()->get_background_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 base_color_sp(base_color.get_red(), base_color.get_green(), base_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 = base_color_sp.toRGBA32(base_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);
-        if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
-            _symbolic_base_color.setSensitive(false);
-            _symbolic_success_color.setSensitive(false);
-            _symbolic_warning_color.setSensitive(false);
-            _symbolic_error_color.setSensitive(false);
-            /* _complementary_colors->get_style_context()->add_class("disabled"); */
-        }
         changeIconsColors();
     } else {
-        _symbolic_base_color.setSensitive(true);
-        _symbolic_success_color.setSensitive(true);
-        _symbolic_warning_color.setSensitive(true);
-        _symbolic_error_color.setSensitive(true);
+        _symbolic_color_1.setSensitive(true);
+        _symbolic_color_2.setSensitive(true);
+        _symbolic_color_3.setSensitive(true);
+        _symbolic_color_4.setSensitive(true);
+        _symbolic_color_5.setSensitive(true);
+        _symbolic_color_6.setSensitive(true);
         /* _complementary_colors->get_style_context()->remove_class("disabled"); */
     }
 }
@@ -705,30 +602,29 @@ void InkscapePreferences::changeIconsColors()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     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);
+    guint32 colorsetbase = prefs->getUInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff);
+    guint32 colorset_1 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor1", 0x4AD589ff);
+    guint32 colorset_2 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor2", 0xF57900ff);
+    guint32 colorset_3 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor3", 0xCC0000ff);
+    _symbolic_color_2.setRgba32(colorsetbase);
+    _symbolic_color_3.setRgba32(colorset1);
+    _symbolic_color_4.setRgba32(colorset2);
+    _symbolic_color_5.setRgba32(colorset3);
     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());
+    Glib::ustring highlight = get_filename(ICONS, Glib::ustring(themeiconname + "/highlights.css").c_str(), false, true);
+    if (!highlight.empty()) {
+        INKSCAPE.colorizeprovider = Gtk::CssProvider::create();
+        try {
+            INKSCAPE.colorizeprovider->load_from_path(highlight);
+        } catch (const Gtk::CssProviderError &ex) {
+            g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
+                       ex.what().c_str());
+        }
+        Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
-    Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider,
-                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 void InkscapePreferences::toggleSymbolic()
@@ -740,10 +636,9 @@ void InkscapePreferences::toggleSymbolic()
             window->get_style_context()->add_class("symbolic");
             window->get_style_context()->remove_class("regular");
         }
-        _symbolic_base_colors.set_sensitive(true);
+        _symbolic_default_colors.set_sensitive(true);
         Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-        if (prefs->getBool("/theme/symbolicDefaultColors", true) ||
-            !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) {
+        if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
             resetIconsColors();
         } else {
             changeIconsColors();
@@ -757,7 +652,7 @@ void InkscapePreferences::toggleSymbolic()
         if (INKSCAPE.colorizeprovider) {
             Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
         }
-        _symbolic_base_colors.set_sensitive(false);
+        _symbolic_default_colors.set_sensitive(false);
     }
     INKSCAPE.signal_change_theme.emit();
 }
@@ -838,35 +733,34 @@ void InkscapePreferences::symbolicThemeCheck()
         if (!symbolic) {
             _symbolic_icons.set_active(false);
             _symbolic_icons.get_parent()->hide();
-            _symbolic_base_colors.get_parent()->hide();
-            _symbolic_base_color.get_parent()->get_parent()->hide();
-            _symbolic_success_color.get_parent()->get_parent()->hide();
+            _symbolic_default_colors.get_parent()->hide();
+            _symbolic_color_2.get_parent()->get_parent()->hide();
+            _symbolic_color_3.get_parent()->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();
+            _symbolic_default_colors.get_parent()->show();
+            _symbolic_color_2.get_parent()->get_parent()->show();
+            _symbolic_color_3.get_parent()->get_parent()->show();
         }
     }
     if (symbolic) {
-        if (prefs->getBool("/theme/symbolicDefaultColors", true) ||
-            !prefs->getEntry("/theme/" + themeiconname + "/symbolicBaseColor").isValid()) {
+        if (prefs->getBool("/theme/symbolicDefaultColors", true)) {
             resetIconsColors();
         } else {
             changeIconsColors();
         }
-        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.init(_("Color for symbolic icons:"), "/theme/" + themeiconname + "/symbolicBaseColor",
+        guint32 colorsetbase = prefs->getUInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff);
+        guint32 colorset_1 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor1", 0x4AD589ff);
+        guint32 colorset_2 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor2", 0xF57900ff);
+        guint32 colorset_3 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor2", 0xCC0000ff);
+        _symbolic_color_2.init(_("Color for symbolic icons:"), "/theme/" + themeiconname + "/symbolicBaseColor",
                                   colorsetbase);
-        _symbolic_success_color.init(_("Color for symbolic success icons:"),
-                                     "/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess);
-        _symbolic_warning_color.init(_("Color for symbolic warning icons:"),
-                                     "/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning);
-        _symbolic_error_color.init(_("Color for symbolic error icons:"),
-                                   "/theme/" + themeiconname + "/symbolicErrorColor", colorseterror);
+        _symbolic_color_3.init(_("Color for symbolic success icons:"),
+                                     "/theme/" + themeiconname + "/symbolicColor1", colorset1);
+        _symbolic_color_4.init(_("Color for symbolic warning icons:"),
+                                     "/theme/" + themeiconname + "/symbolicColor2", colorset2);
+        _symbolic_color_5.init(_("Color for symbolic error icons:"),
+                                   "/theme/" + themeiconname + "/symbolicColor2", colorset3);
     }
 }
 /* void sp_mix_colors(cairo_t *ct, int pos, SPColor a, SPColor b)
@@ -887,12 +781,12 @@ Glib::RefPtr< Gdk::Pixbuf > sp_mix_colors()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Glib::ustring themeiconname = prefs->getString("/theme/iconTheme");
-    guint32 colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff);
-    guint32 colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff);
-    guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff);
-    SPColor success(colorsetsuccess);
-    SPColor warning(colorsetwarning);
-    SPColor error(colorseterror);
+    guint32 colorset_1 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor1", 0x4AD589ff);
+    guint32 colorset_2 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor2", 0xF57900ff);
+    guint32 colorset_3 = prefs->getUInt("/theme/" + themeiconname + "/symbolicColor2", 0xCC0000ff);
+    SPColor success(colorset1);
+    SPColor warning(colorset2);
+    SPColor error(colorset3);
     cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 82, 26);
     cairo_t *ct = cairo_create(s);
     // success + warning
@@ -1149,38 +1043,38 @@ void InkscapePreferences::initPageUI()
     _symbolic_icons.init(_("Use symbolic icons"), "/theme/symbolicIcons", false);
     _symbolic_icons.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::toggleSymbolic));
     _page_theme.add_line(true, "", _symbolic_icons, "", "", true);
-    _symbolic_base_colors.init(_("Use default colors for icons"), "/theme/symbolicDefaultColors", true);
-    _symbolic_base_colors.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::resetIconsColorsWrapper));
-    _page_theme.add_line(true, "", _symbolic_base_colors, "", "", true);
-    _symbolic_base_color.init(_("Color for symbolic icons:"), "/theme/" + themeiconname + "/symbolicBaseColor",
+    _symbolic_default_colors.init(_("Use default colors for icons"), "/theme/symbolicDefaultColors", true);
+    _symbolic_default_colors.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::resetIconsColorsWrapper));
+    _page_theme.add_line(true, "", _symbolic_default_colors, "", "", true);
+    _symbolic_color_1.init(_("Color for symbolic icons:"), "/theme/" + themeiconname + "/symbolicColor1",
+                              0x2E3436ff);
+    _symbolic_color_2.init(_("Color for symbolic icons:"), "/theme/" + themeiconname + "/symbolicColor2",
                               0x2E3436ff);
-    _symbolic_success_color.init(_("Color for symbolic success icons:"),
-                                 "/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff);
-    _symbolic_warning_color.init(_("Color for symbolic warning icons:"),
-                                 "/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff);
-    _symbolic_error_color.init(_("Color for symbolic error icons:"), "/theme/" + themeiconname + "/symbolicErrorColor",
-                               0xcc0000ff);
-    _symbolic_base_color.get_style_context()->add_class("system_base_color");
-    _symbolic_success_color.get_style_context()->add_class("system_success_color");
-    _symbolic_warning_color.get_style_context()->add_class("system_warning_color");
-    _symbolic_error_color.get_style_context()->add_class("system_error_color");
-    _symbolic_base_color.get_style_context()->add_class("symboliccolors");
-    _symbolic_success_color.get_style_context()->add_class("symboliccolors");
-    _symbolic_warning_color.get_style_context()->add_class("symboliccolors");
-    _symbolic_error_color.get_style_context()->add_class("symboliccolors");
-    _symbolic_base_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
-    _symbolic_warning_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
-    _symbolic_success_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
-    _symbolic_error_color.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
+    _symbolic_color_3.init(_("Color for symbolic success icons:"),
+                                 "/theme/" + themeiconname + "/symbolicColor3", 0x4AD589ff);
+    _symbolic_color_4.init(_("Color for symbolic warning icons:"),
+                                 "/theme/" + themeiconname + "/symbolicColor4", 0xF57900ff);
+    _symbolic_color_5.init(_("Color for symbolic error icons:"), "/theme/" + themeiconname + "/symbolicColor5",
+                               0xCC0000ff);
+    _symbolic_color_6.init(_("Color for symbolic error icons:"), "/theme/" + themeiconname + "/symbolicColor5",
+                               0xCC0000ff);
+    _symbolic_color_2.get_style_context()->add_class("symbolicColor1 symbolicColor2");
+    _symbolic_color_3.get_style_context()->add_class("symbolicColor3");
+    _symbolic_color_4.get_style_context()->add_class("symbolicColor4");
+    _symbolic_color_5.get_style_context()->add_class("symbolicColor5");
+    _symbolic_color_2.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
+    _symbolic_color_4.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
+    _symbolic_color_3.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
+    _symbolic_color_5.connectChanged(sigc::mem_fun(this, &InkscapePreferences::changeIconsColor));
     /* _complementary_colors = Gtk::manage(new Gtk::Image()); */
     Gtk::Box *icon_buttons = Gtk::manage(new Gtk::Box());
-    icon_buttons->pack_start(_symbolic_base_color, true, true, 4);
+    icon_buttons->pack_start(_symbolic_color_2, true, true, 4);
     _page_theme.add_line(false, "", *icon_buttons, _("Icon color"),
                          _("Base color for icons. Some icons changes need reload"), false);
     Gtk::Box *icon_buttons_hight = Gtk::manage(new Gtk::Box());
-    icon_buttons_hight->pack_start(_symbolic_success_color, true, true, 4);
-    icon_buttons_hight->pack_start(_symbolic_warning_color, true, true, 4);
-    icon_buttons_hight->pack_start(_symbolic_error_color, true, true, 4);
+    icon_buttons_hight->pack_start(_symbolic_color_3, true, true, 4);
+    icon_buttons_hight->pack_start(_symbolic_color_4, true, true, 4);
+    icon_buttons_hight->pack_start(_symbolic_color_5, true, true, 4);
     /* icon_buttons_hight->pack_start(*_complementary_colors, true, true, 4); */
     _page_theme.add_line(false, "", *icon_buttons_hight, _("Highlights"),
                          _("Highlights 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 15a59df7eb..2dd0e473c5 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -241,11 +241,11 @@ protected:
     UI::Widget::PrefCombo _icon_theme;
     UI::Widget::PrefCheckButton _dark_theme;
     UI::Widget::PrefCheckButton _symbolic_icons;
-    UI::Widget::PrefCheckButton _symbolic_base_colors;
-    UI::Widget::PrefColorPicker _symbolic_base_color;
-    UI::Widget::PrefColorPicker _symbolic_warning_color;
-    UI::Widget::PrefColorPicker _symbolic_error_color;
-    UI::Widget::PrefColorPicker _symbolic_success_color;
+    UI::Widget::PrefCheckButton _symbolic_default_colors;
+    UI::Widget::PrefColorPicker _symbolic_color_2;
+    UI::Widget::PrefColorPicker _symbolic_color_4;
+    UI::Widget::PrefColorPicker _symbolic_color_5;
+    UI::Widget::PrefColorPicker _symbolic_color_3;
     /*     Gtk::Image *_complementary_colors; */
     UI::Widget::PrefCombo _misc_small_toolbar;
     UI::Widget::PrefCombo _misc_small_secondary;
@@ -593,8 +593,6 @@ private:
   void resetIconsColors(bool themechange = false);
   void resetIconsColorsWrapper();
   void changeIconsColor(guint32 /*color*/);
-  void get_highlight_colors(guint32 &colorsetbase, guint32 &colorsetsuccess, guint32 &colorsetwarning,
-                            guint32 &colorseterror);
 
   InkscapePreferences();
   InkscapePreferences(InkscapePreferences const &d);
diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
index c732739539..9e9e444efc 100644
--- a/src/ui/icon-loader.cpp
+++ b/src/ui/icon-loader.cpp
@@ -63,30 +63,8 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
     Glib::RefPtr<Gdk::Pixbuf> _icon_pixbuf;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/theme/symbolicIcons", false)) {
-        Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE);
-        if (iconinfo && SP_ACTIVE_DESKTOP->getToplevel()) {
-            bool was_symbolic = false;
-            Glib::ustring css_str = "";
-            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);
-            gchar colornamed[64];
-            gchar colornamedsuccess[64];
-            gchar colornamedwarning[64];
-            gchar colornamederror[64];
-            sp_svg_write_color(colornamed, sizeof(colornamed), colorsetbase);
-            sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
-            sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
-            sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
-            _icon_pixbuf =
-                iconinfo.load_symbolic(Gdk::RGBA(colornamed), Gdk::RGBA(colornamedsuccess),
-                                       Gdk::RGBA(colornamedwarning), Gdk::RGBA(colornamederror), was_symbolic);
-        } else {
-            Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
-            _icon_pixbuf = iconinfo.load_icon();
-        }
+        Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name + "-symbolic", size, Gtk::ICON_LOOKUP_FORCE_SIZE);
+        _icon_pixbuf = iconinfo.load_icon();
     } else {
         Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
         _icon_pixbuf = iconinfo.load_icon();
-- 
GitLab