diff --git a/source/java/org/alfresco/web/bean/TrashcanBean.java b/source/java/org/alfresco/web/bean/TrashcanBean.java
index 13bc4cc332..a209c99a74 100644
--- a/source/java/org/alfresco/web/bean/TrashcanBean.java
+++ b/source/java/org/alfresco/web/bean/TrashcanBean.java
@@ -35,10 +35,10 @@ import org.alfresco.repo.node.archive.RestoreNodeReport;
 import org.alfresco.repo.node.archive.RestoreNodeReport.RestoreStatus;
 import org.alfresco.repo.search.impl.lucene.QueryParser;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.cmr.search.SearchParameters;
@@ -479,13 +479,31 @@ public class TrashcanBean implements IContextListener
    
    private NodePropertyResolver resolverLocationPath = new NodePropertyResolver() {
       public Object get(Node node) {
-         return (Path)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PATH);
+         ChildAssociationRef childRef =
+            (ChildAssociationRef)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PARENT_ASSOC);
+         if (nodeService.exists(childRef.getParentRef()))
+         {
+            return nodeService.getPath(childRef.getParentRef());
+         }
+         else
+         {
+            return null;
+         }
       }
    };
    
    private NodePropertyResolver resolverDisplayPath = new NodePropertyResolver() {
       public Object get(Node node) {
-         return Repository.getDisplayPath((Path)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PATH));
+         ChildAssociationRef childRef =
+            (ChildAssociationRef)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PARENT_ASSOC);
+         if (nodeService.exists(childRef.getParentRef()))
+         {
+            return Repository.getDisplayPath(nodeService.getPath(childRef.getParentRef()), true);
+         }
+         else
+         {
+            return "";
+         }
       }
    };
    
@@ -623,6 +641,16 @@ public class TrashcanBean implements IContextListener
       contextUpdated();
    }
    
+   /**
+    * Action handler to setup actions that act on lists 
+    */
+   public void setupListAction(ActionEvent event)
+   {
+      // clear the UI state in preparation for finishing the next action
+      setDestination(null);
+      contextUpdated();
+   }
+   
    /**
     * Delete single item OK button handler 
     */
@@ -739,28 +767,28 @@ public class TrashcanBean implements IContextListener
    {
       FacesContext fc = FacesContext.getCurrentInstance();
       
+      // restore the nodes - the user may have requested a restore to a different parent
+      List<NodeRef> nodeRefs = new ArrayList<NodeRef>(this.listedItems.size());
+      for (Node node : this.listedItems)
+      {
+         nodeRefs.add(node.getNodeRef());
+      }
+      List<RestoreNodeReport> reports;
+      if (this.destination == null)
+      {
+         reports = this.nodeArchiveService.restoreArchivedNodes(nodeRefs);
+      }
+      else
+      {
+         reports = this.nodeArchiveService.restoreArchivedNodes(nodeRefs, this.destination, null, null);
+      }
+      
       UserTransaction tx = null;
       try
       {
          tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
          tx.begin();
          
-         // restore the nodes - the user may have requested a restore to a different parent
-         List<NodeRef> nodeRefs = new ArrayList<NodeRef>(this.listedItems.size());
-         for (Node node : this.listedItems)
-         {
-            nodeRefs.add(node.getNodeRef());
-         }
-         List<RestoreNodeReport> reports;
-         if (this.destination == null)
-         {
-            reports = this.nodeArchiveService.restoreArchivedNodes(nodeRefs);
-         }
-         else
-         {
-            reports = this.nodeArchiveService.restoreArchivedNodes(nodeRefs, this.destination, null, null);
-         }
-         
          saveReportDetail(reports);
          
          tx.commit();
@@ -776,9 +804,6 @@ public class TrashcanBean implements IContextListener
          fc.addMessage(null, facesMsg);
       }
       
-      // clear the UI state in preparation for finishing the action
-      contextUpdated();
-      
       return OUTCOME_RECOVERY_REPORT;
    }
    
