diff --git a/cursors/24/X_cursor.svg b/cursors/24/X_cursor.svg
deleted file mode 100644
index c2f415d1f..000000000
--- a/cursors/24/X_cursor.svg
+++ /dev/null
@@ -1,591 +0,0 @@
-
-
diff --git a/cursors/24/dnd-link.svg b/cursors/24/alias.svg
similarity index 100%
rename from cursors/24/dnd-link.svg
rename to cursors/24/alias.svg
diff --git a/cursors/24/bottom_tee.svg b/cursors/24/bottom_tee.svg
deleted file mode 100644
index 2031bfd43..000000000
--- a/cursors/24/bottom_tee.svg
+++ /dev/null
@@ -1,575 +0,0 @@
-
-
diff --git a/cursors/24/cross.svg b/cursors/24/cell.svg
similarity index 94%
rename from cursors/24/cross.svg
rename to cursors/24/cell.svg
index 3bcc5ff20..7e34a761a 100644
--- a/cursors/24/cross.svg
+++ b/cursors/24/cell.svg
@@ -11,7 +11,7 @@
id="svg2"
height="24"
width="24"
- sodipodi:docname="cross.svg"
+ sodipodi:docname="crosshair.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14">
+ id="feGaussianBlur75259" />
+ sodipodi:nodetypes="cccccccccccccccccccccccc"
+ inkscape:connector-curvature="0"
+ style="display:inline;opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter75257)"
+ d="m 11,2.9999999 v 5.5 L 12,9.5 13,8.4999999 v -5.5 z M 3,11 v 2 h 5.5 l 1,-1 -1,-1 z m 12.5,0 -1,1 1,1 H 21 v -2 z m -3.5,3.5 -1,1 V 21 h 2 v -5.5 z"
+ id="path75255" />
+ id="path75253"
+ d="m 10,1.9999999 v 5.5 l 1,1 1,-1 v -5.5 z M 2,10 v 2 h 5.5 l 1,-1 -1,-1 z m 12.5,0 -1,1 1,1 H 20 v -2 z m -3.5,3.5 -1,1 V 20 h 2 v -5.5 z"
+ style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccc" />
+ style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10,1.9999999 v 5.5 l 1,1 1,-1 v -5.5 z M 2,10 v 2 h 5.5 l 1,-1 -1,-1 z m 12.5,0 -1,1 1,1 H 20 v -2 z m -3.5,3.5 -1,1 V 20 h 2 v -5.5 z"
+ id="path75245"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccc" />
diff --git a/cursors/24/circle.svg b/cursors/24/circle.svg
deleted file mode 100644
index c45a896b2..000000000
--- a/cursors/24/circle.svg
+++ /dev/null
@@ -1,630 +0,0 @@
-
-
diff --git a/cursors/24/dnd-copy.svg b/cursors/24/context-menu.svg
similarity index 78%
rename from cursors/24/dnd-copy.svg
rename to cursors/24/context-menu.svg
index e1c1f807b..41eefeb11 100644
--- a/cursors/24/dnd-copy.svg
+++ b/cursors/24/context-menu.svg
@@ -13,56 +13,55 @@
+ id="feGaussianBlur26627-4"
+ stdDeviation="1.1657227" />
-
+ id="linearGradient75198"
+ xlink:href="#linearGradient13193" />
+ id="linearGradient13193">
+ style="stop-color:#000000;stop-opacity:1" />
+ style="stop-color:#333333;stop-opacity:1" />
+ x1="23.528315"
+ y1="6.08318"
+ x2="23.528315"
+ y2="44.23307"
+ gradientTransform="matrix(0.26829268,0,0,0.26829268,7.561357,9.5617196)" />
+ id="linearGradient55160-3">
+ id="stop55156-5" />
+ id="stop55158-6" />
-
+ style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter26625-1)"
+ d="M 7,3.68555 V 15 L 10.03418,11.42773 14.31445,11 Z"
+ id="path75176" />
+ id="path75178"
+ d="M 6,2.68555 V 14 L 9.03418,10.42773 13.31445,10 Z"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:url(#linearGradient75198);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 6,2.68555 V 14 L 9.03418,10.42773 13.31445,10 Z"
+ id="path75180" />
-
+ d="m 14.000381,10.500744 c -3.034711,0 -5.5,2.46529 -5.5,5.499999 0,3.034712 2.465289,5.500002 5.5,5.500001 3.03471,0 5.500003,-2.465289 5.5,-5.500001 0,-3.034709 -2.46529,-5.499999 -5.5,-5.499999 z"
+ id="path2555-7-1-7"
+ style="color:#000000;font-variation-settings:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient3);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;-inkscape-stroke:none;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000" />
-
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:url(#linearGradient3097);stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ id="path1-1-9"
+ style="font-variation-settings:normal;opacity:0.15;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;-inkscape-stroke:none;stop-color:#000000"
+ d="m 13.804688,12.019531 c -1.527367,0.09038 -2.354451,2.100138 -1.34375,3.244141 0.517034,0.385234 -0.570533,0.853236 -0.423781,1.452435 -0.10203,0.655587 0.157408,1.350547 0.660109,1.783893 -1.245523,0.979739 -0.656189,3.22659 0.920764,3.443328 1.556189,0.400776 2.957398,-1.496206 2.148706,-2.872085 -0.500252,-0.481227 -0.384364,-0.725435 0.02712,-1.224289 0.392826,-0.779854 0.186143,-1.793212 -0.483312,-2.354766 1.166912,-0.933433 0.740227,-3.015263 -0.710347,-3.396116 -0.256461,-0.08533 -0.527506,-0.111259 -0.795512,-0.07654 z" />
+ id="path1-1"
+ style="font-variation-settings:normal;opacity:0.3;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;-inkscape-stroke:none;stop-color:#000000"
+ d="m 14,13 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z" />
+ id="path1"
+ style="font-variation-settings:normal;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+ d="m 14,12 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z m 0,3 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 1,1 0 0 0 -1,-1 z" />
diff --git a/cursors/24/copy.svg b/cursors/24/copy.svg
index d928998c7..e1c1f807b 100644
--- a/cursors/24/copy.svg
+++ b/cursors/24/copy.svg
@@ -12,37 +12,38 @@
xmlns:dc="http://purl.org/dc/elements/1.1/">
-
+
+
+
+ id="radialGradient74808"
+ xlink:href="#linearGradient74767" />
+ id="linearGradient74767">
+ id="stop74771" />
+ id="stop74769" />
-
-
-
+ id="path74800"
+ d="m 8.72027,2.70685 c 0,0 -0.5,0 -0.5,1 0,0 -0.0209,0.89699 -0.3,1 -0.24632,0.0909 -0.6398,0.15204 -0.7,-0.16883 0,-1 -0.47036,-1.17821 -1.5,-0.83117 -0.63446,0.21385 -0.5,1 -0.5,1 v 1.5 c 0,1 0.2285,2 0,2 -0.5,0 -0.5,-0.5 -0.5,-1.5 C 3.31572,6.51984 3.22188,7.5237 3.46053,8.47958 c 0.33978,1.36094 0.97811,2.47735 1.69362,3.6529 0.68342,1.12281 1.58906,1.57437 2.56612,1.57437 h 4.5 c 3,0 2.94022,-6.02257 3,-7.125 C 15.30427,5.0325 14.562,5 14,5 c -0.17549,0.1702 -0.0761,0.9787 -0.27973,1.58185 -0.5,0.5 -0.5,-0.41218 -0.5,-0.875 v -1 c 0.11908,-0.6145 -0.5,-1 -0.5,-1 h -1 c -0.3635,-0.0202 -0.48768,0.28538 -0.50158,0.75435 -0.007,0.28973 -0.21717,0.24565 -0.21717,0.24565 h -0.5 c -0.28125,0 -0.28125,-1 -0.28125,-1 0,-1 -0.5,-1 -0.5,-1 z"
+ style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter74703)" />
+
+ id="path74804"
+ d="M 7.5,2 C 7.5,2 7,2 7,3 7,3 6.9791,3.89699 6.7,4 6.45368,4.0909 6.0602,4.15204 6,3.83117 6,2.83117 5.52964,2.65296 4.5,3 3.86554,3.21385 4,4 4,4 v 1.5 c 0,1 0.2285,2 0,2 C 3.5,7.5 3.5,7 3.5,6 2.09545,5.81299 2.00161,6.81685 2.24026,7.77273 2.58004,9.13367 3.21837,10.25008 3.93388,11.42563 4.6173,12.54844 5.52294,13 6.5,13 H 11 C 14,13 13.94022,6.97743 14,5.875 14.084,4.32565 13.34173,4.29315 12.77973,4.29315 12.60424,4.46335 12.70363,5.27185 12.5,5.875 12,6.375 12,5.46282 12,5 V 4 C 12.11908,3.3855 11.5,3 11.5,3 h -1 C 10.1365,2.9798 10.01232,3.28538 9.99842,3.75435 9.99142,4.04408 9.78125,4 9.78125,4 h -0.5 C 9,4 9,3 9,3 9,2 8.5,2 8.5,2 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="opacity:0.2;fill:url(#radialGradient74808);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 7.5,2 C 7.5,2 7,2 7,3 7,3 6.9791,3.89699 6.7,4 6.45368,4.0909 6.0602,4.15204 6,3.83117 6,2.83117 5.52964,2.65296 4.5,3 3.86554,3.21385 4,4 4,4 v 1.5 c 0,1 0.2285,2 0,2 C 3.5,7.5 3.5,7 3.5,6 2.09545,5.81299 2.00161,6.81685 2.24026,7.77273 2.58004,9.13367 3.21837,10.25008 3.93388,11.42563 4.6173,12.54844 5.52294,13 6.5,13 H 11 C 14,13 13.94022,6.97743 14,5.875 14.084,4.32565 13.34173,4.29315 12.77973,4.29315 12.60424,4.46335 12.70363,5.27185 12.5,5.875 12,6.375 12,5.46282 12,5 V 4 C 12.11908,3.3855 11.5,3 11.5,3 h -1 C 10.1365,2.9798 10.01232,3.28538 9.99842,3.75435 9.99142,4.04408 9.78125,4 9.78125,4 h -0.5 C 9,4 9,3 9,3 9,2 8.5,2 8.5,2 Z"
+ id="path74806" />
+ id="feGaussianBlur75278" />
+ style="display:inline;opacity:0.5;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter75276)"
+ d="M 11,2.9999997 V 11 H 2.9999999 v 2 H 11 v 8 h 2 v -8 h 8 V 11 H 13 V 2.9999997 Z"
+ id="path75270"
+ inkscape:connector-curvature="0" />
+ id="path75268"
+ d="m 9.9999999,1.9999997 v 7.9999999 h -8 V 12 h 8 v 8 H 12 v -8 h 8 V 9.9999996 H 12 V 1.9999997 Z"
+ style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 9.9999999,1.9999997 v 7.9999999 h -8 V 12 h 8 v 8 H 12 v -8 h 8 V 9.9999996 H 12 V 1.9999997 Z"
+ id="rect75263"
+ inkscape:connector-curvature="0" />
diff --git a/cursors/24/left_ptr.svg b/cursors/24/default.svg
similarity index 100%
rename from cursors/24/left_ptr.svg
rename to cursors/24/default.svg
diff --git a/cursors/24/dnd-ask.svg b/cursors/24/dnd-ask.svg
deleted file mode 100644
index 839295843..000000000
--- a/cursors/24/dnd-ask.svg
+++ /dev/null
@@ -1,680 +0,0 @@
-
-
diff --git a/cursors/24/dnd-move.svg b/cursors/24/dnd-move.svg
deleted file mode 100644
index f71f4b047..000000000
--- a/cursors/24/dnd-move.svg
+++ /dev/null
@@ -1,628 +0,0 @@
-
-
diff --git a/cursors/24/dotbox.svg b/cursors/24/dotbox.svg
deleted file mode 100644
index 18c47498f..000000000
--- a/cursors/24/dotbox.svg
+++ /dev/null
@@ -1,579 +0,0 @@
-
-
diff --git a/cursors/24/sb_h_double_arrow.svg b/cursors/24/ew-resize.svg
similarity index 100%
rename from cursors/24/sb_h_double_arrow.svg
rename to cursors/24/ew-resize.svg
diff --git a/cursors/24/hand1.svg b/cursors/24/grab.svg
similarity index 100%
rename from cursors/24/hand1.svg
rename to cursors/24/grab.svg
diff --git a/cursors/24/dnd-none.svg b/cursors/24/grabbing.svg
similarity index 100%
rename from cursors/24/dnd-none.svg
rename to cursors/24/grabbing.svg
diff --git a/cursors/24/help.svg b/cursors/24/help.svg
index 5cffb9523..6c3edb6ea 100644
--- a/cursors/24/help.svg
+++ b/cursors/24/help.svg
@@ -1,90 +1,687 @@
diff --git a/cursors/24/left_tee.svg b/cursors/24/left_tee.svg
deleted file mode 100644
index b1450adc6..000000000
--- a/cursors/24/left_tee.svg
+++ /dev/null
@@ -1,575 +0,0 @@
-
-
diff --git a/cursors/24/link.svg b/cursors/24/link.svg
deleted file mode 100644
index 12a76a5bb..000000000
--- a/cursors/24/link.svg
+++ /dev/null
@@ -1,628 +0,0 @@
-
-
diff --git a/cursors/24/ll_angle.svg b/cursors/24/ll_angle.svg
deleted file mode 100644
index 6d3b6617d..000000000
--- a/cursors/24/ll_angle.svg
+++ /dev/null
@@ -1,575 +0,0 @@
-
-
diff --git a/cursors/24/lr_angle.svg b/cursors/24/lr_angle.svg
deleted file mode 100644
index deddb1464..000000000
--- a/cursors/24/lr_angle.svg
+++ /dev/null
@@ -1,614 +0,0 @@
-
-
diff --git a/cursors/24/fd_double_arrow.svg b/cursors/24/nesw-resize.svg
similarity index 100%
rename from cursors/24/fd_double_arrow.svg
rename to cursors/24/nesw-resize.svg
diff --git a/cursors/24/sb_v_double_arrow.svg b/cursors/24/ns-resize.svg
similarity index 100%
rename from cursors/24/sb_v_double_arrow.svg
rename to cursors/24/ns-resize.svg
diff --git a/cursors/24/bd_double_arrow.svg b/cursors/24/nwse-resize.svg
similarity index 100%
rename from cursors/24/bd_double_arrow.svg
rename to cursors/24/nwse-resize.svg
diff --git a/cursors/24/pencil.svg b/cursors/24/pencil.svg
deleted file mode 100644
index 65821b63a..000000000
--- a/cursors/24/pencil.svg
+++ /dev/null
@@ -1,600 +0,0 @@
-
-
diff --git a/cursors/24/plus.svg b/cursors/24/plus.svg
deleted file mode 100644
index 4558a2c8b..000000000
--- a/cursors/24/plus.svg
+++ /dev/null
@@ -1,623 +0,0 @@
-
-
diff --git a/cursors/24/left_ptr_watch_0001.svg b/cursors/24/progress_0001.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0001.svg
rename to cursors/24/progress_0001.svg
diff --git a/cursors/24/left_ptr_watch_0002.svg b/cursors/24/progress_0002.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0002.svg
rename to cursors/24/progress_0002.svg
diff --git a/cursors/24/left_ptr_watch_0003.svg b/cursors/24/progress_0003.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0003.svg
rename to cursors/24/progress_0003.svg
diff --git a/cursors/24/left_ptr_watch_0004.svg b/cursors/24/progress_0004.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0004.svg
rename to cursors/24/progress_0004.svg
diff --git a/cursors/24/left_ptr_watch_0005.svg b/cursors/24/progress_0005.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0005.svg
rename to cursors/24/progress_0005.svg
diff --git a/cursors/24/left_ptr_watch_0006.svg b/cursors/24/progress_0006.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0006.svg
rename to cursors/24/progress_0006.svg
diff --git a/cursors/24/left_ptr_watch_0007.svg b/cursors/24/progress_0007.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0007.svg
rename to cursors/24/progress_0007.svg
diff --git a/cursors/24/left_ptr_watch_0008.svg b/cursors/24/progress_0008.svg
similarity index 100%
rename from cursors/24/left_ptr_watch_0008.svg
rename to cursors/24/progress_0008.svg
diff --git a/cursors/24/right_ptr.svg b/cursors/24/right_ptr.svg
deleted file mode 100644
index 0079b84b0..000000000
--- a/cursors/24/right_ptr.svg
+++ /dev/null
@@ -1,618 +0,0 @@
-
-
diff --git a/cursors/24/right_tee.svg b/cursors/24/right_tee.svg
deleted file mode 100644
index 2f2f95412..000000000
--- a/cursors/24/right_tee.svg
+++ /dev/null
@@ -1,575 +0,0 @@
-
-
diff --git a/cursors/24/sb_down_arrow.svg b/cursors/24/sb_down_arrow.svg
deleted file mode 100644
index aa767b292..000000000
--- a/cursors/24/sb_down_arrow.svg
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
diff --git a/cursors/24/sb_left_arrow.svg b/cursors/24/sb_left_arrow.svg
deleted file mode 100644
index 2eaaf4e7e..000000000
--- a/cursors/24/sb_left_arrow.svg
+++ /dev/null
@@ -1,617 +0,0 @@
-
-
diff --git a/cursors/24/sb_right_arrow.svg b/cursors/24/sb_right_arrow.svg
deleted file mode 100644
index 23e17d4a4..000000000
--- a/cursors/24/sb_right_arrow.svg
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
diff --git a/cursors/24/sb_up_arrow.svg b/cursors/24/sb_up_arrow.svg
deleted file mode 100644
index 9dc1363cd..000000000
--- a/cursors/24/sb_up_arrow.svg
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
diff --git a/cursors/24/tcross.svg b/cursors/24/tcross.svg
deleted file mode 100644
index 2c7326e50..000000000
--- a/cursors/24/tcross.svg
+++ /dev/null
@@ -1,586 +0,0 @@
-
-
diff --git a/cursors/24/top_tee.svg b/cursors/24/top_tee.svg
deleted file mode 100644
index 6a38bfae8..000000000
--- a/cursors/24/top_tee.svg
+++ /dev/null
@@ -1,575 +0,0 @@
-
-
diff --git a/cursors/24/ul_angle.svg b/cursors/24/ul_angle.svg
deleted file mode 100644
index 7d9540f74..000000000
--- a/cursors/24/ul_angle.svg
+++ /dev/null
@@ -1,614 +0,0 @@
-
-
diff --git a/cursors/24/ur_angle.svg b/cursors/24/ur_angle.svg
deleted file mode 100644
index 4a508a0d1..000000000
--- a/cursors/24/ur_angle.svg
+++ /dev/null
@@ -1,614 +0,0 @@
-
-
diff --git a/cursors/24/watch_0001.svg b/cursors/24/wait_0001.svg
similarity index 100%
rename from cursors/24/watch_0001.svg
rename to cursors/24/wait_0001.svg
diff --git a/cursors/24/watch_0002.svg b/cursors/24/wait_0002.svg
similarity index 100%
rename from cursors/24/watch_0002.svg
rename to cursors/24/wait_0002.svg
diff --git a/cursors/24/watch_0003.svg b/cursors/24/wait_0003.svg
similarity index 100%
rename from cursors/24/watch_0003.svg
rename to cursors/24/wait_0003.svg
diff --git a/cursors/24/watch_0004.svg b/cursors/24/wait_0004.svg
similarity index 100%
rename from cursors/24/watch_0004.svg
rename to cursors/24/wait_0004.svg
diff --git a/cursors/24/watch_0005.svg b/cursors/24/wait_0005.svg
similarity index 100%
rename from cursors/24/watch_0005.svg
rename to cursors/24/wait_0005.svg
diff --git a/cursors/24/watch_0006.svg b/cursors/24/wait_0006.svg
similarity index 100%
rename from cursors/24/watch_0006.svg
rename to cursors/24/wait_0006.svg
diff --git a/cursors/24/watch_0007.svg b/cursors/24/wait_0007.svg
similarity index 100%
rename from cursors/24/watch_0007.svg
rename to cursors/24/wait_0007.svg
diff --git a/cursors/24/watch_0008.svg b/cursors/24/wait_0008.svg
similarity index 100%
rename from cursors/24/watch_0008.svg
rename to cursors/24/wait_0008.svg
diff --git a/cursors/24/watch_0009.svg b/cursors/24/wait_0009.svg
similarity index 100%
rename from cursors/24/watch_0009.svg
rename to cursors/24/wait_0009.svg
diff --git a/cursors/24/watch_0010.svg b/cursors/24/wait_0010.svg
similarity index 100%
rename from cursors/24/watch_0010.svg
rename to cursors/24/wait_0010.svg
diff --git a/cursors/24/watch_0011.svg b/cursors/24/wait_0011.svg
similarity index 100%
rename from cursors/24/watch_0011.svg
rename to cursors/24/wait_0011.svg
diff --git a/cursors/24/watch_0012.svg b/cursors/24/wait_0012.svg
similarity index 100%
rename from cursors/24/watch_0012.svg
rename to cursors/24/wait_0012.svg
diff --git a/cursors/24/watch_0013.svg b/cursors/24/wait_0013.svg
similarity index 100%
rename from cursors/24/watch_0013.svg
rename to cursors/24/wait_0013.svg
diff --git a/cursors/24/watch_0014.svg b/cursors/24/wait_0014.svg
similarity index 100%
rename from cursors/24/watch_0014.svg
rename to cursors/24/wait_0014.svg
diff --git a/cursors/24/watch_0015.svg b/cursors/24/wait_0015.svg
similarity index 100%
rename from cursors/24/watch_0015.svg
rename to cursors/24/wait_0015.svg
diff --git a/cursors/24/watch_0016.svg b/cursors/24/wait_0016.svg
similarity index 100%
rename from cursors/24/watch_0016.svg
rename to cursors/24/wait_0016.svg
diff --git a/cursors/X_cursor.in b/cursors/X_cursor.in
deleted file mode 100644
index 4ef944c25..000000000
--- a/cursors/X_cursor.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/X_cursor.png
-32 15 15 32x32/X_cursor.png
-48 22 22 48x48/X_cursor.png
-64 30 30 64x64/X_cursor.png
-96 44 44 96x96/X_cursor.png
diff --git a/cursors/alias.in b/cursors/alias.in
new file mode 100644
index 000000000..87bf9d9cc
--- /dev/null
+++ b/cursors/alias.in
@@ -0,0 +1,5 @@
+24 9 9 24x24/alias.png
+32 13 13 32x32/alias.png
+48 18 18 48x48/alias.png
+64 26 26 64x64/alias.png
+96 36 36 96x96/alias.png
diff --git a/cursors/bd_double_arrow.in b/cursors/bd_double_arrow.in
deleted file mode 100644
index c90394442..000000000
--- a/cursors/bd_double_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/bd_double_arrow.png
-32 15 15 32x32/bd_double_arrow.png
-48 22 22 48x48/bd_double_arrow.png
-64 30 30 64x64/bd_double_arrow.png
-96 44 44 96x96/bd_double_arrow.png
diff --git a/cursors/bottom_left_corner.in b/cursors/bottom_left_corner.in
deleted file mode 100644
index 0a9dadabb..000000000
--- a/cursors/bottom_left_corner.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 4 20 24x24/bottom_left_corner.png
-32 6 30 32x32/bottom_left_corner.png
-48 8 40 48x48/bottom_left_corner.png
-64 12 60 64x64/bottom_left_corner.png
-96 16 80 96x96/bottom_left_corner.png
diff --git a/cursors/bottom_right_corner.in b/cursors/bottom_right_corner.in
deleted file mode 100644
index ea21a8f04..000000000
--- a/cursors/bottom_right_corner.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 20 20 24x24/bottom_right_corner.png
-32 28 28 32x32/bottom_right_corner.png
-48 40 40 48x48/bottom_right_corner.png
-64 56 56 64x64/bottom_right_corner.png
-96 80 80 96x96/bottom_right_corner.png
diff --git a/cursors/bottom_side.in b/cursors/bottom_side.in
deleted file mode 100644
index 6479edd68..000000000
--- a/cursors/bottom_side.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 18 24x24/bottom_side.png
-32 15 20 32x32/bottom_side.png
-48 22 36 48x48/bottom_side.png
-64 30 40 64x64/bottom_side.png
-96 44 72 96x96/bottom_side.png
diff --git a/cursors/bottom_tee.in b/cursors/bottom_tee.in
deleted file mode 100644
index 3191b0b95..000000000
--- a/cursors/bottom_tee.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 18 24x24/bottom_tee.png
-32 15 20 32x32/bottom_tee.png
-48 22 36 48x48/bottom_tee.png
-64 30 40 64x64/bottom_tee.png
-96 44 72 96x96/bottom_tee.png
diff --git a/cursors/cell.in b/cursors/cell.in
new file mode 100644
index 000000000..1b1e91cb9
--- /dev/null
+++ b/cursors/cell.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/cell.png
+32 15 15 32x32/cell.png
+48 22 22 48x48/cell.png
+64 30 30 64x64/cell.png
+96 44 44 96x96/cell.png
diff --git a/cursors/circle.in b/cursors/circle.in
deleted file mode 100644
index fa0664ab8..000000000
--- a/cursors/circle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 4 5 24x24/circle.png
-32 6 8 32x32/circle.png
-48 8 10 48x48/circle.png
-64 12 16 64x64/circle.png
-96 16 20 96x96/circle.png
diff --git a/cursors/context-menu.in b/cursors/context-menu.in
new file mode 100644
index 000000000..639346590
--- /dev/null
+++ b/cursors/context-menu.in
@@ -0,0 +1,5 @@
+24 6 1 24x24/context-menu.png
+32 8 2 32x32/context-menu.png
+48 12 2 48x48/context-menu.png
+64 16 4 64x64/context-menu.png
+96 24 4 96x96/context-menu.png
diff --git a/cursors/copy.in b/cursors/copy.in
index 1b5004963..65ea0e8ec 100644
--- a/cursors/copy.in
+++ b/cursors/copy.in
@@ -1,5 +1,5 @@
-24 6 1 24x24/copy.png
-32 8 2 32x32/copy.png
-48 12 2 48x48/copy.png
-64 16 4 64x64/copy.png
-96 24 4 96x96/copy.png
+24 9 9 24x24/copy.png
+32 13 13 32x32/copy.png
+48 18 18 48x48/copy.png
+64 26 26 64x64/copy.png
+96 36 36 96x96/copy.png
diff --git a/cursors/cross.in b/cursors/cross.in
deleted file mode 100644
index c2a5820a4..000000000
--- a/cursors/cross.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/cross.png
-32 15 15 32x32/cross.png
-48 22 22 48x48/cross.png
-64 30 30 64x64/cross.png
-96 44 44 96x96/cross.png
diff --git a/cursors/crosshair.in b/cursors/crosshair.in
index c2a5820a4..fd152b88f 100644
--- a/cursors/crosshair.in
+++ b/cursors/crosshair.in
@@ -1,5 +1,5 @@
-24 11 11 24x24/cross.png
-32 15 15 32x32/cross.png
-48 22 22 48x48/cross.png
-64 30 30 64x64/cross.png
-96 44 44 96x96/cross.png
+24 11 11 24x24/crosshair.png
+32 15 15 32x32/crosshair.png
+48 22 22 48x48/crosshair.png
+64 30 30 64x64/crosshair.png
+96 44 44 96x96/crosshair.png
diff --git a/cursors/default.in b/cursors/default.in
new file mode 100644
index 000000000..1e196d270
--- /dev/null
+++ b/cursors/default.in
@@ -0,0 +1,5 @@
+24 7 4 24x24/default.png
+32 10 5 32x32/default.png
+48 14 8 48x48/default.png
+64 20 10 64x64/default.png
+96 28 16 96x96/default.png
diff --git a/cursors/dnd-ask.in b/cursors/dnd-ask.in
deleted file mode 100644
index 31ad3f074..000000000
--- a/cursors/dnd-ask.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 9 9 24x24/dnd-ask.png
-32 13 13 32x32/dnd-ask.png
-48 18 18 48x48/dnd-ask.png
-64 26 26 64x64/dnd-ask.png
-96 36 36 96x96/dnd-ask.png
diff --git a/cursors/dnd-copy.in b/cursors/dnd-copy.in
deleted file mode 100644
index b2cb3c356..000000000
--- a/cursors/dnd-copy.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 9 9 24x24/dnd-copy.png
-32 13 13 32x32/dnd-copy.png
-48 18 18 48x48/dnd-copy.png
-64 26 26 64x64/dnd-copy.png
-96 36 36 96x96/dnd-copy.png
diff --git a/cursors/dnd-link.in b/cursors/dnd-link.in
deleted file mode 100644
index 102ce7911..000000000
--- a/cursors/dnd-link.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 9 9 24x24/dnd-link.png
-32 13 13 32x32/dnd-link.png
-48 18 18 48x48/dnd-link.png
-64 26 26 64x64/dnd-link.png
-96 36 36 96x96/dnd-link.png
diff --git a/cursors/dnd-move.in b/cursors/dnd-move.in
deleted file mode 100644
index e3c1be5b4..000000000
--- a/cursors/dnd-move.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 9 9 24x24/dnd-move.png
-32 13 13 32x32/dnd-move.png
-48 18 18 48x48/dnd-move.png
-64 26 26 64x64/dnd-move.png
-96 36 36 96x96/dnd-move.png
diff --git a/cursors/dnd-none.in b/cursors/dnd-none.in
deleted file mode 100644
index 6e754fd1a..000000000
--- a/cursors/dnd-none.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 13 11 24x24/dnd-none.png
-32 20 17 32x32/dnd-none.png
-48 26 22 48x48/dnd-none.png
-64 40 34 64x64/dnd-none.png
-96 52 44 96x96/dnd-none.png
diff --git a/cursors/dotbox.in b/cursors/dotbox.in
deleted file mode 100644
index 1d8c93fbf..000000000
--- a/cursors/dotbox.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/dotbox.png
-32 15 15 32x32/dotbox.png
-48 22 22 48x48/dotbox.png
-64 30 30 64x64/dotbox.png
-96 44 44 96x96/dotbox.png
diff --git a/cursors/ew-resize.in b/cursors/ew-resize.in
new file mode 100644
index 000000000..9fcd9d7dc
--- /dev/null
+++ b/cursors/ew-resize.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/ew-resize.png
+32 15 15 32x32/ew-resize.png
+48 22 22 48x48/ew-resize.png
+64 30 30 64x64/ew-resize.png
+96 44 4 96x96/ew-resize.png
diff --git a/cursors/fd_double_arrow.in b/cursors/fd_double_arrow.in
deleted file mode 100644
index c96d003fa..000000000
--- a/cursors/fd_double_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/fd_double_arrow.png
-32 15 15 32x32/fd_double_arrow.png
-48 22 22 48x48/fd_double_arrow.png
-64 30 30 64x64/fd_double_arrow.png
-96 44 44 96x96/fd_double_arrow.png
diff --git a/cursors/grab.in b/cursors/grab.in
new file mode 100644
index 000000000..55e4b9289
--- /dev/null
+++ b/cursors/grab.in
@@ -0,0 +1,5 @@
+24 12 7 24x24/grab.png
+32 18 11 32x32/grab.png
+48 24 14 48x48/grab.png
+64 36 22 64x64/grab.png
+96 48 28 96x96/grab.png
diff --git a/cursors/hand1.in b/cursors/hand1.in
deleted file mode 100644
index e4ae6c3df..000000000
--- a/cursors/hand1.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 12 7 24x24/hand1.png
-32 18 11 32x32/hand1.png
-48 24 14 48x48/hand1.png
-64 36 22 64x64/hand1.png
-96 48 28 96x96/hand1.png
diff --git a/cursors/help.in b/cursors/help.in
index 89efedef4..623b80635 100644
--- a/cursors/help.in
+++ b/cursors/help.in
@@ -1,5 +1,5 @@
-24 12 21 24x24/help.png
-32 16 30 32x32/help.png
-48 24 42 48x48/help.png
-64 32 60 64x64/help.png
-96 48 84 96x96/help.png
+24 6 1 24x24/help.png
+32 8 2 32x32/help.png
+48 12 2 48x48/help.png
+64 16 4 64x64/help.png
+96 24 4 96x96/help.png
diff --git a/cursors/left_ptr.in b/cursors/left_ptr.in
deleted file mode 100644
index f7ae536b3..000000000
--- a/cursors/left_ptr.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 7 4 24x24/left_ptr.png
-32 10 5 32x32/left_ptr.png
-48 14 8 48x48/left_ptr.png
-64 20 10 64x64/left_ptr.png
-96 28 16 96x96/left_ptr.png
diff --git a/cursors/left_ptr_watch.in b/cursors/left_ptr_watch.in
deleted file mode 100644
index 9fa1a2ead..000000000
--- a/cursors/left_ptr_watch.in
+++ /dev/null
@@ -1,40 +0,0 @@
-24 6 4 24x24/left_ptr_watch_0001.png 120
-24 6 4 24x24/left_ptr_watch_0002.png 120
-24 6 4 24x24/left_ptr_watch_0003.png 120
-24 6 4 24x24/left_ptr_watch_0004.png 120
-24 6 4 24x24/left_ptr_watch_0005.png 120
-24 6 4 24x24/left_ptr_watch_0006.png 120
-24 6 4 24x24/left_ptr_watch_0007.png 120
-24 6 4 24x24/left_ptr_watch_0008.png 120
-32 8 5 32x32/left_ptr_watch_0001.png 120
-32 8 5 32x32/left_ptr_watch_0002.png 120
-32 8 5 32x32/left_ptr_watch_0003.png 120
-32 8 5 32x32/left_ptr_watch_0004.png 120
-32 8 5 32x32/left_ptr_watch_0005.png 120
-32 8 5 32x32/left_ptr_watch_0006.png 120
-32 8 5 32x32/left_ptr_watch_0007.png 120
-32 8 5 32x32/left_ptr_watch_0008.png 120
-48 12 8 48x48/left_ptr_watch_0001.png 120
-48 12 8 48x48/left_ptr_watch_0002.png 120
-48 12 8 48x48/left_ptr_watch_0003.png 120
-48 12 8 48x48/left_ptr_watch_0004.png 120
-48 12 8 48x48/left_ptr_watch_0005.png 120
-48 12 8 48x48/left_ptr_watch_0006.png 120
-48 12 8 48x48/left_ptr_watch_0007.png 120
-48 12 8 48x48/left_ptr_watch_0008.png 120
-64 16 10 64x64/left_ptr_watch_0001.png 120
-64 16 10 64x64/left_ptr_watch_0002.png 120
-64 16 10 64x64/left_ptr_watch_0003.png 120
-64 16 10 64x64/left_ptr_watch_0004.png 120
-64 16 10 64x64/left_ptr_watch_0005.png 120
-64 16 10 64x64/left_ptr_watch_0006.png 120
-64 16 10 64x64/left_ptr_watch_0007.png 120
-64 16 10 64x64/left_ptr_watch_0008.png 120
-96 24 16 96x96/left_ptr_watch_0001.png 120
-96 24 16 96x96/left_ptr_watch_0002.png 120
-96 24 16 96x96/left_ptr_watch_0003.png 120
-96 24 16 96x96/left_ptr_watch_0004.png 120
-96 24 16 96x96/left_ptr_watch_0005.png 120
-96 24 16 96x96/left_ptr_watch_0006.png 120
-96 24 16 96x96/left_ptr_watch_0007.png 120
-96 24 16 96x96/left_ptr_watch_0008.png 120
diff --git a/cursors/left_side.in b/cursors/left_side.in
deleted file mode 100644
index 8b48de21b..000000000
--- a/cursors/left_side.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 7 13 24x24/left_side.png
-32 10 20 32x32/left_side.png
-48 14 26 48x48/left_side.png
-64 20 40 64x64/left_side.png
-96 28 52 96x96/left_side.png
diff --git a/cursors/left_tee.in b/cursors/left_tee.in
deleted file mode 100644
index 35ecc2f55..000000000
--- a/cursors/left_tee.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 7 13 24x24/left_tee.png
-32 10 20 32x32/left_tee.png
-48 14 26 48x48/left_tee.png
-64 20 40 64x64/left_tee.png
-96 28 52 96x96/left_tee.png
diff --git a/cursors/link.in b/cursors/link.in
deleted file mode 100644
index 4731059e7..000000000
--- a/cursors/link.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 4 5 24x24/link.png
-32 6 8 32x32/link.png
-48 8 10 48x48/link.png
-64 12 16 64x64/link.png
-96 16 20 96x96/link.png
diff --git a/cursors/ll_angle.in b/cursors/ll_angle.in
deleted file mode 100644
index 1b1e14e30..000000000
--- a/cursors/ll_angle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 4 20 24x24/ll_angle.png
-32 6 30 32x32/ll_angle.png
-48 8 40 48x48/ll_angle.png
-64 12 60 64x64/ll_angle.png
-96 16 80 96x96/ll_angle.png
diff --git a/cursors/lr_angle.in b/cursors/lr_angle.in
deleted file mode 100644
index a69024d4a..000000000
--- a/cursors/lr_angle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 20 20 24x24/lr_angle.png
-32 28 28 32x32/lr_angle.png
-48 40 40 48x48/lr_angle.png
-64 56 56 64x64/lr_angle.png
-96 80 80 96x96/lr_angle.png
diff --git a/cursors/meson.build b/cursors/meson.build
index 8e2b06059..bd029e9a1 100644
--- a/cursors/meson.build
+++ b/cursors/meson.build
@@ -3,77 +3,55 @@ rsvg = find_program('rsvg-convert')
xcursorgen = find_program('xcursorgen')
cursors = [
+ 'alias',
'all-scroll',
- 'bd_double_arrow',
- 'bottom_tee',
- 'circle',
+ 'cell',
+ 'context-menu',
'copy',
- 'cross',
'crosshair',
- 'dnd-ask',
- 'dnd-copy',
- 'dnd-link',
- 'dnd-move',
- 'dnd-none',
- 'dotbox',
- 'fd_double_arrow',
- 'hand1',
+ 'default',
+ 'ew-resize',
+ 'grab',
+ 'grabbing',
'help',
- 'left_ptr',
- 'left_tee',
- 'link',
- 'll_angle',
- 'lr_angle',
'move',
+ 'nesw-resize',
'no-drop',
'not-allowed',
- 'pencil',
- 'plus',
+ 'ns-resize',
+ 'nwse-resize',
'pointer',
- 'right_ptr',
- 'right_tee',
- 'sb_down_arrow',
- 'sb_h_double_arrow',
- 'sb_left_arrow',
- 'sb_right_arrow',
- 'sb_up_arrow',
- 'sb_v_double_arrow',
- 'tcross',
'text',
- 'top_tee',
- 'ul_angle',
- 'ur_angle',
'vertical-text',
- 'X_cursor',
'zoom-in',
'zoom-out'
]
watches = [
- 'left_ptr_watch_0001',
- 'left_ptr_watch_0002',
- 'left_ptr_watch_0003',
- 'left_ptr_watch_0004',
- 'left_ptr_watch_0005',
- 'left_ptr_watch_0006',
- 'left_ptr_watch_0007',
- 'left_ptr_watch_0008',
- 'watch_0001',
- 'watch_0002',
- 'watch_0003',
- 'watch_0004',
- 'watch_0005',
- 'watch_0006',
- 'watch_0007',
- 'watch_0008',
- 'watch_0009',
- 'watch_0010',
- 'watch_0011',
- 'watch_0012',
- 'watch_0013',
- 'watch_0014',
- 'watch_0015',
- 'watch_0016'
+ 'progress_0001',
+ 'progress_0002',
+ 'progress_0003',
+ 'progress_0004',
+ 'progress_0005',
+ 'progress_0006',
+ 'progress_0007',
+ 'progress_0008',
+ 'wait_0001',
+ 'wait_0002',
+ 'wait_0003',
+ 'wait_0004',
+ 'wait_0005',
+ 'wait_0006',
+ 'wait_0007',
+ 'wait_0008',
+ 'wait_0009',
+ 'wait_0010',
+ 'wait_0011',
+ 'wait_0012',
+ 'wait_0013',
+ 'wait_0014',
+ 'wait_0015',
+ 'wait_0016'
]
sizes = [
@@ -113,8 +91,8 @@ foreach size: sizes
endforeach
cursors += [
- 'left_ptr_watch',
- 'watch'
+ 'progress',
+ 'wait'
]
foreach cursor : cursors
@@ -136,174 +114,37 @@ endforeach
links = []
links += [[
- 'bd_double_arrow',
- [
- 'bottom_right_corner',
- 'top_left_corner',
- 'c7088f0f3e6c8088236ef8e1e3e70000'
- ]
-]]
-
-links += [[
- 'copy',
- [
- '6407b0e94181790501fd1e167b474872',
- '1081e37283d90000800003c07f3ef6bf'
- ]
-]]
-
-links += [[
- 'cross',
- [
- 'diamond_cross',
- 'cross_reverse'
- ]
-]]
-
-links += [[
- 'dnd-none',
+ 'ew-resize',
[
- 'grabbing'
+ 'col-resize',
+ 'e-resize',
+ 'w-resize',
]
]]
links += [[
- 'dotbox',
- [
- 'target',
- 'icon',
- 'draped_box',
- 'dot_box_mask'
- ]
-]]
-
-links += [[
- 'fd_double_arrow',
- [
- 'bottom_left_corner',
- 'top_right_corner',
- 'fcf1c3c7cd4491d801f1e1c78f100000'
- ]
-]]
-
-links += [[
- 'grabbing',
- [
- 'fleur'
- ]
-]]
-
-links += [[
- 'hand1',
- [
- 'grab'
- ]
-]]
-
-links += [[
- 'help',
- [
- 'left_ptr_help',
- 'question_arrow',
- 'd9ce0ab605698f320427677b458ad60b',
- '5c6cd98b3f3ebcb1f9c7f1c204630408'
- ]
-]]
-
-links += [[
- 'left_ptr',
- [
- 'arrow',
- 'top_left_arrow',
- '08e8e1c95fe2fc01f976f1e063a24ccd',
- '3ecb610c1bf2410f44200f48c40d3599'
- ]
-]]
-
-links += [[
- 'link',
- [
- '3085a0e285430894940527032f8b26df',
- '640fb0e74195791501fd1ed57b41487f'
- ]
-]]
-
-links += [[
- 'move',
- [
- '9081237383d90e509aa00f00170e968f',
- '4498f0e0c1937ffe01fd06f973665830'
- ]
-]]
-
-links += [[
- 'not-allowed',
- [
- 'crossed_circle',
- '03b6e0fcb3499374a867c041f52298f0'
- ]
-]]
-
-links += [[
- 'pointer',
- [
- 'hand',
- 'hand2',
- '9d800788f1b08800ae810202380a0822'
- ]
-]]
-
-links += [[
- 'plus',
- [
- 'cell'
- ]
-]]
-
-
-links += [[
- 'right_ptr',
- [
- 'draft_small',
- 'draft_large'
- ]
-]]
-
-links += [[
- 'sb_h_double_arrow',
- [
- 'h_double_arrow',
- 'left_side',
- 'right_side',
- '028006030e0e7ebffc7f7070c0600140',
- '14fef782d02440884392942c11205230'
- ]
-]]
-
-links += [[
- 'sb_v_double_arrow',
- [
- 'bottom_side',
- 'double_arrow',
- 'top_side',
- 'v_double_arrow',
- '00008160000006810000408080010102',
- '2870a09082c103050810ffdffffe0204'
- ]
+ 'nesw-resize',
+ [
+ 'ne-resize',
+ 'sw-resize',
+ ]
]]
links += [[
- 'text',
- [
- 'xterm'
- ]
+ 'ns-resize',
+ [
+ 'row-resize',
+ 'n-resize',
+ 's-resize',
+ ]
]]
links += [[
- 'X_cursor',
- [
- 'pirate'
- ]
+ 'nwse-resize',
+ [
+ 'nw-resize',
+ 'se-resize',
+ ]
]]
foreach link_entry : links
diff --git a/cursors/nesw-resize.in b/cursors/nesw-resize.in
new file mode 100644
index 000000000..4c700a551
--- /dev/null
+++ b/cursors/nesw-resize.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/nesw-resize.png
+32 15 15 32x32/nesw-resize.png
+48 22 22 48x48/nesw-resize.png
+64 30 30 64x64/nesw-resize.png
+96 44 44 96x96/nesw-resize.png
diff --git a/cursors/ns-resize.in b/cursors/ns-resize.in
new file mode 100644
index 000000000..0c0b44883
--- /dev/null
+++ b/cursors/ns-resize.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/ns-resize.png
+32 15 15 32x32/ns-resize.png
+48 22 22 48x48/ns-resize.png
+64 30 30 64x64/ns-resize.png
+96 44 44 96x96/ns-resize.png
diff --git a/cursors/nwse-resize.in b/cursors/nwse-resize.in
new file mode 100644
index 000000000..9d0a30cd9
--- /dev/null
+++ b/cursors/nwse-resize.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/nwse-resize.png
+32 15 15 32x32/nwse-resize.png
+48 22 22 48x48/nwse-resize.png
+64 30 30 64x64/nwse-resize.png
+96 44 44 96x96/nwse-resize.png
diff --git a/cursors/pencil.in b/cursors/pencil.in
deleted file mode 100644
index 85a29c7cb..000000000
--- a/cursors/pencil.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 7 23 24x24/pencil.png
-32 9 31 32x32/pencil.png
-48 14 46 48x48/pencil.png
-64 18 62 64x64/pencil.png
-96 28 92 96x96/pencil.png
diff --git a/cursors/plus.in b/cursors/plus.in
deleted file mode 100644
index 64a6e5fc4..000000000
--- a/cursors/plus.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/plus.png
-32 15 15 32x32/plus.png
-48 22 22 48x48/plus.png
-64 30 30 64x64/plus.png
-96 44 44 96x96/plus.png
diff --git a/cursors/progress.in b/cursors/progress.in
new file mode 100644
index 000000000..86bcc5307
--- /dev/null
+++ b/cursors/progress.in
@@ -0,0 +1,40 @@
+24 6 4 24x24/progress_0001.png 120
+24 6 4 24x24/progress_0002.png 120
+24 6 4 24x24/progress_0003.png 120
+24 6 4 24x24/progress_0004.png 120
+24 6 4 24x24/progress_0005.png 120
+24 6 4 24x24/progress_0006.png 120
+24 6 4 24x24/progress_0007.png 120
+24 6 4 24x24/progress_0008.png 120
+32 8 5 32x32/progress_0001.png 120
+32 8 5 32x32/progress_0002.png 120
+32 8 5 32x32/progress_0003.png 120
+32 8 5 32x32/progress_0004.png 120
+32 8 5 32x32/progress_0005.png 120
+32 8 5 32x32/progress_0006.png 120
+32 8 5 32x32/progress_0007.png 120
+32 8 5 32x32/progress_0008.png 120
+48 12 8 48x48/progress_0001.png 120
+48 12 8 48x48/progress_0002.png 120
+48 12 8 48x48/progress_0003.png 120
+48 12 8 48x48/progress_0004.png 120
+48 12 8 48x48/progress_0005.png 120
+48 12 8 48x48/progress_0006.png 120
+48 12 8 48x48/progress_0007.png 120
+48 12 8 48x48/progress_0008.png 120
+64 16 10 64x64/progress_0001.png 120
+64 16 10 64x64/progress_0002.png 120
+64 16 10 64x64/progress_0003.png 120
+64 16 10 64x64/progress_0004.png 120
+64 16 10 64x64/progress_0005.png 120
+64 16 10 64x64/progress_0006.png 120
+64 16 10 64x64/progress_0007.png 120
+64 16 10 64x64/progress_0008.png 120
+96 24 16 96x96/progress_0001.png 120
+96 24 16 96x96/progress_0002.png 120
+96 24 16 96x96/progress_0003.png 120
+96 24 16 96x96/progress_0004.png 120
+96 24 16 96x96/progress_0005.png 120
+96 24 16 96x96/progress_0006.png 120
+96 24 16 96x96/progress_0007.png 120
+96 24 16 96x96/progress_0008.png 120
diff --git a/cursors/right_ptr.in b/cursors/right_ptr.in
deleted file mode 100644
index b93003227..000000000
--- a/cursors/right_ptr.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 17 4 24x24/right_ptr.png
-32 24 6 32x32/right_ptr.png
-48 34 8 48x48/right_ptr.png
-64 48 12 64x64/right_ptr.png
-96 68 16 96x96/right_ptr.png
diff --git a/cursors/right_side.in b/cursors/right_side.in
deleted file mode 100644
index cfa048966..000000000
--- a/cursors/right_side.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 20 13 24x24/right_side.png
-32 30 19 32x32/right_side.png
-48 40 26 48x48/right_side.png
-64 60 38 64x64/right_side.png
-96 80 52 96x96/right_side.png
diff --git a/cursors/right_tee.in b/cursors/right_tee.in
deleted file mode 100644
index ba48e8c1e..000000000
--- a/cursors/right_tee.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 20 13 24x24/right_tee.png
-32 30 19 32x32/right_tee.png
-48 40 26 48x48/right_tee.png
-64 60 38 64x64/right_tee.png
-96 80 52 96x96/right_tee.png
diff --git a/cursors/sb_down_arrow.in b/cursors/sb_down_arrow.in
deleted file mode 100644
index f0c9b8d22..000000000
--- a/cursors/sb_down_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 18 24x24/sb_down_arrow.png
-32 15 20 32x32/sb_down_arrow.png
-48 22 36 48x48/sb_down_arrow.png
-64 30 40 64x64/sb_down_arrow.png
-96 44 72 96x96/sb_down_arrow.png
diff --git a/cursors/sb_h_double_arrow.in b/cursors/sb_h_double_arrow.in
deleted file mode 100644
index 0d6021587..000000000
--- a/cursors/sb_h_double_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/sb_h_double_arrow.png
-32 15 15 32x32/sb_h_double_arrow.png
-48 22 22 48x48/sb_h_double_arrow.png
-64 30 30 64x64/sb_h_double_arrow.png
-96 44 4 96x96/sb_h_double_arrow.png
diff --git a/cursors/sb_left_arrow.in b/cursors/sb_left_arrow.in
deleted file mode 100644
index dffd9cbbe..000000000
--- a/cursors/sb_left_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 7 13 24x24/sb_left_arrow.png
-32 10 20 32x32/sb_left_arrow.png
-48 14 26 48x48/sb_left_arrow.png
-64 20 40 64x64/sb_left_arrow.png
-96 28 52 96x96/sb_left_arrow.png
diff --git a/cursors/sb_right_arrow.in b/cursors/sb_right_arrow.in
deleted file mode 100644
index 7d4a64f8f..000000000
--- a/cursors/sb_right_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 20 13 24x24/sb_right_arrow.png
-32 30 19 32x32/sb_right_arrow.png
-48 40 26 48x48/sb_right_arrow.png
-64 60 38 64x64/sb_right_arrow.png
-96 80 52 96x96/sb_right_arrow.png
diff --git a/cursors/sb_up_arrow.in b/cursors/sb_up_arrow.in
deleted file mode 100644
index 7bdc2c9f6..000000000
--- a/cursors/sb_up_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 12 4 24x24/sb_up_arrow.png
-32 18 6 32x32/sb_up_arrow.png
-48 24 8 48x48/sb_up_arrow.png
-64 36 12 64x64/sb_up_arrow.png
-96 48 16 96x96/sb_up_arrow.png
diff --git a/cursors/sb_v_double_arrow.in b/cursors/sb_v_double_arrow.in
deleted file mode 100644
index ad2f093ea..000000000
--- a/cursors/sb_v_double_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/sb_v_double_arrow.png
-32 15 15 32x32/sb_v_double_arrow.png
-48 22 22 48x48/sb_v_double_arrow.png
-64 30 30 64x64/sb_v_double_arrow.png
-96 44 44 96x96/sb_v_double_arrow.png
diff --git a/cursors/tcross.in b/cursors/tcross.in
deleted file mode 100644
index c1b3a1344..000000000
--- a/cursors/tcross.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/tcross.png
-32 15 15 32x32/tcross.png
-48 22 22 48x48/tcross.png
-64 30 30 64x64/tcross.png
-96 44 44 96x96/tcross.png
diff --git a/cursors/top_left_corner.in b/cursors/top_left_corner.in
deleted file mode 100644
index 700d540eb..000000000
--- a/cursors/top_left_corner.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 5 5 24x24/top_left_corner.png
-32 8 8 32x32/top_left_corner.png
-48 10 10 48x48/top_left_corner.png
-64 16 16 64x64/top_left_corner.png
-96 20 20 96x96/top_left_corner.png
diff --git a/cursors/top_right_corner.in b/cursors/top_right_corner.in
deleted file mode 100644
index 151cbf6ab..000000000
--- a/cursors/top_right_corner.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 18 5 24x24/top_right_corner.png
-32 26 8 32x32/top_right_corner.png
-48 36 10 48x48/top_right_corner.png
-64 52 16 64x64/top_right_corner.png
-96 72 20 96x96/top_right_corner.png
diff --git a/cursors/top_side.in b/cursors/top_side.in
deleted file mode 100644
index 1bc4cac2d..000000000
--- a/cursors/top_side.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 12 5 24x24/top_side.png
-32 18 8 32x32/top_side.png
-48 24 10 48x48/top_side.png
-64 36 16 64x64/top_side.png
-96 48 20 96x96/top_side.png
diff --git a/cursors/top_tee.in b/cursors/top_tee.in
deleted file mode 100644
index 8062987a5..000000000
--- a/cursors/top_tee.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 12 5 24x24/top_tee.png
-32 18 8 32x32/top_tee.png
-48 24 10 48x48/top_tee.png
-64 36 16 64x64/top_tee.png
-96 48 20 96x96/top_tee.png
diff --git a/cursors/ul_angle.in b/cursors/ul_angle.in
deleted file mode 100644
index 55f4f2a1c..000000000
--- a/cursors/ul_angle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 5 5 24x24/ul_angle.png
-32 8 8 32x32/ul_angle.png
-48 10 10 48x48/ul_angle.png
-64 16 16 64x64/ul_angle.png
-96 20 20 96x96/ul_angle.png
diff --git a/cursors/ur_angle.in b/cursors/ur_angle.in
deleted file mode 100644
index 108e80409..000000000
--- a/cursors/ur_angle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 18 5 24x24/ur_angle.png
-32 26 8 32x32/ur_angle.png
-48 36 10 48x48/ur_angle.png
-64 52 16 64x64/ur_angle.png
-96 72 20 96x96/ur_angle.png
diff --git a/cursors/wait.in b/cursors/wait.in
new file mode 100644
index 000000000..4dec031a5
--- /dev/null
+++ b/cursors/wait.in
@@ -0,0 +1,80 @@
+24 12 12 24x24/wait_0001.png 60
+24 12 12 24x24/wait_0002.png 60
+24 12 12 24x24/wait_0003.png 60
+24 12 12 24x24/wait_0004.png 60
+24 12 12 24x24/wait_0005.png 60
+24 12 12 24x24/wait_0006.png 60
+24 12 12 24x24/wait_0007.png 60
+24 12 12 24x24/wait_0008.png 60
+24 12 12 24x24/wait_0009.png 60
+24 12 12 24x24/wait_0010.png 60
+24 12 12 24x24/wait_0011.png 60
+24 12 12 24x24/wait_0012.png 60
+24 12 12 24x24/wait_0013.png 60
+24 12 12 24x24/wait_0014.png 60
+24 12 12 24x24/wait_0015.png 60
+24 12 12 24x24/wait_0016.png 60
+32 18 18 32x32/wait_0001.png 60
+32 18 18 32x32/wait_0002.png 60
+32 18 18 32x32/wait_0003.png 60
+32 18 18 32x32/wait_0004.png 60
+32 18 18 32x32/wait_0005.png 60
+32 18 18 32x32/wait_0006.png 60
+32 18 18 32x32/wait_0007.png 60
+32 18 18 32x32/wait_0008.png 60
+32 18 18 32x32/wait_0009.png 60
+32 18 18 32x32/wait_0010.png 60
+32 18 18 32x32/wait_0011.png 60
+32 18 18 32x32/wait_0012.png 60
+32 18 18 32x32/wait_0013.png 60
+32 18 18 32x32/wait_0014.png 60
+32 18 18 32x32/wait_0015.png 60
+32 18 18 32x32/wait_0016.png 60
+48 24 24 48x48/wait_0001.png 60
+48 24 24 48x48/wait_0002.png 60
+48 24 24 48x48/wait_0003.png 60
+48 24 24 48x48/wait_0004.png 60
+48 24 24 48x48/wait_0005.png 60
+48 24 24 48x48/wait_0006.png 60
+48 24 24 48x48/wait_0007.png 60
+48 24 24 48x48/wait_0008.png 60
+48 24 24 48x48/wait_0009.png 60
+48 24 24 48x48/wait_0010.png 60
+48 24 24 48x48/wait_0011.png 60
+48 24 24 48x48/wait_0012.png 60
+48 24 24 48x48/wait_0013.png 60
+48 24 24 48x48/wait_0014.png 60
+48 24 24 48x48/wait_0015.png 60
+48 24 24 48x48/wait_0016.png 60
+64 36 36 64x64/wait_0001.png 60
+64 36 36 64x64/wait_0002.png 60
+64 36 36 64x64/wait_0003.png 60
+64 36 36 64x64/wait_0004.png 60
+64 36 36 64x64/wait_0005.png 60
+64 36 36 64x64/wait_0006.png 60
+64 36 36 64x64/wait_0007.png 60
+64 36 36 64x64/wait_0008.png 60
+64 36 36 64x64/wait_0009.png 60
+64 36 36 64x64/wait_0010.png 60
+64 36 36 64x64/wait_0011.png 60
+64 36 36 64x64/wait_0012.png 60
+64 36 36 64x64/wait_0013.png 60
+64 36 36 64x64/wait_0014.png 60
+64 36 36 64x64/wait_0015.png 60
+64 36 36 64x64/wait_0016.png 60
+96 48 48 96x96/wait_0001.png 60
+96 48 48 96x96/wait_0002.png 60
+96 48 48 96x96/wait_0003.png 60
+96 48 48 96x96/wait_0004.png 60
+96 48 48 96x96/wait_0005.png 60
+96 48 48 96x96/wait_0006.png 60
+96 48 48 96x96/wait_0007.png 60
+96 48 48 96x96/wait_0008.png 60
+96 48 48 96x96/wait_0009.png 60
+96 48 48 96x96/wait_0010.png 60
+96 48 48 96x96/wait_0011.png 60
+96 48 48 96x96/wait_0012.png 60
+96 48 48 96x96/wait_0013.png 60
+96 48 48 96x96/wait_0014.png 60
+96 48 48 96x96/wait_0015.png 60
+96 48 48 96x96/wait_0016.png 60
diff --git a/cursors/watch.in b/cursors/watch.in
deleted file mode 100644
index 7444b2d53..000000000
--- a/cursors/watch.in
+++ /dev/null
@@ -1,80 +0,0 @@
-24 12 12 24x24/watch_0001.png 60
-24 12 12 24x24/watch_0002.png 60
-24 12 12 24x24/watch_0003.png 60
-24 12 12 24x24/watch_0004.png 60
-24 12 12 24x24/watch_0005.png 60
-24 12 12 24x24/watch_0006.png 60
-24 12 12 24x24/watch_0007.png 60
-24 12 12 24x24/watch_0008.png 60
-24 12 12 24x24/watch_0009.png 60
-24 12 12 24x24/watch_0010.png 60
-24 12 12 24x24/watch_0011.png 60
-24 12 12 24x24/watch_0012.png 60
-24 12 12 24x24/watch_0013.png 60
-24 12 12 24x24/watch_0014.png 60
-24 12 12 24x24/watch_0015.png 60
-24 12 12 24x24/watch_0016.png 60
-32 18 18 32x32/watch_0001.png 60
-32 18 18 32x32/watch_0002.png 60
-32 18 18 32x32/watch_0003.png 60
-32 18 18 32x32/watch_0004.png 60
-32 18 18 32x32/watch_0005.png 60
-32 18 18 32x32/watch_0006.png 60
-32 18 18 32x32/watch_0007.png 60
-32 18 18 32x32/watch_0008.png 60
-32 18 18 32x32/watch_0009.png 60
-32 18 18 32x32/watch_0010.png 60
-32 18 18 32x32/watch_0011.png 60
-32 18 18 32x32/watch_0012.png 60
-32 18 18 32x32/watch_0013.png 60
-32 18 18 32x32/watch_0014.png 60
-32 18 18 32x32/watch_0015.png 60
-32 18 18 32x32/watch_0016.png 60
-48 24 24 48x48/watch_0001.png 60
-48 24 24 48x48/watch_0002.png 60
-48 24 24 48x48/watch_0003.png 60
-48 24 24 48x48/watch_0004.png 60
-48 24 24 48x48/watch_0005.png 60
-48 24 24 48x48/watch_0006.png 60
-48 24 24 48x48/watch_0007.png 60
-48 24 24 48x48/watch_0008.png 60
-48 24 24 48x48/watch_0009.png 60
-48 24 24 48x48/watch_0010.png 60
-48 24 24 48x48/watch_0011.png 60
-48 24 24 48x48/watch_0012.png 60
-48 24 24 48x48/watch_0013.png 60
-48 24 24 48x48/watch_0014.png 60
-48 24 24 48x48/watch_0015.png 60
-48 24 24 48x48/watch_0016.png 60
-64 36 36 64x64/watch_0001.png 60
-64 36 36 64x64/watch_0002.png 60
-64 36 36 64x64/watch_0003.png 60
-64 36 36 64x64/watch_0004.png 60
-64 36 36 64x64/watch_0005.png 60
-64 36 36 64x64/watch_0006.png 60
-64 36 36 64x64/watch_0007.png 60
-64 36 36 64x64/watch_0008.png 60
-64 36 36 64x64/watch_0009.png 60
-64 36 36 64x64/watch_0010.png 60
-64 36 36 64x64/watch_0011.png 60
-64 36 36 64x64/watch_0012.png 60
-64 36 36 64x64/watch_0013.png 60
-64 36 36 64x64/watch_0014.png 60
-64 36 36 64x64/watch_0015.png 60
-64 36 36 64x64/watch_0016.png 60
-96 48 48 96x96/watch_0001.png 60
-96 48 48 96x96/watch_0002.png 60
-96 48 48 96x96/watch_0003.png 60
-96 48 48 96x96/watch_0004.png 60
-96 48 48 96x96/watch_0005.png 60
-96 48 48 96x96/watch_0006.png 60
-96 48 48 96x96/watch_0007.png 60
-96 48 48 96x96/watch_0008.png 60
-96 48 48 96x96/watch_0009.png 60
-96 48 48 96x96/watch_0010.png 60
-96 48 48 96x96/watch_0011.png 60
-96 48 48 96x96/watch_0012.png 60
-96 48 48 96x96/watch_0013.png 60
-96 48 48 96x96/watch_0014.png 60
-96 48 48 96x96/watch_0015.png 60
-96 48 48 96x96/watch_0016.png 60