diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 0920fcd423b..7bcb4b8827d 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,6 @@
+2005-04-07 Mikhail Khodjaiants
+	Applied patch from Dave Daoust (new images).
+
 2005-03-21 Mikhail Khodjaiants
 	Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform.
 	* icons/full/obj16/mapentry_obj.gif: new
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/auto_refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/auto_refresh_co.gif
new file mode 100644
index 00000000000..7fff7f930c1
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/auto_refresh_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/casttotype_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/casttotype_co.gif
new file mode 100644
index 00000000000..c77da053c5d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/casttotype_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/change_reg_value_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/change_reg_value_co.gif
new file mode 100644
index 00000000000..879de886dd7
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/change_reg_value_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/collapseall.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/collapseall.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/collapseall.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/collapseall.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/debugger_console.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/debugger_console.gif
new file mode 100644
index 00000000000..bc39f092bbc
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/debugger_console.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_hide.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_hide.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_hide.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_hide.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_right.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_right.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_right.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_right.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_under.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_under.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/det_pane_under.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/det_pane_under.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disabled_co.gif
similarity index 56%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disabled_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disabled_co.gif
index f6b9f8a590c..e4385098c6d 100644
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disabled_co.gif and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disabled_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disassembly.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disassembly.gif
new file mode 100644
index 00000000000..bdb795821ee
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/disassembly.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/enabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/enabled_co.gif
new file mode 100644
index 00000000000..2a51b1270ce
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/enabled_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/instr_step.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/instr_step.gif
new file mode 100644
index 00000000000..ebb5323b341
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/instr_step.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/jump_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/jump_co.gif
new file mode 100644
index 00000000000..c030614dc5f
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/jump_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_all_symbols_co.gif
new file mode 100644
index 00000000000..83a6e2cf448
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_all_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_symbols_co.gif
new file mode 100644
index 00000000000..380ee4c05b8
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/load_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_clear.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_clear.gif
new file mode 100644
index 00000000000..02aa9463f35
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_clear.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_update.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_update.gif
new file mode 100644
index 00000000000..42531486003
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/memory_update.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/refresh_co.gif
new file mode 100644
index 00000000000..d8110697ad9
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/refresh_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/rem_all_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/rem_all_co.gif
new file mode 100644
index 00000000000..fe83f93b4fe
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/rem_all_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/rem_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/rem_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/rem_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dlcl16/rem_co.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/restart.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/restart.gif
new file mode 100644
index 00000000000..996938dc9b6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/restart.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/runtoline_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/runtoline_co.gif
new file mode 100644
index 00000000000..ffe5c0250f6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/runtoline_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_ascii.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_ascii.gif
new file mode 100644
index 00000000000..9928595e3c4
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_ascii.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_paths.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_paths.gif
new file mode 100644
index 00000000000..db09b2a5125
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/show_paths.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/showasarray_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/showasarray_co.gif
new file mode 100644
index 00000000000..2c4dc6d7e0e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/showasarray_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal0_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal0_co.gif
new file mode 100644
index 00000000000..47c0b126cb6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal0_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal_co.gif
new file mode 100644
index 00000000000..5feb13ff154
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/signal_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/tnames_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/tnames_co.gif
new file mode 100644
index 00000000000..a8afa63486d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/tnames_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/watch_globals.gif b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/watch_globals.gif
new file mode 100644
index 00000000000..f076f029ec0
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dlcl16/watch_globals.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dtool16/adddirsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/dtool16/adddirsource_wiz.gif
new file mode 100644
index 00000000000..ac8f08f5c49
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dtool16/adddirsource_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/dtool16/addprjsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/dtool16/addprjsource_wiz.gif
new file mode 100644
index 00000000000..fdc4fea76bd
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/dtool16/addprjsource_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/watch_exp.gif b/debug/org.eclipse.cdt.debug.ui/icons/dtool16/watch_exp.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/watch_exp.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/dtool16/watch_exp.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/auto_refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/auto_refresh_co.gif
new file mode 100644
index 00000000000..1ab08934b46
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/auto_refresh_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/casttotype_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/casttotype_co.gif
new file mode 100644
index 00000000000..b04de7e294d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/casttotype_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/change_reg_value_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/change_reg_value_co.gif
new file mode 100644
index 00000000000..533148f2158
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/change_reg_value_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/collapseall.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/collapseall.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/collapseall.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/collapseall.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/debugger_console.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/debugger_console.gif
new file mode 100644
index 00000000000..54f6cb7b1f7
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/debugger_console.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_hide.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_hide.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_hide.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_hide.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_right.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_right.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_right.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_right.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_under.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_under.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/det_pane_under.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/det_pane_under.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/disabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/disabled_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/disabled_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/disabled_co.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/disassembly.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/disassembly.gif
new file mode 100644
index 00000000000..3c64c7ad312
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/disassembly.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/enabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/enabled_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/enabled_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/enabled_co.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/function_brkpt_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/function_brkpt_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/function_brkpt_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/function_brkpt_co.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/instr_step.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/instr_step.gif
new file mode 100644
index 00000000000..83a515921f3
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/instr_step.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/jump_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/jump_co.gif
new file mode 100644
index 00000000000..b453f19ddd2
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/jump_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_all_symbols_co.gif
new file mode 100644
index 00000000000..f80969864d6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_all_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_symbols_co.gif
new file mode 100644
index 00000000000..f326c9ed087
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/load_symbols_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_clear.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_clear.gif
new file mode 100644
index 00000000000..1fe69881000
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_clear.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_update.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_update.gif
new file mode 100644
index 00000000000..593d4d05b45
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/memory_update.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/refresh_co.gif
new file mode 100644
index 00000000000..3ca04d06ff9
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/refresh_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/rem_all_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/rem_all_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/rem_all_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/rem_all_co.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/rem_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/rem_co.gif
new file mode 100644
index 00000000000..e8d74d2d306
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/rem_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/restart.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/restart.gif
new file mode 100644
index 00000000000..16f4e251756
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/restart.gif differ
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
new file mode 100644
index 00000000000..4f96ebf357a
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/runtoline_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_ascii.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_ascii.gif
new file mode 100644
index 00000000000..089e9286fc6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_ascii.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/show_parents.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_parents.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/show_parents.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_parents.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_paths.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_paths.gif
new file mode 100644
index 00000000000..752c08356c9
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/show_paths.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/showasarray_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/showasarray_co.gif
new file mode 100644
index 00000000000..233e52a4a10
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/showasarray_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal0_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal0_co.gif
new file mode 100644
index 00000000000..54255052861
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal0_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal_co.gif
new file mode 100644
index 00000000000..34f333cdf9f
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/signal_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/tnames_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/tnames_co.gif
new file mode 100644
index 00000000000..d85759bde6d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/tnames_co.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/elcl16/watch_globals.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/watch_globals.gif
new file mode 100644
index 00000000000..69b9988f36c
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/watch_globals.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/watchpoint_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/elcl16/watchpoint_co.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/watchpoint_co.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/elcl16/watchpoint_co.gif
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
new file mode 100644
index 00000000000..463d5a17b8f
Binary files /dev/null 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
new file mode 100644
index 00000000000..65f65d62182
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/etool16/addprjsource_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/watch_exp.gif b/debug/org.eclipse.cdt.debug.ui/icons/etool16/watch_exp.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/etool16/watch_exp.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/etool16/watch_exp.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/auto_refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/auto_refresh_co.gif
deleted file mode 100644
index 4a65d6241e1..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/auto_refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/casttotype_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/casttotype_co.gif
deleted file mode 100644
index a13d1549214..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/casttotype_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/change_reg_value_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/change_reg_value_co.gif
deleted file mode 100644
index b6b60770eb2..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/change_reg_value_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/debugger_console.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/debugger_console.gif
deleted file mode 100644
index e6d5b138d46..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/debugger_console.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/disassembly.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/disassembly.gif
deleted file mode 100644
index a78e3024c87..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/disassembly.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/instr_step.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/instr_step.gif
deleted file mode 100644
index 5b0a586ad96..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/instr_step.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/jump_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/jump_co.gif
deleted file mode 100644
index 7de2134e81d..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/jump_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif
deleted file mode 100644
index 2109dd1fc29..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_all_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_symbols_co.gif
deleted file mode 100644
index 2109dd1fc29..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/load_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_clear.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_clear.gif
deleted file mode 100644
index 255832653fd..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_clear.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_update.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_update.gif
deleted file mode 100644
index ca4fe2b1cff..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/memory_update.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/refresh_co.gif
deleted file mode 100644
index c61cfc2f562..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/restart.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/restart.gif
deleted file mode 100644
index 0ca0683909c..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/restart.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/runtoline_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/runtoline_co.gif
deleted file mode 100644
index a5a56e36a2e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/runtoline_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_ascii.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_ascii.gif
deleted file mode 100644
index 4affa870e8e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_ascii.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_paths.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_paths.gif
deleted file mode 100644
index 4a136b7c286..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/show_paths.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/showasarray_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/showasarray_co.gif
deleted file mode 100644
index a87ddbf9ca8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/showasarray_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal0_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal0_co.gif
deleted file mode 100644
index d8ce27f4487..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal0_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal_co.gif
deleted file mode 100644
index 3a65ffa4f9e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/signal_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/tnames_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/tnames_co.gif
deleted file mode 100644
index 1bbbb95c8ea..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/tnames_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/watch_globals.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/watch_globals.gif
deleted file mode 100644
index 30fabfdfa95..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/clcl16/watch_globals.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/adddirsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/adddirsource_wiz.gif
deleted file mode 100644
index 188c920c3f3..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/adddirsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/addprjsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/addprjsource_wiz.gif
deleted file mode 100644
index ca7ef1be4d8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ctool16/addprjsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/disassembly_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/disassembly_view.gif
deleted file mode 100644
index 546c93c42d1..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/disassembly_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/memory_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/memory_view.gif
deleted file mode 100644
index 6343974cee6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/memory_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/modules_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/modules_view.gif
deleted file mode 100644
index ffd9e1fbbf6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/modules_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/sharedlibraries_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/sharedlibraries_view.gif
deleted file mode 100644
index ffd9e1fbbf6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/sharedlibraries_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/signals_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/signals_view.gif
deleted file mode 100644
index 86e982ed6aa..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/cview16/signals_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/auto_refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/auto_refresh_co.gif
deleted file mode 100644
index 2d30174cd9e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/auto_refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/casttotype_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/casttotype_co.gif
deleted file mode 100644
index a13d1549214..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/casttotype_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/change_reg_value_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/change_reg_value_co.gif
deleted file mode 100644
index 53762f25469..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/change_reg_value_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/debugger_console.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/debugger_console.gif
deleted file mode 100644
index 85876974fbc..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/debugger_console.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disabled_co.gif
deleted file mode 100644
index 803d9104308..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disabled_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disassembly.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disassembly.gif
deleted file mode 100644
index dbde1a090aa..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/disassembly.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/enabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/enabled_co.gif
deleted file mode 100644
index 0e83debf450..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/enabled_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/instr_step.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/instr_step.gif
deleted file mode 100644
index 618751d75c9..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/instr_step.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/jump_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/jump_co.gif
deleted file mode 100644
index 0107e2ecc6c..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/jump_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif
deleted file mode 100644
index bb5fdbe45d6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_all_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_symbols_co.gif
deleted file mode 100644
index bb5fdbe45d6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/load_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_clear.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_clear.gif
deleted file mode 100644
index d873c49b8a0..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_clear.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_update.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_update.gif
deleted file mode 100644
index 42890d67054..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/memory_update.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/refresh_co.gif
deleted file mode 100644
index 6ff2b492563..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/rem_all_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/rem_all_co.gif
deleted file mode 100644
index ecd1be56815..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/rem_all_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/restart.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/restart.gif
deleted file mode 100644
index fe2b2c32580..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/restart.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/runtoline_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/runtoline_co.gif
deleted file mode 100644
index 786a24535a2..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/runtoline_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_ascii.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_ascii.gif
deleted file mode 100644
index 31e97de7401..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_ascii.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_paths.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_paths.gif
deleted file mode 100644
index e928437f1f4..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/show_paths.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/showasarray_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/showasarray_co.gif
deleted file mode 100644
index a87ddbf9ca8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/showasarray_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal0_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal0_co.gif
deleted file mode 100644
index bbea1d3334c..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal0_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal_co.gif
deleted file mode 100644
index 081ae40f6f8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/signal_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/tnames_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/tnames_co.gif
deleted file mode 100644
index 764201b3783..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/tnames_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/watch_globals.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/watch_globals.gif
deleted file mode 100644
index 797b0e0e7b4..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dlcl16/watch_globals.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/adddirsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/adddirsource_wiz.gif
deleted file mode 100644
index 70ec11691b7..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/adddirsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/addprjsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/addprjsource_wiz.gif
deleted file mode 100644
index bd5772ade77..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/dtool16/addprjsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/auto_refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/auto_refresh_co.gif
deleted file mode 100644
index 4a65d6241e1..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/auto_refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/casttotype_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/casttotype_co.gif
deleted file mode 100644
index a13d1549214..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/casttotype_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/change_reg_value_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/change_reg_value_co.gif
deleted file mode 100644
index 899ad97909e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/change_reg_value_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/collapseall.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a9044f..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/collapseall.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/debugger_console.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/debugger_console.gif
deleted file mode 100644
index f60aba1679b..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/debugger_console.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_hide.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_hide.gif
deleted file mode 100644
index 42fca3fcc9a..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_hide.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_right.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_right.gif
deleted file mode 100644
index d590470446f..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_right.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_under.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_under.gif
deleted file mode 100644
index dee0cbca025..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/det_pane_under.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disassembly.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disassembly.gif
deleted file mode 100644
index 174087f454a..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/disassembly.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/enabled_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/enabled_co.gif
deleted file mode 100644
index 9cacb96dca9..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/enabled_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/instr_step.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/instr_step.gif
deleted file mode 100644
index a6d7a2fdbcc..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/instr_step.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/jump_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/jump_co.gif
deleted file mode 100644
index 5239257a8b4..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/jump_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif
deleted file mode 100644
index 2109dd1fc29..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_all_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_symbols_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_symbols_co.gif
deleted file mode 100644
index 2109dd1fc29..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/load_symbols_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_clear.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_clear.gif
deleted file mode 100644
index 6faf8d66fef..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_clear.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_update.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_update.gif
deleted file mode 100644
index ca4fe2b1cff..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/memory_update.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/refresh_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/refresh_co.gif
deleted file mode 100644
index c61cfc2f562..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/refresh_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/rem_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/rem_co.gif
deleted file mode 100644
index 2cd9c544436..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/rem_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/restart.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/restart.gif
deleted file mode 100644
index adcbec69525..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/restart.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/runtoline_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/runtoline_co.gif
deleted file mode 100644
index 2ec717803cc..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/runtoline_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/show_ascii.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/show_ascii.gif
deleted file mode 100644
index 31e97de7401..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/show_ascii.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/showasarray_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/showasarray_co.gif
deleted file mode 100644
index a87ddbf9ca8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/showasarray_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal0_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal0_co.gif
deleted file mode 100644
index d8ce27f4487..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal0_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal_co.gif
deleted file mode 100644
index 3a65ffa4f9e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/signal_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/tnames_co.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/tnames_co.gif
deleted file mode 100644
index c63f59ece28..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/tnames_co.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/watch_globals.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/watch_globals.gif
deleted file mode 100644
index dc1a3bce85d..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/elcl16/watch_globals.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/adddirsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/adddirsource_wiz.gif
deleted file mode 100644
index 86b35e403c5..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/adddirsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/addprjsource_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/addprjsource_wiz.gif
deleted file mode 100644
index 617b5a6a5c9..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/etool16/addprjsource_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/memory_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/memory_view.gif
deleted file mode 100644
index 5cf0a55329a..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/memory_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/sharedlibraries_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/sharedlibraries_view.gif
deleted file mode 100644
index f3b58c0fc32..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/sharedlibraries_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/signals_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/signals_view.gif
deleted file mode 100644
index 86e982ed6aa..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/eview16/signals_view.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkp_obj.gif
deleted file mode 100644
index 80eb70008cd..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkp_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkpd_obj.gif
deleted file mode 100644
index 5f6c10598b4..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/addrbrkpd_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkp_obj.gif
deleted file mode 100644
index 06d007905b2..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkp_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkpd_obj.gif
deleted file mode 100644
index 8e8cac5a9d7..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/brkpd_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/cproject_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/cproject_obj.gif
deleted file mode 100644
index 04e530e37c4..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/cproject_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/ext_file_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/ext_file_obj.gif
deleted file mode 100644
index 8b2df2ef24f..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/ext_file_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/filenotfound_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/filenotfound_obj.gif
deleted file mode 100644
index 1bb68c2d649..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/filenotfound_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/folder_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/folder_obj.gif
deleted file mode 100644
index a9c777343c0..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/folder_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkp_obj.gif
deleted file mode 100644
index a61b6bce3d7..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkp_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkpd_obj.gif
deleted file mode 100644
index f047c8ec4b3..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/funbrkpd_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr.gif
deleted file mode 100644
index 5a192d85e7f..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr_top.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr_top.gif
deleted file mode 100644
index a9d1c6131e1..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/inst_ptr_top.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_obj.gif
deleted file mode 100644
index f3b58c0fc32..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_syms_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_syms_obj.gif
deleted file mode 100644
index ffd9e1fbbf6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/library_syms_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/prj_file_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/prj_file_obj.gif
deleted file mode 100644
index e49af938c67..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/prj_file_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/project_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/project_obj.gif
deleted file mode 100644
index 7b2b6334ca0..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/project_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj.gif
deleted file mode 100644
index 793b189d849..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj_disabled.gif
deleted file mode 100644
index d9c0c91a040..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/read_obj_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj.gif
deleted file mode 100644
index 0b1184d72a8..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif
deleted file mode 100644
index 8eba2e1c289..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/register_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/register_obj.gif
deleted file mode 100644
index 277322cf606..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/register_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registergroup_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registergroup_obj.gif
deleted file mode 100644
index 952c2af4ab1..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registergroup_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/showpaths_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/showpaths_obj.gif
deleted file mode 100644
index 6c23051e9f0..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/showpaths_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/signal_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/signal_obj.gif
deleted file mode 100644
index de072720a96..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/signal_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_aggr.gif
deleted file mode 100644
index 1aec8baac60..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_aggr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_env.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_env.gif
deleted file mode 100644
index 65d63ec00d6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_env.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global.gif
deleted file mode 100644
index b63237dcead..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global_aggr.gif
deleted file mode 100644
index 694d6f6f3bd..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_global_aggr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_pointer.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_pointer.gif
deleted file mode 100644
index ca17bd232f6..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_pointer.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple.gif
deleted file mode 100644
index 600d968f7cf..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple_aggr.gif
deleted file mode 100644
index 9ff5c50ace9..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_simple_aggr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static.gif
deleted file mode 100644
index 1ffe406e283..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static_aggr.gif
deleted file mode 100644
index c63f58ee7b3..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_static_aggr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_string.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_string.gif
deleted file mode 100644
index f87131b9652..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/var_string.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_aggr.gif
deleted file mode 100644
index 8c494d67678..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_aggr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_pointer.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_pointer.gif
deleted file mode 100644
index 25c010a9ac0..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_pointer.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_simple.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_simple.gif
deleted file mode 100644
index 1e16bc0d69f..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/vard_simple.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj.gif
deleted file mode 100644
index b5fa352bb51..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj_disabled.gif
deleted file mode 100644
index c4f8b8b7a89..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/write_obj_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr.gif
deleted file mode 100644
index 0914fc22c4e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr_disabled.gif
deleted file mode 100644
index ea1b7fe6093..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/address_ovr_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/argument_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/argument_ovr.gif
deleted file mode 100644
index b89b9298297..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/argument_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/castarray_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/castarray_ovr.gif
deleted file mode 100644
index 2bf69356aa2..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/castarray_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/casttype_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/casttype_ovr.gif
deleted file mode 100644
index 766e87314a7..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/casttype_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr.gif
deleted file mode 100644
index 7c3e9f04f33..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif
deleted file mode 100644
index ea88a6a7c07..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/error_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/error_ovr.gif
deleted file mode 100644
index 8612eaff599..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/error_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr.gif
deleted file mode 100644
index 7227afd4921..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr_disabled.gif
deleted file mode 100644
index 7dd73bdb9c7..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/function_ovr_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/global_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/global_ovr.gif
deleted file mode 100644
index e0decd8c653..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/global_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr.gif
deleted file mode 100644
index 7f4a31ee7eb..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif
deleted file mode 100644
index 9325bc10473..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif
deleted file mode 100644
index 08438a590ab..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/warning_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/warning_ovr.gif
deleted file mode 100644
index 3af228ceac3..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/warning_ovr.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_dir_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_dir_source_location_wiz.gif
deleted file mode 100644
index 47bcb45449e..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_dir_source_location_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_prj_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_prj_source_location_wiz.gif
deleted file mode 100644
index fdb64a836e2..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_prj_source_location_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_source_location_wiz.gif
deleted file mode 100644
index b084ad9cfed..00000000000
Binary files a/debug/org.eclipse.cdt.debug.ui/icons/full/wizban/add_source_location_wiz.gif and /dev/null differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkp_obj.gif
new file mode 100644
index 00000000000..2efd8c9e896
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkp_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkpd_obj.gif
new file mode 100644
index 00000000000..0d0692a6c02
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/addrbrkpd_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif
new file mode 100644
index 00000000000..3d86f92dc79
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkp_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif
new file mode 100644
index 00000000000..c9e344f167d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/brkpd_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/cproject_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/cproject_obj.gif
new file mode 100644
index 00000000000..3a10e712a96
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/cproject_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/disassembly_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/disassembly_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/disassembly_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/disassembly_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/exec_dbg_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/exec_dbg_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_dbg_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/exec_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/exec_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/exec_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/expression_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/expression_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/expression_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/expression_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/ext_file_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/ext_file_obj.gif
new file mode 100644
index 00000000000..16eed37220c
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/ext_file_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/filenotfound_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/filenotfound_obj.gif
new file mode 100644
index 00000000000..b226e41c527
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/filenotfound_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/folder_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/folder_obj.gif
new file mode 100644
index 00000000000..03ee1dcb8e3
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/folder_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkp_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkp_obj.gif
new file mode 100644
index 00000000000..7bb768925e2
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkp_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkpd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkpd_obj.gif
new file mode 100644
index 00000000000..c27e5c749ab
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/funbrkpd_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr.gif
new file mode 100644
index 00000000000..9831329e711
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr_top.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr_top.gif
new file mode 100644
index 00000000000..961873ea99c
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/inst_ptr_top.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_obj.gif
new file mode 100644
index 00000000000..7da17d4194e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_syms_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_syms_obj.gif
new file mode 100644
index 00000000000..dd994fdbe69
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/library_syms_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/mapentry_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/mapentry_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/mapentry_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/mapentry_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/mapping_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/mapping_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/mapping_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/mapping_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/prj_file_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/prj_file_obj.gif
new file mode 100644
index 00000000000..c93cfe95edb
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/prj_file_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/project_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/project_obj.gif
new file mode 100644
index 00000000000..1b6c036f62d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/project_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj.gif
new file mode 100644
index 00000000000..92034b7701d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj_disabled.gif
new file mode 100644
index 00000000000..368a667328e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/read_obj_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj.gif
new file mode 100644
index 00000000000..917400853f5
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj_disabled.gif
new file mode 100644
index 00000000000..c4b0945c0c1
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/readwrite_obj_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/register_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/register_obj.gif
new file mode 100644
index 00000000000..a40c181bf7e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/register_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registerd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/registerd_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registerd_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/registerd_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/registergroup_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/registergroup_obj.gif
new file mode 100644
index 00000000000..aec5afc360a
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/registergroup_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registergroupd_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/registergroupd_obj.gif
similarity index 100%
rename from debug/org.eclipse.cdt.debug.ui/icons/full/obj16/registergroupd_obj.gif
rename to debug/org.eclipse.cdt.debug.ui/icons/obj16/registergroupd_obj.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/showpaths_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/showpaths_obj.gif
new file mode 100644
index 00000000000..6c520a78756
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/showpaths_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/signal_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/signal_obj.gif
new file mode 100644
index 00000000000..34823ea7bdd
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/signal_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_aggr.gif
new file mode 100644
index 00000000000..d261b688728
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_aggr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_env.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_env.gif
new file mode 100644
index 00000000000..1466eeed8d4
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_env.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global.gif
new file mode 100644
index 00000000000..c55fc8b2a62
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global_aggr.gif
new file mode 100644
index 00000000000..349e9344dd1
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_global_aggr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_pointer.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_pointer.gif
new file mode 100644
index 00000000000..961873ea99c
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_pointer.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple.gif
new file mode 100644
index 00000000000..9ea61ad1fc5
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple_aggr.gif
new file mode 100644
index 00000000000..d45205ffc2f
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_simple_aggr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static.gif
new file mode 100644
index 00000000000..3028c85db5c
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static_aggr.gif
new file mode 100644
index 00000000000..0fc482af732
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_static_aggr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_string.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_string.gif
new file mode 100644
index 00000000000..83a3f1fcd94
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/var_string.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_aggr.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_aggr.gif
new file mode 100644
index 00000000000..6b8dd53edf5
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_aggr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_pointer.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_pointer.gif
new file mode 100644
index 00000000000..37f2fea654f
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_pointer.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_simple.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_simple.gif
new file mode 100644
index 00000000000..aa662b3b031
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/vard_simple.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj.gif
new file mode 100644
index 00000000000..ed686b518dc
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj_disabled.gif
new file mode 100644
index 00000000000..841a9ca8aa4
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/obj16/write_obj_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr.gif
new file mode 100644
index 00000000000..daf6d1aacf2
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr_disabled.gif
new file mode 100644
index 00000000000..0d46651994b
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/address_ovr_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/argument_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/argument_ovr.gif
new file mode 100644
index 00000000000..648203b0595
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/argument_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/castarray_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/castarray_ovr.gif
new file mode 100644
index 00000000000..86f3b7f1bf4
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/castarray_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/casttype_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/casttype_ovr.gif
new file mode 100644
index 00000000000..d7583a88636
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/casttype_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr.gif
new file mode 100644
index 00000000000..91749a55ba6
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr_disabled.gif
new file mode 100644
index 00000000000..9475a1272ea
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/conditional_ovr_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/error_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/error_ovr.gif
new file mode 100644
index 00000000000..119dcccd5a7
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/error_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr.gif
new file mode 100644
index 00000000000..d3dd2496297
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr_disabled.gif
new file mode 100644
index 00000000000..b35d73a1290
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/function_ovr_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/global_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/global_ovr.gif
new file mode 100644
index 00000000000..b6158f0fa1d
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/global_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr.gif
new file mode 100644
index 00000000000..899610a858b
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr_disabled.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr_disabled.gif
new file mode 100644
index 00000000000..15cf84fd1d1
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/installed_ovr_disabled.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/symbols_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/symbols_ovr.gif
new file mode 100644
index 00000000000..9d5fd0975df
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/symbols_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/ovr16/warning_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/warning_ovr.gif
new file mode 100644
index 00000000000..ee2dac4a90a
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/ovr16/warning_ovr.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/view16/disassembly_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/view16/disassembly_view.gif
new file mode 100644
index 00000000000..66225ec45d0
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/view16/disassembly_view.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/view16/memory_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/view16/memory_view.gif
new file mode 100644
index 00000000000..e9df7b871bc
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/view16/memory_view.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/view16/sharedlibraries_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/view16/sharedlibraries_view.gif
new file mode 100644
index 00000000000..cb55e33b5eb
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/view16/sharedlibraries_view.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/view16/signals_view.gif b/debug/org.eclipse.cdt.debug.ui/icons/view16/signals_view.gif
new file mode 100644
index 00000000000..34823ea7bdd
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/view16/signals_view.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_dir_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_dir_source_location_wiz.gif
new file mode 100644
index 00000000000..073be403cf3
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_dir_source_location_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_prj_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_prj_source_location_wiz.gif
new file mode 100644
index 00000000000..4d421d9c7be
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_prj_source_location_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_source_location_wiz.gif b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_source_location_wiz.gif
new file mode 100644
index 00000000000..75d88a8283e
Binary files /dev/null and b/debug/org.eclipse.cdt.debug.ui/icons/wizban/add_source_location_wiz.gif differ
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 495bdf76b76..65dd734d88a 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -42,20 +42,20 @@
          point="org.eclipse.ui.views">
       <view
             name="%SignalsView.name"