@@ -789,24 +814,23 @@ public class TrashcanBean implements IContextListener
    {
       FacesContext fc = FacesContext.getCurrentInstance();
       
+      // restore all nodes - the user may have requested a restore to a different parent
+      List<RestoreNodeReport> reports;
+      if (this.destination == null)
+      {
+         reports = this.nodeArchiveService.restoreAllArchivedNodes(Repository.getStoreRef());
+      }
+      else
+      {
+         reports = this.nodeArchiveService.restoreAllArchivedNodes(Repository.getStoreRef(), this.destination, null, null);
+      }
+      
       UserTransaction tx = null;
       try
       {
          tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
          tx.begin();
          
-         // restore all nodes - the user may have requested a restore to a different parent
-         List<RestoreNodeReport> reports;
-         if (this.destination == null)
-         {
-            reports = this.nodeArchiveService.restoreAllArchivedNodes(Repository.getStoreRef());
-         }
-         else
-         {
-            reports = this.nodeArchiveService.restoreAllArchivedNodes(Repository.getStoreRef(), this.destination, null, null);
-         }
-         
-         // TODO: wrap all this in a UserTransaction - it performs a lot of getProperties()!
          saveReportDetail(reports);
          
          tx.commit();
@@ -822,9 +846,6 @@ public class TrashcanBean implements IContextListener
          fc.addMessage(null, facesMsg);
       }
       
-      // clear the UI state in preparation for finishing the action
-      contextUpdated();
-      
       return OUTCOME_RECOVERY_REPORT;
    }
    
@@ -858,9 +879,6 @@ public class TrashcanBean implements IContextListener
                FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
       }
       
-      // clear the UI state in preparation for finishing the action
-      contextUpdated();
-      
       return OUTCOME_DIALOGCLOSE;
    }
    
@@ -879,9 +897,6 @@ public class TrashcanBean implements IContextListener
                FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
       }
       
-      // clear the UI state in preparation for finishing the action
-      contextUpdated();
-      
       return OUTCOME_DIALOGCLOSE;
    }
    
@@ -1100,10 +1115,11 @@ public class TrashcanBean implements IContextListener
          buf.append("</td><td>");
          buf.append(node.getName());
          buf.append("</td><td>");
-         Path path = (Path)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PATH);
-         if (path != null)
+         ChildAssociationRef childRef =
+            (ChildAssociationRef)node.getProperties().get(ContentModel.PROP_ARCHIVED_ORIGINAL_PARENT_ASSOC);
+         if (nodeService.exists(childRef.getParentRef()))
          {
-            buf.append(Repository.getDisplayPath(path));
+            buf.append(Repository.getNamePath(nodeService, nodeService.getPath(childRef.getParentRef()), null, "/", null));
          }
          buf.append("</td>");
          if (report)
diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java
index 3f3b4b0ea0..3860ac21ee 100644
--- a/source/java/org/alfresco/web/bean/repository/Repository.java
+++ b/source/java/org/alfresco/web/bean/repository/Repository.java
@@ -223,10 +223,25 @@ public final class Repository
     * @return human readable form of the Path excluding the final element
     */
    public static String getDisplayPath(Path path)
