diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.svg
new file mode 100644
index 000000000..b9ed634d2
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.svg
@@ -0,0 +1,91 @@
+
+
+
+
diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.svg
new file mode 100644
index 000000000..d74657155
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.svg
@@ -0,0 +1,92 @@
+
+
+
+
diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.svg
new file mode 100644
index 000000000..ecdeb40e0
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.svg
@@ -0,0 +1,157 @@
+
+
+
+
diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.svg
new file mode 100644
index 000000000..a1daa3cf0
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.svg
@@ -0,0 +1,182 @@
+
+
+
+
diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.svg
new file mode 100644
index 000000000..2ade90792
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.svg
@@ -0,0 +1,434 @@
+
+
+
+
diff --git a/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.svg b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.svg
new file mode 100644
index 000000000..293aace4e
--- /dev/null
+++ b/icons/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.svg
@@ -0,0 +1,414 @@
+
+
+
+
diff --git a/org.eclipse.gef/src/org/eclipse/gef/SharedImages.java b/org.eclipse.gef/src/org/eclipse/gef/SharedImages.java
index 1bae35118..1efb8bb31 100644
--- a/org.eclipse.gef/src/org/eclipse/gef/SharedImages.java
+++ b/org.eclipse.gef/src/org/eclipse/gef/SharedImages.java
@@ -73,8 +73,8 @@ public class SharedImages {
public static final ImageDescriptor DESC_MARQUEE_TOOL_CONNECTIONS_24;
static {
- DESC_SELECTION_TOOL_16 = createDescriptor("icons/arrow16.gif"); //$NON-NLS-1$
- DESC_SELECTION_TOOL_24 = createDescriptor("icons/arrow24.gif"); //$NON-NLS-1$
+ DESC_SELECTION_TOOL_16 = createDescriptor("icons/arrow16.png"); //$NON-NLS-1$
+ DESC_SELECTION_TOOL_24 = createDescriptor("icons/arrow24.png"); //$NON-NLS-1$
DESC_MARQUEE_TOOL_16 = createDescriptor("icons/marquee16.gif"); //$NON-NLS-1$
DESC_MARQUEE_TOOL_24 = createDescriptor("icons/marquee24.gif"); //$NON-NLS-1$
DESC_MARQUEE_TOOL_NODES_16 = createDescriptor("icons/marquee_nodes16.gif"); //$NON-NLS-1$
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.gif b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.gif
deleted file mode 100644
index 3158f3f03..000000000
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.gif and /dev/null differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.png
new file mode 100644
index 000000000..f54db8ef7
Binary files /dev/null and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16@2x.png
new file mode 100644
index 000000000..21a381c8c
Binary files /dev/null and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow16@2x.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.gif b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.gif
deleted file mode 100644
index d45c95c56..000000000
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.gif and /dev/null differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.png
new file mode 100644
index 000000000..ed3faf1e1
Binary files /dev/null and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24@2x.png
new file mode 100644
index 000000000..92f4ff010
Binary files /dev/null and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/arrow24@2x.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.png
index 0dd8f7313..8585cf9be 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor@2x.png
index 7450e0a92..c49040d46 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor@2x.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plug-cursor@2x.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.png
index c96ff7628..2e383fba1 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor@2x.png
index 7c2bbfc72..209114ce1 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor@2x.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/plugnot-cursor@2x.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.png
index e6af41d19..e43dbb4de 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor@2x.png
index ce7b88d3f..013af47df 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor@2x.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_add-cursor@2x.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.png
index c7b3a8f20..1865ce65a 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor.png differ
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor@2x.png b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor@2x.png
index f6a848206..a466c3007 100644
Binary files a/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor@2x.png and b/org.eclipse.gef/src/org/eclipse/gef/internal/icons/tree_move-cursor@2x.png differ