diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/runtoline_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/runtoline_co.gif
index 4f96ebf357a..a5a56e36a2e 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/runtoline_co.gif and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/runtoline_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/etool16/adddirsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/etool16/adddirsource_wiz.gif
index 463d5a17b8f..188c920c3f3 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/etool16/adddirsource_wiz.gif and b/debug/org.eclipse.cdt.debug.ui/icons/etool16/adddirsource_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/etool16/addprjsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/etool16/addprjsource_wiz.gif
index 65f65d62182..ca7ef1be4d8 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/etool16/addprjsource_wiz.gif and b/debug/org.eclipse.cdt.debug.ui/icons/etool16/addprjsource_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif
index 3052a80cd67..d90a29fead8 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/wizban/addsrcloc_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/wizban/addsrcloc_wiz.gif
new file mode 100644
index 00000000000..9dec82e9f0e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/wizban/addsrcloc_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
index bcdcf05899b..d6be555bdb4 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
@@ -128,6 +128,8 @@ public class CDebugImages
 	public static final String IMG_WIZBAN_ADD_DIR_SOURCE_LOCATION = NAME_PREFIX + "add_dir_source_location_wiz.gif";	//$NON-NLS-1$
 	public static final String IMG_WIZBAN_ADD_PRJ_SOURCE_LOCATION = NAME_PREFIX + "add_prj_source_location_wiz.gif";	//$NON-NLS-1$
 
+	public static final String IMG_WIZBAN_ADD_SOURCE = NAME_PREFIX + "addsrcloc_wiz.gif";	//$NON-NLS-1$
+
 	/*
 	 * Set of predefined Image Descriptors.
 	 */
@@ -137,9 +139,8 @@ public class CDebugImages
 	private static final String T_LCL = "lcl16"; //$NON-NLS-1$
 	private static final String T_ELCL = "elcl16"; //$NON-NLS-1$
 	private static final String T_DLCL = "dlcl16"; //$NON-NLS-1$
-//	private static final String T_CVIEW = "cview16"; //$NON-NLS-1$
 //	private static final String T_DTOOL = "dtool16"; //$NON-NLS-1$
-//	private static final String T_ETOOL = "etool16"; //$NON-NLS-1$
+	private static final String T_ETOOL = "etool16"; //$NON-NLS-1$
 
 	public static final ImageDescriptor DESC_OVRS_ERROR = createManaged( T_OVR, IMG_OVRS_ERROR );
 	public static final ImageDescriptor DESC_OVRS_WARNING = createManaged( T_OVR, IMG_OVRS_WARNING );
@@ -190,6 +191,11 @@ public class CDebugImages
 	public static final ImageDescriptor DESC_WIZBAN_ADD_SOURCE_LOCATION = createManaged( T_WIZBAN, IMG_WIZBAN_ADD_SOURCE_LOCATION );
 	public static final ImageDescriptor DESC_WIZBAN_ADD_PRJ_SOURCE_LOCATION = createManaged( T_WIZBAN, IMG_WIZBAN_ADD_PRJ_SOURCE_LOCATION );
 	public static final ImageDescriptor DESC_WIZBAN_ADD_DIR_SOURCE_LOCATION = createManaged( T_WIZBAN, IMG_WIZBAN_ADD_DIR_SOURCE_LOCATION );
+	public static final ImageDescriptor DESC_WIZBAN_ADD_SOURCE = createManaged( T_WIZBAN, IMG_WIZBAN_ADD_SOURCE );
+	public static final ImageDescriptor DESC_TOOLS_ADD_PRJ_SOURCE_LOCATION = createManaged( T_ETOOL, IMG_TOOLS_ADD_PRJ_SOURCE_LOCATION );
+	public static final ImageDescriptor DESC_TOOLS_ADD_DIR_SOURCE_LOCATION = createManaged( T_ETOOL, IMG_TOOLS_ADD_DIR_SOURCE_LOCATION );
+	public static final ImageDescriptor DESC_LCL_CAST_TO_TYPE = createManaged( T_ELCL, IMG_LCL_CAST_TO_TYPE );
+	public static final ImageDescriptor DESC_LCL_DISPLAY_AS_ARRAY = createManaged( T_ELCL, IMG_LCL_DISPLAY_AS_ARRAY );
 	public static final ImageDescriptor DESC_LCL_RESUME_AT_LINE = createManaged( T_ELCL, IMG_LCL_RESUME_AT_LINE );
 	public static final ImageDescriptor DESC_LCL_RESUME_AT_LINE_DISABLED = createManaged( T_DLCL, IMG_LCL_RESUME_AT_LINE );
 	public static final ImageDescriptor DESC_LCL_DETAIL_PANE_UNDER = createManaged( T_ELCL, IMG_LCL_DETAIL_PANE_UNDER );