-            icon="icons/full/cview16/signals_view.gif"
+            icon="icons/view16/signals_view.gif"
             category="org.eclipse.debug.ui"
             class="org.eclipse.cdt.debug.internal.ui.views.signals.SignalsView"
             id="org.eclipse.cdt.debug.ui.SignalsView">
       </view>
       <view
             name="%DisassemblyView.name"
-            icon="icons/full/cview16/disassembly_view.gif"
+            icon="icons/view16/disassembly_view.gif"
             category="org.eclipse.debug.ui"
             class="org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView"
             id="org.eclipse.cdt.debug.ui.DisassemblyView">
       </view>
       <view
-            icon="icons/full/cview16/modules_view.gif"
+            icon="icons/view16/modules_view.gif"
             class="org.eclipse.cdt.debug.internal.ui.views.modules.ModulesView"
             category="org.eclipse.debug.ui"
             name="%ModulesView.name"
@@ -130,11 +130,10 @@
          </menu>
          <action
                id="org.eclipse.cdt.debug.ui.actions.ResumeAtLine"
-               hoverIcon="icons/full/clcl16/jump_co.gif"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RetargetResumeAtLineAction"
-               disabledIcon="icons/full/dlcl16/jump_co.gif"
+              class="org.eclipse.cdt.debug.internal.ui.actions.RetargetResumeAtLineAction"
+               disabledIcon="icons/dlcl16/jump_co.gif"
                enablesFor="1"
-               icon="icons/full/elcl16/jump_co.gif"
+               icon="icons/elcl16/jump_co.gif"
                helpContextId="jump_to_line_action_context"
                label="%GlobalJumpToLineAction.label"
                menubarPath="org.eclipse.ui.run/stepGroup">
@@ -147,11 +146,10 @@
          </action>
          <action
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
-               hoverIcon="icons/full/clcl16/signal0_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
-               disabledIcon="icons/full/dlcl16/signal0_co.gif"
+               disabledIcon="icons/dlcl16/signal0_co.gif"
                enablesFor="1"
-               icon="icons/full/elcl16/signal0_co.gif"
+               icon="icons/elcl16/signal0_co.gif"
                helpContextId="resume_without_signal_action_context"
                label="%SignalZeroAction.label"
                menubarPath="org.eclipse.ui.run/stepGroup"
@@ -165,11 +163,10 @@
          </action>
          <action
                id="org.eclipse.cdt.debug.ui.internal.actions.RestartActionDelegate"
-               hoverIcon="icons/full/clcl16/restart.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
-               disabledIcon="icons/full/dlcl16/restart.gif"
+               disabledIcon="icons/dlcl16/restart.gif"
                enablesFor="1"
-               icon="icons/full/elcl16/restart.gif"
+               icon="icons/elcl16/restart.gif"
                helpContextId="restart_action_context"
                label="%RestartAction.label"
                menubarPath="org.eclipse.ui.run/stepGroup">
