diff --git a/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh.png b/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh.png
new file mode 100644
index 0000000..a8670b4
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh@2x.png b/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh@2x.png
new file mode 100644
index 0000000..dd6787d
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/dlcl16/refresh@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus.png
new file mode 100644
index 0000000..30312ed
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus@2x.png
new file mode 100644
index 0000000..1554674
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/focus@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2.png
new file mode 100644
index 0000000..ff32a35
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2@2x.png
new file mode 100644
index 0000000..29bd252
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/nav_refresh_2@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav.png
new file mode 100644
index 0000000..9fcc646
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav@2x.png
new file mode 100644
index 0000000..d46b3a0
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/next_nav@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav.png
new file mode 100644
index 0000000..f2e6a03
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav@2x.png
new file mode 100644
index 0000000..8e26ea4
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/prev_nav@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh.png
new file mode 100644
index 0000000..79df522
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh@2x.png
new file mode 100644
index 0000000..8bac975
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2.png
new file mode 100644
index 0000000..c9deba2
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2@2x.png
new file mode 100644
index 0000000..c54fb20
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/refresh_2@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj.png
new file mode 100644
index 0000000..628bdf8
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj@2x.png b/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj@2x.png
new file mode 100644
index 0000000..05793d7
--- /dev/null
+++ b/bundles/org.eclipse.ui.glance/icons/full/elcl16/searchm_obj@2x.png
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/next.gif b/bundles/org.eclipse.ui.glance/icons/next.gif
deleted file mode 100644
index 8667900..0000000
--- a/bundles/org.eclipse.ui.glance/icons/next.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/prev.gif b/bundles/org.eclipse.ui.glance/icons/prev.gif
deleted file mode 100644
index cd9a705..0000000
--- a/bundles/org.eclipse.ui.glance/icons/prev.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/search.png b/bundles/org.eclipse.ui.glance/icons/search.png
deleted file mode 100644
index 6c05b9b..0000000
--- a/bundles/org.eclipse.ui.glance/icons/search.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/update_1.gif b/bundles/org.eclipse.ui.glance/icons/update_1.gif
deleted file mode 100644
index 3ca04d0..0000000
--- a/bundles/org.eclipse.ui.glance/icons/update_1.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/update_2.gif b/bundles/org.eclipse.ui.glance/icons/update_2.gif
deleted file mode 100644
index 3241d7c..0000000
--- a/bundles/org.eclipse.ui.glance/icons/update_2.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/icons/update_done.gif b/bundles/org.eclipse.ui.glance/icons/update_done.gif
deleted file mode 100644
index e4a1d38..0000000
--- a/bundles/org.eclipse.ui.glance/icons/update_done.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.ui.glance/plugin.xml b/bundles/org.eclipse.ui.glance/plugin.xml
index bc87ba7..822e787 100644
--- a/bundles/org.eclipse.ui.glance/plugin.xml
+++ b/bundles/org.eclipse.ui.glance/plugin.xml
@@ -131,7 +131,7 @@
 		<imageprovider 
 			id="org.eclipse.ui.glance.markerProvider"
 			markertype="org.eclipse.ui.glance.marker"
-			icon="icons/marker.gif">
+			icon="icons/full/elcl16/searchm_obj.png">
 		</imageprovider>
 	</extension>
 	
@@ -150,7 +150,7 @@
 		<specification
 			annotationType="org.eclipse.ui.glance.highlight"
 			label="Glance Results"
-			icon="icons/marker.gif"
+			icon="icons/full/elcl16/searchm_obj.png"
 			textPreferenceKey="glanceText"
 			textPreferenceValue="false"
 			highlightPreferenceKey="glanceHighlight"
@@ -175,7 +175,7 @@
         colorPreferenceValue="255,128,0"
         highlightPreferenceKey="glanceHighlight"
         highlightPreferenceValue="true"
-        icon="icons/marker.gif"
+        icon="icons/full/elcl16/searchm_obj.png"
         isGoToNextNavigationTarget="false"
         isGoToNextNavigationTargetKey="glanceGoNext"
         isGoToPreviousNavigationTarget="false"
diff --git a/bundles/org.eclipse.ui.glance/src/org/eclipse/ui/glance/internal/GlancePlugin.java b/bundles/org.eclipse.ui.glance/src/org/eclipse/ui/glance/internal/GlancePlugin.java
index 5830b05..64b38d9 100644
--- a/bundles/org.eclipse.ui.glance/src/org/eclipse/ui/glance/internal/GlancePlugin.java
+++ b/bundles/org.eclipse.ui.glance/src/org/eclipse/ui/glance/internal/GlancePlugin.java
@@ -34,13 +34,13 @@
 	private static final String IMG_PREFIX = "icons/";
 
 	public static final String IMG_WAIT = IMG_PREFIX + "wait.gif";
-	public static final String IMG_NEXT = IMG_PREFIX + "next.gif";
-	public static final String IMG_PREV = IMG_PREFIX + "prev.gif";
-	public static final String IMG_SEARCH = IMG_PREFIX + "search.png";
-	public static final String IMG_START_INDEXING = IMG_PREFIX + "update_1.gif";
-	public static final String IMG_END_INDEXING = IMG_PREFIX + "update_2.gif";
+	public static final String IMG_NEXT = IMG_PREFIX + "full/elcl16/next_nav.png";
+	public static final String IMG_PREV = IMG_PREFIX + "full/elcl16/prev_nav.png";
+	public static final String IMG_SEARCH = IMG_PREFIX + "full/elcl16/focus.png";
+	public static final String IMG_START_INDEXING = IMG_PREFIX + "full/elcl16/refresh.png";
+	public static final String IMG_END_INDEXING = IMG_PREFIX + "full/elcl16/refresh_2.png";
 	public static final String IMG_INDEXING_FINISHED = IMG_PREFIX
-			+ "update_done.gif";
+			+ "full/dlcl16/refresh.png";
 	public static final String[] IMG_INDEXING_LOOP = new String[] {
 			IMG_START_INDEXING, IMG_END_INDEXING };