diff --git a/source/java/org/alfresco/service/cmr/repository/TemplateNode.java b/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
index def9c5d5e4..e14b1bace3 100644
--- a/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
+++ b/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
@@ -581,7 +581,15 @@ public class TemplateNode implements Serializable
             }
             else
             {
-                return "/images/icons/space_small.gif";
+                String icon = (String)getProperties().get("app:icon");
+                if (icon != null)
+                {
+                    return "/images/icons/" + icon + "-16.gif";
+                }
+                else
+                {
+                    return "/images/icons/space_small.gif";
+                }
             }
         }
         else