diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 95a3853a79..a7f449d3c8 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -697,6 +697,9 @@ public class AVMBrowseBean implements IContextListener
       return this.userSandboxes.getSelectedNodes(this.username);
    }
    
+   /**
+    * @return true if the special Submit All action has been initialised
+    */
    public boolean getSubmitAll()
    {
       return this.submitAll;
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 5975517275..5ca24fbacf 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -484,6 +484,11 @@ public class SubmitDialog extends BaseDialogBean
                            this.workflows.add(wrapper);
                         }
                      }
+                     else
+                     {
+                        this.submitItems.add(new ItemWrapper(node));
+                        submittedPaths.add(node.getPath());
+                     }
                   }
                   else
                   {
@@ -669,8 +674,7 @@ public class SubmitDialog extends BaseDialogBean
       
       public String getIcon()
       {
-         // TODO: handle deleted file types here once implemented in the AVMNodeType enum
-         if (descriptor.isFile())
+         if (descriptor.isDeletedFile())
          {
             return Utils.getFileTypeImage(descriptor.getName(), true);
          }
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 4d73a5e315..5924e3f33f 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -623,8 +623,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
                // must have been deleted from this sandbox - show as ghosted
                String name = node.getName();
                out.write("<td width=16>");
-               // TODO: need new solution - isFile() and isFolder() both return false for a deleted node!
-               if (node.isFile())
+               if (node.isDeletedFile())
                {
                   out.write(Utils.buildImageTag(fc, Utils.getFileTypeImage(fc, name, true), ""));
                   out.write("</td><td style='color:#aaaaaa'>");
diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp
index 679e2384a0..91da43b874 100644
--- a/source/web/jsp/wcm/submit-dialog.jsp
+++ b/source/web/jsp/wcm/submit-dialog.jsp
@@ -137,7 +137,10 @@
                <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
             </f:facet>
             <f:facet name="small-icon">
-               <a:actionLink id="col10-icon1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.icon}" showLink="false" styleClass="inlineAction" rendered="#{!r.deleted}" />
+               <h:panelGroup>
+                  <a:actionLink id="col10-icon1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.icon}" showLink="false" styleClass="inlineAction" rendered="#{!r.deleted}" />
+                  <h:graphicImage id="col10-icon2" title="#{r.name}" url="#{r.icon}" styleClass="inlineAction" rendered="#{r.deleted}" />
+               </h:panelGroup>
             </f:facet>
             <a:actionLink id="col10-name1" value="#{r.name}" href="#{r.url}" target="new" rendered="#{!r.deleted}" />
             <h:outputText id="col10-name2" value="#{r.name}" rendered="#{r.deleted}" />