diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 3a8880c0a20..607a392db63 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-30 Alain Magloire
+
+	New set of icons from Chris Wiebe.
+
+	* icons/full/obj16/enum_obj.gif
+	* icons/full/obj16/namespace_obj.gif
+	* icons/full/obj16/struct_obj.gif
+	* icons/full/obj16/union_obj.gif
+	* icons/full/obj16/typedef_obj.gif
+
+	* browser/org/eclipse/cdt/ui/browser/TypeInfoLabelProvider.java
+
 2004-03-30 Alain Magloire
 
 	Fix in the CView was not refreshing.
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java
index 12a69c9f0fc..89dcb588ab2 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java
@@ -28,7 +28,7 @@ public class TypeInfoLabelProvider extends LabelProvider {
 
 	private static final Image HEADER_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT_HEADER);
 	private static final Image SOURCE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT);
-	private static final Image NAMESPACE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
+	private static final Image NAMESPACE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_NAMESPACE);
 	private static final Image TEMPLATE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TEMPLATE);
 	private static final Image CLASS_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_CLASS);
 	private static final Image STRUCT_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_STRUCT);
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/enum_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/enum_obj.gif
index 3ce0d82ebc4..4a77d8cf115 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/enum_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/enum_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif
index 85554c5e40d..d495f3e790a 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/namespace_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/struct_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/struct_obj.gif
index cb2869f2488..040197f1e81 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/struct_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/struct_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/typedef_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/typedef_obj.gif
index 7e3ace3e77b..34bcaf71351 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/typedef_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/typedef_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/union_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/union_obj.gif
index b8405d54bb4..f5e36403ea7 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/union_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/union_obj.gif differ