@@ -189,7 +186,7 @@
             id="org.eclipse.cdt.debug.ui.debugview.popupMenu">
          <action
                label="%RestartAction.label"
-               icon="icons/full/clcl16/restart.gif"
+               icon="icons/elcl16/restart.gif"
                helpContextId="restart_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
                menubarPath="stepGroup"
@@ -203,7 +200,7 @@
                id="org.eclipse.cdt.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
                class="org.eclipse.cdt.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
                enablesFor="1"
-               icon="icons/full/clcl16/instr_step.gif"
+               icon="icons/elcl16/instr_step.gif"
                helpContextId="toggle_instruction_step_mode_action_context"
                label="%ToggleInstructionStepModeAction.label"
                menubarPath="renderGroup"
@@ -220,7 +217,7 @@
                enablesFor="1"
                label="%SignalZeroAction.label"
                tooltip="%SignalZeroAction.tooltip"
-               icon="icons/full/clcl16/signal0_co.gif"
+               icon="icons/elcl16/signal0_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
                menubarPath="threadGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate">
@@ -265,7 +262,7 @@
          </visibility>
          <action
                label="%AddExpressionAction.label"
-               icon="icons/full/etool16/watch_exp.gif"
+               icon="icons/etool16/watch_exp.gif"
                helpContextId="add_expression_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddExpressionEditorActionDelegate"
                menubarPath="additions"
