diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
index 84fe5144f4..f49cad9122 100644
--- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
+++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
@@ -110,7 +110,11 @@ public class AlfrescoNavigationHandler extends NavigationHandler
                {
                   // there is an overidden outcome so extract it
                   outcome = outcome.substring(idx+1, outcome.length());
-            
+                  
+                  // we also need to empty the dialog stack if we have been given
+                  // an overidden outcome as we could be going anywhere in the app
+                  getViewStack(context).clear();
+                  
                   if (logger.isDebugEnabled())
                      logger.debug("Closing dialog with an overridden outcome of '" + outcome + "'");
                   
@@ -123,15 +127,10 @@ public class AlfrescoNavigationHandler extends NavigationHandler
                // log a warning and return a null outcome to stay on the same page
                if (logger.isWarnEnabled())
                {
-                  logger.warn("Attempting to close a dialog with an empty view stack, returning 'browse' outcome");
+                  logger.warn("Attempting to close a dialog with an empty view stack, returning null outcome");
                }
                
-               // TODO: change this back to returning null outcome as that
-               //       will highlight any areas we have neglected to launch
-               //       in a dilaog, for backwards compatibility for the short
-               //       term return 'browse' outcome.
-               
-               this.origHandler.handleNavigation(context, fromAction, "browse");
+               this.origHandler.handleNavigation(context, fromAction, null);
             }
          }
          else
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 5597cfe59d..16ef142b38 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -1181,7 +1181,8 @@ public class BrowseBean implements IContextListener
             setActionSpace(null);
             
             // setting the outcome will show the browse view again
-            outcome = "browse";
+            outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + 
+                      AlfrescoNavigationHandler.DIALOG_SEPARATOR + "browse";
          }
          catch (Throwable err)
          {
@@ -1220,7 +1221,8 @@ public class BrowseBean implements IContextListener
             setDocument(null);
             
             // setting the outcome will show the browse view again
-            outcome = "browse";
+            outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
+                      AlfrescoNavigationHandler.DIALOG_SEPARATOR + "browse";
          }
          catch (Throwable err)
          {
diff --git a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
index 75899812db..94b1d73818 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
@@ -709,7 +709,11 @@ public class NewSpaceWizard extends AbstractWizardBean
                      // the first icon in the list the default
                      
                      icons = new ArrayList<UIListItem>(iconsCfg.getChildCount());
-                     this.icon = iconName;
+                     if (this.icon == null)
+                     {
+                        // set the default if it is not already
+                        this.icon = iconName;
+                     }
                      first = false;
                   }
                   
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 5165b2ac43..bf35741874 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -107,7 +107,7 @@
                                        <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6" />
                                     </a:actionLink>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval4">
-                                       <a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
+                                       <a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
                                        </a:actionLink>
                                        <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" id="link6" actionListener="#{ClipboardBean.cutNode}">
@@ -311,7 +311,7 @@
                               <f:param name="id" value="#{r.id}" />
                            </a:actionLink>
                            <r:permissionEvaluator value="#{r}" allow="Delete">
-                              <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
+                              <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
                                  <f:param name="id" value="#{r.id}" />
                               </a:actionLink>
                            </r:permissionEvaluator>
@@ -479,7 +479,7 @@
                            </a:actionLink>
                            <r:permissionEvaluator value="#{r}" allow="Delete">
                               <a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
                                     <f:param name="id" value="#{r.id}" />
                                  </a:actionLink>
                               </a:booleanEvaluator>
diff --git a/source/web/jsp/dialog/delete-file.jsp b/source/web/jsp/dialog/delete-file.jsp
index fbb01aa0d6..da36180684 100644
--- a/source/web/jsp/dialog/delete-file.jsp
+++ b/source/web/jsp/dialog/delete-file.jsp
@@ -127,7 +127,7 @@
                                  <tr><td class="dialogButtonSpacing"></td></tr>
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                               </table>
diff --git a/source/web/jsp/dialog/delete-space.jsp b/source/web/jsp/dialog/delete-space.jsp
index f482acc96e..93ccb65fc6 100644
--- a/source/web/jsp/dialog/delete-space.jsp
+++ b/source/web/jsp/dialog/delete-space.jsp
@@ -143,7 +143,7 @@
                                  <tr><td class="dialogButtonSpacing"></td></tr>
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                               </table>
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 93184e0708..5e5303c74b 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -153,7 +153,7 @@
                                  <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Delete">
                                     <a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
                                        <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif"
-                                                     actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
+                                                     actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
                                           <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                        </a:actionLink>
                                     </a:booleanEvaluator>
@@ -441,7 +441,7 @@
                               <table cellpadding="1" cellspacing="1" border="0">
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                       <h:commandButton value="#{msg.close}" action="dialog:close" styleClass="wizardButton" />
                                     </td>
                                  </tr>
                               </table>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index eb9e452a45..320a865030 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -88,7 +88,7 @@
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
                               <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
                               </r:permissionEvaluator>