2005-04-08 Alain Magloire

	New icons from the IBM folks(Patch from DDaoust)
	* icons/*
	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
	* src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java
	* src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
	* src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
	* plugin.xml

226 files changed, 61 insertions, 53 deletions

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index c23cfe4715e..d70719173d5 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-08 Alain Magloire
+	New icons from the IBM folks(Patch from DDaoust)
+	* icons/*
+	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
+	* src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java
+	* src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
+	* src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
+	* plugin.xml
+
 2005-04-06 David Inglis
 	Fixed bug# 90440
 	* plugin.xml
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/alphab_sort_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/alphab_sort_co.gif
new file mode 100644
index 00000000000..7d27529b640
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/alphab_sort_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/clear_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/clear_co.gif
new file mode 100644
index 00000000000..8f14bd2f48c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/clear_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/collapseall.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/collapseall.gif
new file mode 100644
index 00000000000..a2d80a9044f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/collapseall.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/definingtype_sort_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/definingtype_sort_co.gif
new file mode 100644
index 00000000000..ff83256d83b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/definingtype_sort_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/fields_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/fields_co.gif
new file mode 100644
index 00000000000..aa45cf7fb5b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/fields_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/history_list.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/history_list.gif
new file mode 100644
index 00000000000..131063ce97d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/history_list.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/impl_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/impl_co.gif
new file mode 100644
index 00000000000..a727403c3ac
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/impl_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/inher_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/inher_co.gif
new file mode 100644
index 00000000000..23338d74aa7
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/inher_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/lock_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/lock_co.gif
new file mode 100644
index 00000000000..8e3d48a637e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/lock_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/metharg_obj.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/metharg_obj.gif
new file mode 100644
index 00000000000..c25ebbd5d7b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/metharg_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/open_incl.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/open_incl.gif
new file mode 100644
index 00000000000..3503cfe3afa
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/open_incl.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/public_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/public_co.gif
new file mode 100644
index 00000000000..93081d615ed
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/public_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/refresh_nav.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/refresh_nav.gif
new file mode 100644
index 00000000000..3ca04d06ff9
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/refresh_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/search_sortmatch.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/search_sortmatch.gif
new file mode 100644
index 00000000000..86307052bfc
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/search_sortmatch.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/segment_edit.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/segment_edit.gif
new file mode 100644
index 00000000000..1b50ff8d67b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/segment_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/shift_l_edit.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/shift_l_edit.gif
new file mode 100644
index 00000000000..328e97ee6f1
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/shift_l_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/shift_r_edit.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/shift_r_edit.gif
new file mode 100644
index 00000000000..ec35f69fd3f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/shift_r_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/static_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/static_co.gif
new file mode 100644
index 00000000000..b567be4d00f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/static_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/sub_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/sub_co.gif
new file mode 100644
index 00000000000..3848a251dad
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/sub_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/super_co.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/super_co.gif
new file mode 100644
index 00000000000..45808d1d261
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/super_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/synced.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/synced.gif
new file mode 100644
index 00000000000..e37b2db8a59
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/synced.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/th_automatic.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/th_automatic.gif
new file mode 100644
index 00000000000..1b93aaca769
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/th_automatic.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/th_horizontal.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/th_horizontal.gif
new file mode 100644
index 00000000000..05da6248e43
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/th_horizontal.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/th_showqualified.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/th_showqualified.gif
new file mode 100644
index 00000000000..f288b596513
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/th_showqualified.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/th_single.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/th_single.gif
new file mode 100644
index 00000000000..530345b360c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/th_single.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/th_vertical.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/th_vertical.gif
new file mode 100644
index 00000000000..0a52f1de2a3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dlcl16/th_vertical.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/action-buildconfig.gif b/core/org.eclipse.cdt.ui/icons/dtool16/action-buildconfig.gif
new file mode 100644
index 00000000000..f0404659bbf
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/action-buildconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/action-deleteconfig.gif b/core/org.eclipse.cdt.ui/icons/dtool16/action-deleteconfig.gif
new file mode 100644
index 00000000000..0883ade2995
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/action-deleteconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/action-editconfig.gif b/core/org.eclipse.cdt.ui/icons/dtool16/action-editconfig.gif
new file mode 100644
index 00000000000..179b657e2ac
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/action-editconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/action-newconfig.gif b/core/org.eclipse.cdt.ui/icons/dtool16/action-newconfig.gif
new file mode 100644
index 00000000000..ea3c1377eb4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/action-newconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/build_configs.gif b/core/org.eclipse.cdt.ui/icons/dtool16/build_configs.gif
new file mode 100644
index 00000000000..c4c76d0008f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/build_configs.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-category.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-category.gif
new file mode 100644
index 00000000000..cd837b147bb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-category.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-compiler.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-compiler.gif
new file mode 100644
index 00000000000..906f442c4a3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-compiler.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-debug.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-debug.gif
new file mode 100644
index 00000000000..788601256fb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-debug.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-librarian.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-librarian.gif
new file mode 100644
index 00000000000..dd49d5105b2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-librarian.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-linker.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-linker.gif
new file mode 100644
index 00000000000..34b228e7b7b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-linker.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-preprocessor.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-preprocessor.gif
new file mode 100644
index 00000000000..5bfadbc9c4d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-preprocessor.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-profile.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-profile.gif
new file mode 100644
index 00000000000..4539ebd91f4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-profile.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-release.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-release.gif
new file mode 100644
index 00000000000..7d5768794d5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-release.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/config-tool.gif b/core/org.eclipse.cdt.ui/icons/dtool16/config-tool.gif
new file mode 100644
index 00000000000..4539ebd91f4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/config-tool.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/convert-normal.gif b/core/org.eclipse.cdt.ui/icons/dtool16/convert-normal.gif
new file mode 100644
index 00000000000..580eac58966
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/convert-normal.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newc_app.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newc_app.gif
new file mode 100644
index 00000000000..a8353f63756
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newc_lib.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newc_lib.gif
new file mode 100644
index 00000000000..3d6b02f3a4c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newc_lib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newcc_app.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newcc_app.gif
new file mode 100644
index 00000000000..9ed7487c248
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newcc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newcc_lib.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newcc_lib.gif
new file mode 100644
index 00000000000..fd6e03a9e38
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newcc_lib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newcfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newcfile_wiz.gif
new file mode 100644
index 00000000000..8928b5a2167
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newcfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newclass_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newclass_wiz.gif
new file mode 100644
index 00000000000..2d2b2492649
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newclass_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newcprj_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newcprj_wiz.gif
new file mode 100644
index 00000000000..f4ebef18911
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newcprj_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newfile_wiz.gif
new file mode 100644
index 00000000000..4fd3e4121d9
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newfolder_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newfolder_wiz.gif
new file mode 100644
index 00000000000..86f2c134b00
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newfolder_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newhfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newhfile_wiz.gif
new file mode 100644
index 00000000000..2f0083b630a
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newhfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newmngc_app.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newmngc_app.gif
new file mode 100644
index 00000000000..a8353f63756
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newmngc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newmngcc_app.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newmngcc_app.gif
new file mode 100644
index 00000000000..9ed7487c248
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newmngcc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/newsrcfldr_wiz.gif b/core/org.eclipse.cdt.ui/icons/dtool16/newsrcfldr_wiz.gif
new file mode 100644
index 00000000000..0e30f55d388
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/newsrcfldr_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/next_error_nav.gif b/core/org.eclipse.cdt.ui/icons/dtool16/next_error_nav.gif
new file mode 100644
index 00000000000..ec87a5943c9
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/next_error_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/opentype.gif b/core/org.eclipse.cdt.ui/icons/dtool16/opentype.gif
new file mode 100644
index 00000000000..17eea817113
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/opentype.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/prev_error_nav.gif b/core/org.eclipse.cdt.ui/icons/dtool16/prev_error_nav.gif
new file mode 100644
index 00000000000..e53dcc591f8
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/prev_error_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/prj_obj.gif b/core/org.eclipse.cdt.ui/icons/dtool16/prj_obj.gif
new file mode 100644
index 00000000000..9114ee1aa93
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/prj_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/dtool16/prop_edt.gif b/core/org.eclipse.cdt.ui/icons/dtool16/prop_edt.gif
new file mode 100644
index 00000000000..ce790f501c1
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/dtool16/prop_edt.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/alphab_sort_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/alphab_sort_co.gif
new file mode 100644
index 00000000000..7d27529b640
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/alphab_sort_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/clear_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/clear_co.gif
new file mode 100644
index 00000000000..8f14bd2f48c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/clear_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/collapseall.gif b/core/org.eclipse.cdt.ui/icons/elcl16/collapseall.gif
new file mode 100644
index 00000000000..a2d80a9044f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/collapseall.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/definingtype_sort_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/definingtype_sort_co.gif
new file mode 100644
index 00000000000..166eaba9031
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/definingtype_sort_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/fields_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/fields_co.gif
new file mode 100644
index 00000000000..aa45cf7fb5b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/fields_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/history_list.gif b/core/org.eclipse.cdt.ui/icons/elcl16/history_list.gif
new file mode 100644
index 00000000000..364c0e70b1d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/history_list.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/impl_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/impl_co.gif
new file mode 100644
index 00000000000..98d914a4484
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/impl_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/inher_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/inher_co.gif
new file mode 100644
index 00000000000..a326000dae6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/inher_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/lock_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/lock_co.gif
new file mode 100644
index 00000000000..8e3d48a637e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/lock_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/metharg_obj.gif b/core/org.eclipse.cdt.ui/icons/elcl16/metharg_obj.gif
new file mode 100644
index 00000000000..c25ebbd5d7b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/metharg_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/open_incl.gif b/core/org.eclipse.cdt.ui/icons/elcl16/open_incl.gif
new file mode 100644
index 00000000000..3503cfe3afa
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/open_incl.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/public_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/public_co.gif
new file mode 100644
index 00000000000..93081d615ed
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/public_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/refresh_nav.gif b/core/org.eclipse.cdt.ui/icons/elcl16/refresh_nav.gif
new file mode 100644
index 00000000000..3ca04d06ff9
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/refresh_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/search_sortmatch.gif b/core/org.eclipse.cdt.ui/icons/elcl16/search_sortmatch.gif
new file mode 100644
index 00000000000..86307052bfc
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/search_sortmatch.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/segment_edit.gif b/core/org.eclipse.cdt.ui/icons/elcl16/segment_edit.gif
new file mode 100644
index 00000000000..1b50ff8d67b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/segment_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/shift_l_edit.gif b/core/org.eclipse.cdt.ui/icons/elcl16/shift_l_edit.gif
new file mode 100644
index 00000000000..328e97ee6f1
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/shift_l_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/shift_r_edit.gif b/core/org.eclipse.cdt.ui/icons/elcl16/shift_r_edit.gif
new file mode 100644
index 00000000000..ec35f69fd3f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/shift_r_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/static_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/static_co.gif
new file mode 100644
index 00000000000..b567be4d00f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/static_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/sub_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/sub_co.gif
new file mode 100644
index 00000000000..54871df5aa6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/sub_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/super_co.gif b/core/org.eclipse.cdt.ui/icons/elcl16/super_co.gif
new file mode 100644
index 00000000000..59ac11633f2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/super_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/synced.gif b/core/org.eclipse.cdt.ui/icons/elcl16/synced.gif
new file mode 100644
index 00000000000..e37b2db8a59
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/synced.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/th_automatic.gif b/core/org.eclipse.cdt.ui/icons/elcl16/th_automatic.gif
new file mode 100644
index 00000000000..45469ad67c4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/th_automatic.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/th_horizontal.gif b/core/org.eclipse.cdt.ui/icons/elcl16/th_horizontal.gif
new file mode 100644
index 00000000000..d590470446f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/th_horizontal.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/th_showqualified.gif b/core/org.eclipse.cdt.ui/icons/elcl16/th_showqualified.gif
new file mode 100644
index 00000000000..2556b457bca
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/th_showqualified.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/th_single.gif b/core/org.eclipse.cdt.ui/icons/elcl16/th_single.gif
new file mode 100644
index 00000000000..42fca3fcc9a
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/th_single.gif
diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/th_vertical.gif b/core/org.eclipse.cdt.ui/icons/elcl16/th_vertical.gif
new file mode 100644
index 00000000000..dee0cbca025
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/elcl16/th_vertical.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/action-buildconfig.gif b/core/org.eclipse.cdt.ui/icons/etool16/action-buildconfig.gif
new file mode 100644
index 00000000000..c4c76d0008f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/action-buildconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/action-deleteconfig.gif b/core/org.eclipse.cdt.ui/icons/etool16/action-deleteconfig.gif
new file mode 100644
index 00000000000..3986a4bc41e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/action-deleteconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/action-editconfig.gif b/core/org.eclipse.cdt.ui/icons/etool16/action-editconfig.gif
new file mode 100644
index 00000000000..cc28a3a4201
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/action-editconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/action-newconfig.gif b/core/org.eclipse.cdt.ui/icons/etool16/action-newconfig.gif
new file mode 100644
index 00000000000..0ebc0dfe3e2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/action-newconfig.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/build_configs.gif b/core/org.eclipse.cdt.ui/icons/etool16/build_configs.gif
new file mode 100644
index 00000000000..c4c76d0008f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/build_configs.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-category.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-category.gif
new file mode 100644
index 00000000000..ee7c485243c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-category.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-compiler.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-compiler.gif
new file mode 100644
index 00000000000..39ee59207d0
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-compiler.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-debug.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-debug.gif
new file mode 100644
index 00000000000..aef2061e5ef
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-debug.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-librarian.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-librarian.gif
new file mode 100644
index 00000000000..1119c67821b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-librarian.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-linker.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-linker.gif
new file mode 100644
index 00000000000..fe5d5595cdb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-linker.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-preprocessor.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-preprocessor.gif
new file mode 100644
index 00000000000..cf62b63ae3e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-preprocessor.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-profile.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-profile.gif
new file mode 100644
index 00000000000..c984fba7039
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-profile.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-release.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-release.gif
new file mode 100644
index 00000000000..fa1765ec5ab
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-release.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/config-tool.gif b/core/org.eclipse.cdt.ui/icons/etool16/config-tool.gif
new file mode 100644
index 00000000000..c984fba7039
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/config-tool.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/convert-normal.gif b/core/org.eclipse.cdt.ui/icons/etool16/convert-normal.gif
new file mode 100644
index 00000000000..0b693cb5f60
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/convert-normal.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newc_app.gif b/core/org.eclipse.cdt.ui/icons/etool16/newc_app.gif
new file mode 100644
index 00000000000..23b0284f84e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newc_lib.gif b/core/org.eclipse.cdt.ui/icons/etool16/newc_lib.gif
new file mode 100644
index 00000000000..5fd6d522164
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newc_lib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newcc_app.gif b/core/org.eclipse.cdt.ui/icons/etool16/newcc_app.gif
new file mode 100644
index 00000000000..4b39411daf5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newcc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newcc_lib.gif b/core/org.eclipse.cdt.ui/icons/etool16/newcc_lib.gif
new file mode 100644
index 00000000000..9b082f90e15
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newcc_lib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newcfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newcfile_wiz.gif
new file mode 100644
index 00000000000..138f6750258
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newcfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newclass_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newclass_wiz.gif
new file mode 100644
index 00000000000..eecb86e5d7e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newclass_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newcprj_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newcprj_wiz.gif
new file mode 100644
index 00000000000..3287eda79e8
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newcprj_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newfile_wiz.gif
new file mode 100644
index 00000000000..9d050885be6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newfolder_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newfolder_wiz.gif
new file mode 100644
index 00000000000..310eb18e34b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newfolder_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newhfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newhfile_wiz.gif
new file mode 100644
index 00000000000..9d1fe9f7be5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newhfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newmngc_app.gif b/core/org.eclipse.cdt.ui/icons/etool16/newmngc_app.gif
new file mode 100644
index 00000000000..23b0284f84e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newmngc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newmngcc_app.gif b/core/org.eclipse.cdt.ui/icons/etool16/newmngcc_app.gif
new file mode 100644
index 00000000000..4b39411daf5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newmngcc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/newsrcfldr_wiz.gif b/core/org.eclipse.cdt.ui/icons/etool16/newsrcfldr_wiz.gif
new file mode 100644
index 00000000000..7caaa0fdae8
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/newsrcfldr_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/next_error_nav.gif b/core/org.eclipse.cdt.ui/icons/etool16/next_error_nav.gif
new file mode 100644
index 00000000000..1920339b75a
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/next_error_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/opentype.gif b/core/org.eclipse.cdt.ui/icons/etool16/opentype.gif
new file mode 100644
index 00000000000..e8c49481cda
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/opentype.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/prev_error_nav.gif b/core/org.eclipse.cdt.ui/icons/etool16/prev_error_nav.gif
new file mode 100644
index 00000000000..73d1fa1982b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/prev_error_nav.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/prj_obj.gif b/core/org.eclipse.cdt.ui/icons/etool16/prj_obj.gif
new file mode 100644
index 00000000000..0effc175814
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/prj_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/etool16/prop_edt.gif b/core/org.eclipse.cdt.ui/icons/etool16/prop_edt.gif
new file mode 100644
index 00000000000..c4681c673d4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/etool16/prop_edt.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif
new file mode 100644
index 00000000000..d1a56087c66
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/bin_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/bin_obj.gif
new file mode 100644
index 00000000000..66225ec45d0
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/bin_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/breakpoint.gif b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint.gif
new file mode 100644
index 00000000000..1eaff5a566e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_active.gif b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_active.gif
new file mode 100644
index 00000000000..11d3d8da1e3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_active.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_disabled.gif b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_disabled.gif
new file mode 100644
index 00000000000..2966a281637
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/breakpoint_disabled.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/build_menu.gif b/core/org.eclipse.cdt.ui/icons/obj16/build_menu.gif
new file mode 100644
index 00000000000..73a2e2a0186
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/build_menu.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/c_file_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/c_file_obj.gif
new file mode 100644
index 00000000000..bd603cff7a2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/c_file_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/c_resource_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/c_resource_obj.gif
new file mode 100644
index 00000000000..cc28a6fc168
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/c_resource_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/cdeclaration_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/cdeclaration_obj.gif
new file mode 100644
index 00000000000..cee1c6cb8ac
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/cdeclaration_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/cfolder_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/cfolder_obj.gif
new file mode 100644
index 00000000000..03ee1dcb8e3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/cfolder_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/change.gif b/core/org.eclipse.cdt.ui/icons/obj16/change.gif
new file mode 100644
index 00000000000..41695a9cfea
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/change.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/class_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/class_obj.gif
new file mode 100644
index 00000000000..6279478c51b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/class_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/composite_change.gif b/core/org.eclipse.cdt.ui/icons/obj16/composite_change.gif
new file mode 100644
index 00000000000..71c4196ed3d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/composite_change.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/container_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/container_obj.gif
new file mode 100644
index 00000000000..d90a51c0220
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/container_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/core_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/core_obj.gif
new file mode 100644
index 00000000000..39b5fde37ef
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/core_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/cp_order_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/cp_order_obj.gif
new file mode 100644
index 00000000000..b2fa4cefc58
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/cp_order_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/cprojects.gif b/core/org.eclipse.cdt.ui/icons/obj16/cprojects.gif
new file mode 100644
index 00000000000..fcc08ad89c6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/cprojects.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/csearch_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/csearch_obj.gif
new file mode 100644
index 00000000000..d6ad2f5261e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/csearch_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/cu_change.gif b/core/org.eclipse.cdt.ui/icons/obj16/cu_change.gif
new file mode 100644
index 00000000000..bd0e1567c6b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/cu_change.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/define_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/define_obj.gif
new file mode 100644
index 00000000000..87d583e1dd3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/define_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/enum_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/enum_obj.gif
new file mode 100644
index 00000000000..a441bef7dc2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/enum_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/enumerator_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/enumerator_obj.gif
new file mode 100644
index 00000000000..ec911412eff
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/enumerator_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/error_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/error_obj.gif
new file mode 100644
index 00000000000..2cd37c2548e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/error_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exclusion_filter_attrib.gif b/core/org.eclipse.cdt.ui/icons/obj16/exclusion_filter_attrib.gif
new file mode 100644
index 00000000000..5a15a79b1bc
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/exclusion_filter_attrib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif
new file mode 100644
index 00000000000..d90a29fead8
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif
new file mode 100644
index 00000000000..8174dade2bb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/fatalerror_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/fatalerror_obj.gif
new file mode 100644
index 00000000000..75a92755b27
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/fatalerror_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/field_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/field_obj.gif
new file mode 100644
index 00000000000..240749472c6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/field_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/field_private_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/field_private_obj.gif
new file mode 100644
index 00000000000..567c7786e3c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/field_private_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/field_protected_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/field_protected_obj.gif
new file mode 100644
index 00000000000..4234e04bba6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/field_protected_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/field_public_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/field_public_obj.gif
new file mode 100644
index 00000000000..63a390c8326
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/field_public_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/file_change.gif b/core/org.eclipse.cdt.ui/icons/obj16/file_change.gif
new file mode 100644
index 00000000000..55a7bace546
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/file_change.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/fldr_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/fldr_obj.gif
new file mode 100644
index 00000000000..03ee1dcb8e3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/fldr_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/function_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/function_obj.gif
new file mode 100644
index 00000000000..92075a8a352
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/function_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/h_file_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/h_file_obj.gif
new file mode 100644
index 00000000000..b902fca49ef
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/h_file_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/hfolder_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/hfolder_obj.gif
new file mode 100644
index 00000000000..b98b8172795
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/hfolder_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/incc_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/incc_obj.gif
new file mode 100644
index 00000000000..ea94702caff
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/incc_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/include_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/include_obj.gif
new file mode 100644
index 00000000000..9835b63eb86
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/include_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif b/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif
new file mode 100644
index 00000000000..8505f9d3c63
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/info_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/info_obj.gif
new file mode 100644
index 00000000000..745b884ff03
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/info_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/keyword_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/keyword_obj.gif
new file mode 100644
index 00000000000..1be9094053c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/keyword_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/lib_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/lib_obj.gif
new file mode 100644
index 00000000000..cb55e33b5eb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/lib_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/method_private_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/method_private_obj.gif
new file mode 100644
index 00000000000..75bfeb8cfa6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/method_private_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/method_protected_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/method_protected_obj.gif
new file mode 100644
index 00000000000..563743d393f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/method_protected_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/method_public_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/method_public_obj.gif
new file mode 100644
index 00000000000..7d24707ee82
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/method_public_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/namespace_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/namespace_obj.gif
new file mode 100644
index 00000000000..c70cce0ecdf
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/namespace_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/opentype.gif b/core/org.eclipse.cdt.ui/icons/obj16/opentype.gif
new file mode 100644
index 00000000000..e687f54e672
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/opentype.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/output_folder_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/output_folder_obj.gif
new file mode 100644
index 00000000000..07c4101589c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/output_folder_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/output_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/output_obj.gif
new file mode 100644
index 00000000000..b6a24b60be6
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/output_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/quickfix_error_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/quickfix_error_obj.gif
new file mode 100644
index 00000000000..07a10545817
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/quickfix_error_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/quickfix_warning_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/quickfix_warning_obj.gif
new file mode 100644
index 00000000000..3a0827a811d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/quickfix_warning_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/s_file_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/s_file_obj.gif
new file mode 100644
index 00000000000..c2f79bc74d0
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/s_file_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/search_decl_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/search_decl_obj.gif
new file mode 100644
index 00000000000..f31a02a394d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/search_decl_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/search_ref_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/search_ref_obj.gif
new file mode 100644
index 00000000000..f8f0ce5aa85
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/search_ref_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/search_sortmatch.gif b/core/org.eclipse.cdt.ui/icons/obj16/search_sortmatch.gif
new file mode 100644
index 00000000000..5952ed97569
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/search_sortmatch.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif
new file mode 100644
index 00000000000..4e51447b23b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/source_attach_attrib.gif b/core/org.eclipse.cdt.ui/icons/obj16/source_attach_attrib.gif
new file mode 100644
index 00000000000..27ee7863064
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/source_attach_attrib.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif
new file mode 100644
index 00000000000..57ba1fbf159
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/struct_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/struct_obj.gif
new file mode 100644
index 00000000000..5db2efa2516
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/struct_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/template_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/template_obj.gif
new file mode 100644
index 00000000000..c0d9d95c268
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/template_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/text_edit.gif b/core/org.eclipse.cdt.ui/icons/obj16/text_edit.gif
new file mode 100644
index 00000000000..9312d7e0fe0
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/text_edit.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/typedef_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/typedef_obj.gif
new file mode 100644
index 00000000000..9d6df6acc62
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/typedef_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/union_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/union_obj.gif
new file mode 100644
index 00000000000..df0f59fdf10
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/union_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/unknown_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/unknown_obj.gif
new file mode 100644
index 00000000000..f34581acb04
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/unknown_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/unknown_type_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/unknown_type_obj.gif
new file mode 100644
index 00000000000..86550fe9f45
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/unknown_type_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/using_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/using_obj.gif
new file mode 100644
index 00000000000..561bdf1cb36
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/using_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/var_declaration_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/var_declaration_obj.gif
new file mode 100644
index 00000000000..91c4c93ab51
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/var_declaration_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/variable_local_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/variable_local_obj.gif
new file mode 100644
index 00000000000..3244b26ef4f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/variable_local_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/variable_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/variable_obj.gif
new file mode 100644
index 00000000000..727812daf62
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/variable_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/obj16/warning_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/warning_obj.gif
new file mode 100644
index 00000000000..1e5f5eb367c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/obj16/warning_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/c_ovr.gif b/core/org.eclipse.cdt.ui/icons/ovr16/c_ovr.gif
new file mode 100644
index 00000000000..f4496021a73
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/c_ovr.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/error_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/error_co.gif
new file mode 100644
index 00000000000..119dcccd5a7
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/error_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/path_inherit_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/path_inherit_co.gif
new file mode 100644
index 00000000000..85e21898780
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/path_inherit_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/static_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/static_co.gif
new file mode 100644
index 00000000000..9b2d21f808f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/static_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/template_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/template_co.gif
new file mode 100644
index 00000000000..8b2e11f2ce3
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/template_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/volatile_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/volatile_co.gif
new file mode 100644
index 00000000000..bfc7f9c605f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/volatile_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/warning_co.gif b/core/org.eclipse.cdt.ui/icons/ovr16/warning_co.gif
new file mode 100644
index 00000000000..ee2dac4a90a
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/ovr16/warning_co.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/buildconsole.gif b/core/org.eclipse.cdt.ui/icons/view16/buildconsole.gif
new file mode 100644
index 00000000000..e1f6e5c9de1
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/buildconsole.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/c_pers.gif b/core/org.eclipse.cdt.ui/icons/view16/c_pers.gif
new file mode 100644
index 00000000000..c2ec7be7cc5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/c_pers.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/cbrowsing_pers.gif b/core/org.eclipse.cdt.ui/icons/view16/cbrowsing_pers.gif
new file mode 100644
index 00000000000..1a8e5f9e811
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/cbrowsing_pers.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/chierch_pers.gif b/core/org.eclipse.cdt.ui/icons/view16/chierch_pers.gif
new file mode 100644
index 00000000000..905c3387956
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/chierch_pers.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/class_hi.gif b/core/org.eclipse.cdt.ui/icons/view16/class_hi.gif
new file mode 100644
index 00000000000..17f927e9a4e
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/class_hi.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/cprojects.gif b/core/org.eclipse.cdt.ui/icons/view16/cprojects.gif
new file mode 100644
index 00000000000..be76eef3d12
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/cprojects.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/cview.gif b/core/org.eclipse.cdt.ui/icons/view16/cview.gif
new file mode 100644
index 00000000000..c2ec7be7cc5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/cview.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/members.gif b/core/org.eclipse.cdt.ui/icons/view16/members.gif
new file mode 100644
index 00000000000..e9a6bd966a5
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/members.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/namespaces.gif b/core/org.eclipse.cdt.ui/icons/view16/namespaces.gif
new file mode 100644
index 00000000000..22f78af0bc4
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/namespaces.gif
diff --git a/core/org.eclipse.cdt.ui/icons/view16/types.gif b/core/org.eclipse.cdt.ui/icons/view16/types.gif
new file mode 100644
index 00000000000..5ba5b91c5bb
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/view16/types.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/addpath_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/addpath_wiz.gif
new file mode 100644
index 00000000000..97bddd0b209
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/addpath_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/c_app_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/c_app_wiz.gif
new file mode 100644
index 00000000000..cc58563037c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/c_app_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/fieldrefact_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/fieldrefact_wiz.gif
new file mode 100644
index 00000000000..f3e9221cca9
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/fieldrefact_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/methrefact_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/methrefact_wiz.gif
new file mode 100644
index 00000000000..ec154e963b2
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/methrefact_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newcfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newcfile_wiz.gif
new file mode 100644
index 00000000000..1f91a8d329b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newcfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newclass_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newclass_wiz.gif
new file mode 100644
index 00000000000..eb5016a1175
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newclass_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newcprj_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newcprj_wiz.gif
new file mode 100644
index 00000000000..df7c4890775
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newcprj_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newfile_wiz.gif
new file mode 100644
index 00000000000..136e94c1880
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newfolder_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newfolder_wiz.gif
new file mode 100644
index 00000000000..f988dc6d25b
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newfolder_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newhfile_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newhfile_wiz.gif
new file mode 100644
index 00000000000..d610654ab38
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newhfile_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newmngc_app.gif b/core/org.eclipse.cdt.ui/icons/wizban/newmngc_app.gif
new file mode 100644
index 00000000000..beefb8ee95d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newmngc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newmngcc_app.gif b/core/org.eclipse.cdt.ui/icons/wizban/newmngcc_app.gif
new file mode 100644
index 00000000000..85e3f72d33c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newmngcc_app.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/newsrcfldr_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/newsrcfldr_wiz.gif
new file mode 100644
index 00000000000..6b7f8e74c0d
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/newsrcfldr_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/prj_obj.gif b/core/org.eclipse.cdt.ui/icons/wizban/prj_obj.gif
new file mode 100644
index 00000000000..6624c902a16
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/prj_obj.gif
diff --git a/core/org.eclipse.cdt.ui/icons/wizban/typerefact_wiz.gif b/core/org.eclipse.cdt.ui/icons/wizban/typerefact_wiz.gif
new file mode 100644
index 00000000000..ed3b49f2565
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/icons/wizban/typerefact_wiz.gif
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index ab02e1ad8fa..994e884dc86 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -191,19 +191,19 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             name="%perspective.name"
-            icon="icons/full/cview16/c_pers.gif"
+            icon="icons/view16/c_pers.gif"
             class="org.eclipse.cdt.internal.ui.CPerspectiveFactory"
             id="org.eclipse.cdt.ui.CPerspective">
       </perspective>
       <perspective
             name="%CBrowsing.perspective.name"
-            icon="icons/full/cview16/cbrowsing_pers.gif"
+            icon="icons/view16/cbrowsing_pers.gif"
             class="org.eclipse.cdt.internal.ui.browser.cbrowsing.CBrowsingPerspectiveFactory"
             id="org.eclipse.cdt.ui.CBrowsingPerspective">
       </perspective>
       <perspective
             name="%CHierarchy.perspective.name"
-            icon="icons/full/eview16/chierch_pers.gif"
+            icon="icons/view16/chierch_pers.gif"
             class="org.eclipse.cdt.internal.ui.browser.typehierarchy.CHierarchyPerspectiveFactory"
             id="org.eclipse.cdt.ui.CHierarchyPerspective">
       </perspective>
@@ -258,7 +258,7 @@
       </category>
       <view
             name="%CView.name"
-            icon="icons/full/cview16/cview.gif"
+            icon="icons/view16/cview.gif"
             category="org.eclipse.cdt.ui.views"
             class="org.eclipse.cdt.internal.ui.cview.CView"
             id="org.eclipse.cdt.ui.CView">
@@ -269,28 +269,28 @@
       </category>
       <view
             name="%CBrowsing.projectsViewName"
-            icon="icons/full/eview16/cprojects.gif"
+            icon="icons/view16/cprojects.gif"
             category="org.eclipse.cdt.ui.c.browsing"
             class="org.eclipse.cdt.internal.ui.browser.cbrowsing.ProjectsView"
             id="org.eclipse.cdt.ui.ProjectsView">
       </view>
       <view
             name="%CBrowsing.namespacesViewName"
-            icon="icons/full/eview16/namespaces.gif"
+            icon="icons/view16/namespaces.gif"
             category="org.eclipse.cdt.ui.c.browsing"
             class="org.eclipse.cdt.internal.ui.browser.cbrowsing.NamespacesView"
             id="org.eclipse.cdt.ui.NamespacesView">
       </view>
       <view
             name="%CBrowsing.typesViewName"
-            icon="icons/full/eview16/types.gif"
+            icon="icons/view16/types.gif"
             category="org.eclipse.cdt.ui.c.browsing"
             class="org.eclipse.cdt.internal.ui.browser.cbrowsing.TypesView"
             id="org.eclipse.cdt.ui.TypesView">
       </view>
       <view
             name="%CBrowsing.membersViewName"
-            icon="icons/full/eview16/members.gif"
+            icon="icons/view16/members.gif"
             category="org.eclipse.cdt.ui.c.browsing"
             class="org.eclipse.cdt.internal.ui.browser.cbrowsing.MembersView"
             id="org.eclipse.cdt.ui.MembersView">
@@ -301,7 +301,7 @@
       </category>
       <view
             name="%CHierarchy.hierarchyViewName"
-            icon="icons/full/eview16/class_hi.gif"
+            icon="icons/view16/class_hi.gif"
             category="org.eclipse.cdt.ui.c.hierarchy"
             class="org.eclipse.cdt.internal.ui.browser.typehierarchy.TypeHierarchyViewPart"
             id="org.eclipse.cdt.ui.TypeHierarchyView">
@@ -317,7 +317,7 @@
       </category>
       <wizard
             name="%NewWizards.sourceFile"
-            icon="icons/full/ctool16/newcfile_wiz.gif"
+            icon="icons/etool16/newcfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewSourceFileCreationWizard">
@@ -330,7 +330,7 @@
       </wizard>
       <wizard
             name="%NewWizards.headerFile"
-            icon="icons/full/ctool16/newhfile_wiz.gif"
+            icon="icons/etool16/newhfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewHeaderFileCreationWizard">
@@ -343,7 +343,7 @@
       </wizard>
       <wizard
             name="%NewWizards.file"
-            icon="icons/full/ctool16/newfile_wiz.gif"
+            icon="icons/etool16/newfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewFileCreationWizard">
@@ -356,7 +356,7 @@
       </wizard>
       <wizard
             name="%NewWizards.sourceFolder"
-            icon="icons/full/ctool16/newsrcfldr_wiz.gif"
+            icon="icons/etool16/newsrcfldr_wiz.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewSourceFolderCreationWizard">
@@ -369,7 +369,7 @@
       </wizard>
       <wizard
             name="%NewWizards.folder"
-            icon="icons/full/ctool16/newfolder_wiz.gif"
+            icon="icons/etool16/newfolder_wiz.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewFolderCreationWizard">
@@ -387,7 +387,7 @@
       </category>
       <wizard
             name="%NewWizards.class"
-            icon="icons/full/ctool16/newclass_wiz.gif"
+            icon="icons/etool16/newclass_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewClassCreationWizard">
@@ -401,7 +401,7 @@
       </wizard>
       <wizard
             name="%NewWizards.sourceFile"
-            icon="icons/full/ctool16/newcfile_wiz.gif"
+            icon="icons/etool16/newcfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewSourceFileCreationWizard">
@@ -414,7 +414,7 @@
       </wizard>
       <wizard
             name="%NewWizards.headerFile"
-            icon="icons/full/ctool16/newhfile_wiz.gif"
+            icon="icons/etool16/newhfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewHeaderFileCreationWizard">
@@ -427,7 +427,7 @@
       </wizard>
       <wizard
             name="%NewWizards.file"
-            icon="icons/full/ctool16/newfile_wiz.gif"
+            icon="icons/etool16/newfile_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewFileCreationWizard">
@@ -440,7 +440,7 @@
       </wizard>
       <wizard
             name="%NewWizards.sourceFolder"
-            icon="icons/full/ctool16/newsrcfldr_wiz.gif"
+            icon="icons/etool16/newsrcfldr_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewSourceFolderCreationWizard">
@@ -453,7 +453,7 @@
       </wizard>
       <wizard
             name="%NewWizards.folder"
-            icon="icons/full/ctool16/newfolder_wiz.gif"
+            icon="icons/etool16/newfolder_wiz.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewFolderCreationWizard">
@@ -523,7 +523,7 @@
             default="true"
             name="%CEditor.name"
             extensions="c,C,cc,cpp,cxx,h,hh,hpp"
-            icon="icons/full/obj16/c_file_obj.gif"
+            icon="icons/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             symbolicFontName="org.eclipse.cdt.ui.editors.textfont"
@@ -532,14 +532,14 @@
       <editor
             name="%AsmEditor.name"
             extensions="s,asm,S"
-            icon="icons/full/obj16/s_file_obj.gif"
+            icon="icons/obj16/s_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
       </editor>
       <editor
             symbolicFontName="org.eclipse.cdt.ui.editors.textfont"
             class="org.eclipse.cdt.internal.ui.editor.ExternalSearchEditor"
-            icon="icons/full/obj16/c_file_obj.gif"
+            icon="icons/obj16/c_file_obj.gif"
             name="%ExternalSearchEditor.name"
             id="org.eclipse.cdt.ui.editor.ExternalSearchEditor"/>
       
@@ -669,7 +669,7 @@
          </filter>
          <action
                label="%DeleteTaskAction.label"
-               icon="icons/full/ovr16/error_co.gif"
+               icon="icons/ovr16/error_co.gif"
                class="org.eclipse.cdt.internal.ui.util.DeleteTaskAction"
                menubarPath="additions"
                enablesFor="+"
@@ -721,7 +721,7 @@
             id="org.eclipse.cdt.ui.action.DeleteIProblemMarkers">
          <action
                label="%DeleteIProblemMarkerAction.label"
-               icon="icons/full/ovr16/error_co.gif"
+               icon="icons/ovr16/error_co.gif"
                class="org.eclipse.cdt.internal.ui.util.DeleteIProblemMarkerAction"
                menubarPath="additions"
                id="org.eclipse.cdt.ui.action.DeleteIProblemMarkers"/>
@@ -789,8 +789,8 @@
                id="org.eclipse.cdt.ui.actions.NewTypeDropDown"
                toolbarPath="Normal/CCWizards"
                class="org.eclipse.cdt.internal.ui.wizards.NewTypeDropDownAction"
-               disabledIcon="icons/full/dtool16/newclass_wiz.gif"
-               icon="icons/full/etool16/newclass_wiz.gif"
+               disabledIcon="icons/dtool16/newclass_wiz.gif"
+               icon="icons/etool16/newclass_wiz.gif"
                label="%NewTypeDropDownAction.label"
                pulldown="true"
                tooltip="%NewTypeDropDownAction.tooltip">
@@ -799,8 +799,8 @@
                id="org.eclipse.cdt.ui.actions.NewFileDropDown"
                toolbarPath="Normal/CCWizards"
                class="org.eclipse.cdt.internal.ui.wizards.NewFileDropDownAction"
-               disabledIcon="icons/full/dtool16/newcfile_wiz.gif"
-               icon="icons/full/etool16/newcfile_wiz.gif"
+               disabledIcon="icons/dtool16/newcfile_wiz.gif"
+               icon="icons/etool16/newcfile_wiz.gif"
                label="%NewFileDropDownAction.label"
                pulldown="true"
                tooltip="%NewFileDropDownAction.tooltip">
@@ -809,8 +809,8 @@
                id="org.eclipse.cdt.ui.actions.NewFolderDropDown"
                toolbarPath="Normal/CCWizards"
                class="org.eclipse.cdt.internal.ui.wizards.NewFolderDropDownAction"
-               disabledIcon="icons/full/dtool16/newsrcfldr_wiz.gif"
-               icon="icons/full/etool16/newsrcfldr_wiz.gif"
+               disabledIcon="icons/dtool16/newsrcfldr_wiz.gif"
+               icon="icons/etool16/newsrcfldr_wiz.gif"
                label="%NewFolderDropDownAction.label"
                pulldown="true"
                tooltip="%NewFolderDropDownAction.tooltip">
@@ -819,8 +819,8 @@
                id="org.eclipse.cdt.ui.actions.NewProjectDropDown"
                toolbarPath="Normal/CCWizards"
                class="org.eclipse.cdt.internal.ui.wizards.NewProjectDropDownAction"
-               disabledIcon="icons/full/dtool16/newcprj_wiz.gif"
-               icon="icons/full/etool16/newcprj_wiz.gif"
+               disabledIcon="icons/dtool16/newcprj_wiz.gif"
+               icon="icons/etool16/newcprj_wiz.gif"
                label="%NewProjectDropDownAction.label"
                pulldown="true"
                tooltip="%NewProjectDropDownAction.tooltip">
@@ -830,7 +830,7 @@
    <extension
          point="org.eclipse.ui.ide.projectNatureImages">
       <image
-            icon="icons/full/ovr16/c_ovr.gif"
+            icon="icons/ovr16/c_ovr.gif"
             natureId="org.eclipse.cdt.core.cnature"
             id="org.eclipse.cdt.ui.cProjectNatureImage">
       </image>
@@ -1058,7 +1058,7 @@
             showScopeSection="true"
             label="%CSearchPage.label"
             extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
-            icon="icons/full/obj16/csearch_obj.gif"
+            icon="icons/obj16/csearch_obj.gif"
             class="org.eclipse.cdt.internal.ui.search.CSearchPage"
             sizeHint="460, 160"
             id="org.eclipse.cdt.ui.CSearchPage">
@@ -1069,7 +1069,7 @@
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
-            icon="icons/full/clcl16/search_sortmatch.gif"
+            icon="icons/obj16/search_sortmatch.gif"
             class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
             tooltip="%ElementNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.ElementNameSorter">
@@ -1077,7 +1077,7 @@
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ParentNameSorter.label"
-            icon="icons/full/clcl16/search_sortmatch.gif"
+            icon="icons/obj16/search_sortmatch.gif"
             class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
             tooltip="%ParentNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.ParentNameSorter">
@@ -1085,7 +1085,7 @@
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%PathNameSorter.label"
-            icon="icons/full/clcl16/search_sortmatch.gif"
+            icon="icons/obj16/search_sortmatch.gif"
             class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
             tooltip="%PathNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.PathNameSorter">
@@ -1100,7 +1100,7 @@
             id="org.eclipse.cdt.ui.SearchActionSet">
          <action
                label="%openCSearchPageAction.label"
-               icon="icons/full/obj16/csearch_obj.gif"
+               icon="icons/obj16/csearch_obj.gif"
                class="org.eclipse.cdt.internal.ui.search.OpenCSearchPageAction"
                menubarPath="org.eclipse.search.menu/dialogGroup"
                id="org.eclipse.cdt.ui.actions.OpenCSearchPage">
@@ -1110,7 +1110,7 @@
                toolbarPath="org.eclipse.search.searchActionSet/Search"
                class="org.eclipse.cdt.internal.ui.browser.opentype.OpenTypeAction"
                definitionId="org.eclipse.cdt.ui.navigate.opentype"
-               icon="icons/full/etool16/opentype.gif"
+               icon="icons/etool16/opentype.gif"
                helpContextId="org.eclipse.cdt.ui.open_type_action"
                label="%OpenTypeAction.label"
                menubarPath="navigate/open.ext2"
@@ -1192,7 +1192,7 @@
       <workingSet
             name="%CElementWorkingSetPage.name"
             pageClass="org.eclipse.cdt.internal.ui.workingsets.CElementWorkingSetPage"
-            icon="icons/full/cview16/cview.gif"
+            icon="icons/view16/cview.gif"
             id="org.eclipse.cdt.ui.CElementWorkingSetPage">
       </workingSet>
    </extension>
@@ -1208,7 +1208,7 @@
             presentationLayer="3"
             textStylePreferenceValue="NONE"
             symbolicIcon="warning"
-            icon="icons/full/obj16/unknown_obj.gif"
+            icon="icons/obj16/unknown_obj.gif"
             label="%CDTIndexerMarker.label"
             textPreferenceValue="true"
             textPreferenceKey="indexResultIndication"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index 288e63c026e..70d1c7d9cf9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -34,14 +34,13 @@ public class CPluginImages {
 	}	
 	private static final String NAME_PREFIX= CUIPlugin.PLUGIN_ID + '.';
 	private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
-	private static final String T= "full/"; //$NON-NLS-1$
 
-	public static final String T_OBJ= T + "obj16/"; //$NON-NLS-1$
-	public static final String T_WIZBAN= T + "wizban/"; //$NON-NLS-1$
+	public static final String T_OBJ= "obj16/"; //$NON-NLS-1$
+	public static final String T_WIZBAN= "wizban/"; //$NON-NLS-1$
 	public static final String T_LCL=  "lcl16/"; //$NON-NLS-1$
 	public static final String T_TOOL= "tool16/"; //$NON-NLS-1$
-	public static final String T_VIEW= T + "cview16/"; //$NON-NLS-1$
-	public static final String T_OVR= T + "ovr16/"; //$NON-NLS-1$
+	public static final String T_VIEW= "view16/"; //$NON-NLS-1$
+	public static final String T_OVR= "ovr16/"; //$NON-NLS-1$
 
 	public static final String IMG_OBJS_TEMPLATE= NAME_PREFIX + "template_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_VARIABLE= NAME_PREFIX + "variable_obj.gif"; //$NON-NLS-1$
@@ -286,9 +285,9 @@ public class CPluginImages {
 	public static void setImageDescriptors(IAction action, String type, String relPath) {
 	    if (relPath.startsWith(NAME_PREFIX))
 	        relPath= relPath.substring(NAME_PREFIX_LENGTH);
-		action.setDisabledImageDescriptor(create(T + "d" + type, relPath)); //$NON-NLS-1$
-		action.setHoverImageDescriptor(create(T + "c" + type, relPath)); //$NON-NLS-1$
-		action.setImageDescriptor(create(T + "e" + type, relPath)); //$NON-NLS-1$
+		action.setDisabledImageDescriptor(create("d" + type, relPath)); //$NON-NLS-1$
+//		action.setHoverImageDescriptor(create("c" + type, relPath)); //$NON-NLS-1$
+		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
 
 		// We are still not sure about this, let see TF results first.
 		//		Use the managed version so that we ensure that there is no resource handle leaks
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java
index df25f150f09..91092a6acb2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java
@@ -54,7 +54,7 @@ public abstract class CViewActionGroup extends ActionGroup {
 	 * Returns the image descriptor with the given relative path.
 	 */
 	protected ImageDescriptor getImageDescriptor(String relativePath) {
-		String iconPath = "icons/full/"; //$NON-NLS-1$
+		String iconPath = "icons/"; //$NON-NLS-1$
 		try {
 			URL installURL = CUIPlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
 			URL url = new URL(installURL, iconPath + relativePath);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
index 17326b9b986..1a881d4ecec 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
@@ -156,7 +156,7 @@ public class MainActionGroup extends CViewActionGroup {
 		toggleLinkingAction = new ToggleLinkingAction(getCView()); //$NON-NLS-1$
 		toggleLinkingAction.setToolTipText(CViewMessages.getString("ToggleLinkingAction.toolTip")); //$NON-NLS-1$
 		toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced.gif"));//$NON-NLS-1$
-		toggleLinkingAction.setHoverImageDescriptor(getImageDescriptor("clcl16/synced.gif"));//$NON-NLS-1$
+//		toggleLinkingAction.setHoverImageDescriptor(getImageDescriptor("clcl16/synced.gif"));//$NON-NLS-1$
 
 		selectionSearchGroup = new SelectionSearchGroup(getCView().getSite());
 		refactoringActionGroup = new RefactoringActionGroup(getCView().getSite(), null);	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
index bcf407f36a9..7c6a995cc68 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
@@ -137,7 +137,7 @@ public class OpenProjectGroup extends CViewActionGroup {
 		refreshAction = new RefreshAction(shell);
 		refreshAction.setDisabledImageDescriptor(getImageDescriptor("dlcl16/refresh_nav.gif"));//$NON-NLS-1$
 		refreshAction.setImageDescriptor(getImageDescriptor("elcl16/refresh_nav.gif"));//$NON-NLS-1$
-		refreshAction.setHoverImageDescriptor(getImageDescriptor("clcl16/refresh_nav.gif"));//$NON-NLS-1$		
+//		refreshAction.setHoverImageDescriptor(getImageDescriptor("clcl16/refresh_nav.gif"));//$NON-NLS-1$		
 	}
 
 	public void updateActionBars() {