@@ -273,7 +270,7 @@
          </action>
          <action
                label="%JumpToLineAction.label"
-               icon="icons/full/clcl16/jump_co.gif"
+               icon="icons/elcl16/jump_co.gif"
                helpContextId="jump_to_line_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
                menubarPath="additions"
@@ -311,7 +308,7 @@
 <!--
          <action
                label="%RunToLineAction.label"
-               icon="icons/full/clcl16/runtoline_co.gif"
+               icon="icons/elcl16/runtoline_co.gif"
                helpContextId="run_to_line_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.RunToLineRulerActionDelegate"
                menubarPath="debug"
@@ -353,7 +350,7 @@
          </visibility>
          <action
                label="%AddExpressionAction.label"
-               icon="icons/full/etool16/watch_exp.gif"
+               icon="icons/etool16/watch_exp.gif"
                helpContextId="add_expression_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddExpressionEditorActionDelegate"
                menubarPath="additions"
@@ -361,7 +358,7 @@
          </action>
          <action
                label="%JumpToLineAction.label"
-               icon="icons/full/clcl16/jump_co.gif"
+               icon="icons/elcl16/jump_co.gif"
                helpContextId="jump_to_line_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
                menubarPath="additions"
@@ -418,7 +415,7 @@
             id="org.eclipse.cdt.debug.ui.SignalActions">
          <action
                label="%SignalAction.label"
