From 9d685504eaf84a372b13d1fa01e2436718fba11c Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 11:55:58 -0700
Subject: [PATCH 01/11] optional drop shadow

---
 share/icons/hicolor/CMakeLists.txt            |   2 +
 share/icons/hicolor/cursors-drop-shadow.svg   | 124 ++++++++++++++++++
 share/icons/hicolor/cursors.css               |   5 +
 .../icons/hicolor/cursors/node-mouseover.svg  |  54 +-------
 share/icons/hicolor/cursors/node.svg          | 124 ++++++------------
 src/ui/cursor-utils.cpp                       |  20 ++-
 6 files changed, 198 insertions(+), 131 deletions(-)
 create mode 100644 share/icons/hicolor/cursors-drop-shadow.svg
 create mode 100644 share/icons/hicolor/cursors.css

diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt
index 54142487da..5f5eeb8119 100644
--- a/share/icons/hicolor/CMakeLists.txt
+++ b/share/icons/hicolor/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(THEME hicolor)
 install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
+install(FILES "cursors-drop-shadow.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
+install(FILES "cursors.css" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
 
 set(PIXMAP_SIZES "scalable" "symbolic")
 set(CONTENT "actions")
diff --git a/share/icons/hicolor/cursors-drop-shadow.svg b/share/icons/hicolor/cursors-drop-shadow.svg
new file mode 100644
index 0000000000..b9697d2686
--- /dev/null
+++ b/share/icons/hicolor/cursors-drop-shadow.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="32"
+   style="fill:gray;stroke:black"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="cursors-drop-shadow.svg"
+   inkscape:version="1.2-dev (11cc75ba41, 2021-06-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1500"
+     inkscape:window-height="934"
+     id="namedview18"
+     showgrid="true"
+     inkscape:zoom="4.9375"
+     inkscape:cx="12.556962"
+     inkscape:cy="16.607595"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid845"
+       spacingx="2"
+       spacingy="2" />
+  </sodipodi:namedview>
+  <defs
+     id="defs9">
+    <!-- Shadow -->
+    <filter
+       id="shadow"
+       x="-0.31588888"
+       y="-0.30215663"
+       width="1.6646238"
+       height="1.6274443">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2" />
+      <feComponentTransfer
+         id="feComponentTransfer1423">
+        <feFuncR
+           id="feFuncR1425"
+           type="identity" />
+        <feFuncG
+           id="feFuncG1427"
+           type="identity" />
+        <feFuncB
+           id="feFuncB1429"
+           type="identity" />
+        <feFuncA
+           id="feFuncA1431"
+           type="linear"
+           slope="0.40" />
+      </feComponentTransfer>
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6" />
+    </filter>
+  </defs>
+
+  <g
+     id="cursor"
+     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#shadow)">
+    <path
+       d="m 5,5 12,8 -5,5 z"
+       style="stroke-width:1px"
+       id="path13"
+       sodipodi:nodetypes="cccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:6px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;stroke:none;stroke-width:1"
+       x="2.551548"
+       y="23.478367"
+       id="text2466"><tspan
+         sodipodi:role="line"
+         id="tspan2464"
+         x="2.551548"
+         y="23.478367"
+         style="stroke-width:1">drop</tspan><tspan
+         sodipodi:role="line"
+         x="2.551548"
+         y="29.450216"
+         style="stroke-width:1"
+         id="tspan7036">shadow</tspan></text>
+  </g>
+</svg>
diff --git a/share/icons/hicolor/cursors.css b/share/icons/hicolor/cursors.css
new file mode 100644
index 0000000000..2c3eddfa20
--- /dev/null
+++ b/share/icons/hicolor/cursors.css
@@ -0,0 +1,5 @@
+/* common cursor styles */
+
+.drop-shadow {
+	filter: url(../cursors-drop-shadow.svg#shadow);
+}
diff --git a/share/icons/hicolor/cursors/node-mouseover.svg b/share/icons/hicolor/cursors/node-mouseover.svg
index 6628af0865..eb93247212 100644
--- a/share/icons/hicolor/cursors/node-mouseover.svg
+++ b/share/icons/hicolor/cursors/node-mouseover.svg
@@ -17,7 +17,9 @@
    sodipodi:docname="node-mouseover.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
   <style
-     id="style849"></style>
+    id="s2">
+    @import '../cursors.css';
+  </style>
   <metadata
      id="metadata24">
     <rdf:RDF>
@@ -51,55 +53,11 @@
      inkscape:current-layer="cursor" />
   <defs
      id="defs9">
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-8"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-4" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-1" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-3" />
-    </filter>
-  </defs>
+      </defs>
   <g
      id="cursor"
-     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#shadow)">
+     class="drop-shadow"
+     style="stroke-linejoin:miter;stroke-miterlimit:10">
     <!-- Triangle -->
     <!-- Outline -->
     <path
diff --git a/share/icons/hicolor/cursors/node.svg b/share/icons/hicolor/cursors/node.svg
index 5bba6626c1..45dbae9956 100644
--- a/share/icons/hicolor/cursors/node.svg
+++ b/share/icons/hicolor/cursors/node.svg
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
    height="32"
    inkscape:hotspot_x="3"
@@ -15,7 +8,18 @@
    version="1.1"
    id="svg16"
    sodipodi:docname="node.svg"
-   inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
+   inkscape:version="1.2-dev (11cc75ba41, 2021-06-18)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <style
+     id="s2"> 
+     @import '../cursors.css'; 
+  </style>
   <metadata
      id="metadata20">
     <rdf:RDF>
@@ -24,7 +28,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -37,18 +40,19 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="2602"
-     inkscape:window-height="1790"
+     inkscape:window-width="1500"
+     inkscape:window-height="934"
      id="namedview18"
      showgrid="true"
-     inkscape:zoom="27.930718"
-     inkscape:cx="12.587779"
-     inkscape:cy="16.587583"
-     inkscape:window-x="123"
-     inkscape:window-y="-11"
+     inkscape:zoom="15.69823"
+     inkscape:cx="21.977"
+     inkscape:cy="22.805119"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="cursor"
-     inkscape:document-rotation="0">
+     inkscape:current-layer="svg16"
+     inkscape:document-rotation="0"
+     inkscape:pagecheckerboard="true">
     <inkscape:grid
        type="xygrid"
        id="grid845"
@@ -57,77 +61,35 @@
   </sodipodi:namedview>
   <defs
      id="defs9">
+    <inkscape:path-effect
+       effect="offset"
+       id="path-effect1015"
+       is_visible="true"
+       lpeversion="1"
+       linejoin_type="miter-clip"
+       unit="px"
+       offset="1"
+       miter_limit="2.8"
+       attempt_force_join="false"
+       update_on_knot_move="true" />
     <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-4"
-       x="-0.5"
-       y="-0.5"
-       width="2.5"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-5" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-5" />
-    </filter>
   </defs>
   <!-- Triangle -->
   <g
      id="cursor"
-     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#shadow)">
-    <path
-       d="m 5,5 12,8 -3.5,1 -1.5,4 z"
-       style="stroke:#ffffff;stroke-width:3px"
-       id="path11"
-       sodipodi:nodetypes="ccccc" />
+     class="drop-shadow"
+     style="stroke-linejoin:miter;stroke-miterlimit:10">
     <path
        d="m 5,5 12,8 -3.5,1 -1.5,4 z"
        style="stroke-width:1px"
        id="path13"
        sodipodi:nodetypes="ccccc" />
-    <g
-       id="cursor-9"
-       style="display:none;fill:#808080;stroke:#000000;filter:url(#shadow-4)">
-      <path
-         d="M 4.5,4.5 12,12 H 8 l 3,7 -1,0.5 -3,-7 -2.5,2.5 z"
-         style="stroke:#ffffff;stroke-width:3px"
-         id="path11-3" />
-      <path
-         d="M 4.5,4.5 12,12 H 8 l 3,7 -1,0.5 -3,-7 -2.5,2.5 z"
-         style="fill:#000000;stroke-width:1px"
-         id="path13-7" />
-    </g>
+    <path
+       d="m 3.3613281,2.7050781 -0.4921875,0.4472657 9.2949214,17.2597652 2.095704,-5.589843 5.09375,-1.455078 z"
+       style="fill:none;stroke:#ffffff;stroke-width:1px"
+       id="path1013"
+       sodipodi:nodetypes="ccccc"
+       inkscape:path-effect="#path-effect1015"
+       inkscape:original-d="m 5,5 12,8 -3.5,1 -1.5,4 z" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/ui/cursor-utils.cpp b/src/ui/cursor-utils.cpp
index 3ae6740b7e..cb11b9a364 100644
--- a/src/ui/cursor-utils.cpp
+++ b/src/ui/cursor-utils.cpp
@@ -114,11 +114,11 @@ load_svg_cursor(Glib::RefPtr<Gdk::Display> display,
     SPCSSAttr *css = sp_repr_css_attr(root->getRepr(), "style");
 
     std::stringstream fill_stream;
-    fill_stream << "#" 
+    fill_stream << "#"
                 << std::setfill ('0') << std::setw(6)
                 << std::hex << (fill >> 8);
     std::stringstream stroke_stream;
-    stroke_stream << "#" 
+    stroke_stream << "#"
                   << std::setfill ('0') << std::setw(6)
                   << std::hex << (stroke >> 8);
 
@@ -143,6 +143,22 @@ load_svg_cursor(Glib::RefPtr<Gdk::Display> display,
         scale = window->get_scale_factor(); // Adjust for HiDPI screens.
     }
 #endif
+    auto enable_drop_shadow = prefs->getBool("/options/cursor-drop-shadow", true);
+    if (!enable_drop_shadow) {
+        // turn off drop shadow, if any
+        if (auto main = document->getObjectById("cursor")) {
+            Glib::ustring cls = main->getAttribute("class");
+            auto shadow = "drop-shadow";
+            auto pos = cls.find(shadow);
+            if (pos != Glib::ustring::npos) {
+                cls.erase(pos, strlen(shadow)); // can get away with strlen for ASCII string...
+            }
+            main->setAttribute("class", cls);
+        }
+        else {
+            g_warning("Cursor's main object with ID='cursor' not found in %s. Cannot disable drop shadow.", full_file_path.c_str());
+        }
+    }
 
     // Check for maximum size
     // int mwidth = 0;
-- 
GitLab


From 0d1ec160740ba09b68608e5a353916820e6cfbb6 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 14:54:25 -0700
Subject: [PATCH 02/11] preferences checkbox added

---
 src/ui/dialog/inkscape-preferences.cpp | 4 +++-
 src/ui/dialog/inkscape-preferences.h   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index e824fac7da..12f38310cd 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1610,9 +1610,11 @@ void InkscapePreferences::initPageUI()
         _mouse_grabsize.init("/options/grabsize/value", 1, 15, 1, 2, 3, 0);
     _page_ui.add_line(false, "", _mouse_grabsize, "", _("Set the relative size of node handles"), true);
 
-    _page_ui.add_group_header(_("Cursor size"));
+    _page_ui.add_group_header(_("Mouse cursors"));
     _ui_cursorscaling.init(_("Enable cursor scaling"), "/options/cursorscaling", true);
     _page_ui.add_line(false, "", _ui_cursorscaling, "", _("When off, cursor scaling is disabled. Cursor scaling may be broken when fractional scaling is enabled."), true);
+    _ui_cursor_shadow.init(_("Show cursor drop shadow"), "/options/cursor-drop-shadow", true);
+    _page_ui.add_line(false, "", _ui_cursor_shadow, "", _("Control visibility of drop shadow for Inkscape cursors."), true);
 
     // Theme
     _page_theme.add_group_header(_("Theme"));
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index d0a65d6cfd..0a4aed900a 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -413,6 +413,7 @@ protected:
     UI::Widget::PrefCheckButton _ui_yaxisdown;
     UI::Widget::PrefCheckButton _ui_rotationlock;
     UI::Widget::PrefCheckButton _ui_cursorscaling;
+    UI::Widget::PrefCheckButton _ui_cursor_shadow;
 
     //Spellcheck
     UI::Widget::PrefCombo       _spell_language;
-- 
GitLab


From b1929d7c2f093657980ca9effe64ddd5330e20a6 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 17:04:43 -0700
Subject: [PATCH 03/11] added drop shadow style

---
 share/icons/hicolor/cursors-drop-shadow.svg   |   2 +-
 share/icons/hicolor/cursors.css               |   2 +-
 share/icons/hicolor/cursors/adjust_alpha.svg  |   4 +-
 share/icons/hicolor/cursors/adjust_alpha2.svg |  41 +++
 share/icons/hicolor/cursors/adjust_hue.svg    |   4 +-
 .../hicolor/cursors/adjust_lightness.svg      |   4 +-
 .../hicolor/cursors/adjust_saturation.svg     |   4 +-
 share/icons/hicolor/cursors/arc.svg           |   4 +-
 share/icons/hicolor/cursors/box.svg           |   4 +-
 share/icons/hicolor/cursors/calligraphy.svg   |   4 +-
 share/icons/hicolor/cursors/connector.svg     |   4 +-
 .../hicolor/cursors/dropper-drop-fill.svg     |   4 +-
 .../hicolor/cursors/dropper-drop-stroke.svg   |   4 +-
 .../hicolor/cursors/dropper-pick-fill.svg     |   4 +-
 .../hicolor/cursors/dropper-pick-stroke.svg   |   4 +-
 share/icons/hicolor/cursors/eraser.svg        |   4 +-
 share/icons/hicolor/cursors/flood.svg         |   4 +-
 share/icons/hicolor/cursors/geometric.svg     |   4 +-
 .../hicolor/cursors/gradient-add-stop.svg     |   4 +-
 share/icons/hicolor/cursors/gradient-add.svg  |   4 +-
 .../hicolor/cursors/gradient-drag-stop.svg    |   2 +-
 .../hicolor/cursors/gradient-over-stop.svg    |   2 +-
 share/icons/hicolor/cursors/gradient.svg      |   4 +-
 share/icons/hicolor/cursors/measure.svg       |   4 +-
 share/icons/hicolor/cursors/mesh-add.svg      |   4 +-
 share/icons/hicolor/cursors/mesh.svg          |   4 +-
 share/icons/hicolor/cursors/node-blunt.svg    | 244 ++++++++++++++++++
 share/icons/hicolor/cursors/node-dragging.svg |   7 +-
 .../icons/hicolor/cursors/node-mouseover.svg  |  54 +++-
 share/icons/hicolor/cursors/node.svg          | 122 ++++++---
 share/icons/hicolor/cursors/pen.svg           |   3 +-
 share/icons/hicolor/cursors/pencil.svg        |   4 +-
 share/icons/hicolor/cursors/rect.svg          |   4 +-
 share/icons/hicolor/cursors/rotate.svg        |   4 +-
 .../icons/hicolor/cursors/select-dragging.svg |   4 +-
 .../hicolor/cursors/select-mouseover.svg      |   4 +-
 share/icons/hicolor/cursors/select.svg        |   4 +-
 share/icons/hicolor/cursors/spiral.svg        |   4 +-
 share/icons/hicolor/cursors/spray.svg         |   4 +-
 share/icons/hicolor/cursors/star.svg          |   4 +-
 share/icons/hicolor/cursors/text-insert.svg   |   4 +-
 share/icons/hicolor/cursors/text.svg          |   4 +-
 share/icons/hicolor/cursors/tran.py           |  22 ++
 share/icons/hicolor/cursors/tweak-attract.svg |   2 +
 share/icons/hicolor/cursors/tweak-color.svg   |   2 +
 share/icons/hicolor/cursors/tweak-inset.svg   |   2 +
 share/icons/hicolor/cursors/tweak-less.svg    |   2 +
 share/icons/hicolor/cursors/tweak-more.svg    |   2 +
 share/icons/hicolor/cursors/tweak-move-in.svg |   2 +
 .../hicolor/cursors/tweak-move-jitter.svg     |   2 +
 .../icons/hicolor/cursors/tweak-move-out.svg  |   2 +
 share/icons/hicolor/cursors/tweak-move.svg    |   2 +
 share/icons/hicolor/cursors/tweak-outset.svg  |   2 +
 share/icons/hicolor/cursors/tweak-push.svg    |   2 +
 share/icons/hicolor/cursors/tweak-repel.svg   |   2 +
 .../cursors/tweak-rotate-clockwise.svg        |   2 +
 .../cursors/tweak-rotate-counterclockwise.svg |   2 +
 share/icons/hicolor/cursors/tweak-roughen.svg |   2 +
 .../hicolor/cursors/tweak-scale-down.svg      |   2 +
 .../icons/hicolor/cursors/tweak-scale-up.svg  |   2 +
 share/icons/hicolor/cursors/zoom-in.svg       |   2 +
 share/icons/hicolor/cursors/zoom-out.svg      |   2 +
 src/ui/cursor-utils.cpp                       |  15 +-
 63 files changed, 591 insertions(+), 91 deletions(-)
 create mode 100644 share/icons/hicolor/cursors/adjust_alpha2.svg
 create mode 100644 share/icons/hicolor/cursors/node-blunt.svg
 create mode 100644 share/icons/hicolor/cursors/tran.py

diff --git a/share/icons/hicolor/cursors-drop-shadow.svg b/share/icons/hicolor/cursors-drop-shadow.svg
index b9697d2686..9d11f55cc7 100644
--- a/share/icons/hicolor/cursors-drop-shadow.svg
+++ b/share/icons/hicolor/cursors-drop-shadow.svg
@@ -57,7 +57,7 @@
      id="defs9">
     <!-- Shadow -->
     <filter
-       id="shadow"
+       id="def-drop-shadow"
        x="-0.31588888"
        y="-0.30215663"
        width="1.6646238"
diff --git a/share/icons/hicolor/cursors.css b/share/icons/hicolor/cursors.css
index 2c3eddfa20..2318aab16e 100644
--- a/share/icons/hicolor/cursors.css
+++ b/share/icons/hicolor/cursors.css
@@ -1,5 +1,5 @@
 /* common cursor styles */
 
 .drop-shadow {
-	filter: url(../cursors-drop-shadow.svg#shadow);
+	filter: url(../cursors-drop-shadow.svg#def-drop-shadow);
 }
diff --git a/share/icons/hicolor/cursors/adjust_alpha.svg b/share/icons/hicolor/cursors/adjust_alpha.svg
index 49fd0d47e1..0222512aee 100644
--- a/share/icons/hicolor/cursors/adjust_alpha.svg
+++ b/share/icons/hicolor/cursors/adjust_alpha.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -31,7 +33,7 @@
     </g>
   </defs>
 
-  <g style="filter:url(#shadow);stroke-linecap:square;stroke-linejoin:bevel">
+  <g class="drop-shadow" style="stroke-linecap:square;stroke-linejoin:bevel">
     <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
     <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/adjust_alpha2.svg b/share/icons/hicolor/cursors/adjust_alpha2.svg
new file mode 100644
index 0000000000..1711dfb566
--- /dev/null
+++ b/share/icons/hicolor/cursors/adjust_alpha2.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+     width="32" height="32"
+     inkscape:hotspot_x="16"
+     inkscape:hotspot_y="16"
+     style="fill:gray;stroke:black">
+
+  <style>
+    @import '../cursors.css';
+  </style>
+  <defs>
+    <!-- Shadow -->
+    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
+      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
+      <feGaussianBlur result="blurOut" stdDeviation="1" />
+      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
+    </filter>
+
+    <g id="objects">
+
+      <!-- Slash -->
+      <path d="m 3.5,28.5 16,-16"/>
+
+      <!-- Plus -->
+      <path d="m 4,15.5 h 5 m -2.5,-2.5 v 5"/>
+
+      <!-- Minus -->
+      <path d="m 14,25.5 h 5"/>
+
+      <!-- Letter -->
+      <path d="m 25,7.5 h 2 m -3.5,3 2.5,-8 2.5,8"/>
+    </g>
+  </defs>
+
+  <g style="filter:url(#shadow);stroke-linecap:square;stroke-linejoin:bevel">
+    <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
+    <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
+  </g>
+</svg>
diff --git a/share/icons/hicolor/cursors/adjust_hue.svg b/share/icons/hicolor/cursors/adjust_hue.svg
index a9161e36a6..85a3658996 100644
--- a/share/icons/hicolor/cursors/adjust_hue.svg
+++ b/share/icons/hicolor/cursors/adjust_hue.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -32,7 +34,7 @@
     </g>
   </defs>
 
-  <g style="filter:url(#shadow);stroke-linecap:square">
+  <g class="drop-shadow" style="stroke-linecap:square">
     <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
     <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/adjust_lightness.svg b/share/icons/hicolor/cursors/adjust_lightness.svg
index 316b04504a..9249bea605 100644
--- a/share/icons/hicolor/cursors/adjust_lightness.svg
+++ b/share/icons/hicolor/cursors/adjust_lightness.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -32,7 +34,7 @@
     </g>
   </defs>
 
-  <g style="filter:url(#shadow);stroke-linecap:square">
+  <g class="drop-shadow" style="stroke-linecap:square">
     <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
     <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/adjust_saturation.svg b/share/icons/hicolor/cursors/adjust_saturation.svg
index 6672d2e0d0..8410fe0291 100644
--- a/share/icons/hicolor/cursors/adjust_saturation.svg
+++ b/share/icons/hicolor/cursors/adjust_saturation.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -32,7 +34,7 @@
     </g>
   </defs>
 
-  <g style="filter:url(#shadow);stroke-linecap:square">
+  <g class="drop-shadow" style="stroke-linecap:square">
     <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
     <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/arc.svg b/share/icons/hicolor/cursors/arc.svg
index 8ee9a12f93..d8649b2b32 100644
--- a/share/icons/hicolor/cursors/arc.svg
+++ b/share/icons/hicolor/cursors/arc.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Ellipse -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <ellipse cx="16" cy="14.5" rx="7.5" ry="6" style="stroke:white;stroke-width:3px"/>
     <ellipse cx="16" cy="14.5" rx="7.5" ry="6" style="stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/box.svg b/share/icons/hicolor/cursors/box.svg
index 22685599bb..c7fe7e4c2b 100644
--- a/share/icons/hicolor/cursors/box.svg
+++ b/share/icons/hicolor/cursors/box.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Sides  -->
-  <g id="cursor" style="filter:url(#shadow);stroke-linejoin:round">
+  <g id="cursor" class="drop-shadow" style="stroke-linejoin:round">
     <path d="m 16,24 -8,-4 0,-8 8,-4 8,4 0,8 z" style="stroke:white;stroke-width:3px"/>
     <g style="stroke:black;stroke-width:1px">
       <path d="m 16,16 0,8 -8,-4 0,-8 z" style="fill:darkgray"/>
diff --git a/share/icons/hicolor/cursors/calligraphy.svg b/share/icons/hicolor/cursors/calligraphy.svg
index 9144965dec..dd4b2b0c22 100644
--- a/share/icons/hicolor/cursors/calligraphy.svg
+++ b/share/icons/hicolor/cursors/calligraphy.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Sides  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="M 8 8 C 8 17 14.5 20.5 17.5 20.5 L 16.5 21.5 L 19.5 24.5 L 24.5 19.5 L 21.5 16.5 L 20.5 17.5 C 20.5 14.5 17 8 8 8 z"
           style="fill:none;stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/connector.svg b/share/icons/hicolor/cursors/connector.svg
index 2922136d2e..3eda3cc12a 100644
--- a/share/icons/hicolor/cursors/connector.svg
+++ b/share/icons/hicolor/cursors/connector.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -19,7 +21,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
 
     <path d="m 7.5,22.5 4,4 4,-4 m 5,-16 v 9.5 h -9 v 10.5" style="fill:none;stroke:white;stroke-width:3px"/>
     <path d="m 7.5,22.5 4,4 4,-4 m 5,-16 v 9.5 h -9 v 10.5" style="fill:none;stroke:black;stroke-width:1px"/>
diff --git a/share/icons/hicolor/cursors/dropper-drop-fill.svg b/share/icons/hicolor/cursors/dropper-drop-fill.svg
index cbcae734a0..c7e5e4af96 100644
--- a/share/icons/hicolor/cursors/dropper-drop-fill.svg
+++ b/share/icons/hicolor/cursors/dropper-drop-fill.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Dropper  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
       <path d="m 8.5,23.5 v -2 l 8,-8 2,2 -8,8 z"/>
diff --git a/share/icons/hicolor/cursors/dropper-drop-stroke.svg b/share/icons/hicolor/cursors/dropper-drop-stroke.svg
index 0a8d60c5cc..9a8192ba23 100644
--- a/share/icons/hicolor/cursors/dropper-drop-stroke.svg
+++ b/share/icons/hicolor/cursors/dropper-drop-stroke.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Dropper  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
       <!-- Dropper -->
diff --git a/share/icons/hicolor/cursors/dropper-pick-fill.svg b/share/icons/hicolor/cursors/dropper-pick-fill.svg
index 1f70d775eb..3c85829095 100644
--- a/share/icons/hicolor/cursors/dropper-pick-fill.svg
+++ b/share/icons/hicolor/cursors/dropper-pick-fill.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Dropper  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
       <path d="m 8.5,8.5 h 2 l 8,8 l -2,2 l -8,-8 z"/>
diff --git a/share/icons/hicolor/cursors/dropper-pick-stroke.svg b/share/icons/hicolor/cursors/dropper-pick-stroke.svg
index 03ee7dd762..3adf06af1c 100644
--- a/share/icons/hicolor/cursors/dropper-pick-stroke.svg
+++ b/share/icons/hicolor/cursors/dropper-pick-stroke.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Dropper  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
       <path d="m 8.5,8.5 h 2 l 8,8 l -2,2 l -8,-8 z"/>
diff --git a/share/icons/hicolor/cursors/eraser.svg b/share/icons/hicolor/cursors/eraser.svg
index 139bf48328..969118cdf0 100644
--- a/share/icons/hicolor/cursors/eraser.svg
+++ b/share/icons/hicolor/cursors/eraser.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -19,7 +21,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
-  <g id="cursor" style="filter:url(#shadow);stroke-linejoin:round">
+  <g id="cursor" class="drop-shadow" style="stroke-linejoin:round">
     <!-- Outline -->
     <path d="m 20,24 -12,-6 v -5 l 6,-3 12,6 v 5 z" style="stroke:white;stroke-width:3px"/>
 
diff --git a/share/icons/hicolor/cursors/flood.svg b/share/icons/hicolor/cursors/flood.svg
index 2e7a42d41a..185f4112b8 100644
--- a/share/icons/hicolor/cursors/flood.svg
+++ b/share/icons/hicolor/cursors/flood.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="26"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -23,7 +25,7 @@
   </defs>
 
   <!-- Bucket with paint -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
 
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
diff --git a/share/icons/hicolor/cursors/geometric.svg b/share/icons/hicolor/cursors/geometric.svg
index d53b88809e..bb65e20580 100644
--- a/share/icons/hicolor/cursors/geometric.svg
+++ b/share/icons/hicolor/cursors/geometric.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -23,7 +25,7 @@
 
   <!-- Compass -->
 
-  <g style="filter:url(#shadow)">
+  <g class="drop-shadow" style="">
 
     <g style="fill:white;stroke:white;stroke-width:3px">
       <!-- Legs -->
diff --git a/share/icons/hicolor/cursors/gradient-add-stop.svg b/share/icons/hicolor/cursors/gradient-add-stop.svg
index d5fb1f9914..b075dd02a6 100644
--- a/share/icons/hicolor/cursors/gradient-add-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-add-stop.svg
@@ -54,6 +54,8 @@
        id="grid1537"
        type="xygrid" />
   </sodipodi:namedview>
+  <style>@import '../cursors.css';</style>
+
   <defs
      id="defs957">
     <!-- Shadow -->
@@ -81,7 +83,7 @@
     </filter>
   </defs>
   <g
-     style="filter:url(#shadow)"
+    class="drop-shadow"
      id="cursor">
     <!-- Arrow -->
     <path
diff --git a/share/icons/hicolor/cursors/gradient-add.svg b/share/icons/hicolor/cursors/gradient-add.svg
index 00248e51fb..c95be68f4d 100644
--- a/share/icons/hicolor/cursors/gradient-add.svg
+++ b/share/icons/hicolor/cursors/gradient-add.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Gradient -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <rect x="10.5" y=" 8.5" width="4" height="4" style="stroke:white;stroke-width:3px"/>
     <rect x="10.5" y="20.5" width="4" height="4" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/gradient-drag-stop.svg b/share/icons/hicolor/cursors/gradient-drag-stop.svg
index f6786bacf9..7397b7b8dd 100644
--- a/share/icons/hicolor/cursors/gradient-drag-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-drag-stop.svg
@@ -103,7 +103,7 @@
     </filter>
   </defs>
   <g
-     style="filter:url(#shadow)"
+    class="drop-shadow"
      id="cursor">
     <!-- Arrow -->
     <path
diff --git a/share/icons/hicolor/cursors/gradient-over-stop.svg b/share/icons/hicolor/cursors/gradient-over-stop.svg
index c6172da22a..932b19c332 100644
--- a/share/icons/hicolor/cursors/gradient-over-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-over-stop.svg
@@ -82,7 +82,7 @@
   </defs>
   <g
      id="cursor"
-     style="filter:url(#shadow)">
+     class="drop-shadow">
     <!-- Arrow -->
     <path
        d="M 4.5,4.5 12,12 H 8 l 3,7 -1,0.5 -3,-7 -2.5,2.5 z"
diff --git a/share/icons/hicolor/cursors/gradient.svg b/share/icons/hicolor/cursors/gradient.svg
index 4d0a776ad4..f92b678286 100644
--- a/share/icons/hicolor/cursors/gradient.svg
+++ b/share/icons/hicolor/cursors/gradient.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Gradient -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <rect x="10.5" y=" 8.5" width="4" height="4" style="stroke:white;stroke-width:3px"/>
     <rect x="10.5" y="20.5" width="4" height="4" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/measure.svg b/share/icons/hicolor/cursors/measure.svg
index 9a57518c49..52e163beed 100644
--- a/share/icons/hicolor/cursors/measure.svg
+++ b/share/icons/hicolor/cursors/measure.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -22,7 +24,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Ruler  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="m 7.5,12.5 15,15 5,-5 -15,-15 z"
           style="fill:white;stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/mesh-add.svg b/share/icons/hicolor/cursors/mesh-add.svg
index 6309e2d4d0..e26424f9ce 100644
--- a/share/icons/hicolor/cursors/mesh-add.svg
+++ b/share/icons/hicolor/cursors/mesh-add.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Gradient -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="stroke:white;stroke-width:3px" transform="translate(-2,0)">
       <rect x="10.5" y=" 8.5" width="4" height="4"/>
diff --git a/share/icons/hicolor/cursors/mesh.svg b/share/icons/hicolor/cursors/mesh.svg
index feadeee8eb..1d1def90d9 100644
--- a/share/icons/hicolor/cursors/mesh.svg
+++ b/share/icons/hicolor/cursors/mesh.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Gradient -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <g style="stroke:white;stroke-width:3px">
       <rect x="10.5" y=" 8.5" width="4" height="4"/>
diff --git a/share/icons/hicolor/cursors/node-blunt.svg b/share/icons/hicolor/cursors/node-blunt.svg
new file mode 100644
index 0000000000..cd5a3219d0
--- /dev/null
+++ b/share/icons/hicolor/cursors/node-blunt.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="32"
+   inkscape:hotspot_x="2"
+   inkscape:hotspot_y="2"
+   style="fill:gray;stroke:black"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="node.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#707070"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0.43921569"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1858"
+     inkscape:window-height="1177"
+     id="namedview18"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="26.47231"
+     inkscape:cy="21.169009"
+     inkscape:window-x="54"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="cursor"
+     inkscape:document-rotation="0"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid845"
+       spacingx="2"
+       spacingy="2" />
+  </sodipodi:namedview>
+  <style>@import '../cursors.css';</style>
+
+  <defs
+     id="defs9">
+    <inkscape:path-effect
+       effect="offset"
+       id="path-effect1818"
+       is_visible="true"
+       lpeversion="1"
+       linejoin_type="miter"
+       unit="px"
+       offset="1.848611"
+       miter_limit="4"
+       attempt_force_join="true"
+       update_on_knot_move="true" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect853"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2"
+       unit="px"
+       method="auto"
+       mode="C"
+       radius="0"
+       chamfer_steps="2"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="offset"
+       id="path-effect872"
+       is_visible="true"
+       lpeversion="1"
+       linejoin_type="miter"
+       unit="px"
+       offset="-0.5"
+       miter_limit="4"
+       attempt_force_join="true"
+       update_on_knot_move="true" />
+    <inkscape:path-effect
+       effect="offset"
+       id="path-effect870"
+       is_visible="false"
+       lpeversion="1"
+       linejoin_type="miter"
+       unit="px"
+       offset="-0.178"
+       miter_limit="4"
+       attempt_force_join="true"
+       update_on_knot_move="true" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect860"
+       is_visible="true"
+       lpeversion="1"
+       offset_points="1,84.644"
+       sort_points="true"
+       interpolator_type="CubicBezierJohan"
+       interpolator_beta="0.2"
+       start_linecap_type="zerowidth"
+       linejoin_type="extrp_arc"
+       miter_limit="4"
+       scale_width="1"
+       end_linecap_type="zerowidth" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect848"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 | C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,3.072978,0,1"
+       unit="px"
+       method="auto"
+       mode="C"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="join_type"
+       id="path-effect846"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="butt"
+       line_width="3"
+       linejoin_type="extrp_arc"
+       miter_limit="100"
+       attempt_force_join="true" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect844"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,1,1,1,0,0,0,1 @ F,1,0,1,0,0,0,1 @ F,1,0,1,0,0,0,1 @ F,1,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="true"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="true"
+       hide_knots="false" />
+    <!-- Shadow -->
+    <filter
+       id="shadow"
+       x="-0.18640777"
+       y="-0.18"
+       width="1.4245955"
+       height="1.41">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1.5"
+         id="feGaussianBlur4" />
+      <feColorMatrix
+         id="feColorMatrix874"
+         result="result1"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.3 0 " />
+      <feBlend
+         in="SourceGraphic"
+         in2="result1"
+         mode="normal"
+         id="feBlend6" />
+    </filter>
+    <filter
+       id="shadow-4"
+       x="-0.5"
+       y="-0.5"
+       width="2.5"
+       height="2">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2-5" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4-4" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6-5" />
+    </filter>
+  </defs>
+  <!-- Triangle -->
+  <g
+     id="cursor"
+     class="drop-shadow"
+     style="stroke-linejoin:miter;stroke-miterlimit:10">
+    <path
+       d="M 2,2 V 4 L 12.326172,22.394531 14.902344,15.521484 21.306641,13.691406 4,2 Z"
+       style="fill:#ffffff;stroke:none;stroke-width:1px"
+       id="path1814"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       d="M 4.5,4.5 17,13 13.5,14 12,18 Z"
+       style="fill:#000000;stroke-width:1px"
+       id="path13"
+       sodipodi:nodetypes="ccccc"
+       inkscape:original-d="M 4.5,4.5 17,13 13.5,14 12,18 Z"
+       inkscape:path-effect="#path-effect870" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/cursors/node-dragging.svg b/share/icons/hicolor/cursors/node-dragging.svg
index e484243495..01f5f451c8 100644
--- a/share/icons/hicolor/cursors/node-dragging.svg
+++ b/share/icons/hicolor/cursors/node-dragging.svg
@@ -16,8 +16,8 @@
    id="svg20"
    sodipodi:docname="node-dragging.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
-  <style
-     id="style849"></style>
+  <style>@import '../cursors.css';</style>
+
   <metadata
      id="metadata24">
     <rdf:RDF>
@@ -99,7 +99,8 @@
   </defs>
   <g
      id="cursor"
-     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#shadow)">
+     class="drop-shadow"
+     style="stroke-linejoin:miter;stroke-miterlimit:10">
     <!-- Triangle -->
     <!-- Outline (cross) -->
     <path
diff --git a/share/icons/hicolor/cursors/node-mouseover.svg b/share/icons/hicolor/cursors/node-mouseover.svg
index eb93247212..a93be12e6f 100644
--- a/share/icons/hicolor/cursors/node-mouseover.svg
+++ b/share/icons/hicolor/cursors/node-mouseover.svg
@@ -16,10 +16,9 @@
    id="svg20"
    sodipodi:docname="node-mouseover.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
-  <style
-    id="s2">
-    @import '../cursors.css';
-  </style>
+
+  <style>@import '../cursors.css';</style>
+
   <metadata
      id="metadata24">
     <rdf:RDF>
@@ -53,7 +52,52 @@
      inkscape:current-layer="cursor" />
   <defs
      id="defs9">
-      </defs>
+    <!-- Shadow -->
+    <filter
+       id="shadow"
+       x="-0.5"
+       y="-0.5"
+       width="2"
+       height="2">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6" />
+    </filter>
+    <filter
+       id="shadow-8"
+       x="-0.5"
+       y="-0.5"
+       width="2"
+       height="2">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2-4" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4-1" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6-3" />
+    </filter>
+  </defs>
   <g
      id="cursor"
      class="drop-shadow"
diff --git a/share/icons/hicolor/cursors/node.svg b/share/icons/hicolor/cursors/node.svg
index 45dbae9956..b799ae2a00 100644
--- a/share/icons/hicolor/cursors/node.svg
+++ b/share/icons/hicolor/cursors/node.svg
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
    height="32"
    inkscape:hotspot_x="3"
@@ -8,18 +15,10 @@
    version="1.1"
    id="svg16"
    sodipodi:docname="node.svg"
-   inkscape:version="1.2-dev (11cc75ba41, 2021-06-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <style
-     id="s2"> 
-     @import '../cursors.css'; 
-  </style>
+   inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
+
+  <style>@import '../cursors.css';</style>
+
   <metadata
      id="metadata20">
     <rdf:RDF>
@@ -28,6 +27,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -40,19 +40,18 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1500"
-     inkscape:window-height="934"
+     inkscape:window-width="2602"
+     inkscape:window-height="1790"
      id="namedview18"
      showgrid="true"
-     inkscape:zoom="15.69823"
-     inkscape:cx="21.977"
-     inkscape:cy="22.805119"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:zoom="27.930718"
+     inkscape:cx="12.587779"
+     inkscape:cy="16.587583"
+     inkscape:window-x="123"
+     inkscape:window-y="-11"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg16"
-     inkscape:document-rotation="0"
-     inkscape:pagecheckerboard="true">
+     inkscape:current-layer="cursor"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid845"
@@ -61,35 +60,78 @@
   </sodipodi:namedview>
   <defs
      id="defs9">
-    <inkscape:path-effect
-       effect="offset"
-       id="path-effect1015"
-       is_visible="true"
-       lpeversion="1"
-       linejoin_type="miter-clip"
-       unit="px"
-       offset="1"
-       miter_limit="2.8"
-       attempt_force_join="false"
-       update_on_knot_move="true" />
     <!-- Shadow -->
+    <filter
+       id="shadow"
+       x="-0.5"
+       y="-0.5"
+       width="2"
+       height="2">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6" />
+    </filter>
+    <filter
+       id="shadow-4"
+       x="-0.5"
+       y="-0.5"
+       width="2.5"
+       height="2">
+      <feOffset
+         result="offOut"
+         in="SourceAlpha"
+         dx="1"
+         dy="1"
+         id="feOffset2-5" />
+      <feGaussianBlur
+         result="blurOut"
+         stdDeviation="1"
+         id="feGaussianBlur4-4" />
+      <feBlend
+         in="SourceGraphic"
+         in2="blurOut"
+         mode="normal"
+         id="feBlend6-5" />
+    </filter>
   </defs>
   <!-- Triangle -->
   <g
      id="cursor"
      class="drop-shadow"
      style="stroke-linejoin:miter;stroke-miterlimit:10">
+    <path
+       d="m 5,5 12,8 -3.5,1 -1.5,4 z"
+       style="stroke:#ffffff;stroke-width:3px"
+       id="path11"
+       sodipodi:nodetypes="ccccc" />
     <path
        d="m 5,5 12,8 -3.5,1 -1.5,4 z"
        style="stroke-width:1px"
        id="path13"
        sodipodi:nodetypes="ccccc" />
-    <path
-       d="m 3.3613281,2.7050781 -0.4921875,0.4472657 9.2949214,17.2597652 2.095704,-5.589843 5.09375,-1.455078 z"
-       style="fill:none;stroke:#ffffff;stroke-width:1px"
-       id="path1013"
-       sodipodi:nodetypes="ccccc"
-       inkscape:path-effect="#path-effect1015"
-       inkscape:original-d="m 5,5 12,8 -3.5,1 -1.5,4 z" />
+    <g
+       id="cursor-9"
+       style="display:none;fill:#808080;stroke:#000000;filter:url(#shadow-4)">
+      <path
+         d="M 4.5,4.5 12,12 H 8 l 3,7 -1,0.5 -3,-7 -2.5,2.5 z"
+         style="stroke:#ffffff;stroke-width:3px"
+         id="path11-3" />
+      <path
+         d="M 4.5,4.5 12,12 H 8 l 3,7 -1,0.5 -3,-7 -2.5,2.5 z"
+         style="fill:#000000;stroke-width:1px"
+         id="path13-7" />
+    </g>
   </g>
 </svg>
diff --git a/share/icons/hicolor/cursors/pen.svg b/share/icons/hicolor/cursors/pen.svg
index 2e93dbc48e..428dc0bfae 100644
--- a/share/icons/hicolor/cursors/pen.svg
+++ b/share/icons/hicolor/cursors/pen.svg
@@ -6,6 +6,7 @@
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
+  <style>@import '../cursors.css';</style>
 
   <defs>
     <!-- Shadow -->
@@ -27,7 +28,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Pen  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="M 9.5 7.5 L 7.5 9.5 L 10.5 12.5 L 9.5 13.5 L 12.5 16.5 L 11.5 17.5 L 19.5 25.5 L 25.5 19.5 L 17.5 11.5 L 16.5 12.5 L 13.5 9.5 L 12.5 10.5 L 9.5 7.5 z"
           style="fill:none;stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/pencil.svg b/share/icons/hicolor/cursors/pencil.svg
index 0edca92127..50812a55d5 100644
--- a/share/icons/hicolor/cursors/pencil.svg
+++ b/share/icons/hicolor/cursors/pencil.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -27,7 +29,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Sides  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="m 8.5,8.5 l 2,8.5 l 8,8 l 2.5,-0.5 l 3.5,-3.5 l 0.5,-2.5 l -8,-8 z"
           style="fill:white;stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/rect.svg b/share/icons/hicolor/cursors/rect.svg
index 377022aea8..016c94df31 100644
--- a/share/icons/hicolor/cursors/rect.svg
+++ b/share/icons/hicolor/cursors/rect.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Rectangle -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <rect x="8.5" y="8.5" width="15" height="12" style="stroke:white;stroke-width:3px"/>
     <rect x="8.5" y="8.5" width="15" height="12" style="stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/rotate.svg b/share/icons/hicolor/cursors/rotate.svg
index 9a492d3c6c..9c9c8a0947 100644
--- a/share/icons/hicolor/cursors/rotate.svg
+++ b/share/icons/hicolor/cursors/rotate.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -23,7 +25,7 @@
     </g>
   </defs>
 
-  <g style="filter:url(#shadow)">
+  <g class="drop-shadow" style="">
     <g id="cursor" style="fill:none">
       <circle cx="16" cy="16" r="6.5" style="fill:white;stroke:none"/>
       <use xlink:href="#objects" style="stroke:black;stroke-width:1px"/>
diff --git a/share/icons/hicolor/cursors/select-dragging.svg b/share/icons/hicolor/cursors/select-dragging.svg
index 33135d319f..e82922fafb 100644
--- a/share/icons/hicolor/cursors/select-dragging.svg
+++ b/share/icons/hicolor/cursors/select-dragging.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
@@ -15,7 +17,7 @@
     </filter>
   </defs>
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Arrow -->
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="stroke:white;stroke-width:3px"/>
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="fill:black;stroke-width:1px"/>
diff --git a/share/icons/hicolor/cursors/select-mouseover.svg b/share/icons/hicolor/cursors/select-mouseover.svg
index 6c23dd25a3..fa1b2bd6cc 100644
--- a/share/icons/hicolor/cursors/select-mouseover.svg
+++ b/share/icons/hicolor/cursors/select-mouseover.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
@@ -15,7 +17,7 @@
     </filter>
   </defs>
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Arrow -->
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="stroke:white;stroke-width:3px"/>
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="fill:black;stroke-width:1px"/>
diff --git a/share/icons/hicolor/cursors/select.svg b/share/icons/hicolor/cursors/select.svg
index 8a866d013c..f264a571a0 100644
--- a/share/icons/hicolor/cursors/select.svg
+++ b/share/icons/hicolor/cursors/select.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
@@ -16,7 +18,7 @@
   </defs>
 
   <!-- Arrow -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="stroke:white;stroke-width:3px"/>
     <path d="m 4.5,4.5 l 7.5,7.5 h -4 l 3,7 l -1,0.5 l -3,-7 l -2.5,2.5 z" style="fill:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/spiral.svg b/share/icons/hicolor/cursors/spiral.svg
index 9d39789ef1..64f32f3716 100644
--- a/share/icons/hicolor/cursors/spiral.svg
+++ b/share/icons/hicolor/cursors/spiral.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -28,7 +30,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Sides  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <use xlink:href="#spiral" style="fill:none;stroke:white;stroke-width:3px"/>
     <use xlink:href="#spiral" style="fill:none;stroke:black;stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/spray.svg b/share/icons/hicolor/cursors/spray.svg
index 3f12641ae1..6b80ad779b 100644
--- a/share/icons/hicolor/cursors/spray.svg
+++ b/share/icons/hicolor/cursors/spray.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
@@ -58,7 +60,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
 
     <!-- Outline -->
     <use xlink:href="#bottle" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/star.svg b/share/icons/hicolor/cursors/star.svg
index aa516ad70d..55c82b24f6 100644
--- a/share/icons/hicolor/cursors/star.svg
+++ b/share/icons/hicolor/cursors/star.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -20,7 +22,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- Triangle -->
-  <g id="cursor" style="filter:url(#shadow);stroke-linejoin:miter;stroke-miterlimit:10">
+  <g id="cursor" class="drop-shadow" style="stroke-linejoin:miter;stroke-miterlimit:10">
     <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z" style="stroke:white;stroke-width:3px"/>
     <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z" style="stroke-width:1px"/>
   </g>
diff --git a/share/icons/hicolor/cursors/text-insert.svg b/share/icons/hicolor/cursors/text-insert.svg
index b4cad856ea..aa82f01be3 100644
--- a/share/icons/hicolor/cursors/text-insert.svg
+++ b/share/icons/hicolor/cursors/text-insert.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="13"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
@@ -17,7 +19,7 @@
   </defs>
 
   <!-- 'I'  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="m 2.5,23.5 l 3,-3 l 3,3 m -3,-18 v 15 m -3,-18 l 3,3 l 3,-3"
           style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:round"/>
diff --git a/share/icons/hicolor/cursors/text.svg b/share/icons/hicolor/cursors/text.svg
index adb434da28..de959aefe7 100644
--- a/share/icons/hicolor/cursors/text.svg
+++ b/share/icons/hicolor/cursors/text.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
@@ -21,7 +23,7 @@
   <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
 
   <!-- "A"  -->
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" class="drop-shadow" style="">
     <!-- Outline -->
     <path d="m 14,7.5 h 4 l 5.5,16 h -4 l -1,-3 h -5 l -1,3 h -4 z"
           style="fill:white;stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tran.py b/share/icons/hicolor/cursors/tran.py
new file mode 100644
index 0000000000..d767cde2c0
--- /dev/null
+++ b/share/icons/hicolor/cursors/tran.py
@@ -0,0 +1,22 @@
+import sys
+
+f = open(sys.argv[1], 'r')
+o = open(sys.argv[2], 'w')
+
+style = False
+
+for line in f:
+  if line.find("<defs>") >= 0 or line.find(" <def") >= 0:
+    o.write("  <style>\n    @import '../cursors.css';\n  </style>\n")
+  o.write(line)
+
+#    txt = line.strip()
+#    if txt == '':
+#        sys.stdout.write('\n\n')
+#        sys.stdout.flush()
+#    sys.stdout.write( txt + ';')
+#    sys.stdout.flush()
+
+f.close()
+o.close()
+
diff --git a/share/icons/hicolor/cursors/tweak-attract.svg b/share/icons/hicolor/cursors/tweak-attract.svg
index 30bd66c83c..30bf53955d 100644
--- a/share/icons/hicolor/cursors/tweak-attract.svg
+++ b/share/icons/hicolor/cursors/tweak-attract.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-color.svg b/share/icons/hicolor/cursors/tweak-color.svg
index cb4491f512..65f449fc7e 100644
--- a/share/icons/hicolor/cursors/tweak-color.svg
+++ b/share/icons/hicolor/cursors/tweak-color.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-inset.svg b/share/icons/hicolor/cursors/tweak-inset.svg
index 3110b3ad26..cf73050915 100644
--- a/share/icons/hicolor/cursors/tweak-inset.svg
+++ b/share/icons/hicolor/cursors/tweak-inset.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-less.svg b/share/icons/hicolor/cursors/tweak-less.svg
index 61206acbcf..61ac426f33 100644
--- a/share/icons/hicolor/cursors/tweak-less.svg
+++ b/share/icons/hicolor/cursors/tweak-less.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-more.svg b/share/icons/hicolor/cursors/tweak-more.svg
index 0897fdc1dd..6905d6d79a 100644
--- a/share/icons/hicolor/cursors/tweak-more.svg
+++ b/share/icons/hicolor/cursors/tweak-more.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-move-in.svg b/share/icons/hicolor/cursors/tweak-move-in.svg
index 208cc4f5fc..62928378d8 100644
--- a/share/icons/hicolor/cursors/tweak-move-in.svg
+++ b/share/icons/hicolor/cursors/tweak-move-in.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-move-jitter.svg b/share/icons/hicolor/cursors/tweak-move-jitter.svg
index 7c9180dfc7..49255b52d0 100644
--- a/share/icons/hicolor/cursors/tweak-move-jitter.svg
+++ b/share/icons/hicolor/cursors/tweak-move-jitter.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-move-out.svg b/share/icons/hicolor/cursors/tweak-move-out.svg
index d97e46c143..d9ca911c76 100644
--- a/share/icons/hicolor/cursors/tweak-move-out.svg
+++ b/share/icons/hicolor/cursors/tweak-move-out.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-move.svg b/share/icons/hicolor/cursors/tweak-move.svg
index a4e8edc12c..75adfc06ba 100644
--- a/share/icons/hicolor/cursors/tweak-move.svg
+++ b/share/icons/hicolor/cursors/tweak-move.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-outset.svg b/share/icons/hicolor/cursors/tweak-outset.svg
index bed3f34960..65161cde30 100644
--- a/share/icons/hicolor/cursors/tweak-outset.svg
+++ b/share/icons/hicolor/cursors/tweak-outset.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-push.svg b/share/icons/hicolor/cursors/tweak-push.svg
index 3e2feb7dc7..b96df210c0 100644
--- a/share/icons/hicolor/cursors/tweak-push.svg
+++ b/share/icons/hicolor/cursors/tweak-push.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-repel.svg b/share/icons/hicolor/cursors/tweak-repel.svg
index 4d896f91be..9e8a5c4c49 100644
--- a/share/icons/hicolor/cursors/tweak-repel.svg
+++ b/share/icons/hicolor/cursors/tweak-repel.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg b/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
index bad1cd8232..c3f4db99a0 100644
--- a/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
+++ b/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg b/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
index 47afa4280a..3b2499697e 100644
--- a/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
+++ b/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-roughen.svg b/share/icons/hicolor/cursors/tweak-roughen.svg
index 67f51a3e54..85400fed74 100644
--- a/share/icons/hicolor/cursors/tweak-roughen.svg
+++ b/share/icons/hicolor/cursors/tweak-roughen.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-scale-down.svg b/share/icons/hicolor/cursors/tweak-scale-down.svg
index 666ebf89ff..d59fe5ab7d 100644
--- a/share/icons/hicolor/cursors/tweak-scale-down.svg
+++ b/share/icons/hicolor/cursors/tweak-scale-down.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/tweak-scale-up.svg b/share/icons/hicolor/cursors/tweak-scale-up.svg
index 8295e1fed5..903c523d53 100644
--- a/share/icons/hicolor/cursors/tweak-scale-up.svg
+++ b/share/icons/hicolor/cursors/tweak-scale-up.svg
@@ -7,6 +7,8 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/zoom-in.svg b/share/icons/hicolor/cursors/zoom-in.svg
index 7bf8cc8b0c..52791f39c8 100644
--- a/share/icons/hicolor/cursors/zoom-in.svg
+++ b/share/icons/hicolor/cursors/zoom-in.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="8"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/share/icons/hicolor/cursors/zoom-out.svg b/share/icons/hicolor/cursors/zoom-out.svg
index 1eff5a9bf3..f52f23e506 100644
--- a/share/icons/hicolor/cursors/zoom-out.svg
+++ b/share/icons/hicolor/cursors/zoom-out.svg
@@ -6,6 +6,8 @@
      inkscape:hotspot_y="8"
      style="fill:gray;stroke:black">
 
+  <style>@import '../cursors.css';</style>
+
   <defs>
     <!-- Shadow -->
     <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
diff --git a/src/ui/cursor-utils.cpp b/src/ui/cursor-utils.cpp
index cb11b9a364..864f191b0a 100644
--- a/src/ui/cursor-utils.cpp
+++ b/src/ui/cursor-utils.cpp
@@ -143,17 +143,20 @@ load_svg_cursor(Glib::RefPtr<Gdk::Display> display,
         scale = window->get_scale_factor(); // Adjust for HiDPI screens.
     }
 #endif
+
     auto enable_drop_shadow = prefs->getBool("/options/cursor-drop-shadow", true);
     if (!enable_drop_shadow) {
         // turn off drop shadow, if any
         if (auto main = document->getObjectById("cursor")) {
-            Glib::ustring cls = main->getAttribute("class");
-            auto shadow = "drop-shadow";
-            auto pos = cls.find(shadow);
-            if (pos != Glib::ustring::npos) {
-                cls.erase(pos, strlen(shadow)); // can get away with strlen for ASCII string...
+            if (auto val = main->getAttribute("class")) {
+                Glib::ustring cls = val;
+                auto shadow = "drop-shadow";
+                auto pos = cls.find(shadow);
+                if (pos != Glib::ustring::npos) {
+                    cls.erase(pos, strlen(shadow)); // can get away with strlen for ASCII string...
+                }
+                main->setAttribute("class", cls);
             }
-            main->setAttribute("class", cls);
         }
         else {
             g_warning("Cursor's main object with ID='cursor' not found in %s. Cannot disable drop shadow.", full_file_path.c_str());
-- 
GitLab


From 36cefb93abc7fab0717fb5a1ce8946b2d4fd1e76 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 17:13:01 -0700
Subject: [PATCH 04/11] extra comments

---
 share/icons/hicolor/cursors-drop-shadow.svg | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/icons/hicolor/cursors-drop-shadow.svg b/share/icons/hicolor/cursors-drop-shadow.svg
index 9d11f55cc7..87b28dc815 100644
--- a/share/icons/hicolor/cursors-drop-shadow.svg
+++ b/share/icons/hicolor/cursors-drop-shadow.svg
@@ -55,7 +55,7 @@
   </sodipodi:namedview>
   <defs
      id="defs9">
-    <!-- Shadow -->
+    <!-- Drop shadow filter used by mouse cursors -->
     <filter
        id="def-drop-shadow"
        x="-0.31588888"
@@ -79,6 +79,7 @@
         <feFuncB
            id="feFuncB1429"
            type="identity" />
+		  <!-- Shadow's transparency -->
         <feFuncA
            id="feFuncA1431"
            type="linear"
@@ -96,9 +97,10 @@
     </filter>
   </defs>
 
+  <!-- This object is not used. It's just an illustration of drop shadow effect. -->
   <g
      id="cursor"
-     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#shadow)">
+     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#def-drop-shadow)">
     <path
        d="m 5,5 12,8 -5,5 z"
        style="stroke-width:1px"
-- 
GitLab


From af6748927ba01385a2f6b6d0cf3246ed2df49cfc Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 17:22:56 -0700
Subject: [PATCH 05/11] removing test file

---
 share/icons/hicolor/cursors/adjust_alpha2.svg | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 share/icons/hicolor/cursors/adjust_alpha2.svg

diff --git a/share/icons/hicolor/cursors/adjust_alpha2.svg b/share/icons/hicolor/cursors/adjust_alpha2.svg
deleted file mode 100644
index 1711dfb566..0000000000
--- a/share/icons/hicolor/cursors/adjust_alpha2.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     width="32" height="32"
-     inkscape:hotspot_x="16"
-     inkscape:hotspot_y="16"
-     style="fill:gray;stroke:black">
-
-  <style>
-    @import '../cursors.css';
-  </style>
-  <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
-
-    <g id="objects">
-
-      <!-- Slash -->
-      <path d="m 3.5,28.5 16,-16"/>
-
-      <!-- Plus -->
-      <path d="m 4,15.5 h 5 m -2.5,-2.5 v 5"/>
-
-      <!-- Minus -->
-      <path d="m 14,25.5 h 5"/>
-
-      <!-- Letter -->
-      <path d="m 25,7.5 h 2 m -3.5,3 2.5,-8 2.5,8"/>
-    </g>
-  </defs>
-
-  <g style="filter:url(#shadow);stroke-linecap:square;stroke-linejoin:bevel">
-    <use xlink:href="#objects" style="fill:none;stroke:white;stroke-width:3px"/>
-    <use xlink:href="#objects" style="fill:none;stroke:black;stroke-width:1px"/>
-  </g>
-</svg>
-- 
GitLab


From 52afffc0d94c1511368dd8e277f70ba369f16798 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 17:23:47 -0700
Subject: [PATCH 06/11] removing test file

---
 share/icons/hicolor/cursors/node-blunt.svg | 244 ---------------------
 1 file changed, 244 deletions(-)
 delete mode 100644 share/icons/hicolor/cursors/node-blunt.svg

diff --git a/share/icons/hicolor/cursors/node-blunt.svg b/share/icons/hicolor/cursors/node-blunt.svg
deleted file mode 100644
index cd5a3219d0..0000000000
--- a/share/icons/hicolor/cursors/node-blunt.svg
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="32"
-   height="32"
-   inkscape:hotspot_x="2"
-   inkscape:hotspot_y="2"
-   style="fill:gray;stroke:black"
-   version="1.1"
-   id="svg16"
-   sodipodi:docname="node.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata20">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#707070"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0.43921569"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
-     id="namedview18"
-     showgrid="true"
-     inkscape:zoom="11.313709"
-     inkscape:cx="26.47231"
-     inkscape:cy="21.169009"
-     inkscape:window-x="54"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="cursor"
-     inkscape:document-rotation="0"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:snap-center="true"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid845"
-       spacingx="2"
-       spacingy="2" />
-  </sodipodi:namedview>
-  <style>@import '../cursors.css';</style>
-
-  <defs
-     id="defs9">
-    <inkscape:path-effect
-       effect="offset"
-       id="path-effect1818"
-       is_visible="true"
-       lpeversion="1"
-       linejoin_type="miter"
-       unit="px"
-       offset="1.848611"
-       miter_limit="4"
-       attempt_force_join="true"
-       update_on_knot_move="true" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect853"
-       is_visible="true"
-       lpeversion="1"
-       satellites_param="C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2 @ C,0,0,1,0,0,0,2"
-       unit="px"
-       method="auto"
-       mode="C"
-       radius="0"
-       chamfer_steps="2"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <inkscape:path-effect
-       effect="offset"
-       id="path-effect872"
-       is_visible="true"
-       lpeversion="1"
-       linejoin_type="miter"
-       unit="px"
-       offset="-0.5"
-       miter_limit="4"
-       attempt_force_join="true"
-       update_on_knot_move="true" />
-    <inkscape:path-effect
-       effect="offset"
-       id="path-effect870"
-       is_visible="false"
-       lpeversion="1"
-       linejoin_type="miter"
-       unit="px"
-       offset="-0.178"
-       miter_limit="4"
-       attempt_force_join="true"
-       update_on_knot_move="true" />
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect860"
-       is_visible="true"
-       lpeversion="1"
-       offset_points="1,84.644"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="extrp_arc"
-       miter_limit="4"
-       scale_width="1"
-       end_linecap_type="zerowidth" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect848"
-       is_visible="true"
-       lpeversion="1"
-       satellites_param="C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 | C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,0,0,1 @ C,0,0,1,0,3.072978,0,1"
-       unit="px"
-       method="auto"
-       mode="C"
-       radius="0"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <inkscape:path-effect
-       effect="join_type"
-       id="path-effect846"
-       is_visible="true"
-       lpeversion="1"
-       linecap_type="butt"
-       line_width="3"
-       linejoin_type="extrp_arc"
-       miter_limit="100"
-       attempt_force_join="true" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect844"
-       is_visible="true"
-       lpeversion="1"
-       satellites_param="F,1,1,1,0,0,0,1 @ F,1,0,1,0,0,0,1 @ F,1,0,1,0,0,0,1 @ F,1,0,1,0,0,0,1"
-       unit="px"
-       method="auto"
-       mode="F"
-       radius="0"
-       chamfer_steps="1"
-       flexible="true"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="true"
-       hide_knots="false" />
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.18640777"
-       y="-0.18"
-       width="1.4245955"
-       height="1.41">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1.5"
-         id="feGaussianBlur4" />
-      <feColorMatrix
-         id="feColorMatrix874"
-         result="result1"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.3 0 " />
-      <feBlend
-         in="SourceGraphic"
-         in2="result1"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-4"
-       x="-0.5"
-       y="-0.5"
-       width="2.5"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-5" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-5" />
-    </filter>
-  </defs>
-  <!-- Triangle -->
-  <g
-     id="cursor"
-     class="drop-shadow"
-     style="stroke-linejoin:miter;stroke-miterlimit:10">
-    <path
-       d="M 2,2 V 4 L 12.326172,22.394531 14.902344,15.521484 21.306641,13.691406 4,2 Z"
-       style="fill:#ffffff;stroke:none;stroke-width:1px"
-       id="path1814"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       d="M 4.5,4.5 17,13 13.5,14 12,18 Z"
-       style="fill:#000000;stroke-width:1px"
-       id="path13"
-       sodipodi:nodetypes="ccccc"
-       inkscape:original-d="M 4.5,4.5 17,13 13.5,14 12,18 Z"
-       inkscape:path-effect="#path-effect870" />
-  </g>
-</svg>
-- 
GitLab


From 86fd965dd8a03f0a5fe2a80c355d9a05e8c85fa7 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 18:09:22 -0700
Subject: [PATCH 07/11] remove temp script

---
 share/icons/hicolor/cursors/tran.py | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 share/icons/hicolor/cursors/tran.py

diff --git a/share/icons/hicolor/cursors/tran.py b/share/icons/hicolor/cursors/tran.py
deleted file mode 100644
index d767cde2c0..0000000000
--- a/share/icons/hicolor/cursors/tran.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import sys
-
-f = open(sys.argv[1], 'r')
-o = open(sys.argv[2], 'w')
-
-style = False
-
-for line in f:
-  if line.find("<defs>") >= 0 or line.find(" <def") >= 0:
-    o.write("  <style>\n    @import '../cursors.css';\n  </style>\n")
-  o.write(line)
-
-#    txt = line.strip()
-#    if txt == '':
-#        sys.stdout.write('\n\n')
-#        sys.stdout.flush()
-#    sys.stdout.write( txt + ';')
-#    sys.stdout.flush()
-
-f.close()
-o.close()
-
-- 
GitLab


From 346830515d9ce84176cdf40e36d92e5c20a1900d Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 20 Jun 2021 19:34:06 -0700
Subject: [PATCH 08/11] shorter labels in preferences

---
 src/ui/dialog/inkscape-preferences.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 12f38310cd..f4e39f78e3 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1611,9 +1611,9 @@ void InkscapePreferences::initPageUI()
     _page_ui.add_line(false, "", _mouse_grabsize, "", _("Set the relative size of node handles"), true);
 
     _page_ui.add_group_header(_("Mouse cursors"));
-    _ui_cursorscaling.init(_("Enable cursor scaling"), "/options/cursorscaling", true);
+    _ui_cursorscaling.init(_("Enable scaling"), "/options/cursorscaling", true);
     _page_ui.add_line(false, "", _ui_cursorscaling, "", _("When off, cursor scaling is disabled. Cursor scaling may be broken when fractional scaling is enabled."), true);
-    _ui_cursor_shadow.init(_("Show cursor drop shadow"), "/options/cursor-drop-shadow", true);
+    _ui_cursor_shadow.init(_("Show drop shadow"), "/options/cursor-drop-shadow", true);
     _page_ui.add_line(false, "", _ui_cursor_shadow, "", _("Control visibility of drop shadow for Inkscape cursors."), true);
 
     // Theme
-- 
GitLab


From 483258a3479f180e8614195c8a6badfbb21d32bf Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Mon, 21 Jun 2021 16:19:18 -0700
Subject: [PATCH 09/11] cleanup

removed local shadow defs
little crosses replaced with <use>
moved css and common defs
no reliance on ID=cursor
---
 share/icons/hicolor/CMakeLists.txt            |  5 +-
 share/icons/hicolor/cursors.css               |  5 --
 .../-common.svg}                              | 19 ++++---
 share/icons/hicolor/cursors/adjust_alpha.svg  |  8 +--
 share/icons/hicolor/cursors/adjust_hue.svg    |  8 +--
 .../hicolor/cursors/adjust_lightness.svg      |  8 +--
 .../hicolor/cursors/adjust_saturation.svg     |  8 +--
 share/icons/hicolor/cursors/arc.svg           | 13 ++---
 share/icons/hicolor/cursors/box.svg           | 13 ++---
 share/icons/hicolor/cursors/calligraphy.svg   | 12 ++---
 share/icons/hicolor/cursors/connector.svg     | 13 ++---
 share/icons/hicolor/cursors/cursors.css       |  5 ++
 .../hicolor/cursors/dropper-drop-fill.svg     | 12 ++---
 .../hicolor/cursors/dropper-drop-stroke.svg   | 12 ++---
 .../hicolor/cursors/dropper-pick-fill.svg     | 12 ++---
 .../hicolor/cursors/dropper-pick-stroke.svg   | 12 ++---
 share/icons/hicolor/cursors/eraser.svg        | 13 ++---
 share/icons/hicolor/cursors/flood.svg         |  8 +--
 share/icons/hicolor/cursors/geometric.svg     | 12 ++---
 .../hicolor/cursors/gradient-add-stop.svg     | 27 ++--------
 share/icons/hicolor/cursors/gradient-add.svg  | 13 ++---
 .../hicolor/cursors/gradient-drag-stop.svg    | 49 ++----------------
 .../hicolor/cursors/gradient-over-stop.svg    | 27 ++--------
 share/icons/hicolor/cursors/gradient.svg      | 13 ++---
 share/icons/hicolor/cursors/measure.svg       | 12 ++---
 share/icons/hicolor/cursors/mesh-add.svg      | 13 ++---
 share/icons/hicolor/cursors/mesh.svg          | 13 ++---
 share/icons/hicolor/cursors/node-dragging.svg | 49 ++----------------
 .../icons/hicolor/cursors/node-mouseover.svg  | 48 +-----------------
 share/icons/hicolor/cursors/node.svg          | 50 ++-----------------
 share/icons/hicolor/cursors/pen.svg           | 12 ++---
 share/icons/hicolor/cursors/pencil.svg        | 12 ++---
 share/icons/hicolor/cursors/rect.svg          | 12 ++---
 share/icons/hicolor/cursors/rotate.svg        |  8 +--
 .../icons/hicolor/cursors/select-dragging.svg |  9 +---
 .../hicolor/cursors/select-mouseover.svg      |  9 +---
 share/icons/hicolor/cursors/select.svg        |  9 +---
 share/icons/hicolor/cursors/spiral.svg        | 12 ++---
 share/icons/hicolor/cursors/spray.svg         | 12 ++---
 share/icons/hicolor/cursors/star.svg          | 13 ++---
 share/icons/hicolor/cursors/text-insert.svg   |  8 +--
 share/icons/hicolor/cursors/text.svg          | 12 ++---
 share/icons/hicolor/cursors/tweak-attract.svg | 12 ++---
 share/icons/hicolor/cursors/tweak-color.svg   | 12 ++---
 share/icons/hicolor/cursors/tweak-inset.svg   | 12 ++---
 share/icons/hicolor/cursors/tweak-less.svg    | 12 ++---
 share/icons/hicolor/cursors/tweak-more.svg    | 12 ++---
 share/icons/hicolor/cursors/tweak-move-in.svg | 12 ++---
 .../hicolor/cursors/tweak-move-jitter.svg     | 12 ++---
 .../icons/hicolor/cursors/tweak-move-out.svg  | 12 ++---
 share/icons/hicolor/cursors/tweak-move.svg    | 12 ++---
 share/icons/hicolor/cursors/tweak-outset.svg  | 12 ++---
 share/icons/hicolor/cursors/tweak-push.svg    | 12 ++---
 share/icons/hicolor/cursors/tweak-repel.svg   | 12 ++---
 .../cursors/tweak-rotate-clockwise.svg        | 12 ++---
 .../cursors/tweak-rotate-counterclockwise.svg | 12 ++---
 share/icons/hicolor/cursors/tweak-roughen.svg | 12 ++---
 .../hicolor/cursors/tweak-scale-down.svg      | 12 ++---
 .../icons/hicolor/cursors/tweak-scale-up.svg  | 12 ++---
 share/icons/hicolor/cursors/zoom-in.svg       |  9 +---
 share/icons/hicolor/cursors/zoom-out.svg      |  9 +---
 src/ui/cursor-utils.cpp                       | 14 +++---
 62 files changed, 190 insertions(+), 686 deletions(-)
 delete mode 100644 share/icons/hicolor/cursors.css
 rename share/icons/hicolor/{cursors-drop-shadow.svg => cursors/-common.svg} (87%)
 create mode 100644 share/icons/hicolor/cursors/cursors.css

diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt
index 5f5eeb8119..a0b60cf077 100644
--- a/share/icons/hicolor/CMakeLists.txt
+++ b/share/icons/hicolor/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(THEME hicolor)
 install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
-install(FILES "cursors-drop-shadow.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
-install(FILES "cursors.css" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
 
 set(PIXMAP_SIZES "scalable" "symbolic")
 set(CONTENT "actions")
@@ -16,6 +14,9 @@ endforeach(pixmap_size)
 FILE(GLOB CURSOR_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cursors/*.svg)
 install(FILES ${CURSOR_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/cursors)
 
+FILE(GLOB CURSOR_CSS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cursors/*.css)
+install(FILES ${CURSOR_CSS_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/cursors)
+
 if(WIN32)
     install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/${INKSCAPE_SHARE_INSTALL}/icons/${THEME})")
 endif()
diff --git a/share/icons/hicolor/cursors.css b/share/icons/hicolor/cursors.css
deleted file mode 100644
index 2318aab16e..0000000000
--- a/share/icons/hicolor/cursors.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* common cursor styles */
-
-.drop-shadow {
-	filter: url(../cursors-drop-shadow.svg#def-drop-shadow);
-}
diff --git a/share/icons/hicolor/cursors-drop-shadow.svg b/share/icons/hicolor/cursors/-common.svg
similarity index 87%
rename from share/icons/hicolor/cursors-drop-shadow.svg
rename to share/icons/hicolor/cursors/-common.svg
index 87b28dc815..d1eb753375 100644
--- a/share/icons/hicolor/cursors-drop-shadow.svg
+++ b/share/icons/hicolor/cursors/-common.svg
@@ -5,7 +5,7 @@
    style="fill:gray;stroke:black"
    version="1.1"
    id="svg16"
-   sodipodi:docname="cursors-drop-shadow.svg"
+   sodipodi:docname="-common.svg"
    inkscape:version="1.2-dev (11cc75ba41, 2021-06-18)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -53,15 +53,16 @@
        spacingx="2"
        spacingy="2" />
   </sodipodi:namedview>
+
   <defs
      id="defs9">
     <!-- Drop shadow filter used by mouse cursors -->
     <filter
        id="def-drop-shadow"
-       x="-0.31588888"
-       y="-0.30215663"
-       width="1.6646238"
-       height="1.6274443">
+       x="-0.3"
+       y="-0.3"
+       width="1.6"
+       height="1.6">
       <feOffset
          result="offOut"
          in="SourceAlpha"
@@ -79,7 +80,7 @@
         <feFuncB
            id="feFuncB1429"
            type="identity" />
-		  <!-- Shadow's transparency -->
+        <!-- Shadow's transparency -->
         <feFuncA
            id="feFuncA1431"
            type="linear"
@@ -97,6 +98,12 @@
     </filter>
   </defs>
 
+  <!-- Cross (centered on hotspot @ 4,4) -->
+  <g id="def-cross">
+    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square;stroke-opacity:0.7"/>
+    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-opacity:1"/>
+  </g>
+
   <!-- This object is not used. It's just an illustration of drop shadow effect. -->
   <g
      id="cursor"
diff --git a/share/icons/hicolor/cursors/adjust_alpha.svg b/share/icons/hicolor/cursors/adjust_alpha.svg
index 0222512aee..a9c1c76856 100644
--- a/share/icons/hicolor/cursors/adjust_alpha.svg
+++ b/share/icons/hicolor/cursors/adjust_alpha.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
 
diff --git a/share/icons/hicolor/cursors/adjust_hue.svg b/share/icons/hicolor/cursors/adjust_hue.svg
index 85a3658996..d3c82e6271 100644
--- a/share/icons/hicolor/cursors/adjust_hue.svg
+++ b/share/icons/hicolor/cursors/adjust_hue.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
 
diff --git a/share/icons/hicolor/cursors/adjust_lightness.svg b/share/icons/hicolor/cursors/adjust_lightness.svg
index 9249bea605..250ea67e29 100644
--- a/share/icons/hicolor/cursors/adjust_lightness.svg
+++ b/share/icons/hicolor/cursors/adjust_lightness.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
 
diff --git a/share/icons/hicolor/cursors/adjust_saturation.svg b/share/icons/hicolor/cursors/adjust_saturation.svg
index 8410fe0291..04fd2f34f3 100644
--- a/share/icons/hicolor/cursors/adjust_saturation.svg
+++ b/share/icons/hicolor/cursors/adjust_saturation.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
 
diff --git a/share/icons/hicolor/cursors/arc.svg b/share/icons/hicolor/cursors/arc.svg
index d8649b2b32..3423904e0b 100644
--- a/share/icons/hicolor/cursors/arc.svg
+++ b/share/icons/hicolor/cursors/arc.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Ellipse -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/box.svg b/share/icons/hicolor/cursors/box.svg
index c7fe7e4c2b..8bc6dd03bb 100644
--- a/share/icons/hicolor/cursors/box.svg
+++ b/share/icons/hicolor/cursors/box.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Sides  -->
   <g id="cursor" class="drop-shadow" style="stroke-linejoin:round">
diff --git a/share/icons/hicolor/cursors/calligraphy.svg b/share/icons/hicolor/cursors/calligraphy.svg
index dd4b2b0c22..37a95e28e9 100644
--- a/share/icons/hicolor/cursors/calligraphy.svg
+++ b/share/icons/hicolor/cursors/calligraphy.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="22.5" y1="18.5" x2="18.5" y2="22.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Sides  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/connector.svg b/share/icons/hicolor/cursors/connector.svg
index 3eda3cc12a..d034ca85dd 100644
--- a/share/icons/hicolor/cursors/connector.svg
+++ b/share/icons/hicolor/cursors/connector.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" class="drop-shadow" style="">
 
diff --git a/share/icons/hicolor/cursors/cursors.css b/share/icons/hicolor/cursors/cursors.css
new file mode 100644
index 0000000000..3f0acd6d6c
--- /dev/null
+++ b/share/icons/hicolor/cursors/cursors.css
@@ -0,0 +1,5 @@
+/* common cursor styles */
+
+.drop-shadow {
+	filter: url(./-common.svg#def-drop-shadow);
+}
diff --git a/share/icons/hicolor/cursors/dropper-drop-fill.svg b/share/icons/hicolor/cursors/dropper-drop-fill.svg
index c7e5e4af96..c05703513c 100644
--- a/share/icons/hicolor/cursors/dropper-drop-fill.svg
+++ b/share/icons/hicolor/cursors/dropper-drop-fill.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="15.5" y1="12.5" x2="19.5" y2="16.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Dropper  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/dropper-drop-stroke.svg b/share/icons/hicolor/cursors/dropper-drop-stroke.svg
index 9a8192ba23..afd9c55979 100644
--- a/share/icons/hicolor/cursors/dropper-drop-stroke.svg
+++ b/share/icons/hicolor/cursors/dropper-drop-stroke.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="15.5" y1="12.5" x2="19.5" y2="16.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Dropper  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/dropper-pick-fill.svg b/share/icons/hicolor/cursors/dropper-pick-fill.svg
index 3c85829095..f5d94cd95b 100644
--- a/share/icons/hicolor/cursors/dropper-pick-fill.svg
+++ b/share/icons/hicolor/cursors/dropper-pick-fill.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="10.5" y1="6.5" x2="6.5" y2="10.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Dropper  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/dropper-pick-stroke.svg b/share/icons/hicolor/cursors/dropper-pick-stroke.svg
index 3adf06af1c..4031d2bd4e 100644
--- a/share/icons/hicolor/cursors/dropper-pick-stroke.svg
+++ b/share/icons/hicolor/cursors/dropper-pick-stroke.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="10.5" y1="6.5" x2="6.5" y2="10.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Dropper  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/eraser.svg b/share/icons/hicolor/cursors/eraser.svg
index 969118cdf0..3e0887ce26 100644
--- a/share/icons/hicolor/cursors/eraser.svg
+++ b/share/icons/hicolor/cursors/eraser.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" class="drop-shadow" style="stroke-linejoin:round">
     <!-- Outline -->
diff --git a/share/icons/hicolor/cursors/flood.svg b/share/icons/hicolor/cursors/flood.svg
index 185f4112b8..3716629f6c 100644
--- a/share/icons/hicolor/cursors/flood.svg
+++ b/share/icons/hicolor/cursors/flood.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="26"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="15.5" y1="12.5" x2="19.5" y2="16.5">
diff --git a/share/icons/hicolor/cursors/geometric.svg b/share/icons/hicolor/cursors/geometric.svg
index bb65e20580..6abc4f452c 100644
--- a/share/icons/hicolor/cursors/geometric.svg
+++ b/share/icons/hicolor/cursors/geometric.svg
@@ -7,21 +7,15 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Compass -->
 
diff --git a/share/icons/hicolor/cursors/gradient-add-stop.svg b/share/icons/hicolor/cursors/gradient-add-stop.svg
index b075dd02a6..e64af59117 100644
--- a/share/icons/hicolor/cursors/gradient-add-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-add-stop.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -54,33 +55,11 @@
        id="grid1537"
        type="xygrid" />
   </sodipodi:namedview>
-  <style>@import '../cursors.css';</style>
+
+  <style>@import './cursors.css';</style>
 
   <defs
      id="defs957">
-    <!-- Shadow -->
-    <filter
-       height="2"
-       width="2.5"
-       y="-0.5"
-       x="-0.5"
-       id="shadow">
-      <feOffset
-         id="feOffset950"
-         dy="1"
-         dx="1"
-         in="SourceAlpha"
-         result="offOut" />
-      <feGaussianBlur
-         id="feGaussianBlur952"
-         stdDeviation="1"
-         result="blurOut" />
-      <feBlend
-         id="feBlend954"
-         mode="normal"
-         in2="blurOut"
-         in="SourceGraphic" />
-    </filter>
   </defs>
   <g
     class="drop-shadow"
diff --git a/share/icons/hicolor/cursors/gradient-add.svg b/share/icons/hicolor/cursors/gradient-add.svg
index c95be68f4d..7d21f98509 100644
--- a/share/icons/hicolor/cursors/gradient-add.svg
+++ b/share/icons/hicolor/cursors/gradient-add.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Gradient -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/gradient-drag-stop.svg b/share/icons/hicolor/cursors/gradient-drag-stop.svg
index 7397b7b8dd..f1b7529e4b 100644
--- a/share/icons/hicolor/cursors/gradient-drag-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-drag-stop.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16,6 +17,9 @@
    inkscape:hotspot_x="4"
    height="32"
    width="32">
+
+  <style>@import './cursors.css';</style>
+
   <metadata
      id="metadata972">
     <rdf:RDF>
@@ -56,51 +60,6 @@
   </sodipodi:namedview>
   <defs
      id="defs957">
-    <!-- Shadow -->
-    <filter
-       height="2"
-       width="2.5"
-       y="-0.5"
-       x="-0.5"
-       id="shadow">
-      <feOffset
-         id="feOffset950"
-         dy="1"
-         dx="1"
-         in="SourceAlpha"
-         result="offOut" />
-      <feGaussianBlur
-         id="feGaussianBlur952"
-         stdDeviation="1"
-         result="blurOut" />
-      <feBlend
-         id="feBlend954"
-         mode="normal"
-         in2="blurOut"
-         in="SourceGraphic" />
-    </filter>
-    <filter
-       height="2"
-       width="2.5"
-       y="-0.5"
-       x="-0.5"
-       id="shadow-0">
-      <feOffset
-         id="feOffset950-8"
-         dy="1"
-         dx="1"
-         in="SourceAlpha"
-         result="offOut" />
-      <feGaussianBlur
-         id="feGaussianBlur952-1"
-         stdDeviation="1"
-         result="blurOut" />
-      <feBlend
-         id="feBlend954-1"
-         mode="normal"
-         in2="blurOut"
-         in="SourceGraphic" />
-    </filter>
   </defs>
   <g
     class="drop-shadow"
diff --git a/share/icons/hicolor/cursors/gradient-over-stop.svg b/share/icons/hicolor/cursors/gradient-over-stop.svg
index 932b19c332..c304de5c33 100644
--- a/share/icons/hicolor/cursors/gradient-over-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-over-stop.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    width="32"
    height="32"
    inkscape:hotspot_x="4"
@@ -16,6 +17,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+  <style>@import './cursors.css';</style>
+
   <metadata
      id="metadata972">
     <rdf:RDF>
@@ -56,29 +60,6 @@
   </sodipodi:namedview>
   <defs
      id="defs957">
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.066749824"
-       y="-0.063651296"
-       width="1.2288565"
-       height="1.218233">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset950" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur952" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend954" />
-    </filter>
   </defs>
   <g
      id="cursor"
diff --git a/share/icons/hicolor/cursors/gradient.svg b/share/icons/hicolor/cursors/gradient.svg
index f92b678286..c61654755d 100644
--- a/share/icons/hicolor/cursors/gradient.svg
+++ b/share/icons/hicolor/cursors/gradient.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Gradient -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/measure.svg b/share/icons/hicolor/cursors/measure.svg
index 52e163beed..5077b13498 100644
--- a/share/icons/hicolor/cursors/measure.svg
+++ b/share/icons/hicolor/cursors/measure.svg
@@ -7,21 +7,15 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Ruler  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/mesh-add.svg b/share/icons/hicolor/cursors/mesh-add.svg
index e26424f9ce..12f9118b2d 100644
--- a/share/icons/hicolor/cursors/mesh-add.svg
+++ b/share/icons/hicolor/cursors/mesh-add.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Gradient -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/mesh.svg b/share/icons/hicolor/cursors/mesh.svg
index 1d1def90d9..02b4477524 100644
--- a/share/icons/hicolor/cursors/mesh.svg
+++ b/share/icons/hicolor/cursors/mesh.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Gradient -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/node-dragging.svg b/share/icons/hicolor/cursors/node-dragging.svg
index 01f5f451c8..934892f1be 100644
--- a/share/icons/hicolor/cursors/node-dragging.svg
+++ b/share/icons/hicolor/cursors/node-dragging.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16,7 +17,8 @@
    id="svg20"
    sodipodi:docname="node-dragging.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
-  <style>@import '../cursors.css';</style>
+
+  <style>@import './cursors.css';</style>
 
   <metadata
      id="metadata24">
@@ -51,51 +53,6 @@
      inkscape:current-layer="cursor" />
   <defs
      id="defs9">
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-3"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-8" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-0" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-7" />
-    </filter>
   </defs>
   <g
      id="cursor"
diff --git a/share/icons/hicolor/cursors/node-mouseover.svg b/share/icons/hicolor/cursors/node-mouseover.svg
index a93be12e6f..811f91ee9d 100644
--- a/share/icons/hicolor/cursors/node-mouseover.svg
+++ b/share/icons/hicolor/cursors/node-mouseover.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -17,7 +18,7 @@
    sodipodi:docname="node-mouseover.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <metadata
      id="metadata24">
@@ -52,51 +53,6 @@
      inkscape:current-layer="cursor" />
   <defs
      id="defs9">
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-8"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-4" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-1" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-3" />
-    </filter>
   </defs>
   <g
      id="cursor"
diff --git a/share/icons/hicolor/cursors/node.svg b/share/icons/hicolor/cursors/node.svg
index b799ae2a00..14c8c31fd7 100644
--- a/share/icons/hicolor/cursors/node.svg
+++ b/share/icons/hicolor/cursors/node.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+     xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -17,7 +18,7 @@
    sodipodi:docname="node.svg"
    inkscape:version="1.0.1 (3bc2e81, 2020-09-07)">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <metadata
      id="metadata20">
@@ -60,51 +61,6 @@
   </sodipodi:namedview>
   <defs
      id="defs9">
-    <!-- Shadow -->
-    <filter
-       id="shadow"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
-    </filter>
-    <filter
-       id="shadow-4"
-       x="-0.5"
-       y="-0.5"
-       width="2.5"
-       height="2">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2-5" />
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4-4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6-5" />
-    </filter>
   </defs>
   <!-- Triangle -->
   <g
@@ -121,6 +77,7 @@
        style="stroke-width:1px"
        id="path13"
        sodipodi:nodetypes="ccccc" />
+<!--
     <g
        id="cursor-9"
        style="display:none;fill:#808080;stroke:#000000;filter:url(#shadow-4)">
@@ -133,5 +90,6 @@
          style="fill:#000000;stroke-width:1px"
          id="path13-7" />
     </g>
+-->
   </g>
 </svg>
diff --git a/share/icons/hicolor/cursors/pen.svg b/share/icons/hicolor/cursors/pen.svg
index 428dc0bfae..72fbbd1c68 100644
--- a/share/icons/hicolor/cursors/pen.svg
+++ b/share/icons/hicolor/cursors/pen.svg
@@ -6,15 +6,9 @@
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="10.5" y1="6.5" x2="6.5" y2="10.5">
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Pen  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/pencil.svg b/share/icons/hicolor/cursors/pencil.svg
index 50812a55d5..3888719044 100644
--- a/share/icons/hicolor/cursors/pencil.svg
+++ b/share/icons/hicolor/cursors/pencil.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" x1="22.5" y1="18.5" x2="18.5" y2="22.5">
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Sides  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/rect.svg b/share/icons/hicolor/cursors/rect.svg
index 016c94df31..5b85dbc8a0 100644
--- a/share/icons/hicolor/cursors/rect.svg
+++ b/share/icons/hicolor/cursors/rect.svg
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
 
   <!-- Rectangle -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/rotate.svg b/share/icons/hicolor/cursors/rotate.svg
index 9c9c8a0947..3d5370c9b6 100644
--- a/share/icons/hicolor/cursors/rotate.svg
+++ b/share/icons/hicolor/cursors/rotate.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="16"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 11.5,16 a 4.5,4.5 0 0 1 2.78,-4.16 4.5,4.5 0 0 1 4.9,0.98"/>
diff --git a/share/icons/hicolor/cursors/select-dragging.svg b/share/icons/hicolor/cursors/select-dragging.svg
index e82922fafb..d2fa30087a 100644
--- a/share/icons/hicolor/cursors/select-dragging.svg
+++ b/share/icons/hicolor/cursors/select-dragging.svg
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/select-mouseover.svg b/share/icons/hicolor/cursors/select-mouseover.svg
index fa1b2bd6cc..ec2bcfa536 100644
--- a/share/icons/hicolor/cursors/select-mouseover.svg
+++ b/share/icons/hicolor/cursors/select-mouseover.svg
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/select.svg b/share/icons/hicolor/cursors/select.svg
index f264a571a0..7a0c160b5a 100644
--- a/share/icons/hicolor/cursors/select.svg
+++ b/share/icons/hicolor/cursors/select.svg
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Arrow -->
diff --git a/share/icons/hicolor/cursors/spiral.svg b/share/icons/hicolor/cursors/spiral.svg
index 64f32f3716..2205d3d042 100644
--- a/share/icons/hicolor/cursors/spiral.svg
+++ b/share/icons/hicolor/cursors/spiral.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <path id="spiral" style="fill:none"
           d="m 16,16 c -0.5,0 -0.2,-0.6 0,-0.7 c 0.6,-0.4 1.3,0.1 1.5,0.7
@@ -26,8 +20,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Sides  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/spray.svg b/share/icons/hicolor/cursors/spray.svg
index 6b80ad779b..86227840f2 100644
--- a/share/icons/hicolor/cursors/spray.svg
+++ b/share/icons/hicolor/cursors/spray.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-1.0" y="-0.5" width="5.0" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Gradient -->
     <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="26" y1="10" x2="19" y2="10">
@@ -56,8 +50,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
 
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/star.svg b/share/icons/hicolor/cursors/star.svg
index 55c82b24f6..cbad1016b8 100644
--- a/share/icons/hicolor/cursors/star.svg
+++ b/share/icons/hicolor/cursors/star.svg
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="4"
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Triangle -->
   <g id="cursor" class="drop-shadow" style="stroke-linejoin:miter;stroke-miterlimit:10">
diff --git a/share/icons/hicolor/cursors/text-insert.svg b/share/icons/hicolor/cursors/text-insert.svg
index aa82f01be3..b1971bdac9 100644
--- a/share/icons/hicolor/cursors/text-insert.svg
+++ b/share/icons/hicolor/cursors/text-insert.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="13"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2.5" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- 'I'  -->
diff --git a/share/icons/hicolor/cursors/text.svg b/share/icons/hicolor/cursors/text.svg
index de959aefe7..550aa8ae1e 100644
--- a/share/icons/hicolor/cursors/text.svg
+++ b/share/icons/hicolor/cursors/text.svg
@@ -7,20 +7,14 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- "A"  -->
   <g id="cursor" class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/tweak-attract.svg b/share/icons/hicolor/cursors/tweak-attract.svg
index 30bf53955d..7a169ade8c 100644
--- a/share/icons/hicolor/cursors/tweak-attract.svg
+++ b/share/icons/hicolor/cursors/tweak-attract.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,9.5 c 4,0 8,4 12,4 c 4,0 8,-4 12,-4 l 0,3 c -4,0 -8,4 -12,4 c -4,0 -8,-4 -12,-4 z" style="fill:lightgray;stroke:none"/>
@@ -27,8 +21,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-color.svg b/share/icons/hicolor/cursors/tweak-color.svg
index 65f449fc7e..01e92573cd 100644
--- a/share/icons/hicolor/cursors/tweak-color.svg
+++ b/share/icons/hicolor/cursors/tweak-color.svg
@@ -7,21 +7,15 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="stroke:none">
     <rect x="8"  y="8"  width="6" height="6" style="fill:lightgray"/>
diff --git a/share/icons/hicolor/cursors/tweak-inset.svg b/share/icons/hicolor/cursors/tweak-inset.svg
index cf73050915..7672e761cd 100644
--- a/share/icons/hicolor/cursors/tweak-inset.svg
+++ b/share/icons/hicolor/cursors/tweak-inset.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,10.5 c 4,0 8,4 12,4 c 4,0 8,-4 12,-4 l 0,11 c -4,0 -8,-4 -12,-4 c -4,0 -8,4 -12,4 z" style="fill:lightgray;stroke:none"/>
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-less.svg b/share/icons/hicolor/cursors/tweak-less.svg
index 61ac426f33..57376e1541 100644
--- a/share/icons/hicolor/cursors/tweak-less.svg
+++ b/share/icons/hicolor/cursors/tweak-less.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <circle cx="16" cy="16" r="3.5" style="fill:none"/>
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-more.svg b/share/icons/hicolor/cursors/tweak-more.svg
index 6905d6d79a..94c0e2bfe3 100644
--- a/share/icons/hicolor/cursors/tweak-more.svg
+++ b/share/icons/hicolor/cursors/tweak-more.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <circle cx="6"  cy="16" r="3.5" style="fill:none"/>
@@ -27,8 +21,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-move-in.svg b/share/icons/hicolor/cursors/tweak-move-in.svg
index 62928378d8..438ef13efd 100644
--- a/share/icons/hicolor/cursors/tweak-move-in.svg
+++ b/share/icons/hicolor/cursors/tweak-move-in.svg
@@ -6,20 +6,14 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Arrows -->
   <g id="cursor" style="fill:none">
diff --git a/share/icons/hicolor/cursors/tweak-move-jitter.svg b/share/icons/hicolor/cursors/tweak-move-jitter.svg
index 49255b52d0..0d75de2c5b 100644
--- a/share/icons/hicolor/cursors/tweak-move-jitter.svg
+++ b/share/icons/hicolor/cursors/tweak-move-jitter.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Arrows -->
     <g id="arrows">
@@ -30,8 +24,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#arrows" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-move-out.svg b/share/icons/hicolor/cursors/tweak-move-out.svg
index d9ca911c76..c5a42524bd 100644
--- a/share/icons/hicolor/cursors/tweak-move-out.svg
+++ b/share/icons/hicolor/cursors/tweak-move-out.svg
@@ -6,20 +6,14 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <!-- Arrows -->
   <g id="cursor" style="fill:none">
diff --git a/share/icons/hicolor/cursors/tweak-move.svg b/share/icons/hicolor/cursors/tweak-move.svg
index 75adfc06ba..cd23d95947 100644
--- a/share/icons/hicolor/cursors/tweak-move.svg
+++ b/share/icons/hicolor/cursors/tweak-move.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <!-- Arrows -->
     <g id="arrows">
@@ -26,8 +20,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#arrows" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-outset.svg b/share/icons/hicolor/cursors/tweak-outset.svg
index 65161cde30..d14b5012bf 100644
--- a/share/icons/hicolor/cursors/tweak-outset.svg
+++ b/share/icons/hicolor/cursors/tweak-outset.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,14.5 c 4,0 8,-4 12,-4 c 4,0 8,4 12,4 l 0,3 c -4,0 -8,4 -12,4 c -4,0 -8,-4 -12,-4 z" style="fill:lightgray;stroke:none"/>
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-push.svg b/share/icons/hicolor/cursors/tweak-push.svg
index b96df210c0..92582edd4e 100644
--- a/share/icons/hicolor/cursors/tweak-push.svg
+++ b/share/icons/hicolor/cursors/tweak-push.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,13.5 c 4,0 8,-4 12,-4 c 4,0 8,4 12,4 l 0,5 c -4,0 -8,-4 -12,-4 c -4,0 -8,4 -12,4 z" style="fill:lightgray;stroke:none"/>
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-repel.svg b/share/icons/hicolor/cursors/tweak-repel.svg
index 9e8a5c4c49..b4850680b7 100644
--- a/share/icons/hicolor/cursors/tweak-repel.svg
+++ b/share/icons/hicolor/cursors/tweak-repel.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,11.5 c 4,0 8,-4 12,-4 c 4,0 8,4 12,4 l 0,3 c -4,0 -8,-4 -12,-4 c -4,0 -8,4 -12,4 z" style="fill:lightgray;stroke:none"/>
@@ -27,8 +21,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg b/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
index c3f4db99a0..ea2871d76d 100644
--- a/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
+++ b/share/icons/hicolor/cursors/tweak-rotate-clockwise.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 24.5,8.5 a 16 16 0 0 1 -16,16 l -2,0 m 6,6 -6,-6 6,-6"/> 
@@ -23,8 +17,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg b/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
index 3b2499697e..246aa6bb4b 100644
--- a/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
+++ b/share/icons/hicolor/cursors/tweak-rotate-counterclockwise.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 8.5,24.5 a 16 16 0 0 0 16,-16 l 0,-2 m 6,6 -6,-6 -6,6"/> 
@@ -23,8 +17,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-roughen.svg b/share/icons/hicolor/cursors/tweak-roughen.svg
index 85400fed74..6a573108af 100644
--- a/share/icons/hicolor/cursors/tweak-roughen.svg
+++ b/share/icons/hicolor/cursors/tweak-roughen.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 4,14.5 3,-4 3,5 3,-4 3,2 3,-3 3,4 3,-2 3,0 l 0,5 -3,-2 -3,4 -3,-2 -3,-1 -3,3 -3,-2 -3,2 -3,-3 z" style="fill:lightgray;stroke:none"/>
@@ -24,8 +18,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-scale-down.svg b/share/icons/hicolor/cursors/tweak-scale-down.svg
index d59fe5ab7d..05616098ef 100644
--- a/share/icons/hicolor/cursors/tweak-scale-down.svg
+++ b/share/icons/hicolor/cursors/tweak-scale-down.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 17.5,21.5 h -7 v -7 m 8,-1 -8,8"/>
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/tweak-scale-up.svg b/share/icons/hicolor/cursors/tweak-scale-up.svg
index 903c523d53..6066b7da63 100644
--- a/share/icons/hicolor/cursors/tweak-scale-up.svg
+++ b/share/icons/hicolor/cursors/tweak-scale-up.svg
@@ -7,15 +7,9 @@
      inkscape:hotspot_y="4"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
 
     <g id="objects">
       <path d="m 11.5,13.5 h 7 v 7 m -8,1 8,-8"/>
@@ -25,8 +19,8 @@
   </defs>
 
   <!-- Cross (centered on hotspot) -->
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square"/>
-  <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square"/>
+  <use xlink:href="-common.svg#def-cross"/>
+
 
   <g id="cursor" style="fill:none">
     <use xlink:href="#objects" style="stroke:white;stroke-width:3px"/>
diff --git a/share/icons/hicolor/cursors/zoom-in.svg b/share/icons/hicolor/cursors/zoom-in.svg
index 52791f39c8..aa27e851e3 100644
--- a/share/icons/hicolor/cursors/zoom-in.svg
+++ b/share/icons/hicolor/cursors/zoom-in.svg
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="8"
      inkscape:hotspot_y="8"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <g id="cursor" style="filter:url(#shadow)">
diff --git a/share/icons/hicolor/cursors/zoom-out.svg b/share/icons/hicolor/cursors/zoom-out.svg
index f52f23e506..d6abeab695 100644
--- a/share/icons/hicolor/cursors/zoom-out.svg
+++ b/share/icons/hicolor/cursors/zoom-out.svg
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
      width="32" height="32"
      inkscape:hotspot_x="8"
      inkscape:hotspot_y="8"
      style="fill:gray;stroke:black">
 
-  <style>@import '../cursors.css';</style>
+  <style>@import './cursors.css';</style>
 
   <defs>
-    <!-- Shadow -->
-    <filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
-      <feOffset result="offOut" in="SourceAlpha" dx="1" dy="1" />
-      <feGaussianBlur result="blurOut" stdDeviation="1" />
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
-    </filter>
   </defs>
 
   <g id="cursor" style="filter:url(#shadow)">
diff --git a/src/ui/cursor-utils.cpp b/src/ui/cursor-utils.cpp
index 864f191b0a..7f8f2da867 100644
--- a/src/ui/cursor-utils.cpp
+++ b/src/ui/cursor-utils.cpp
@@ -147,20 +147,18 @@ load_svg_cursor(Glib::RefPtr<Gdk::Display> display,
     auto enable_drop_shadow = prefs->getBool("/options/cursor-drop-shadow", true);
     if (!enable_drop_shadow) {
         // turn off drop shadow, if any
-        if (auto main = document->getObjectById("cursor")) {
-            if (auto val = main->getAttribute("class")) {
+        Glib::ustring shadow("drop-shadow");
+        auto objects = document->getObjectsByClass(shadow);
+        for (auto&& el : objects) {
+            if (auto val = el->getAttribute("class")) {
                 Glib::ustring cls = val;
-                auto shadow = "drop-shadow";
                 auto pos = cls.find(shadow);
                 if (pos != Glib::ustring::npos) {
-                    cls.erase(pos, strlen(shadow)); // can get away with strlen for ASCII string...
+                    cls.erase(pos, shadow.length());
                 }
-                main->setAttribute("class", cls);
+                el->setAttribute("class", cls);
             }
         }
-        else {
-            g_warning("Cursor's main object with ID='cursor' not found in %s. Cannot disable drop shadow.", full_file_path.c_str());
-        }
     }
 
     // Check for maximum size
-- 
GitLab


From b0c50c68ff33a29bcd6d1f258731b943e98f2d8f Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Mon, 21 Jun 2021 19:26:40 -0700
Subject: [PATCH 10/11] more opacity fixes

---
 share/icons/hicolor/cursors/arc.svg                |  3 +--
 share/icons/hicolor/cursors/box.svg                |  3 +--
 share/icons/hicolor/cursors/flood.svg              |  2 +-
 share/icons/hicolor/cursors/geometric.svg          |  1 -
 share/icons/hicolor/cursors/gradient-add-stop.svg  |  2 +-
 share/icons/hicolor/cursors/gradient-drag-stop.svg | 13 +------------
 share/icons/hicolor/cursors/gradient-over-stop.svg |  2 +-
 share/icons/hicolor/cursors/node.svg               |  2 +-
 share/icons/hicolor/cursors/rect.svg               |  2 +-
 share/icons/hicolor/cursors/star.svg               |  7 ++++---
 share/icons/hicolor/cursors/zoom-in.svg            |  2 +-
 share/icons/hicolor/cursors/zoom-out.svg           |  2 +-
 12 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/share/icons/hicolor/cursors/arc.svg b/share/icons/hicolor/cursors/arc.svg
index 3423904e0b..27db5c29c0 100644
--- a/share/icons/hicolor/cursors/arc.svg
+++ b/share/icons/hicolor/cursors/arc.svg
@@ -15,10 +15,9 @@
   <!-- Cross (centered on hotspot) -->
   <use xlink:href="-common.svg#def-cross"/>
 
-
   <!-- Ellipse -->
   <g id="cursor" class="drop-shadow" style="">
-    <ellipse cx="16" cy="14.5" rx="7.5" ry="6" style="stroke:white;stroke-width:3px"/>
+    <ellipse cx="16" cy="14.5" rx="7.5" ry="6" style="stroke:white;stroke-width:3px;stroke-opacity:1"/>
     <ellipse cx="16" cy="14.5" rx="7.5" ry="6" style="stroke-width:1px"/>
   </g>
 </svg>
diff --git a/share/icons/hicolor/cursors/box.svg b/share/icons/hicolor/cursors/box.svg
index 8bc6dd03bb..8f2c0e7268 100644
--- a/share/icons/hicolor/cursors/box.svg
+++ b/share/icons/hicolor/cursors/box.svg
@@ -15,10 +15,9 @@
   <!-- Cross (centered on hotspot) -->
   <use xlink:href="-common.svg#def-cross"/>
 
-
   <!-- Sides  -->
   <g id="cursor" class="drop-shadow" style="stroke-linejoin:round">
-    <path d="m 16,24 -8,-4 0,-8 8,-4 8,4 0,8 z" style="stroke:white;stroke-width:3px"/>
+    <path d="m 16,24 -8,-4 0,-8 8,-4 8,4 0,8 z" style="stroke:white;stroke-width:3px;stroke-opacity:1"/>
     <g style="stroke:black;stroke-width:1px">
       <path d="m 16,16 0,8 -8,-4 0,-8 z" style="fill:darkgray"/>
       <path d="m 16,16 0,8  8,-4 0,-8 z" style="fill:gray"/>
diff --git a/share/icons/hicolor/cursors/flood.svg b/share/icons/hicolor/cursors/flood.svg
index 3716629f6c..51d97e7659 100644
--- a/share/icons/hicolor/cursors/flood.svg
+++ b/share/icons/hicolor/cursors/flood.svg
@@ -19,7 +19,7 @@
   </defs>
 
   <!-- Bucket with paint -->
-  <g id="cursor" class="drop-shadow" style="">
+  <g id="cursor" class="drop-shadow" style="stroke-opacity:1">
 
     <!-- Outline -->
     <g style="fill:white;stroke:white;stroke-width:3px">
diff --git a/share/icons/hicolor/cursors/geometric.svg b/share/icons/hicolor/cursors/geometric.svg
index 6abc4f452c..a3f25ed1e1 100644
--- a/share/icons/hicolor/cursors/geometric.svg
+++ b/share/icons/hicolor/cursors/geometric.svg
@@ -16,7 +16,6 @@
   <!-- Cross (centered on hotspot) -->
   <use xlink:href="-common.svg#def-cross"/>
 
-
   <!-- Compass -->
 
   <g class="drop-shadow" style="">
diff --git a/share/icons/hicolor/cursors/gradient-add-stop.svg b/share/icons/hicolor/cursors/gradient-add-stop.svg
index e64af59117..9380e70935 100644
--- a/share/icons/hicolor/cursors/gradient-add-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-add-stop.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-     xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/share/icons/hicolor/cursors/gradient-drag-stop.svg b/share/icons/hicolor/cursors/gradient-drag-stop.svg
index f1b7529e4b..4178203699 100644
--- a/share/icons/hicolor/cursors/gradient-drag-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-drag-stop.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-     xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -86,15 +86,4 @@
        style="fill:#ffffff;stroke:#ffffff;stroke-width:1px;stroke-opacity:1"
        id="path965" />
   </g>
-  <g
-     transform="translate(19.248044,-16.309248)"
-     style="opacity:0.716157;fill:#ff0101;fill-opacity:1;stroke:#081cf7;stroke-opacity:1;filter:url(#shadow-0)"
-     id="cursor-6">
-    <!-- Arrow -->
-    <!-- Outline (cross) -->
-    <!-- Cross -->
-  </g>
-  <g
-     transform="matrix(-1,0,0,1,59.366699,-19.101396)"
-     id="g916" />
 </svg>
diff --git a/share/icons/hicolor/cursors/gradient-over-stop.svg b/share/icons/hicolor/cursors/gradient-over-stop.svg
index c304de5c33..4033303e50 100644
--- a/share/icons/hicolor/cursors/gradient-over-stop.svg
+++ b/share/icons/hicolor/cursors/gradient-over-stop.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-     xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    width="32"
    height="32"
    inkscape:hotspot_x="4"
diff --git a/share/icons/hicolor/cursors/node.svg b/share/icons/hicolor/cursors/node.svg
index 14c8c31fd7..b34a37bc00 100644
--- a/share/icons/hicolor/cursors/node.svg
+++ b/share/icons/hicolor/cursors/node.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-     xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/share/icons/hicolor/cursors/rect.svg b/share/icons/hicolor/cursors/rect.svg
index 5b85dbc8a0..a87434051c 100644
--- a/share/icons/hicolor/cursors/rect.svg
+++ b/share/icons/hicolor/cursors/rect.svg
@@ -17,7 +17,7 @@
 
   <!-- Rectangle -->
   <g id="cursor" class="drop-shadow" style="">
-    <rect x="8.5" y="8.5" width="15" height="12" style="stroke:white;stroke-width:3px"/>
+    <rect x="8.5" y="8.5" width="15" height="12" style="stroke:white;stroke-width:3px;stroke-opacity:1"/>
     <rect x="8.5" y="8.5" width="15" height="12" style="stroke-width:1px"/>
   </g>
 </svg>
diff --git a/share/icons/hicolor/cursors/star.svg b/share/icons/hicolor/cursors/star.svg
index cbad1016b8..240edce80c 100644
--- a/share/icons/hicolor/cursors/star.svg
+++ b/share/icons/hicolor/cursors/star.svg
@@ -15,10 +15,11 @@
   <!-- Cross (centered on hotspot) -->
   <use xlink:href="-common.svg#def-cross"/>
 
-
   <!-- Triangle -->
   <g id="cursor" class="drop-shadow" style="stroke-linejoin:miter;stroke-miterlimit:10">
-    <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z" style="stroke:white;stroke-width:3px"/>
-    <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z" style="stroke-width:1px"/>
+    <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z"
+      style="stroke:white;stroke-width:3px;stroke-opacity:1"/>
+    <path d="m 16.5,5.5 l 2.5,7.6 l 8,0 l -6.5,4.7 l 2.5,7.6 l -6.5,-4.7 l -6.5,4.7 l 2.5,-7.6 l -6.5,-4.7 l 8,0 z"
+      style="stroke-width:1px"/>
   </g>
 </svg>
diff --git a/share/icons/hicolor/cursors/zoom-in.svg b/share/icons/hicolor/cursors/zoom-in.svg
index aa27e851e3..0f8f28712b 100644
--- a/share/icons/hicolor/cursors/zoom-in.svg
+++ b/share/icons/hicolor/cursors/zoom-in.svg
@@ -12,7 +12,7 @@
   <defs>
   </defs>
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" style="">
 
     <g style="fill:white;stroke:white;stroke-width:3px">
       <circle cx="8.5" cy="8.5" r="6"/>
diff --git a/share/icons/hicolor/cursors/zoom-out.svg b/share/icons/hicolor/cursors/zoom-out.svg
index d6abeab695..9e9eec3c4b 100644
--- a/share/icons/hicolor/cursors/zoom-out.svg
+++ b/share/icons/hicolor/cursors/zoom-out.svg
@@ -12,7 +12,7 @@
   <defs>
   </defs>
 
-  <g id="cursor" style="filter:url(#shadow)">
+  <g id="cursor" style="">
 
     <g style="fill:white;stroke:white;stroke-width:3px">
       <circle cx="8.5" cy="8.5" r="6"/>
-- 
GitLab


From cb498fd8811e8bc42267f7c54e217b38864a6d85 Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Wed, 23 Jun 2021 07:29:34 -0700
Subject: [PATCH 11/11] optimized SVG for common part

---
 share/icons/hicolor/cursors/-common.svg | 139 +++---------------------
 1 file changed, 18 insertions(+), 121 deletions(-)

diff --git a/share/icons/hicolor/cursors/-common.svg b/share/icons/hicolor/cursors/-common.svg
index d1eb753375..60915ae259 100644
--- a/share/icons/hicolor/cursors/-common.svg
+++ b/share/icons/hicolor/cursors/-common.svg
@@ -1,133 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="32"
-   height="32"
-   style="fill:gray;stroke:black"
-   version="1.1"
-   id="svg16"
-   sodipodi:docname="-common.svg"
-   inkscape:version="1.2-dev (11cc75ba41, 2021-06-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata20">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1500"
-     inkscape:window-height="934"
-     id="namedview18"
-     showgrid="true"
-     inkscape:zoom="4.9375"
-     inkscape:cx="12.556962"
-     inkscape:cy="16.607595"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg16"
-     inkscape:document-rotation="0"
-     inkscape:pagecheckerboard="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid845"
-       spacingx="2"
-       spacingy="2" />
-  </sodipodi:namedview>
-
-  <defs
-     id="defs9">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" fill="gray" stroke="black" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
     <!-- Drop shadow filter used by mouse cursors -->
-    <filter
-       id="def-drop-shadow"
-       x="-0.3"
-       y="-0.3"
-       width="1.6"
-       height="1.6">
-      <feOffset
-         result="offOut"
-         in="SourceAlpha"
-         dx="1"
-         dy="1"
-         id="feOffset2" />
-      <feComponentTransfer
-         id="feComponentTransfer1423">
-        <feFuncR
-           id="feFuncR1425"
-           type="identity" />
-        <feFuncG
-           id="feFuncG1427"
-           type="identity" />
-        <feFuncB
-           id="feFuncB1429"
-           type="identity" />
+    <filter id="def-drop-shadow" x="-.5" y="-.5" width="2" height="2">
+      <feOffset dx="1" dy="1" in="SourceAlpha" result="offOut"/>
+      <feComponentTransfer>
+        <feFuncR type="identity"/>
+        <feFuncG type="identity"/>
+        <feFuncB type="identity"/>
         <!-- Shadow's transparency -->
-        <feFuncA
-           id="feFuncA1431"
-           type="linear"
-           slope="0.40" />
+        <feFuncA slope="0.40" type="linear"/>
       </feComponentTransfer>
-      <feGaussianBlur
-         result="blurOut"
-         stdDeviation="1"
-         id="feGaussianBlur4" />
-      <feBlend
-         in="SourceGraphic"
-         in2="blurOut"
-         mode="normal"
-         id="feBlend6" />
+      <feGaussianBlur result="blurOut" stdDeviation="1"/>
+      <feBlend in="SourceGraphic" in2="blurOut"/>
     </filter>
   </defs>
 
   <!-- Cross (centered on hotspot @ 4,4) -->
-  <g id="def-cross">
-    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:white;stroke-width:3px;stroke-linecap:square;stroke-opacity:0.7"/>
-    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" style="fill:none;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-opacity:1"/>
+  <g id="def-cross" fill="none" stroke-linecap="square">
+    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" stroke="#fff" stroke-opacity=".7" stroke-width="3px"/>
+    <path d="M 1.5,4.5 7.5,4.5 M 4.5,1.5 4.5,7.5" stroke="#000" stroke-opacity="1"  stroke-width="1px"/>
   </g>
 
   <!-- This object is not used. It's just an illustration of drop shadow effect. -->
-  <g
-     id="cursor"
-     style="stroke-linejoin:miter;stroke-miterlimit:10;filter:url(#def-drop-shadow)">
-    <path
-       d="m 5,5 12,8 -5,5 z"
-       style="stroke-width:1px"
-       id="path13"
-       sodipodi:nodetypes="cccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:6px;line-height:1;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;stroke:none;stroke-width:1"
-       x="2.551548"
-       y="23.478367"
-       id="text2466"><tspan
-         sodipodi:role="line"
-         id="tspan2464"
-         x="2.551548"
-         y="23.478367"
-         style="stroke-width:1">drop</tspan><tspan
-         sodipodi:role="line"
-         x="2.551548"
-         y="29.450216"
-         style="stroke-width:1"
-         id="tspan7036">shadow</tspan></text>
+  <g id="example-ignore" filter="url(#def-drop-shadow)" stroke-miterlimit="10">
+    <path d="m5 5 12 8-5 5z" stroke-width="1px"/>
+    <text x="2.55" y="23.47" fill="#000000" font-family="sans-serif" font-size="6px" letter-spacing="0px" stroke="none" word-spacing="0px" style="line-height:1" xml:space="preserve"><tspan x="2.55" y="23.47">drop</tspan><tspan x="2.55" y="29.45">shadow</tspan></text>
   </g>
 </svg>
-- 
GitLab