diff --git a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
index 741d1d9948..22d3c01bd2 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
@@ -295,7 +295,7 @@ public abstract class BaseTemplateContentServlet extends BaseServlet
    }
    
    /** Template Image resolver helper */
-   private TemplateImageResolver imageResolver = new TemplateImageResolver()
+   protected TemplateImageResolver imageResolver = new TemplateImageResolver()
    {
       public String resolveImagePathForName(String filename, boolean small)
       {
diff --git a/source/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
index 6800dcacd5..f459d61f67 100644
--- a/source/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
@@ -111,7 +111,7 @@ public class GuestTemplateContentServlet extends BaseTemplateContentServlet
       guestUser.setHomeSpaceId(guestHomeRef.getId());
       
       // build the default model
-      return DefaultModelHelper.buildDefaultModel(services, guestUser, templateRef);
+      return DefaultModelHelper.buildDefaultModel(services, guestUser, templateRef, this.imageResolver);
    }
    
    /**
diff --git a/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
index 09effd521d..12794904d4 100644
--- a/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
@@ -84,7 +84,7 @@ public class TemplateContentServlet extends BaseTemplateContentServlet
          NodeRef templateRef)
    {
       return DefaultModelHelper.buildDefaultModel(services, 
-            Application.getCurrentUser(req.getSession()), templateRef);
+            Application.getCurrentUser(req.getSession()), templateRef, this.imageResolver);
    }
    
    /**
diff --git a/source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java b/source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
index a24798c76e..f665d164a7 100644
--- a/source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
+++ b/source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
@@ -55,11 +55,31 @@ public class DefaultModelHelper
     * Other root level objects such as the current Space or Document are generally
     * added by the appropriate bean responsible for provided access to those nodes. 
     * <p>
+    * Uses the default TemplateImageResolver instance to resolve icons - assumes that the client
+    * has a valid FacesContext.
+    * <p>
     * See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
     * 
     * @return Map containing the default model.
     */
-   public static Map<String, Object> buildDefaultModel(ServiceRegistry services, User user, NodeRef template)
+   public static Map<String, Object> buildDefaultModel(
+         ServiceRegistry services, User user, NodeRef template)
+   {
+      return buildDefaultModel(services, user, template, imageResolver);
+   }
+   
+   /**
+    * Construct the default FreeMarker template model.
+    * <p>
+    * Other root level objects such as the current Space or Document are generally
+    * added by the appropriate bean responsible for provided access to those nodes. 
+    * <p>
+    * See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
+    * 
+    * @return Map containing the default model.
+    */
+   public static Map<String, Object> buildDefaultModel(
+         ServiceRegistry services, User user, NodeRef template, TemplateImageResolver resolver)
    {
       if (services == null)
       {
@@ -74,7 +94,7 @@ public class DefaultModelHelper
       NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
       
       return FreeMarkerProcessor.buildDefaultModel(
-              services, user.getPerson(), companyRootRef, userRootRef, template, imageResolver);
+              services, user.getPerson(), companyRootRef, userRootRef, template, resolver);
    }
    
    /** Template Image resolver helper */