-               icon="icons/full/clcl16/signal_co.gif"
+               icon="icons/elcl16/signal_co.gif"
                helpContextId="signal_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
                tooltip="%SignalAction.tooltip"
@@ -472,7 +469,7 @@
          </action>
          <action
                label="%CastToTypeAction.label"
-               icon="icons/full/clcl16/casttotype_co.gif"
+               icon="icons/elcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
                tooltip="%CastToTypeAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
@@ -488,7 +485,7 @@
          </action>
          <action
                label="%CastToArrayAction.label"
-               icon="icons/full/clcl16/showasarray_co.gif"
+               icon="icons/elcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
                tooltip="%CastToArrayAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
@@ -508,7 +505,7 @@
             id="org.eclipse.cdt.debug.ui.FunctionBreakpointActions">
          <action
                label="%ManageFunctionBreakpointAction.label"
-               icon="icons/full/elcl16/function_brkpt_co.gif"
+               icon="icons/elcl16/function_brkpt_co.gif"
                helpContextId="manage_function_breakpoint_action_context"
                tooltip="%ManageFunctionBreakpointAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
@@ -522,7 +519,7 @@
             id="org.eclipse.cdt.debug.ui.FunctionBreakpointActions">
          <action
                label="%ManageFunctionBreakpointAction.label"
-               icon="icons/full/elcl16/function_brkpt_co.gif"
+               icon="icons/elcl16/function_brkpt_co.gif"
                helpContextId="manage_function_breakpoint_action_context"
                tooltip="%ManageFunctionBreakpointAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
@@ -538,7 +535,7 @@
                helpContextId="toggle_watchpoint_action_context"
                enablesFor="1"
                label="%ToggleWatchpointAction.label"
-               icon="icons/full/elcl16/watchpoint_co.gif"
+               icon="icons/elcl16/watchpoint_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ToggleWatchpointActionDelegate"
                tooltip="%ToggleWatchpointAction.tooltip"
                menubarPath="additions"
@@ -552,7 +549,7 @@
                enablesFor="*"
                label="%RemoveAllGlobalsAction.label"
                tooltip="%RemoveAllGlobalsAction.tooltip"
-               icon="icons/full/elcl16/rem_all_co.gif"
+               icon="icons/elcl16/rem_all_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate"
                menubarPath="additions"
                id="org.eclipse.cdt.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate">
@@ -567,7 +564,7 @@
                enablesFor="+"
                label="%RemoveGlobalsAction.label"
                tooltip="%RemoveGlobalsAction.tooltip"
