diff --git a/build/org.eclipse.cdt.make.ui/icons/actions/build_menu.gif b/build/org.eclipse.cdt.make.ui/icons/actions/build_menu.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/actions/build_menu.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/alphab_sort_co.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/alphab_sort_co.gif
deleted file mode 100644
index 6d772441d0d..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/alphab_sort_co.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/convert-normal.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/convert-normal.gif
deleted file mode 100644
index 80c3f8cbc5c..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/convert-normal.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/make.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/make.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/make.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/newc_app.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/newc_app.gif
deleted file mode 100644
index 6c2d75db2e6..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/newc_app.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/newcc_app.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/newcc_app.gif
deleted file mode 100644
index 86d78df150f..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/newcc_app.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/segment_edit.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/segment_edit.gif
deleted file mode 100644
index be9eb921513..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/segment_edit.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_add.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/target_add.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_add.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_build.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/target_build.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_build.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_delete.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/target_delete.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_delete.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_edit.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/target_edit.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/target_edit.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/ctool16/update_old.gif b/build/org.eclipse.cdt.make.ui/icons/ctool16/update_old.gif
deleted file mode 100644
index 9d5a508bc49..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/ctool16/update_old.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/cview16/make_target.gif b/build/org.eclipse.cdt.make.ui/icons/cview16/make_target.gif
deleted file mode 100644
index 3fc40d6a13a..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/cview16/make_target.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/alphab_sort_co.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/alphab_sort_co.gif
index 62a8fdb555b..a0245485d57 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/alphab_sort_co.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/alphab_sort_co.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/build_menu.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/build_menu.gif
new file mode 100644
index 00000000000..825d4c15fbe
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/build_menu.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/convert-normal.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/convert-normal.gif
new file mode 100644
index 00000000000..580eac58966
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/convert-normal.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/make.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/make.gif
new file mode 100644
index 00000000000..496f46b6749
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/make.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/makefile.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/makefile.gif
new file mode 100644
index 00000000000..a66cba4228b
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/makefile.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/newc_app.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/newc_app.gif
new file mode 100644
index 00000000000..a8353f63756
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/newc_app.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/newcc_app.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/newcc_app.gif
new file mode 100644
index 00000000000..9ed7487c248
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/newcc_app.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/segment_edit.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/segment_edit.gif
index 6844777924f..8cbaa857b79 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/segment_edit.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/segment_edit.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_add.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_add.gif
index 3fc40d6a13a..92003c4d620 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_add.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_add.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif
index 3fc40d6a13a..f5451485731 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_delete.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_delete.gif
index 3fc40d6a13a..5bff52281b9 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_delete.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_delete.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_edit.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_edit.gif
index 3fc40d6a13a..5e4b501b7da 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_edit.gif and b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_edit.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/update_old.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/update_old.gif
new file mode 100644
index 00000000000..1f378279aa3
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/dtool16/update_old.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/alphab_sort_co.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/alphab_sort_co.gif
index 9d38f6dff8a..7d27529b640 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/alphab_sort_co.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/alphab_sort_co.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/build_menu.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/build_menu.gif
new file mode 100644
index 00000000000..ab543f4d49c
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/build_menu.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/convert-normal.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/convert-normal.gif
new file mode 100644
index 00000000000..0b693cb5f60
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/convert-normal.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/make.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/make.gif
new file mode 100644
index 00000000000..def312aa120
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/make.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/makefile.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/makefile.gif
new file mode 100644
index 00000000000..7afb4948ba7
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/makefile.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/newc_app.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/newc_app.gif
new file mode 100644
index 00000000000..23b0284f84e
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/newc_app.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/newcc_app.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/newcc_app.gif
new file mode 100644
index 00000000000..4b39411daf5
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/newcc_app.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/segment_edit.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/segment_edit.gif
index e292fe5ef18..1b50ff8d67b 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/segment_edit.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/segment_edit.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/target_add.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/target_add.gif
index 3fc40d6a13a..7fe9625c8aa 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/target_add.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/target_add.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/target_build.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/target_build.gif
index 3fc40d6a13a..174965f26be 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/target_build.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/target_build.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/target_delete.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/target_delete.gif
index 3fc40d6a13a..b853d62333d 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/target_delete.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/target_delete.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/target_edit.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/target_edit.gif
index 3fc40d6a13a..65b97a547f5 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/etool16/target_edit.gif and b/build/org.eclipse.cdt.make.ui/icons/etool16/target_edit.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/etool16/update_old.gif b/build/org.eclipse.cdt.make.ui/icons/etool16/update_old.gif
new file mode 100644
index 00000000000..c40724d98ba
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/etool16/update_old.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/command_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/command_obj.gif
index f13e465665b..7b3a92e0906 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/command_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/command_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/error_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/error_obj.gif
index b04020bc723..0bc60689c6d 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/error_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/error_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/include_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/include_obj.gif
index 0c5f2085409..612067c1f9a 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/include_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/include_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/irule_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/irule_obj.gif
index a9a08d038fd..975d7894b61 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/irule_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/irule_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/macro_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/macro_obj.gif
index c12970d2b48..fdde5fbb95e 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/macro_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/macro_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/makefile.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/makefile.gif
deleted file mode 100644
index b3158c8b3b9..00000000000
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/makefile.gif and /dev/null differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/relation_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/relation_obj.gif
index 11b6f337fb8..edbd8a35510 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/relation_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/relation_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/target_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/target_obj.gif
index 3fc40d6a13a..def312aa120 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/target_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/target_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/trule_obj.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/trule_obj.gif
index 64c522da372..dd261127c83 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/trule_obj.gif and b/build/org.eclipse.cdt.make.ui/icons/obj16/trule_obj.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/view16/make_target.gif b/build/org.eclipse.cdt.make.ui/icons/view16/make_target.gif
new file mode 100644
index 00000000000..91627fa1376
Binary files /dev/null and b/build/org.eclipse.cdt.make.ui/icons/view16/make_target.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/icons/wizban/newcprj_wiz.gif b/build/org.eclipse.cdt.make.ui/icons/wizban/newcprj_wiz.gif
index 60ccf9c7c6a..df7c4890775 100644
Binary files a/build/org.eclipse.cdt.make.ui/icons/wizban/newcprj_wiz.gif and b/build/org.eclipse.cdt.make.ui/icons/wizban/newcprj_wiz.gif differ
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index c555ddd6396..65fc01a65f5 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -33,7 +33,7 @@
          point="org.eclipse.ui.newWizards">
       <wizard
             name="%WizardNewCMakeProject.name"
