diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-buildconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-buildconfig.gif
new file mode 100644
index 00000000000..f0404659bbf
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-buildconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-deleteconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-deleteconfig.gif
new file mode 100644
index 00000000000..0883ade2995
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-deleteconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-editconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-editconfig.gif
new file mode 100644
index 00000000000..179b657e2ac
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-editconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-newconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-newconfig.gif
new file mode 100644
index 00000000000..ea3c1377eb4
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/action-newconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/build_configs.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/build_configs.gif
new file mode 100644
index 00000000000..f0404659bbf
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/build_configs.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-category.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-category.gif
new file mode 100644
index 00000000000..cd837b147bb
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-category.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-compiler.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-compiler.gif
new file mode 100644
index 00000000000..906f442c4a3
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-compiler.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-debug.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-debug.gif
new file mode 100644
index 00000000000..788601256fb
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-debug.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-librarian.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-librarian.gif
new file mode 100644
index 00000000000..0e6ec962477
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-librarian.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-linker.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-linker.gif
new file mode 100644
index 00000000000..34b228e7b7b
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-linker.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-preprocessor.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-preprocessor.gif
new file mode 100644
index 00000000000..5bfadbc9c4d
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-preprocessor.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-profile.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-profile.gif
new file mode 100644
index 00000000000..4539ebd91f4
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-profile.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-release.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-release.gif
new file mode 100644
index 00000000000..439138bec68
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-release.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-tool.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-tool.gif
new file mode 100644
index 00000000000..4539ebd91f4
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/config-tool.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-add.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-add.gif
new file mode 100644
index 00000000000..5ee82b45c22
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-add.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-delete.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-delete.gif
new file mode 100644
index 00000000000..5fd7e2d44e3
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-delete.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-edit.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-edit.gif
new file mode 100644
index 00000000000..37189728513
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-edit.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-movedown.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-movedown.gif
new file mode 100644
index 00000000000..d2866389ea0
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-movedown.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-moveup.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-moveup.gif
new file mode 100644
index 00000000000..f8440c8161e
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/list-moveup.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngc_app.gif
new file mode 100644
index 00000000000..a8353f63756
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngc_app.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngcc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngcc_app.gif
new file mode 100644
index 00000000000..9ed7487c248
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/dlcl16/newmngcc_app.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-buildconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-buildconfig.gif
new file mode 100644
index 00000000000..c4c76d0008f
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-buildconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-deleteconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-deleteconfig.gif
new file mode 100644
index 00000000000..3986a4bc41e
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-deleteconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-editconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-editconfig.gif
new file mode 100644
index 00000000000..cc28a3a4201
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-editconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-newconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-newconfig.gif
new file mode 100644
index 00000000000..0ebc0dfe3e2
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/action-newconfig.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/build_configs.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/build_configs.gif
new file mode 100644
index 00000000000..c4c76d0008f
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/build_configs.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-category.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-category.gif
new file mode 100644
index 00000000000..ee7c485243c
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-category.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-compiler.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-compiler.gif
new file mode 100644
index 00000000000..39ee59207d0
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-compiler.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-debug.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-debug.gif
new file mode 100644
index 00000000000..aef2061e5ef
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-debug.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-librarian.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-librarian.gif
new file mode 100644
index 00000000000..cb55e33b5eb
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-librarian.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-linker.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-linker.gif
new file mode 100644
index 00000000000..fe5d5595cdb
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-linker.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-preprocessor.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-preprocessor.gif
new file mode 100644
index 00000000000..cf62b63ae3e
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-preprocessor.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-profile.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-profile.gif
new file mode 100644
index 00000000000..c984fba7039
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-profile.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-release.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-release.gif
new file mode 100644
index 00000000000..fa1765ec5ab
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-release.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-tool.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-tool.gif
new file mode 100644
index 00000000000..c984fba7039
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/config-tool.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-add.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-add.gif
new file mode 100644
index 00000000000..45c0e60778b
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-add.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-delete.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-delete.gif
new file mode 100644
index 00000000000..af59a0b19a3
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-delete.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-edit.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-edit.gif
new file mode 100644
index 00000000000..d1aa86cdf6f
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-edit.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-movedown.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-movedown.gif
new file mode 100644
index 00000000000..572933eec50
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-movedown.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-moveup.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-moveup.gif
new file mode 100644
index 00000000000..768c5c1711e
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/list-moveup.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngc_app.gif
new file mode 100644
index 00000000000..23b0284f84e
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngc_app.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngcc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngcc_app.gif
new file mode 100644
index 00000000000..4b39411daf5
Binary files /dev/null and b/build/org.eclipse.cdt.managedbuilder.ui/icons/elcl16/newmngcc_app.gif differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-buildconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-buildconfig.gif
deleted file mode 100644
index bb64374a7be..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-buildconfig.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-deleteconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-deleteconfig.gif
deleted file mode 100644
index a06106af2d8..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-deleteconfig.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-editconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-editconfig.gif
deleted file mode 100644
index 820079ad6ba..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-editconfig.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-newconfig.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-newconfig.gif
deleted file mode 100644
index 5b04a5e4610..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/action-newconfig.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/build_configs.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/build_configs.gif
deleted file mode 100644
index bb64374a7be..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/build_configs.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-category.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-category.gif
deleted file mode 100644
index 690bba071fc..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-category.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-compiler.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-compiler.gif
deleted file mode 100644
index 20e7baed143..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-compiler.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-debug.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-debug.gif
deleted file mode 100644
index 3052a80cd67..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-debug.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-librarian.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-librarian.gif
deleted file mode 100644
index f966fc39d9b..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-librarian.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-linker.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-linker.gif
deleted file mode 100644
index 91eec0f7dae..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-linker.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-preprocessor.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-preprocessor.gif
deleted file mode 100644
index 082e49fbe66..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-preprocessor.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-profile.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-profile.gif
deleted file mode 100644
index 45d614829bf..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-profile.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-release.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-release.gif
deleted file mode 100644
index b7b23708e09..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-release.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-tool.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-tool.gif
deleted file mode 100644
index 33981a5dbf1..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/build16/config-tool.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-add.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-add.gif
deleted file mode 100644
index 4d1833aca55..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-add.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-delete.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-delete.gif
deleted file mode 100644
index 6f647666d32..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-delete.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-edit.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-edit.gif
deleted file mode 100644
index 1c38124c127..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-edit.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-movedown.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-movedown.gif
deleted file mode 100644
index 2707f9cae1f..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-movedown.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-moveup.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-moveup.gif
deleted file mode 100644
index b913cc1a50b..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/list/list-moveup.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngc_app.gif
deleted file mode 100644
index beefb8ee95d..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngc_app.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngcc_app.gif b/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngcc_app.gif
deleted file mode 100644
index 85e3f72d33c..00000000000
Binary files a/build/org.eclipse.cdt.managedbuilder.ui/icons/full/wizban/newmngcc_app.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 85e82d214f0..30b8153e1e7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -28,7 +28,7 @@
 <!-- Managed Make Builder Projects -->
       <wizard
             name="%MngCCWizard.name"