-               icon="icons/full/elcl16/rem_co.gif"
+               icon="icons/elcl16/rem_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RemoveGlobalsActionDelegate"
                menubarPath="additions"
                id="org.eclipse.cdt.debug.internal.ui.actions.RemoveGlobalsActionDelegate">
@@ -582,7 +579,7 @@
                enablesFor="1"
                label="%AddGlobalsAction.label"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
-               icon="icons/full/clcl16/watch_globals.gif"
+               icon="icons/elcl16/watch_globals.gif"
                menubarPath="additions"
                id="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate">
             <enablement>
@@ -593,7 +590,7 @@
          </action>
          <action
                label="%DisableVariablesAction.label"
-               icon="icons/full/clcl16/disabled_co.gif"
+               icon="icons/elcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
                tooltip="%DisableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
@@ -606,7 +603,7 @@
          </action>
          <action
                label="%EnableVariablesAction.label"
-               icon="icons/full/clcl16/enabled_co.gif"
+               icon="icons/elcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
                tooltip="%EnableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
@@ -629,7 +626,7 @@
          </menu>
          <action
                label="%DisableVariablesAction.label"
-               icon="icons/full/clcl16/disabled_co.gif"
+               icon="icons/elcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
                tooltip="%DisableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
@@ -642,7 +639,7 @@
          </action>
          <action
                label="%EnableVariablesAction.label"
-               icon="icons/full/clcl16/enabled_co.gif"
+               icon="icons/elcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
                tooltip="%EnableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
@@ -669,7 +666,7 @@
                helpContextId="jump_to_line_action_context"
                enablesFor="1"
                label="%JumpToLineAction.label"
-               icon="icons/full/clcl16/jump_co.gif"
+               icon="icons/elcl16/jump_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
                menubarPath="additions"
                id="org.eclipse.cdt.debug.internal.ui.actions.JumpToLineActionDelegate"/>
@@ -682,7 +679,7 @@
                enablesFor="1"
                label="%LoadSymbolsAction.label"
                tooltip="%LoadSymbolsAction.tooltip"
-               icon="icons/full/elcl16/load_symbols_co.gif"
+               icon="icons/elcl16/load_symbols_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadModuleSymbolsActionDelegate"
                menubarPath="modulesGroup"
                id="org.eclipse.cdt.debug.ui.LoadSymbolsAction"/>
@@ -703,7 +700,7 @@
                helpContextId="load_symbols_for_all_context"
                label="%LoadSymbolsForAllAction.label"
                tooltip="%LoadSymbolsForAllAction.tooltip"
-               icon="icons/full/elcl16/load_all_symbols_co.gif"
+               icon="icons/elcl16/load_all_symbols_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsForAllActionDelegate"
                style="push"
                menubarPath="modulesGroup"
@@ -724,11 +721,10 @@
          <action
                id="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
                toolbarPath="threadGroup"
-               hoverIcon="icons/full/clcl16/restart.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
-               disabledIcon="icons/full/dlcl16/restart.gif"
+               disabledIcon="icons/dlcl16/restart.gif"
                enablesFor="1"
-               icon="icons/full/elcl16/restart.gif"
+               icon="icons/elcl16/restart.gif"
                helpContextId="restart_action_context"
                label="%RestartAction.label"
                tooltip="%RestartAction.tooltip">
@@ -739,10 +735,9 @@
                style="toggle"
                id="org.eclipse.cdt.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
                toolbarPath="renderGroup"
-               hoverIcon="icons/full/clcl16/instr_step.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
-               disabledIcon="icons/full/dlcl16/instr_step.gif"
-               icon="icons/full/elcl16/instr_step.gif"
+               disabledIcon="icons/dlcl16/instr_step.gif"
+               icon="icons/elcl16/instr_step.gif"
                enablesFor="1"
                label="%ToggleInstructionStepModeAction.label"
                helpContextId="toggle_instruction_step_mode_action_context"
@@ -760,7 +755,7 @@
             id="org.eclipse.cdt.debug.ui.debugView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
+               icon="icons/elcl16/show_paths.gif"
                style="toggle"
                helpContextId="show_full_paths_context"
                tooltip="%ShowFullPathsAction.tooltip"
@@ -778,7 +773,7 @@
             id="org.eclipse.cdt.debug.ui.breakpointView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
+               icon="icons/elcl16/show_paths.gif"
                style="toggle"
                helpContextId="show_full_paths_context"
                tooltip="%ShowFullPathsAction.tooltip"
@@ -792,13 +787,12 @@
             id="org.eclipse.debug.ui.variablesView.toolbar">
          <action
                helpContextId="remove_all_globals_action_context"
-               disabledIcon="icons/full/dlcl16/rem_all_co.gif"
-               hoverIcon="icons/full/elcl16/rem_all_co.gif"
+               disabledIcon="icons/dlcl16/rem_all_co.gif"
                enablesFor="*"
                toolbarPath="additions"
                label="%RemoveAllGlobalsAction.label"
                tooltip="%RemoveAllGlobalsAction.tooltip"
-               icon="icons/full/elcl16/rem_all_co.gif"
+               icon="icons/elcl16/rem_all_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate"
                id="org.eclipse.cdt.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate">
             <enablement>
@@ -809,13 +803,12 @@
          </action>
          <action
                helpContextId="remove_globals_action_context"
-               disabledIcon="icons/full/dlcl16/rem_co.gif"
-               hoverIcon="icons/full/elcl16/rem_co.gif"
+               disabledIcon="icons/dlcl16/rem_co.gif"
                enablesFor="+"
                toolbarPath="additions"
                label="%RemoveGlobalsAction.label"
                tooltip="%RemoveGlobalsAction.tooltip"
-               icon="icons/full/elcl16/rem_co.gif"
+               icon="icons/elcl16/rem_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RemoveGlobalsActionDelegate"
                id="org.eclipse.cdt.debug.internal.ui.actions.RemoveGlobalsActionDelegate">
             <enablement>
@@ -826,13 +819,12 @@
          </action>
          <action
                helpContextId="add_globals_action_context"
-               disabledIcon="icons/full/dlcl16/watch_globals.gif"
-               hoverIcon="icons/full/clcl16/watch_globals.gif"
+               disabledIcon="icons/dlcl16/watch_globals.gif"
                enablesFor="1"
                toolbarPath="additions"
                label="%AddGlobalsAction.label"
                tooltip="%AddGlobalsAction.tooltip"