-            icon="icons/ctool16/newc_app.gif"
+            icon="icons/etool16/newc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCProjectWizard"
             project="true"
@@ -45,7 +45,7 @@
       </wizard>
       <wizard
             name="%WizardConvertMakeProject.name"
-            icon="icons/ctool16/convert-normal.gif"
+            icon="icons/etool16/convert-normal.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.ConvertToMakeProjectWizard"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
@@ -60,7 +60,7 @@
 <!-- For C++ Wizards -->
       <wizard
             name="%WizardNewCCMakeProject.name"
-            icon="icons/ctool16/newcc_app.gif"
+            icon="icons/etool16/newcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard"
             project="true"
@@ -72,7 +72,7 @@
       </wizard>
       <wizard
             name="%WizardConvertMakeProject.name"
-            icon="icons/ctool16/convert-normal.gif"
+            icon="icons/etool16/convert-normal.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.ConvertToMakeProjectWizard"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
@@ -227,7 +227,7 @@
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </page> 
-      <!-- page
+      <!--page
             objectClass="org.eclipse.cdt.core.model.ICContainer"
             name="%IncludeSymbolProperties.name"
             class="org.eclipse.cdt.internal.ui.dialogs.cpaths.IncludesSymbolsPropertyPage"
@@ -246,7 +246,7 @@
                name="projectNature"
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
-      </page -->
+      </page-->
       <page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
@@ -268,7 +268,7 @@
       </category>
       <view
             name="%ViewMake.name"
-            icon="icons/cview16/make_target.gif"
+            icon="icons/view16/make_target.gif"
             category="org.eclipse.cdt.make.ui"
             class="org.eclipse.cdt.make.ui.views.MakeView"
             id="org.eclipse.cdt.make.ui.views.MakeView">
@@ -281,7 +281,7 @@
             id="org.eclipse.cdt.make.ui.updateActionSet">
          <action
                label="%ActionMakeUpdate.label"
-               icon="icons/ctool16/update_old.gif"
+               icon="icons/etool16/update_old.gif"
                tooltip="%ActionMakeUpdate.tooltip"
                class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                toolbarPath="Normal"
