diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 21556e8156b..9ffaa068496 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -4,6 +4,11 @@
 	IResource/IFile.
 	* model/org/eclipse/cdt/internal/core/model/TranslationUnit.java
 
+2003-08-28 Hoda Amer
+	Solution to bugs #39961 & #39968:
+	-Template Union missing an icon
+	-Template parameter signature documentation
+
 2003-08-28 Hoda Amer
 	- Added resolving references in a method's qualified name 
 	in Complete parse mode.
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java
index 392bf3f7359..ad2f99bae97 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java
@@ -49,6 +49,14 @@ public class FunctionTemplate extends FunctionDeclaration implements ITemplate{
 
 	/**
 	 * @see org.eclipse.cdt.core.model.ITemplate#getTemplateSignature()
+	 */
+	/*
+	 * The signature in the outline view will be: 
+	 * The class X followed by its template parameters, 
+	 * then the scope resolution, then the function name, 
+	 * followed by its template parameters, folowed by its 
+	 * normal parameter list, then a colon then the function's 
+	 * return type.
 	 */	
 	public String getTemplateSignature() {
 		StringBuffer sig = new StringBuffer(getElementName());
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java
index b2e8e988ca9..a4b3a9020c8 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodTemplate.java
@@ -50,6 +50,15 @@ public class MethodTemplate extends MethodDeclaration implements ITemplate{
 	/**
 	 * @see org.eclipse.cdt.core.model.ITemplate#getTemplateSignature()
 	 */	
+	/*
+	 * The signature in the outline view will be: 
+	 * The class X followed by its template parameters, 
+	 * then the scope resolution, then the function name, 
+	 * followed by its template parameters, folowed by its 
+	 * normal parameter list, then a colon then the function's 
+	 * return type.
+	 */	
+
 	public String getTemplateSignature() {
 		StringBuffer sig = new StringBuffer(getElementName());
 		if(getNumberOfTemplateParameters() > 0){
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index ae733e58e99..c4370c55228 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-28 Hoda Amer
+ 	Solution to Bug	#39968:
+	-Template Union missing an icon
+	
 2003-08-28 Alain Magloire
 
 	Changes to be able to see external file in the CEditor.  The main problem
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 d51e4848835..27a321720f9 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
@@ -212,6 +212,7 @@ public class CElementImageProvider {
 				return CPluginImages.DESC_OBJS_CLASS;
 				
 			case ICElement.C_UNION:
+			case ICElement.C_TEMPLATE_UNION:
 				return CPluginImages.DESC_OBJS_UNION;
 
 			case ICElement.C_TYPEDEF: