diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java
index e43f27d3f..a344041b9 100644
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java
+++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java
@@ -13,10 +13,11 @@
 package org.eclipse.wb.gef.core.tools;
 
 import org.eclipse.wb.gef.core.requests.AbstractCreateRequest;
-import org.eclipse.wb.internal.gef.core.SharedCursors;
 
+import org.eclipse.draw2d.Cursors;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.Request;
+import org.eclipse.gef.SharedCursors;
 import org.eclipse.gef.tools.TargetingTool;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
@@ -32,8 +33,8 @@ public abstract class AbstractCreationTool extends TargetingTool {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	public AbstractCreationTool() {
-		setDefaultCursor(SharedCursors.CURSOR_ADD);
-		setDisabledCursor(SharedCursors.CURSOR_NO);
+		setDefaultCursor(SharedCursors.CURSOR_TREE_ADD);
+		setDisabledCursor(Cursors.NO);
 	}
 
 	////////////////////////////////////////////////////////////////////////////
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java
index f2c63fad4..e723f5a96 100644
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java
+++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java
@@ -16,6 +16,7 @@
 import org.eclipse.wb.internal.gef.core.IObjectInfoEditPart;
 import org.eclipse.wb.internal.gef.core.SharedCursors;
 
+import org.eclipse.draw2d.Cursors;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.gef.EditPart;
@@ -50,10 +51,11 @@ public class DragEditPartTracker extends SelectEditPartTracker {
 	// Constructor
 	//
 	////////////////////////////////////////////////////////////////////////////
+	@SuppressWarnings("deprecation")
 	public DragEditPartTracker(EditPart sourceEditPart) {
 		super(sourceEditPart);
 		setDefaultCursor(SharedCursors.CURSOR_MOVE);
-		setDisabledCursor(SharedCursors.CURSOR_NO);
+		setDisabledCursor(Cursors.NO);
 	}
 
 	////////////////////////////////////////////////////////////////////////////
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java
index 4c7989c8d..b0d3afa5d 100644
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java
+++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java
@@ -51,9 +51,11 @@ public class SharedCursors extends Cursors {
 		return CURSOR_AT_200_ZOOM.getImageData(100);
 	});
 
-	public static final Cursor CURSOR_ADD = createCursor("icons/add_cursor.svg");
+	/**
+	 * TODO gef - Remove together with DragEditPartTracker
+	 */
+	@Deprecated
 	public static final Cursor CURSOR_MOVE = createCursor("icons/move_cursor.svg");
-	public static final Cursor CURSOR_NO = createCursor("icons/no_cursor.svg");
 
 	private static Cursor createCursor(String sourceName) {
 		if (DesignerPlugin.isSvgSupported()) {
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png
deleted file mode 100644
index f43a2fde3..000000000
Binary files a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png and /dev/null differ
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.svg b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.svg
deleted file mode 100644
index 6b71f00b9..000000000
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
-   version="1.1"
-   id="svg1"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1">
-    <linearGradient
-       id="linearGradient3">
-      <stop
-         style="stop-color:#70b87a;stop-opacity:1;"
-         offset="0"
-         id="stop3" />
-      <stop
-         style="stop-color:#299548;stop-opacity:1;"
-         offset="1"
-         id="stop4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1">
-      <stop
-         style="stop-color:#3c9c55;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#1a8e3d;stop-opacity:1;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="10.961023"
-       y1="17.062119"
-       x2="25.077953"
-       y2="31.093788"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient3"
-       id="linearGradient4"
-       x1="10.961023"
-       y1="17.062119"
-       x2="25.077953"
-       y2="31.093788"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <circle
-       style="fill:url(#linearGradient4);fill-opacity:1;stroke:url(#linearGradient2);stroke-width:1;stroke-opacity:1"
-       id="path1"
-       cx="18"
-       cy="24"
-       r="6.5" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
-       d="m 15,25 v -2 h 2 v -2 h 2 v 2 h 2 v 2 h -2 v 2 h -2 v -2 z"
-       id="path2" />
-  </g>
-</svg>
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png
deleted file mode 100644
index a675bedab..000000000
Binary files a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png and /dev/null differ
diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg
deleted file mode 100644
index cc552c222..000000000
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
-   version="1.1"
-   id="svg1"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1">
-    <linearGradient
-       id="linearGradient3">
-      <stop
-         style="stop-color:#fee1a7;stop-opacity:1;"
-         offset="0"
-         id="stop3" />
-      <stop
-         style="stop-color:#da5e35;stop-opacity:1;"
-         offset="1"
-         id="stop4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1">
-      <stop
-         style="stop-color:#e4967b;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#d74f23;stop-opacity:1;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="10.961023"
-       y1="17.062119"
-       x2="25.077953"
-       y2="31.093788"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient3"
-       id="linearGradient4"
-       x1="10.961023"
-       y1="17.062119"
-       x2="25.077953"
-       y2="31.093788"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <circle
-       style="fill:url(#linearGradient4);fill-opacity:1;stroke:url(#linearGradient2);stroke-width:1;stroke-opacity:1"
-       id="path1"
-       cx="18"
-       cy="24"
-       r="6.5" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
-       id="rect4"
-       width="6"
-       height="2"
-       x="15"
-       y="23" />
-  </g>
-</svg>
diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java
index 6c436b77f..bf72cf0fd 100644
--- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java
+++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java
@@ -14,9 +14,10 @@
 
 import org.eclipse.wb.gef.core.tools.CreationTool;
 import org.eclipse.wb.gef.graphical.tools.SelectionTool;
-import org.eclipse.wb.internal.gef.core.SharedCursors;
 
+import org.eclipse.draw2d.Cursors;
 import org.eclipse.gef.EditPart;
+import org.eclipse.gef.SharedCursors;
 import org.eclipse.gef.Tool;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.requests.CreationFactory;
@@ -39,11 +40,11 @@ public class CreationToolCursorTest extends GefCursorTestCase {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	public static final Cursor CURSOR_ADD() {
-		return SharedCursors.CURSOR_ADD;
+		return SharedCursors.CURSOR_TREE_ADD;
 	}
 
 	public static final Cursor CURSOR_NO() {
-		return SharedCursors.CURSOR_NO;
+		return Cursors.NO;
 	}
 
 	////////////////////////////////////////////////////////////////////////////