diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index cd8fbc7dcc..008ead0554 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -165,6 +165,7 @@ filter=Filter
 choose_icon=Choose icon
 security=Security
 all_formats=All Formats
+rules_count=Number of rules applied to this Space
 
 # Properties
 username=User Name
diff --git a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
index a3356af2c0..1bae92e281 100644
--- a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
@@ -172,11 +172,11 @@ public class DownloadContentServlet extends BaseServlet
          if (attachment == true)
          {
             // set header based on filename - will force a Save As from the browse if it doesn't recognise it
-            // this is better than the default response of the browse trying to display the contents!
-            // TODO: make this configurable - and check it does not prevent streaming of large files
-            res.setHeader("Content-Disposition", "attachment;filename=\"" + URLDecoder.decode(filename, "UTF-8") + '"');
+            // this is better than the default response of the browser trying to display the contents
+            String encname = filename.replace('%', '=');
+            res.setHeader("Content-Disposition", "attachment;filename=\"=?ISO-8859-1?Q?" + encname + "?=\"");
          }
-      
+         
          // get the content reader
          ContentReader reader = contentService.getReader(nodeRef, propertyQName);
          // ensure that it is safe to use
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
index 0669c5354b..9e8260b0d0 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
@@ -136,14 +136,7 @@ public class ModeListRenderer extends BaseRenderer
          String selectedImage = (String)attrs.get("selectedImage");
          if (selectedImage != null)
          {
-            out.write("<td");
-            int colWidth = list.getIconColumnWidth();
-            if (colWidth != 0)
-            {
-               out.write(" width=");
-               out.write(Integer.toString(colWidth));
-            }
-            out.write('>');
+            out.write("<td style='padding-right:4px'>");
             out.write(Utils.buildImageTag(context, selectedImage, null, "absmiddle"));
             out.write("</td>");
          }
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
index aca038c64f..cce1ce3fd5 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
@@ -86,26 +86,6 @@ public class UISpaceSelector extends AbstractItemSelector
       
       return id;
    }
