diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 7130b14f7c..61e80b2bf6 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -824,21 +824,21 @@ website_save_location_info=Use the following pattern when saving content
 website_filename_pattern=Filename pattern
 website_workflow=Workflow
 website_workflow_info=Use the following workflow
-website_form_summary=Using workflow ''{0}'', with filename pattern ''{1}'', {2} template(s) selected.
+website_form_summary=Using workflow ''{0}'', with filename pattern ''{1}'', {2} rendering engine(s) selected.
 website_forms=Define Forms
 form_template_details=Form Details
 form_template_details_desc=Edit the details of this Form Template
 form_template_conf_workflow=Configure Workflow
-form_template_select_templates=Select Templates
-form_template_templates=Manage Presentation Templates
-form_template_templates_desc=Setup the Presentation Templates you want to use for the Web Content Form.
+form_template_select_templates=Select Rendering Engines
+form_template_templates=Manage Rendering Engines
+form_template_templates_desc=Setup the Rendering Engines you want to use for the Web Content Form.
 form_template_workflow=Configure Workflow
 form_template_workflow_desc=Configure the workflow defaults for this Web Project
 create_website_step2_title=Step Two - Define Web Content Forms
 create_website_step2_desc=Setup the forms you want to use in this project.
 website_select_form=Select Form Templates to use
-website_select_templates=Select Presentation Templates to use
-website_selected_templates=Selected Presentation Templates
+website_select_templates=Select Rendering Engines to use
+website_selected_templates=Selected Rendering Engines
 website_settings=Specify Settings
 create_website_step3_title=Step Three - Web Project Settings
 create_website_step3_desc=Specify settings for this Web Project.
diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 8690544659..d72309b06d 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -123,7 +123,7 @@
                  description-id="sandbox_snapshot_info" />
          
          <dialog name="deleteSandbox" page="/jsp/dialog/delete.jsp" managed-bean="DeleteSandboxDialog"
-                 icon="/images/icons/delete_large.gif" title-id="delete_sandbox" 
+                 icon="/images/icons/delete_sandbox_large.gif" title-id="delete_sandbox" 
                  description-id="delete_sandbox_info" />
          
          <dialog name="deleteAvmFile" page="/jsp/dialog/delete.jsp" managed-bean="DeleteFileDialog"
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index b2730ca991..bd96d86eee 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -341,7 +341,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
                   out.write("&nbsp;");
                   
                   Utils.encodeRecursive(context, aquireAction(
-                        context, mainStore, username, ACT_SANDBOX_REVERTALL, "/images/icons/revert.gif",
+                        context, mainStore, username, ACT_SANDBOX_REVERTALL, "/images/icons/revert_all.gif",
                         "#{AVMBrowseBean.revertAll}", null));
                   out.write("&nbsp;");
                   
@@ -666,7 +666,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
                "#{AVMBrowseBean.submitSelected}", null));
          out.write("&nbsp;");
          Utils.encodeRecursive(fc, aquireAction(
-               fc, userStorePrefix, username, ACT_SANDBOX_REVERTSELECTED, "/images/icons/revert.gif",
+               fc, userStorePrefix, username, ACT_SANDBOX_REVERTSELECTED, "/images/icons/revert_all.gif",
                "#{AVMBrowseBean.revertSelected}", null));
          out.write("</td></tr>");
          
diff --git a/source/web/images/icons/create_snapshot.gif b/source/web/images/icons/create_snapshot.gif
index 51e4f1c52a..0abdfcbb5a 100644
Binary files a/source/web/images/icons/create_snapshot.gif and b/source/web/images/icons/create_snapshot.gif differ
diff --git a/source/web/images/icons/create_snapshot_large.gif b/source/web/images/icons/create_snapshot_large.gif
index 43a269c1df..ab2235ebd9 100644
Binary files a/source/web/images/icons/create_snapshot_large.gif and b/source/web/images/icons/create_snapshot_large.gif differ
diff --git a/source/web/images/icons/delete_sandbox.gif b/source/web/images/icons/delete_sandbox.gif
index 4ee6ccfce4..61777c0dbb 100644
Binary files a/source/web/images/icons/delete_sandbox.gif and b/source/web/images/icons/delete_sandbox.gif differ
diff --git a/source/web/images/icons/delete_sandbox_large.gif b/source/web/images/icons/delete_sandbox_large.gif
index cfe75d348b..bf5ee7db6e 100644
Binary files a/source/web/images/icons/delete_sandbox_large.gif and b/source/web/images/icons/delete_sandbox_large.gif differ
diff --git a/source/web/images/icons/revert.gif b/source/web/images/icons/revert.gif
index aa523b84e4..e992a1a8cb 100644
Binary files a/source/web/images/icons/revert.gif and b/source/web/images/icons/revert.gif differ
diff --git a/source/web/images/icons/revert_all.gif b/source/web/images/icons/revert_all.gif
new file mode 100644
index 0000000000..6399554051
Binary files /dev/null and b/source/web/images/icons/revert_all.gif differ
diff --git a/source/web/images/icons/revert_all_large.gif b/source/web/images/icons/revert_all_large.gif
new file mode 100644
index 0000000000..c08b6e998e
Binary files /dev/null and b/source/web/images/icons/revert_all_large.gif differ
diff --git a/source/web/images/icons/revert_large.gif b/source/web/images/icons/revert_large.gif
index bec0134e1b..0912248e74 100644
Binary files a/source/web/images/icons/revert_large.gif and b/source/web/images/icons/revert_large.gif differ
diff --git a/source/web/images/icons/template_large.gif b/source/web/images/icons/template_large.gif
index def3c84410..7b477e519e 100644
Binary files a/source/web/images/icons/template_large.gif and b/source/web/images/icons/template_large.gif differ
diff --git a/source/web/images/icons/webform_large.gif b/source/web/images/icons/webform_large.gif
index def3c84410..04399f2462 100644
Binary files a/source/web/images/icons/webform_large.gif and b/source/web/images/icons/webform_large.gif differ
diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
index cf00b6c421..73f6ccce36 100644
--- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
@@ -151,47 +151,39 @@ else
   </h:panelGroup>
   <h:panelGroup id="data-table-panel-group">
     <h:dataTable id="rendering-engine-template-data-table"
