diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index bebda9c7aa5..9e95dfa8387 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-14 Alain Magloire
+
+	Remove the contribution for header doing this will force
+	all C files to have the header icon. Added icon for assembly files.
+
+	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+	* plugin.xml
+
 2004-04-14 Andrew Niefer
 	updated src/org/eclipse/cdt/internal/ui/compare/SourceElementRequestorAdapter with acceptFriendDeclaration
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 07ac2e36030..77560129de7 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -198,31 +198,14 @@
             name="%CEditor.name"
             default="true"
             icon="icons/full/obj16/c_file_obj.gif"
-            extensions="c, cc, cpp, cxx"
+            extensions="c, cc, cpp, cxx, h, hh, hpp"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
-      <editor
-            name="%CEditor.name"
-            default="true"
-            icon="icons/full/obj16/h_file_obj.gif"
-            extensions="h, hh, hpp"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
-            class="org.eclipse.cdt.internal.ui.editor.CEditor"
-            id="org.eclipse.cdt.ui.editor.CEditor">
-      </editor>
-      <editor
-            name="%Editors.DefaultTextEditor"
-            icon="icons/full/obj16/file_obj.gif"
-            extensions="mk"
-            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
-            class="org.eclipse.ui.editors.text.TextEditor"
-            id="org.eclipse.ui.DefaultTextEditor">
-      </editor>
       <editor
             name="%AsmEditor.name"
-            icon="icons/full/obj16/c_file_obj.gif"
+            icon="icons/full/obj16/s_file_obj.gif"
             extensions="s"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
@@ -644,6 +627,17 @@
                value="org.eclipse.cdt.core.cnature">
          </filter>
       </page>
+      <page
+            objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
+            name="C/C++ Include Paths &amp; Symbols"
+            class="org.eclipse.cdt.internal.ui.dialogs.cpaths.IncludesSymbolsPropertyPage"
+            id="org.eclipse.cdt.internal.ui.dialogs.cpath.IncludeSymbolsPropertyPage">
+         <filter
+               name="nature"
+               value="org.eclipse.cdt.core.cnature">
+         </filter>
+      </page>
    </extension>
 -->
 </plugin>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
index 4e0c7ffc056..017dac9aa94 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
@@ -288,6 +288,12 @@ public class CElementImageProvider {
 							return CPluginImages.DESC_OBJS_TUNIT_HEADER;
 						}
 					}
+					exts = CoreModel.getDefault().getAssemblyExtensions();
+					for (int i = 0; i < exts.length; i++) {
+						if (exts[i].equalsIgnoreCase(ext)) {
+							return CPluginImages.DESC_OBJS_TUNIT_ASM;
+						}
+					}
 				}
 				return CPluginImages.DESC_OBJS_TUNIT;