-   
-   /**
-    * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#parentAccessable()
-    */
-   /*public boolean parentAccessable(FacesContext context)
-   {
-      boolean accessable = false;
-      try
-      {
-         ChildAssociationRef parentRef = getNodeService(context).getPrimaryParent(
-               new NodeRef(Repository.getStoreRef(), this.navigationId));
-         parentRef.getParentRef().getId();
-         accessable = true;
-      }
-      catch (AccessDeniedException accessErr)
-      {
-         // cannot navigate to parent id - not accessable
-      }
-      return accessable;
-   }*/
 
    /**
     * Returns the child spaces of the current space
diff --git a/source/web/images/icons/nav_file.gif b/source/web/images/icons/nav_file.gif
new file mode 100644
index 0000000000..837fda0824
Binary files /dev/null and b/source/web/images/icons/nav_file.gif differ
diff --git a/source/web/images/icons/nav_forum.gif b/source/web/images/icons/nav_forum.gif
new file mode 100644
index 0000000000..678f487252
Binary files /dev/null and b/source/web/images/icons/nav_forum.gif differ
diff --git a/source/web/images/icons/nav_next.gif b/source/web/images/icons/nav_next.gif
new file mode 100644
index 0000000000..8747626f1c
Binary files /dev/null and b/source/web/images/icons/nav_next.gif differ
diff --git a/source/web/images/icons/nav_prev.gif b/source/web/images/icons/nav_prev.gif
new file mode 100644
index 0000000000..9e27e5b20c
Binary files /dev/null and b/source/web/images/icons/nav_prev.gif differ
diff --git a/source/web/images/icons/nav_space.gif b/source/web/images/icons/nav_space.gif
new file mode 100644
index 0000000000..92a0ff0f60
Binary files /dev/null and b/source/web/images/icons/nav_space.gif differ
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 0d0867d19f..4ab048a89e 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -89,7 +89,7 @@
                               <td style="padding-right:4px" align=right>
                                  <nobr>
                                  <%-- Additional summary info --%>
-                                 <img src="<%=request.getContextPath()%>/images/icons/rule.gif" width=16 height=16> <h:outputText value="(#{NavigationBean.ruleCount})" id="rulemsg1" style="vertical-align:20%" />
+                                 <h:graphicImage id="img-rule" url="/images/icons/rule.gif" width="16" height="16" title="#{msg.rules_count}" /> <h:outputText value="(#{NavigationBean.ruleCount})" id="rulemsg1" style="vertical-align:20%" />
                                  </nobr>
                               </td>
                               <td class="separator" width=1></td>
@@ -97,7 +97,7 @@
                                  <%-- Quick upload action --%>
                                  <nobr>
                                  <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
-                                    <a:actionLink value="#{msg.add_content}" image="/images/icons/add.gif" action="addContent" actionListener="#{AddContentWizard.startWizard}" style="white-space:nowrap" id="link3" />
+                                    <a:actionLink value="#{msg.add_content}" image="/images/icons/add.gif" padding="2" action="addContent" actionListener="#{AddContentWizard.startWizard}" style="white-space:nowrap" id="link3" />
                                  </r:permissionEvaluator>
                                  </nobr>
                               </td>
diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp
index ed3944bbc7..8313ea0be6 100644
--- a/source/web/jsp/dialog/advanced-search.jsp
+++ b/source/web/jsp/dialog/advanced-search.jsp
@@ -86,10 +86,10 @@
                            </td>
                            
                            <td align=right>
-                              <a:actionLink value="#{msg.resetall}" image="/images/icons/delete.gif" padding="4" actionListener="#{AdvancedSearchBean.reset}" style="white-space:nowrap" />
+                              <a:actionLink value="#{msg.resetall}" image="/images/icons/delete.gif" padding="2" actionListener="#{AdvancedSearchBean.reset}" style="white-space:nowrap" />
                            </td>
                            <td class="separator" width=1></td>
-                           <td width=80 style="padding-left:4px">
+                           <td width=128 style="padding-left:4px">
                               <%-- Available Saved Searches --%>
                               <div style="padding-top:4px" style="white-space:nowrap">
                                  <a:modeList itemSpacing="3" iconColumnWidth="20" style="text-align:right" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 060e60b161..20b76623ad 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -81,14 +81,14 @@
                               <nobr>
                               <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="CheckOut">
                                  <a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
-                                    <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" padding="4" style="white-space:nowrap" 
+                                    <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" padding="2" style="white-space:nowrap" 
                                                   actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
                                        <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                     </a:actionLink>
                                  </a:booleanEvaluator>
                               </r:permissionEvaluator>
                               <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.checkIn == true}">
-                                 <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" padding="4" style="white-space:nowrap" 
+                                 <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" padding="2" style="white-space:nowrap" 
                                                actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkinFile">
                                     <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                  </a:actionLink>
@@ -200,18 +200,14 @@
                               </a:menu>
                            </td>
                            
-                           
-                           <%-- TODO: FINISH --%>
-                           
-                           
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{DocumentDetailsBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_file.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{DocumentDetailsBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index 7ed5cf156e..146accc0bf 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -141,12 +141,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_space.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp
index 4dd50ddd58..813872a888 100644
--- a/source/web/jsp/forums/forum-details.jsp
+++ b/source/web/jsp/forums/forum-details.jsp
@@ -95,12 +95,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_forum.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp
index 6ea8ce0547..0469529cdc 100644
--- a/source/web/jsp/forums/forums-details.jsp
+++ b/source/web/jsp/forums/forums-details.jsp
@@ -95,12 +95,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_forum.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp
index f87b5e6167..744726ff1e 100644
--- a/source/web/jsp/forums/topic-details.jsp
+++ b/source/web/jsp/forums/topic-details.jsp
@@ -95,12 +95,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_file.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
                            </td>