-               icon="icons/full/elcl16/watch_globals.gif"
+               icon="icons/elcl16/watch_globals.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
                id="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate">
             <enablement>
@@ -857,12 +849,11 @@
             id="org.eclipse.debug.ui.modulesView.toolbar">
          <action
                helpContextId="load_symbols_for_all_context"
-               disabledIcon="icons/full/dlcl16/load_all_symbols_co.gif"
-               hoverIcon="icons/full/elcl16/load_all_symbols_co.gif"
+               disabledIcon="icons/dlcl16/load_all_symbols_co.gif"
                toolbarPath="modulesGroup"
                label="%LoadSymbolsForAllAction.label"
                tooltip="%LoadSymbolsForAllAction.tooltip"
-               icon="icons/full/elcl16/load_all_symbols_co.gif"
+               icon="icons/elcl16/load_all_symbols_co.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsForAllActionDelegate"
                style="push"
                id="org.eclipse.cdt.debug.ui.LoadSymbolsForAllAction">
@@ -874,12 +865,11 @@
          </action>
          <action
                helpContextId="collapse_all_modules_context"
-               disabledIcon="icons/full/dlcl16/collapseall.gif"
-               hoverIcon="icons/full/clcl16/collapseall.gif"
+               disabledIcon="icons/dlcl16/collapseall.gif"
                toolbarPath="additions"
                label="%CollapseAllModulesAction.label"
                tooltip="%CollapseAllModulesAction.tooltip"
-               icon="icons/full/elcl16/collapseall.gif"
+               icon="icons/elcl16/collapseall.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.CollapseAllModulesAction"
                style="push"
                id="org.eclipse.cdt.debug.ui.CollapseAllModulesAction"/>
@@ -985,7 +975,7 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%CDebugEditor.name"
-            icon="icons/full/obj16/filenotfound_obj.gif"
+            icon="icons/obj16/filenotfound_obj.gif"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
@@ -1058,7 +1048,7 @@
          point="org.eclipse.ui.editors.markerAnnotationSpecification">
       <specification
             annotationImageProvider="org.eclipse.cdt.debug.internal.ui.BreakpointImageProvider"
-            icon="icons/full/obj16/brkp_obj.gif"
+            icon="icons/obj16/brkp_obj.gif"
             annotationType="org.eclipse.cdt.debug.core.breakpoint">
       </specification>
       <specification
@@ -1070,7 +1060,7 @@
             overviewRulerPreferenceValue="true"
             highlightPreferenceValue="true"
             presentationLayer="6"
-            icon="icons/full/obj16/inst_ptr_top.gif"
+            icon="icons/obj16/inst_ptr_top.gif"
             label="%DisassemblyCurrentInstructionPointer"
             textPreferenceValue="false"
             textPreferenceKey="currentDisassemblyIPIndication"
@@ -1086,7 +1076,7 @@
             overviewRulerPreferenceValue="true"
             highlightPreferenceValue="true"
             presentationLayer="6"
-            icon="icons/full/obj16/inst_ptr.gif"
+            icon="icons/obj16/inst_ptr.gif"
             label="%DisassemblySecondaryInstructionPointer"
             textPreferenceValue="false"
             textPreferenceKey="secondaryDisassemblyIPIndication"
@@ -1203,11 +1193,11 @@
       <sourceContainerPresentation
             browserClass="org.eclipse.cdt.debug.internal.ui.sourcelookup.MappingSourceContainerBrowser"
             containerTypeID="org.eclipse.cdt.debug.core.containerType.mapping"
-            icon="icons/full/obj16/mapping_obj.gif"
+            icon="icons/obj16/mapping_obj.gif"
             id="org.eclipse.cdt.debug.ui.sourceContainerPresentation.mapping"/>
       <sourceContainerPresentation
             containerTypeID="org.eclipse.cdt.debug.core.containerType.mapEntry"
-            icon="icons/full/obj16/mapentry_obj.gif"
+            icon="icons/obj16/mapentry_obj.gif"
             id="org.eclipse.cdt.debug.ui.sourceContainerPresentation.mapEntry"/>
    </extension>
 
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 5ed26e5877a..bcdcf05899b 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
@@ -36,7 +36,7 @@ public class CDebugImages
 
 	static 
 	{
-		String pathSuffix = "icons/full/"; //$NON-NLS-1$
+		String pathSuffix = "icons/"; //$NON-NLS-1$
 		try
 		{
 			fgIconBaseURL = new URL( CDebugUIPlugin.getDefault().getBundle().getEntry( "/" ), pathSuffix ); //$NON-NLS-1$
@@ -135,10 +135,8 @@ public class CDebugImages
 	private static final String T_OVR = "ovr16"; //$NON-NLS-1$
 	private static final String T_WIZBAN = "wizban"; //$NON-NLS-1$
 	private static final String T_LCL = "lcl16"; //$NON-NLS-1$
-	private static final String T_CLCL = "clcl16"; //$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_CTOOL = "ctool16"; //$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$
@@ -192,11 +190,7 @@ 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_TOOLS_ADD_PRJ_SOURCE_LOCATION = createManaged( T_CTOOL, IMG_TOOLS_ADD_PRJ_SOURCE_LOCATION );
-	public static final ImageDescriptor DESC_TOOLS_ADD_DIR_SOURCE_LOCATION = createManaged( T_CTOOL, IMG_TOOLS_ADD_DIR_SOURCE_LOCATION );
-	public static final ImageDescriptor DESC_LCL_CAST_TO_TYPE = createManaged( T_CLCL, IMG_LCL_CAST_TO_TYPE );
-	public static final ImageDescriptor DESC_LCL_DISPLAY_AS_ARRAY = createManaged( T_CLCL, IMG_LCL_DISPLAY_AS_ARRAY );
-	public static final ImageDescriptor DESC_LCL_RESUME_AT_LINE = createManaged( T_CLCL, IMG_LCL_RESUME_AT_LINE );
+	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 );
 	public static final ImageDescriptor DESC_LCL_DETAIL_PANE_UNDER_DISABLED = createManaged( T_DLCL, IMG_LCL_DETAIL_PANE_UNDER );