@@ -357,7 +357,7 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%MakefileEditor.name"
-            icon="icons/obj16/makefile.gif"
+            icon="icons/etool16/makefile.gif"
             extensions="mk"
             filenames="Makefile,makefile,GNUMakefile"
             contributorClass="org.eclipse.cdt.make.internal.ui.editor.MakefileEditorActionContributor"
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java
index 5dc701e058c..4b3ac3e7b30 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java
@@ -77,6 +77,9 @@ public class MakeUIImages {
 
 	public static final String IMG_TOOLS_MAKEFILE_SEGMENT_EDIT= NAME_PREFIX + "segment_edit.gif"; //$NON-NLS-1$
 
+	public static final String IMG_OBJS_ENV_VAR = NAME_PREFIX + "environment_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENV_VAR = createManaged(OBJ, IMG_OBJS_ENV_VAR);
+
 	private static ImageDescriptor createManaged(String prefix, String name) {
 		return createManaged(imageRegistry, prefix, name);
 	}
@@ -112,7 +115,7 @@ public class MakeUIImages {
 	public static void setImageDescriptors(IAction action, String type, String relPath) {
 		relPath = relPath.substring(NAME_PREFIX_LENGTH);
 		action.setDisabledImageDescriptor(create("d" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
-		action.setHoverImageDescriptor(create("c" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+//		action.setHoverImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
 		action.setImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
index a37a692fa5a..d1579edcfdf 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java
@@ -34,7 +34,7 @@ public class LexicalSortingAction extends Action {
 
 		setDescription(MakeUIPlugin.getResourceString(ACTION_NAME + ".description")); //$NON-NLS-1$
 		setToolTipText(MakeUIPlugin.getResourceString(ACTION_NAME + ".tooltip")); //$NON-NLS-1$
-		MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_ALPHA_SORTING); //$NON-NLS-1$
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_ALPHA_SORTING);
 
 		fTreeViewer = treeViewer;
 		fSorter = new LexicalMakefileSorter();
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 8af55c0f7de..9f87d50bfbc 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,6 @@
+2005-04-07 David Daoust
+	Update icons
+	
 2005-02-24 Alain Magloire
 	Fix for PR 86443
 
diff --git a/launch/org.eclipse.cdt.launch/icons/c_app.gif b/launch/org.eclipse.cdt.launch/icons/c_app.gif
deleted file mode 100644
index 67c491f307b..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/c_app.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/obj16/c_app.gif b/launch/org.eclipse.cdt.launch/icons/obj16/c_app.gif
new file mode 100644
index 00000000000..504ef509f9c
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/obj16/c_app.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/obj16/exec_obj.gif b/launch/org.eclipse.cdt.launch/icons/obj16/exec_obj.gif
index 8174dade2bb..7b3a92e0906 100644
Binary files a/launch/org.eclipse.cdt.launch/icons/obj16/exec_obj.gif and b/launch/org.eclipse.cdt.launch/icons/obj16/exec_obj.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/tabs/arguments_tab.gif b/launch/org.eclipse.cdt.launch/icons/tabs/arguments_tab.gif
deleted file mode 100644
index 8670a384bd3..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/tabs/arguments_tab.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/tabs/debugger_tab.gif b/launch/org.eclipse.cdt.launch/icons/tabs/debugger_tab.gif
deleted file mode 100644
index 8b4f2340c94..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/tabs/debugger_tab.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/tabs/environment_tab.gif b/launch/org.eclipse.cdt.launch/icons/tabs/environment_tab.gif
deleted file mode 100644
index 65d63ec00d6..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/tabs/environment_tab.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/tabs/main_tab.gif b/launch/org.eclipse.cdt.launch/icons/tabs/main_tab.gif
deleted file mode 100644
index 6b86d079780..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/tabs/main_tab.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/tabs/source_tab.gif b/launch/org.eclipse.cdt.launch/icons/tabs/source_tab.gif
deleted file mode 100644
index 3976f8f7913..00000000000
Binary files a/launch/org.eclipse.cdt.launch/icons/tabs/source_tab.gif and /dev/null differ
diff --git a/launch/org.eclipse.cdt.launch/icons/view16/arguments_tab.gif b/launch/org.eclipse.cdt.launch/icons/view16/arguments_tab.gif
new file mode 100644
index 00000000000..44660b5f0b5
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/view16/arguments_tab.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/view16/debugger_tab.gif b/launch/org.eclipse.cdt.launch/icons/view16/debugger_tab.gif
new file mode 100644
index 00000000000..d90a29fead8
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/view16/debugger_tab.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/view16/environment_tab.gif b/launch/org.eclipse.cdt.launch/icons/view16/environment_tab.gif
new file mode 100644
index 00000000000..c379dd2548e
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/view16/environment_tab.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/view16/main_tab.gif b/launch/org.eclipse.cdt.launch/icons/view16/main_tab.gif
new file mode 100644
index 00000000000..b226e41c527
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/view16/main_tab.gif differ
diff --git a/launch/org.eclipse.cdt.launch/icons/view16/source_tab.gif b/launch/org.eclipse.cdt.launch/icons/view16/source_tab.gif
new file mode 100644
index 00000000000..08422596e26
Binary files /dev/null and b/launch/org.eclipse.cdt.launch/icons/view16/source_tab.gif differ
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 9361d7527c9..0bbd6a8664e 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -56,17 +56,17 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.localCLaunch"
             id="org.eclipse.cdt.launch.localRunLaunchImage">
       </launchConfigurationTypeImage>
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.localAttachCLaunch"
             id="org.eclipse.cdt.launch.localAttachLaunchImage">
       </launchConfigurationTypeImage>
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.coreFileCLaunch"
             id="org.eclipse.cdt.launch.coreFileLaunchImage">
       </launchConfigurationTypeImage>
@@ -93,7 +93,7 @@
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
             label="%CApplicationShortcut.label"
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             modes="run, debug"
             class="org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut"
             id="org.eclipse.cdt.debug.ui.localCShortcut">
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java
index fbf7d9a796a..f10de56c31a 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java
@@ -32,7 +32,7 @@ public class LaunchImages {
 		fgIconBaseURL= Platform.getBundle(LaunchUIPlugin.getUniqueIdentifier()).getEntry("/icons/"); //$NON-NLS-1$
 	}	
 
-	private static final String T_TABS = "tabs/"; //$NON-NLS-1$
+	private static final String T_TABS = "view16/"; //$NON-NLS-1$
 	private static final String T_OBJS = "obj16/"; //$NON-NLS-1$
 
 	public static String IMG_VIEW_MAIN_TAB = NAME_PREFIX + "main_tab.gif"; //$NON-NLS-1$