diff --git a/core/org.eclipse.cdt.core/icons/full/clcl16/alphab_sort_co.gif b/core/org.eclipse.cdt.core/icons/full/clcl16/alphab_sort_co.gif
deleted file mode 100644
index 6d772441d0d..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/clcl16/alphab_sort_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/clcl16/clear_co.gif b/core/org.eclipse.cdt.core/icons/full/clcl16/clear_co.gif
deleted file mode 100644
index 255832653fd..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/clcl16/clear_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/clcl16/open_incl.gif b/core/org.eclipse.cdt.core/icons/full/clcl16/open_incl.gif
deleted file mode 100644
index 58b9a012e89..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/clcl16/open_incl.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/clcl16/shift_l_edit.gif b/core/org.eclipse.cdt.core/icons/full/clcl16/shift_l_edit.gif
deleted file mode 100644
index 2700d541ecf..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/clcl16/shift_l_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/clcl16/shift_r_edit.gif b/core/org.eclipse.cdt.core/icons/full/clcl16/shift_r_edit.gif
deleted file mode 100644
index fed137329e7..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/clcl16/shift_r_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/ctool16/newcprj_wiz.gif b/core/org.eclipse.cdt.core/icons/full/ctool16/newcprj_wiz.gif
deleted file mode 100644
index 812cf458709..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/ctool16/newcprj_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/ctool16/newfile_wiz.gif b/core/org.eclipse.cdt.core/icons/full/ctool16/newfile_wiz.gif
deleted file mode 100644
index 6baa03787f4..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/ctool16/newfile_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/cview16/buildconsole.gif b/core/org.eclipse.cdt.core/icons/full/cview16/buildconsole.gif
deleted file mode 100644
index 4723724a209..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/cview16/buildconsole.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/cview16/c_pers.gif b/core/org.eclipse.cdt.core/icons/full/cview16/c_pers.gif
deleted file mode 100644
index 86316d592ee..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/cview16/c_pers.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dlcl16/alphab_sort_co.gif b/core/org.eclipse.cdt.core/icons/full/dlcl16/alphab_sort_co.gif
deleted file mode 100644
index 62a8fdb555b..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dlcl16/alphab_sort_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dlcl16/clear_co.gif b/core/org.eclipse.cdt.core/icons/full/dlcl16/clear_co.gif
deleted file mode 100644
index d873c49b8a0..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dlcl16/clear_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dlcl16/open_incl.gif b/core/org.eclipse.cdt.core/icons/full/dlcl16/open_incl.gif
deleted file mode 100644
index 9bdd658229f..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dlcl16/open_incl.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_l_edit.gif b/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_l_edit.gif
deleted file mode 100644
index a93966ed990..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_l_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_r_edit.gif b/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_r_edit.gif
deleted file mode 100644
index c1254afc730..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dlcl16/shift_r_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dtool16/newcprj_wiz.gif b/core/org.eclipse.cdt.core/icons/full/dtool16/newcprj_wiz.gif
deleted file mode 100644
index 82450711805..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dtool16/newcprj_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/dtool16/newfile_wiz.gif b/core/org.eclipse.cdt.core/icons/full/dtool16/newfile_wiz.gif
deleted file mode 100644
index c931715bb32..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/dtool16/newfile_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/elcl16/alphab_sort_co.gif b/core/org.eclipse.cdt.core/icons/full/elcl16/alphab_sort_co.gif
deleted file mode 100644
index 9d38f6dff8a..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/elcl16/alphab_sort_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/elcl16/clear_co.gif b/core/org.eclipse.cdt.core/icons/full/elcl16/clear_co.gif
deleted file mode 100644
index 6faf8d66fef..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/elcl16/clear_co.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/elcl16/open_incl.gif b/core/org.eclipse.cdt.core/icons/full/elcl16/open_incl.gif
deleted file mode 100644
index aec95f8fbcc..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/elcl16/open_incl.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/elcl16/shift_l_edit.gif b/core/org.eclipse.cdt.core/icons/full/elcl16/shift_l_edit.gif
deleted file mode 100644
index fe7b3111b11..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/elcl16/shift_l_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/elcl16/shift_r_edit.gif b/core/org.eclipse.cdt.core/icons/full/elcl16/shift_r_edit.gif
deleted file mode 100644
index e0f2a56933d..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/elcl16/shift_r_edit.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/etool16/newcprj_wiz.gif b/core/org.eclipse.cdt.core/icons/full/etool16/newcprj_wiz.gif
deleted file mode 100644
index 5f7c6a973f8..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/etool16/newcprj_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/etool16/newfile_wiz.gif b/core/org.eclipse.cdt.core/icons/full/etool16/newfile_wiz.gif
deleted file mode 100644
index f2fe6e1d036..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/etool16/newfile_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/eview16/buildconsole.gif b/core/org.eclipse.cdt.core/icons/full/eview16/buildconsole.gif
deleted file mode 100644
index 56d14e449eb..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/eview16/buildconsole.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/eview16/c_pers.gif b/core/org.eclipse.cdt.core/icons/full/eview16/c_pers.gif
deleted file mode 100644
index 655cd2f4c21..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/eview16/c_pers.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/c_file_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/c_file_obj.gif
deleted file mode 100644
index 1bb68c2d649..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/c_file_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/class_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/class_obj.gif
deleted file mode 100644
index a4a14864987..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/class_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/define_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/define_obj.gif
deleted file mode 100644
index b3ddb5deebc..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/define_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/field_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/field_obj.gif
deleted file mode 100644
index 19d27defb62..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/field_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/function_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/function_obj.gif
deleted file mode 100644
index 18103b11fc7..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/function_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/include_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/include_obj.gif
deleted file mode 100644
index 2cc5866a64c..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/include_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/struct_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/struct_obj.gif
deleted file mode 100644
index cb2869f2488..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/struct_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/obj16/union_obj.gif b/core/org.eclipse.cdt.core/icons/full/obj16/union_obj.gif
deleted file mode 100644
index b8405d54bb4..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/obj16/union_obj.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/ovr16/c_ovr.gif b/core/org.eclipse.cdt.core/icons/full/ovr16/c_ovr.gif
deleted file mode 100644
index bec7ac2faef..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/ovr16/c_ovr.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/wizban/c_app_wiz.gif b/core/org.eclipse.cdt.core/icons/full/wizban/c_app_wiz.gif
deleted file mode 100644
index 60ccf9c7c6a..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/wizban/c_app_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/icons/full/wizban/newcprj_wiz.gif b/core/org.eclipse.cdt.core/icons/full/wizban/newcprj_wiz.gif
deleted file mode 100644
index 60ccf9c7c6a..00000000000
Binary files a/core/org.eclipse.cdt.core/icons/full/wizban/newcprj_wiz.gif and /dev/null differ
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 90e890150d7..88412f81287 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -28,7 +28,7 @@
 
    <extension-point id="CBuildCommand" name="%CBuildCommand.name"/>
    <extension-point id="CBuildConsole" name="%CBuildConsole.name"/>
-   <extension-point id="CProjectInfo" name="%CProjectInfo.name"/>
+   <extension-point id="CProjectOwner" name="%CProjectOwner.name"/>
 
    <extension
          id="cbuilder"
@@ -51,14 +51,6 @@
             type="org.eclipse.core.resources.textmarker">
       </super>
    </extension>
-   <extension
-         point="org.eclipse.ui.projectNatureImages">
-      <image
-            icon="icons/full/ovr16/c_ovr.gif"
-            natureId="org.eclipse.cdt.core.cnature"
-            id="org.eclipse.cdt.cProjectNatureImage">
-      </image>
-   </extension>
    <extension
          id="cnature"
          name="%cnature.name"
@@ -86,10 +78,10 @@
       </buildcommand>
    </extension>
    <extension
-         point="org.eclipse.cdt.core.CProjectInfo"
-         name="%projectinfo.name"
+         point="org.eclipse.cdt.core.CProjectOwner"
+         name="%projectowner.name"
          id="make">
-         <platform id="org.eclipse.cdt.core.genericmake"
+         <platform id="*"
          	name="%genericmake.name" architecture="*"/>
          <run 
          	class = "org.eclipse.cdt.internal.core.make.MakeProject">