diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index abb7c05647e..0937bb0d901 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-15 Alain Magloire
+
+	Header icon provide by  Mirza Hadzic PR 26486.  Thanks.
+
+	* icons/full/obj16/h_file_obj.gif
+	* src/org/eclipse/cdt/internal/ui/CElementImagerProvider.java
+	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
+	* plugin.xml
+
 2003-12-15 Hoda Amer
 	Fixed [Bug 47234] new ParserMode required for a better CModel :
 	- Added a user preference to build the CModel using Structural mode
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/h_file_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/h_file_obj.gif
new file mode 100644
index 00000000000..6095bd540de
Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/h_file_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 43632749ca7..8c638a14257 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -167,12 +167,21 @@
       <editor
             default="true"
             name="%CEditor.name"
-            extensions="c, h, cc, hh, cpp, cxx, hpp"
+            extensions="c, cc, cpp, cxx"
             icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
+      <editor
+            default="true"
+            name="%CEditor.name"
+            extensions="h, hh, hpp"
+            icon="icons/full/obj16/h_file_obj.gif"
+            class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            id="org.eclipse.cdt.ui.editor.CEditor">
+      </editor>
       <editor
             name="%Editors.DefaultTextEditor"
             extensions="mk"
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 2fb1c50180f..ce75ad74bd4 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
@@ -5,6 +5,7 @@ package org.eclipse.cdt.internal.ui;
  * All Rights Reserved.
  */
 
+import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.IBinaryModule;
 import org.eclipse.cdt.core.model.ICElement;
@@ -264,6 +265,15 @@ public class CElementImageProvider {
 				return CPluginImages.DESC_OBJS_ARCHIVE;
 
 			case ICElement.C_UNIT:
+				String ext = celement.getPath().getFileExtension();
+				if (ext != null) {
+					String[] exts = CoreModel.getDefault().getHeaderExtensions();
+					for (int i = 0; i < exts.length; i++) {
+						if (exts[i].equalsIgnoreCase(ext)) {
+							return CPluginImages.DESC_OBJS_TUNIT_HEADER;
+						}
+					}
+				}
 				return CPluginImages.DESC_OBJS_TUNIT;
 				
 			case ICElement.C_CCONTAINER:
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 07a7634c6d1..8eaf1a66cd3 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
@@ -62,6 +62,7 @@ public class CPluginImages {
 	public static final String IMG_OBJS_INCLUDE= NAME_PREFIX + "include_obj.gif";
 	public static final String IMG_OBJS_MACRO= NAME_PREFIX + "define_obj.gif";
 	public static final String IMG_OBJS_TUNIT= NAME_PREFIX + "c_file_obj.gif";
+	public static final String IMG_OBJS_TUNIT_HEADER= NAME_PREFIX + "h_file_obj.gif";
 	public static final String IMG_OBJS_ARCHIVE= NAME_PREFIX + "ar_obj.gif";
 	public static final String IMG_OBJS_BINARY= NAME_PREFIX + "bin_obj.gif";
 	public static final String IMG_OBJS_SHLIB= NAME_PREFIX + "shlib_obj.gif";
@@ -95,6 +96,7 @@ public class CPluginImages {
 	public static final ImageDescriptor DESC_OBJS_INCLUDE= createManaged(T_OBJ, IMG_OBJS_INCLUDE);
 	public static final ImageDescriptor DESC_OBJS_MACRO= createManaged(T_OBJ, IMG_OBJS_MACRO);
 	public static final ImageDescriptor DESC_OBJS_TUNIT= createManaged(T_OBJ, IMG_OBJS_TUNIT);
+	public static final ImageDescriptor DESC_OBJS_TUNIT_HEADER= createManaged(T_OBJ, IMG_OBJS_TUNIT_HEADER);
 	public static final ImageDescriptor DESC_OBJS_ARCHIVE= createManaged(T_OBJ, IMG_OBJS_ARCHIVE);
 	public static final ImageDescriptor DESC_OBJS_BINARY= createManaged(T_OBJ, IMG_OBJS_BINARY);
 	public static final ImageDescriptor DESC_OBJS_SHLIB= createManaged(T_OBJ, IMG_OBJS_SHLIB);