diff --git a/cursors/24/question_arrow.svg b/cursors/24/help.svg
similarity index 100%
rename from cursors/24/question_arrow.svg
rename to cursors/24/help.svg
diff --git a/cursors/24/crossed_circle.svg b/cursors/24/not-allowed.svg
similarity index 100%
rename from cursors/24/crossed_circle.svg
rename to cursors/24/not-allowed.svg
diff --git a/cursors/24/hand2.svg b/cursors/24/pointer.svg
similarity index 100%
rename from cursors/24/hand2.svg
rename to cursors/24/pointer.svg
diff --git a/cursors/24/xterm.svg b/cursors/24/text.svg
similarity index 100%
rename from cursors/24/xterm.svg
rename to cursors/24/text.svg
diff --git a/cursors/crossed_circle.in b/cursors/crossed_circle.in
deleted file mode 100644
index 3e3dc1b99..000000000
--- a/cursors/crossed_circle.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/crossed_circle.png
-32 15 15 32x32/crossed_circle.png
-48 22 22 48x48/crossed_circle.png
-64 30 30 64x64/crossed_circle.png
-96 44 44 96x96/crossed_circle.png
diff --git a/cursors/hand2.in b/cursors/hand2.in
deleted file mode 100644
index cef426652..000000000
--- a/cursors/hand2.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 9 5 24x24/hand2.png
-32 14 8 32x32/hand2.png
-48 18 10 48x48/hand2.png
-64 28 16 64x64/hand2.png
-96 36 20 96x96/hand2.png
diff --git a/cursors/help.in b/cursors/help.in
new file mode 100644
index 000000000..89efedef4
--- /dev/null
+++ b/cursors/help.in
@@ -0,0 +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
diff --git a/cursors/meson.build b/cursors/meson.build
index a49804fe7..d4f38416b 100644
--- a/cursors/meson.build
+++ b/cursors/meson.build
@@ -12,7 +12,6 @@ cursors = [
     'circle',
     'copy',
     'cross',
-    'crossed_circle',
     'crosshair',
     'dnd-ask',
     'dnd-copy',
@@ -23,7 +22,7 @@ cursors = [
     'fd_double_arrow',
     'grabbing',
     'hand1',
-    'hand2',
+    'help',
     'left_ptr',
     'left_side',
     'left_tee',
@@ -32,9 +31,10 @@ cursors = [
     'lr_angle',
     'move',
     'no-drop',
+    'not-allowed',
     'pencil',
     'plus',
-    'question_arrow',
+    'pointer',
     'right_ptr',
     'right_side',
     'right_tee',
@@ -45,6 +45,7 @@ cursors = [
     'sb_up_arrow',
     'sb_v_double_arrow',
     'tcross',
+    'text',
     'top_left_corner',
     'top_right_corner',
     'top_side',
@@ -53,7 +54,6 @@ cursors = [
     'ur_angle',
     'vertical-text',
     'X_cursor',
-    'xterm',
     'zoom-in',
     'zoom-out'
 ]
@@ -143,18 +143,25 @@ endforeach
 links = []
 
 links += [[
-  'left_ptr',
+  'bd_double_arrow',
   [
-      'top_left_arrow',
-      'arrow'
+      'c7088f0f3e6c8088236ef8e1e3e70000'
   ]
 ]]
 
 links += [[
-  'right_ptr',
+  'copy',
   [
-      'draft_small',
-      'draft_large'
+      '6407b0e94181790501fd1e167b474872',
+      '1081e37283d90000800003c07f3ef6bf'
+  ]
+]]
+
+links += [[
+  'cross',
+  [
+      'diamond_cross',
+      'cross_reverse'
   ]
 ]]
 
@@ -169,114 +176,111 @@ links += [[
 ]]
 
 links += [[
-  'X_cursor',
+  'fd_double_arrow',
   [
-      'pirate'
+      'fcf1c3c7cd4491d801f1e1c78f100000'
   ]
 ]]
 
 links += [[
-  'question_arrow',
+  'grabbing',
   [
-      'left_ptr_help',
-      'help',
-      'd9ce0ab605698f320427677b458ad60b',
-      '5c6cd98b3f3ebcb1f9c7f1c204630408'
+      'fleur'
   ]
 ]]
 
 links += [[
-  'sb_v_double_arrow',
+  'help',
   [
-      'v_double_arrow',
-      'double_arrow',
-      '00008160000006810000408080010102',
-      '2870a09082c103050810ffdffffe0204'
+      'left_ptr_help',
+      'question_arrow',
+      'd9ce0ab605698f320427677b458ad60b',
+      '5c6cd98b3f3ebcb1f9c7f1c204630408'
   ]
 ]]
 
 links += [[
-  'sb_h_double_arrow',
+  'left_ptr',
   [
-      'h_double_arrow',
-      '028006030e0e7ebffc7f7070c0600140',
-      '14fef782d02440884392942c11205230'
+      'arrow',
+      'top_left_arrow',
+      '08e8e1c95fe2fc01f976f1e063a24ccd',
+      '3ecb610c1bf2410f44200f48c40d3599'
   ]
 ]]
 
 links += [[
-  'fd_double_arrow',
+  'link',
   [
-      'fcf1c3c7cd4491d801f1e1c78f100000'
+      '3085a0e285430894940527032f8b26df',
+      '640fb0e74195791501fd1ed57b41487f'
   ]
 ]]
 
 links += [[
-  'bd_double_arrow',
+  'move',
   [
-      'c7088f0f3e6c8088236ef8e1e3e70000'
+      '9081237383d90e509aa00f00170e968f',
+      '4498f0e0c1937ffe01fd06f973665830'
   ]
 ]]
 
 links += [[
-  'hand2',
+  'not-allowed',
   [
-      'hand',
-      '9d800788f1b08800ae810202380a0822'
+      'crossed_circle',
+      '03b6e0fcb3499374a867c041f52298f0'
   ]
 ]]
 
 links += [[
-  'grabbing',
+  'pointer',
   [
-      'fleur'
+      'hand',
+      'hand2',
+      '9d800788f1b08800ae810202380a0822'
   ]
 ]]
 
-links += [[
-  'cross',
-  [
-      'diamond_cross',
-      'cross_reverse'
-  ]
-]]
 
 links += [[
-  'crossed_circle',
+  'right_ptr',
   [
-      '03b6e0fcb3499374a867c041f52298f0'
+      'draft_small',
+      'draft_large'
   ]
 ]]
 
 links += [[
-  'move',
+  'sb_h_double_arrow',
   [
-      '9081237383d90e509aa00f00170e968f',
-      '4498f0e0c1937ffe01fd06f973665830'
+      'h_double_arrow',
+      '028006030e0e7ebffc7f7070c0600140',
+      '14fef782d02440884392942c11205230'
   ]
 ]]
 
 links += [[
-  'copy',
+  'sb_v_double_arrow',
   [
-      '6407b0e94181790501fd1e167b474872',
-      '1081e37283d90000800003c07f3ef6bf'
+      'v_double_arrow',
+      'double_arrow',
+      '00008160000006810000408080010102',
+      '2870a09082c103050810ffdffffe0204'
   ]
 ]]
 
 links += [[
-  'link',
+  'text',
   [
-      '3085a0e285430894940527032f8b26df',
-      '640fb0e74195791501fd1ed57b41487f'
+      'xterm'
   ]
 ]]
 
 links += [[
-  'left_ptr',
+  'X_cursor',
   [
-      '08e8e1c95fe2fc01f976f1e063a24ccd',
-      '3ecb610c1bf2410f44200f48c40d3599'
+      'pirate'
   ]
 ]]
 
diff --git a/cursors/not-allowed.in b/cursors/not-allowed.in
new file mode 100644
index 000000000..3e7ae462d
--- /dev/null
+++ b/cursors/not-allowed.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/not-allowed.png
+32 15 15 32x32/not-allowed.png
+48 22 22 48x48/not-allowed.png
+64 30 30 64x64/not-allowed.png
+96 44 44 96x96/not-allowed.png
diff --git a/cursors/pointer.in b/cursors/pointer.in
new file mode 100644
index 000000000..eb3fa6dad
--- /dev/null
+++ b/cursors/pointer.in
@@ -0,0 +1,5 @@
+24 9 5 24x24/pointer.png
+32 14 8 32x32/pointer.png
+48 18 10 48x48/pointer.png
+64 28 16 64x64/pointer.png
+96 36 20 96x96/pointer.png
diff --git a/cursors/question_arrow.in b/cursors/question_arrow.in
deleted file mode 100644
index f58dfa808..000000000
--- a/cursors/question_arrow.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 12 21 24x24/question_arrow.png
-32 16 30 32x32/question_arrow.png
-48 24 42 48x48/question_arrow.png
-64 32 60 64x64/question_arrow.png
-96 48 84 96x96/question_arrow.png
diff --git a/cursors/text.in b/cursors/text.in
new file mode 100644
index 000000000..16c42e2e2
--- /dev/null
+++ b/cursors/text.in
@@ -0,0 +1,5 @@
+24 11 11 24x24/text.png
+32 15 15 32x32/text.png
+48 22 22 48x48/text.png
+64 30 30 64x64/text.png
+96 44 44 96x96/text.png
diff --git a/cursors/xterm.in b/cursors/xterm.in
deleted file mode 100644
index f8d8a8d8b..000000000
--- a/cursors/xterm.in
+++ /dev/null
@@ -1,5 +0,0 @@
-24 11 11 24x24/xterm.png
-32 15 15 32x32/xterm.png
-48 22 22 48x48/xterm.png
-64 30 30 64x64/xterm.png
-96 44 44 96x96/xterm.png