diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 60a83527dd7..db9830dd8eb 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-01 Alain Magloire
+
+	New set of icons to experiment, from Chris.
+	On April first .... ???
+
+	* icons/full/obj16/bin_obj.gif
+	* icons/full/obj16/cfolder_obj.gif
+	* icons/full/obj16/container_obj.gif
+	* icons/full/obj16/output_folder_obj.gif
+	* icons/full/obj16/output_obj.gif
+
+	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+	* src/org/eclipse/cdt/ui/CSearchResultLableProvider.java
+
 2004-03-31 David Inglis
 
 	removed org.apache.xerces dependency
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/bin_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/bin_obj.gif
index b96495c7bb1..f6d97e0d060 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/bin_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/bin_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif
index b6fedd4bb49..57ba1fbf159 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/container_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/container_obj.gif
index 3aa2efae2e0..d90a51c0220 100644
Binary files a/core/org.eclipse.cdt.ui/icons/full/obj16/container_obj.gif and b/core/org.eclipse.cdt.ui/icons/full/obj16/container_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/output_folder_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/output_folder_obj.gif
new file mode 100644
index 00000000000..090f799838b
Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/output_folder_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/output_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/output_obj.gif
new file mode 100644
index 00000000000..d90a51c0220
Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/output_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 67c6ed52ca1..0076d451c2c 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -135,7 +135,7 @@ HideArchiveFiles.description= Hides Archive files
 HideObjectFiles.label= Object files
 HideObjectFiles.description= Hides Object files
 
-HideNonCElements.label= Non-C elements
+HideNonCElements.label= Non-C Resource
 HideNonCElements.description= Show only C elements
 
 HideReferencedLibraries.label= Referenced libraries
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 7acf680a0d4..e57a643d59d 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
@@ -77,6 +77,7 @@ public class CPluginImages {
 	public static final String IMG_OBJS_CEXEC_DEBUG= NAME_PREFIX + "exec_dbg_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_CORE= NAME_PREFIX + "core_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_CONTAINER= NAME_PREFIX + "container_obj.gif"; //$NON-NLS-1$
+	public static final String IMG_OBJS_OUTPUT_FOLDER= NAME_PREFIX + "output_folder_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_LIBRARY= NAME_PREFIX + "lib_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_ORDER= NAME_PREFIX + "cp_order_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_EXCLUDSION_FILTER_ATTRIB= NAME_PREFIX + "exclusion_filter_attrib.gif"; //$NON-NLS-1$
@@ -125,6 +126,7 @@ public class CPluginImages {
 	public static final ImageDescriptor DESC_OBJS_CEXEC_DEBUG= createManaged(T_OBJ, IMG_OBJS_CEXEC_DEBUG);
 	public static final ImageDescriptor DESC_OBJS_CORE= createManaged(T_OBJ, IMG_OBJS_CORE);
 	public static final ImageDescriptor DESC_OBJS_CONTAINER= createManaged(T_OBJ, IMG_OBJS_CONTAINER);
+	public static final ImageDescriptor DESC_OBJS_OUTPUT_FOLDER= createManaged(T_OBJ, IMG_OBJS_OUTPUT_FOLDER);
 	public static final ImageDescriptor DESC_OBJS_LIBRARY= createManaged(T_OBJ, IMG_OBJS_LIBRARY);
 	public static final ImageDescriptor DESC_OBJS_ORDER= createManaged(T_OBJ, IMG_OBJS_ORDER);
 	public static final ImageDescriptor DESC_OBJS_EXCLUSION_FILTER_ATTRIB = createManaged(T_OBJ, IMG_OBJS_EXCLUDSION_FILTER_ATTRIB);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
index 9e015a86627..b3739042414 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
@@ -70,7 +70,7 @@ public class CSearchResultLabelProvider extends LabelProvider {
 			case ICElement.C_CLASS:			imageDescriptor = CPluginImages.DESC_OBJS_CLASS;		break;
 			case ICElement.C_STRUCT:		imageDescriptor = CPluginImages.DESC_OBJS_STRUCT;		break;
 			case ICElement.C_UNION:			imageDescriptor = CPluginImages.DESC_OBJS_UNION;		break;
-			case ICElement.C_NAMESPACE:		imageDescriptor = CPluginImages.DESC_OBJS_CONTAINER;	break;
+			case ICElement.C_NAMESPACE:		imageDescriptor = CPluginImages.DESC_OBJS_NAMESPACE;	break;
 			case ICElement.C_ENUMERATION:	imageDescriptor = CPluginImages.DESC_OBJS_ENUMERATION;	break;
 			case ICElement.C_MACRO:			imageDescriptor = CPluginImages.DESC_OBJS_MACRO;		break;
 			case ICElement.C_FUNCTION:		imageDescriptor = CPluginImages.DESC_OBJS_FUNCTION;		break;