+   {
+      return getDisplayPath(path, false);
+   }
+   
+   /**
+    * Return the human readable form of the specified node Path. Fast version of the method that
+    * simply converts QName localname components to Strings.
+    * 
+    * @param path       Path to extract readable form from
+    * @param showLeaf   Whether to process the final leaf element of the path
+    * 
+    * @return human readable form of the Path excluding the final element
+    */
+   public static String getDisplayPath(Path path, boolean showLeaf)
    {
       StringBuilder buf = new StringBuilder(64);
       
-      for (int i=0; i<path.size()-1; i++)
+      int count = path.size() - (showLeaf ? 0 : 1);
+      for (int i=0; i<count; i++)
       {
          String elementString = null;
          Path.Element element = path.get(i);
diff --git a/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java b/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
index b26ffb8de2..dc90db8245 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/NodePathTag.java
@@ -55,7 +55,7 @@ public class NodePathTag extends HtmlComponentTag
       setActionListenerProperty((UICommand)component, this.actionListener);
       setBooleanProperty(component, "breadcrumb", this.breadcrumb);
       setBooleanProperty(component, "disabled", this.disabled);
-      setBooleanProperty(component, "showLeaf", this.disabled);
+      setBooleanProperty(component, "showLeaf", this.showLeaf);
       setStringBindingProperty(component, "value", this.value);
    }
    
diff --git a/source/web/images/filetypes/js.gif b/source/web/images/filetypes/js.gif
new file mode 100644
index 0000000000..9e3f3b9f3a
Binary files /dev/null and b/source/web/images/filetypes/js.gif differ
diff --git a/source/web/images/filetypes32/js.gif b/source/web/images/filetypes32/js.gif
new file mode 100644
index 0000000000..b06728268b
Binary files /dev/null and b/source/web/images/filetypes32/js.gif differ
diff --git a/source/web/jsp/trashcan/trash-list.jsp b/source/web/jsp/trashcan/trash-list.jsp
index 62ae75ba1b..9812c118ff 100644
--- a/source/web/jsp/trashcan/trash-list.jsp
+++ b/source/web/jsp/trashcan/trash-list.jsp
@@ -114,8 +114,8 @@
                            
                            <td align=right style="white-space:nowrap">
                               <%-- Admin only global actions --%>
-                              <a:actionLink value="#{msg.recover_all_items}" image="/images/icons/recover_all.gif" action="dialog:recoverAllItems" rendered="#{NavigationBean.currentUser.admin == true}" />&nbsp;
-                              <a:actionLink value="#{msg.delete_all_items}" image="/images/icons/delete_all.gif" action="dialog:deleteAllItems" rendered="#{NavigationBean.currentUser.admin == true}" />
+                              <a:actionLink value="#{msg.recover_all_items}" image="/images/icons/recover_all.gif" action="dialog:recoverAllItems" actionListener="#{TrashcanBean.setupListAction}" rendered="#{NavigationBean.currentUser.admin == true}" />&nbsp;
+                              <a:actionLink value="#{msg.delete_all_items}" image="/images/icons/delete_all.gif" action="dialog:deleteAllItems" actionListener="#{TrashcanBean.setupListAction}" rendered="#{NavigationBean.currentUser.admin == true}" />
                            </td>
                         </tr>
                      </table>
@@ -210,8 +210,8 @@
                               <div style="padding: 4px;"></div>
                               
                               <%-- Recover Listed Items actions --%>
-                              <a:actionLink value="#{msg.recover_listed_items}" image="/images/icons/recover_all.gif" action="dialog:recoverListedItems" />&nbsp;
-                              <a:actionLink value="#{msg.delete_listed_items}" image="/images/icons/delete_all.gif" action="dialog:deleteListedItems"/>
+                              <a:actionLink value="#{msg.recover_listed_items}" image="/images/icons/recover_all.gif" action="dialog:recoverListedItems" actionListener="#{TrashcanBean.setupListAction}" />&nbsp;
+                              <a:actionLink value="#{msg.delete_listed_items}" image="/images/icons/delete_all.gif" action="dialog:deleteListedItems" actionListener="#{TrashcanBean.setupListAction}" />
                               <div style="padding: 4px;"></div>
                               
                               <a:richList id="trashcan-list" binding="#{TrashcanBean.itemsRichList}" viewMode="details" pageSize="10"
@@ -238,7 +238,7 @@
                                     <f:facet name="header">
                                        <a:sortLink label="#{msg.original_location}" value="displayPath" styleClass="header"/>
                                     </f:facet>
-                                    <r:nodePath value="#{r.locationPath}" actionListener="#{BrowseBean.clickSpacePath}" showLeaf="#{r.isFolder == false}" />
+                                    <r:nodePath value="#{r.locationPath}" actionListener="#{BrowseBean.clickSpacePath}" showLeaf="true" />
                                  </a:column>
                                  
                                  <%-- Deleted Date column --%>