diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 35cd2c3fc6..6f27c7457a 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -29,10 +29,10 @@ var DragMotionResult = {
 };
 
 var DRAG_CURSOR_MAP = {
-    0: Cinnamon.Cursor.DND_UNSUPPORTED_TARGET,
-    1: Cinnamon.Cursor.DND_COPY,
-    2: Cinnamon.Cursor.DND_MOVE,
-    3: Cinnamon.Cursor.POINTING_HAND
+    0: Cinnamon.Cursor.NO_DROP,
+    1: Cinnamon.Cursor.COPY,
+    2: Cinnamon.Cursor.MOVE,
+    3: Cinnamon.Cursor.POINTER
 };
 
 var DragDropResult = {
@@ -269,7 +269,7 @@ var _Draggable = new Lang.Class({
         if (this._onEventId)
             this._ungrabActor(event);
         this._grabEvents(event);
-        global.set_cursor(Cinnamon.Cursor.DND_IN_DRAG);
+        global.set_cursor(Cinnamon.Cursor.NO_DROP);
 
         this._dragX = this._dragStartX = stageX;
         this._dragY = this._dragStartY = stageY;
@@ -446,7 +446,7 @@ var _Draggable = new Lang.Class({
             target = target.get_parent();
         }
         if (result in DRAG_CURSOR_MAP) global.set_cursor(DRAG_CURSOR_MAP[result]);
-        else global.set_cursor(Cinnamon.Cursor.DND_IN_DRAG);
+        else global.set_cursor(Cinnamon.Cursor.NO_DROP);
         return false;
     },
 
diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c
index e57fc7ca4c..d86f7f07fc 100644
--- a/src/cinnamon-global.c
+++ b/src/cinnamon-global.c
@@ -587,32 +587,32 @@ cinnamon_global_set_cursor (CinnamonGlobal *global,
 
   switch (type)
     {
-    case CINNAMON_CURSOR_DND_IN_DRAG:
-      ret_curs = META_CURSOR_DND_IN_DRAG;
+    case CINNAMON_CURSOR_NOT_ALLOWED:
+      ret_curs = META_CURSOR_NOT_ALLOWED;
       break;
-    case CINNAMON_CURSOR_DND_MOVE:
-      ret_curs = META_CURSOR_DND_MOVE;
+    case CINNAMON_CURSOR_MOVE:
+      ret_curs = META_CURSOR_MOVE;
       break;
-    case CINNAMON_CURSOR_DND_COPY:
-      ret_curs = META_CURSOR_DND_COPY;
+    case CINNAMON_CURSOR_COPY:
+      ret_curs = META_CURSOR_DND_ASK;
       break;
-    case CINNAMON_CURSOR_DND_UNSUPPORTED_TARGET:
-      ret_curs = META_CURSOR_DND_UNSUPPORTED_TARGET;
+    case CINNAMON_CURSOR_NO_DROP:
+      ret_curs = META_CURSOR_NO_DROP;
       break;
-    case CINNAMON_CURSOR_POINTING_HAND:
-      ret_curs = META_CURSOR_POINTING_HAND;
+    case CINNAMON_CURSOR_POINTER:
+      ret_curs = META_CURSOR_POINTER;
       break;
     case CINNAMON_CURSOR_RESIZE_BOTTOM:
-      ret_curs = META_CURSOR_SOUTH_RESIZE;
+      ret_curs = META_CURSOR_S_RESIZE;
       break;
     case CINNAMON_CURSOR_RESIZE_TOP:
-      ret_curs = META_CURSOR_NORTH_RESIZE;
+      ret_curs = META_CURSOR_N_RESIZE;
       break;
     case CINNAMON_CURSOR_RESIZE_LEFT:
-      ret_curs = META_CURSOR_WEST_RESIZE;
+      ret_curs = META_CURSOR_W_RESIZE;
       break;
     case CINNAMON_CURSOR_RESIZE_RIGHT:
-      ret_curs = META_CURSOR_EAST_RESIZE;
+      ret_curs = META_CURSOR_E_RESIZE;
       break;
     case CINNAMON_CURSOR_RESIZE_BOTTOM_RIGHT:
       ret_curs = META_CURSOR_SE_RESIZE;
@@ -630,7 +630,7 @@ cinnamon_global_set_cursor (CinnamonGlobal *global,
       ret_curs = META_CURSOR_CROSSHAIR;
       break;
     case CINNAMON_CURSOR_TEXT:
-      ret_curs = META_CURSOR_IBEAM;
+      ret_curs = META_CURSOR_TEXT;
       break;
     default:
       g_return_if_reached ();
@@ -1625,4 +1625,4 @@ cinnamon_global_alloc_leak (CinnamonGlobal *global, gint mb)
                                       "xxxxxxxxxxxxxxxxxxxxxxxx"
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/cinnamon-global.h b/src/cinnamon-global.h
index d0f057ac71..ec34ffc25c 100644
--- a/src/cinnamon-global.h
+++ b/src/cinnamon-global.h
@@ -59,11 +59,11 @@ void     cinnamon_global_set_stage_input_region (CinnamonGlobal         *global,
 
 /* X utilities */
 typedef enum {
-  CINNAMON_CURSOR_DND_IN_DRAG,
-  CINNAMON_CURSOR_DND_UNSUPPORTED_TARGET,
-  CINNAMON_CURSOR_DND_MOVE,
-  CINNAMON_CURSOR_DND_COPY,
-  CINNAMON_CURSOR_POINTING_HAND,
+  CINNAMON_CURSOR_NOT_ALLOWED,
+  CINNAMON_CURSOR_NO_DROP,
+  CINNAMON_CURSOR_MOVE,
+  CINNAMON_CURSOR_COPY,
+  CINNAMON_CURSOR_POINTER,
   CINNAMON_CURSOR_RESIZE_BOTTOM,
   CINNAMON_CURSOR_RESIZE_TOP,
   CINNAMON_CURSOR_RESIZE_LEFT,