-            icon="icons/full/wizban/newmngcc_app.gif"
+            icon="icons/elcl16/newmngcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCCProjectWizard"
             project="true"
@@ -40,7 +40,7 @@
       </wizard>
       <wizard
             name="%MngCWizard.name"
-            icon="icons/full/wizban/newmngc_app.gif"
+            icon="icons/elcl16/newmngc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCProjectWizard"
             project="true"
@@ -64,53 +64,37 @@
                value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
          </filter>
       </page>
-   </extension>
-       
-   <extension
-         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
             name="%MngResourceProp.name"
             nameFilter="*.c"
             class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
-            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties.c">
       </page>
-   </extension>
-      
-   <extension
-         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
             name="%MngResourceProp.name"
             nameFilter="*.cpp"
             class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
-            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties.cpp">
       </page>
-   </extension>
-      
-   <extension
-         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
             name="%MngResourceProp.name"
             nameFilter="*.cc"
             class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
-            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties.cc">
       </page>
-   </extension>
-      
-   <extension
-         point="org.eclipse.ui.propertyPages">
       <page
             objectClass="org.eclipse.core.resources.IFile"
             adaptable="true"
             name="%MngResourceProp.name"
             nameFilter="*.cxx"
             class="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildPropertyPage"
-            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties">
+            id="org.eclipse.cdt.managedbuilder.ui.properties.ResourceBuildProperties.cxx">
       </page>
    </extension>
       
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
index 36c85e1aa74..c04de9352e8 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
@@ -1,7 +1,7 @@
 package org.eclipse.cdt.managedbuilder.internal.ui;
 
 /**********************************************************************
- * Copyright (c) 2002,2003 Rational Software Corporation and others.
+ * Copyright (c) 2002, 2005 Rational Software Corporation and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Common Public License v0.5
  * which accompanies this distribution, and is available at
@@ -15,7 +15,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
@@ -36,11 +35,10 @@ public class ManagedBuilderUIImages {
 
 	private static final String NAME_PREFIX= ManagedBuilderUIPlugin.getUniqueIdentifier() + '.';
 	private static final int NAME_PREFIX_LENGTH= NAME_PREFIX.length();
-	private static final String T= "full/"; //$NON-NLS-1$
 
-	public static final String T_BUILD= T + "build16/"; //$NON-NLS-1$
+	public static final String T_BUILD= "elcl16/"; //$NON-NLS-1$
 	// list icons dir
-	public static final String T_LIST= T + "list/"; //$NON-NLS-1$
+	public static final String T_LIST= "elcl16/"; //$NON-NLS-1$
 
 
 	// For the managed build images
@@ -107,12 +105,12 @@ public class ManagedBuilderUIImages {
 	/**
 	 * Sets all available image descriptors for the given action.
 	 */	
-	public static void setImageDescriptors(IAction action, String type, String relPath) {
-		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$
-	}
+//	public static void setImageDescriptors(IAction action, String type, String relPath) {
+//		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$
+//	}
 	
 	/**
 	 * Helper method to access the image registry from the JavaPlugin class.