-                 value="#{WizardManager.bean.renderingEngineTemplatesDataModel}" 
-		 var="row" 
+                 value="#{WizardManager.bean.renderingEngineTemplatesDataModel}" var="row" 
                  rowClasses="selectedItemsRow,selectedItemsRowAlt"
-                 styleClass="selectedItems" 
-		 headerClass="selectedItemsHeader"
-                 cellspacing="0" 
-		 cellpadding="4" 
-		 width="100%"
+                 styleClass="selectedItems" headerClass="selectedItemsHeader"
+                 cellspacing="0" cellpadding="4" width="100%"
                  rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount != 0}">
       <h:column id="data-table-column-0">
-        <f:facet name="header">
-          <h:outputText id="data-table-name-0" value="#{msg.selected_rendering_engine_templates}" />
-        </f:facet>
-	<f:verbatim>
-	  <span style="float:left">
-	    <img src="<%= request.getContextPath() %>/images/icons/template_large.gif"/>
-	  </span>
-	</f:verbatim>
-	<h:outputText id="data-table-name-0-type" value="#{msg.type}: " />
-	<h:outputText id="data-table-value-0-type" value="#{row.renderingEngine.name}" />
-	<f:verbatim><br/></f:verbatim>
-	<h:outputText id="data-table-name-0-name" value="#{msg.file_name}: " />
-	<h:outputText id="data-table-value-0-name" value="#{row.fileName}" />
-	<f:verbatim><br/></f:verbatim>
-	<h:outputText id="data-table-name-0-title" value="#{msg.title}: " />
-	<h:outputText id="data-table-value-0-title" value="#{row.title}" />
-	<f:verbatim><br clear="all"/></f:verbatim>
-	<h:outputText id="data-table-name-0-description" value="#{msg.description}: " />
-	<h:outputText id="data-table-value-0-description" value="#{row.description}" />
-	<f:verbatim><br clear="all"/></f:verbatim>
-	<h:outputText id="data-table-name-0-mimetype" value="#{msg.mimetype_for_renditions}: " />
-	<h:outputText id="data-table-value-0-mimetype" value="#{row.mimetypeForRendition}" />
-	<f:verbatim><br clear="all"/></f:verbatim>
-	<h:outputText id="data-table-name-0-opp" value="#{msg.output_path_pattern}: " />
-	<h:outputText id="data-table-value-0-opp" value="#{row.outputPathPatternForRendition}" />
+         <f:facet name="header">
+            <h:outputText id="data-table-name-0" value="#{msg.selected_rendering_engine_templates}" />
+         </f:facet>
+         <f:verbatim>
+            <span style="float:left">
+               <img src="<%= request.getContextPath() %>/images/icons/template_large.gif"/>
+            </span>
+         </f:verbatim>
+         <h:outputText id="data-table-name-0-type" value="#{msg.type}: " />
+         <h:outputText id="data-table-value-0-type" value="#{row.renderingEngine.name}" />
+         <f:verbatim><br></f:verbatim>
+         <h:outputText id="data-table-name-0-name" value="#{msg.file_name}: " />
+         <h:outputText id="data-table-value-0-name" value="#{row.fileName}" />
+         <f:verbatim><br></f:verbatim>
+         <h:outputText id="data-table-name-0-title" value="#{msg.title}: " />
+         <h:outputText id="data-table-value-0-title" value="#{row.title}" />
+         <f:verbatim><br clear="all"></f:verbatim>
+         <h:outputText id="data-table-name-0-mimetype" value="#{msg.mimetype_for_renditions}: " />
+         <h:outputText id="data-table-value-0-mimetype" value="#{row.mimetypeForRendition}" />
+         <f:verbatim><br clear="all"></f:verbatim>
+         <h:outputText id="data-table-name-0-opp" value="#{msg.output_path_pattern}: " />
+         <h:outputText id="data-table-value-0-opp" value="#{row.outputPathPatternForRendition}" />
       </h:column>
       <h:column id="data-table-column-5">
         <a:actionLink id="remove-select-rendering-engine-action-link"
 		      actionListener="#{WizardManager.bean.removeSelectedRenderingEngineTemplate}" 
-	              image="/images/icons/delete.gif"
-                      value="#{msg.remove}" showLink="false" style="padding-left:6px" />
+	         image="/images/icons/delete.gif" value="#{msg.remove}" showLink="false" style="padding-left:6px" />
       </h:column>
     </h:dataTable>