diff --git a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
index 2439c2ae6..1ab621e0b 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java
@@ -235,13 +235,12 @@ public class UINavigator extends SelfRenderingComponent
       // generate the javascript method to capture the tree node click events
       if (treePanel)
       {
-         out.write("\n<script type=\"text/javascript\">\n");      
-         out.write("function treeNodeSelected(nodeRef) {\n");
+         out.write("<script type=\"text/javascript\">");      
+         out.write("function treeNodeSelected(nodeRef) {");
          out.write(Utils.generateFormSubmit(context, this, getClientId(context), 
                "nodeRef", true, null));
-         out.write("\n}\n");
-         out.write("</script>\n");
-      
+         out.write("}</script>");
+         
          // generate the active panel containing the tree
          out.write("<div class=\"navigatorPanelBody\">");
          UITree tree = (UITree)context.getApplication().createComponent(
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
index 161825223..8287caed8 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java
@@ -83,7 +83,7 @@ public class UISidebar extends SelfRenderingComponent
       out.write("/images/parts/sidebar_grey_01.gif\" width=5 height=5></td>" + 
                 "<td style=\"background-image: url(");
       out.write(cxPath);
-      out.write("/images/parts/sidebar_top_grey_bg.gif)\" height=24 width=100%>");
+      out.write("/images/parts/sidebar_top_grey_bg.gif)\" height=24>");
       
       // generate the required child components if not present
       if (this.getChildCount() == 1)
@@ -171,7 +171,7 @@ public class UISidebar extends SelfRenderingComponent
                    "<tr><td colspan='3'>");
          
          // render the plugin
-         out.write("<div id=\"pluginBox\" style=\"border: solid 1px #babfc5;\">");
+         out.write("<div id=\"pluginBox\">");
          UIComponent plugin = (UIComponent)getChildren().get(2);
          Utils.encodeRecursive(context, plugin);
          out.write("</div>");
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
index d849bd071..1582f956e 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
@@ -211,9 +211,9 @@ public class UIClipboardShelfItem extends UIShelfItem
          }
          
          // output general actions if any clipboard items are present
-         out.write("<tr><td colspan=3><nobr>");
+         out.write("<tr><td colspan=4 style='padding-top:3px' align='center'><nobr>");
          out.write(buildActionLink(ACTION_PASTE_ALL, -1, bundle.getString(MSG_PASTE_ALL), null));
-         out.write("&nbsp;");
+         out.write("&nbsp;|&nbsp;");
          out.write(buildActionLink(ACTION_REMOVE_ALL, -1, bundle.getString(MSG_REMOVE_ALL), null));
          out.write("</nobr></td><td></td></tr>");
       }
diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
index 758f8859f..614b33fda 100644
--- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
+++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShelf.java
@@ -170,8 +170,8 @@ public class UIShelf extends SelfRenderingComponent
       
       ResponseWriter out = context.getResponseWriter();
       
-      // TODO: allow config of spacing between ShelfGroup components
-      out.write("<table border=0 cellspacing=2 cellpadding=0 width=100%>");
+      out.write("<div id=\"shelf\" class=\"shelf\">");
+      out.write("<table border=0 cellspacing=4 cellpadding=0 width=100%>");
    }
    
    /**
@@ -294,7 +294,7 @@ public class UIShelf extends SelfRenderingComponent
       
       ResponseWriter out = context.getResponseWriter();
       
-      out.write("</table>");
+      out.write("</table></div>");
    }
 
    /**
diff --git a/source/web/css/main.css b/source/web/css/main.css
index c90d4904e..c8f51fb96 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -216,11 +216,11 @@ a.headbarLink
 
 .moreActionsMenu
 {
-   background-color: #eeeeee;
-   border-top: thin solid #FFFFFF;
-   border-left: thin solid #FFFFFF;
-   border-right: thin solid #444444;
-   border-bottom: thin solid #444444;
+   background-color: #f5f5f5;
+   border-top: thin solid #cacfd3;
+   border-left: thin solid #cacfd3;
+   border-right: thin solid #cacfd3;
+   border-bottom: thin solid #cacfd3;
 }
 
 .welcomeHeader
@@ -364,8 +364,7 @@ a.topToolbarLink, a.topToolbarLink:link, a.topToolbarLink:visited
 .topToolbarHighlight
 {
    background-color:#FFFFFF;
-   border:solid #5D6B71;
-   border-width:1px;
+   border: 1px solid #5D6B71;
 }
 
 a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighlight:visited
@@ -377,8 +376,7 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
 .statusListHighlight
 {
    background-color:#FFFFFF;
-   border:solid #71828A;
-   border-width:1px;
+   border: 1px solid #babfc5;
 }
 
 .statusListDisabled
@@ -563,11 +561,6 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
    padding-bottom: 8px;
 }
 
-.navigator
-{
-   width:220px;
-}
-
 .selectListTable
 {
    border: 1px solid #999999;
@@ -598,32 +591,20 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
    border-color: #DDDDDD;
 }
 
-.navigatorPanelTitle
+#shelf
 {
-   background-color: #efefef;
-   color: #004488;
-   padding: 5px;
-   border-top: 1px solid #aaaaaa;
+   min-width: 220px;
+   *width: 100%;
 }
 
-.navigatorPanelTitle a
+#pluginBox
 {
-   font-weight: bold;
+   border: 1px solid #babfc5;
 }
 
-.navigatorPanelTitle a:hover
+.navigator
 {
-   color: #4272b4;
-   font-weight: bold;
-}
-
-.navigatorPanelTitleSelected
-{
-   width: 220px;
-   font-weight: bold;
-   background-color: #7b7b7b;
-   color: white;
-   padding: 5px;
+   min-width: 220px;
 }
 
 .navigatorPanelBody
diff --git a/source/web/images/parts/greyround_01.gif b/source/web/images/parts/greyround_01.gif
index 0633b6405..4e923ef5a 100644
Binary files a/source/web/images/parts/greyround_01.gif and b/source/web/images/parts/greyround_01.gif differ
diff --git a/source/web/images/parts/greyround_02.gif b/source/web/images/parts/greyround_02.gif
index acebcbb99..dd0b59e59 100644
Binary files a/source/web/images/parts/greyround_02.gif and b/source/web/images/parts/greyround_02.gif differ
diff --git a/source/web/images/parts/greyround_03.gif b/source/web/images/parts/greyround_03.gif
index 93d3d7454..66d47ef93 100644
Binary files a/source/web/images/parts/greyround_03.gif and b/source/web/images/parts/greyround_03.gif differ
diff --git a/source/web/images/parts/greyround_04.gif b/source/web/images/parts/greyround_04.gif
index d30fcca52..4798bf7bc 100644
Binary files a/source/web/images/parts/greyround_04.gif and b/source/web/images/parts/greyround_04.gif differ
diff --git a/source/web/images/parts/greyround_06.gif b/source/web/images/parts/greyround_06.gif
index f5ecb2906..2779c1e63 100644
Binary files a/source/web/images/parts/greyround_06.gif and b/source/web/images/parts/greyround_06.gif differ
diff --git a/source/web/images/parts/greyround_07.gif b/source/web/images/parts/greyround_07.gif
index 0d3501795..6939d3194 100644
Binary files a/source/web/images/parts/greyround_07.gif and b/source/web/images/parts/greyround_07.gif differ
diff --git a/source/web/images/parts/greyround_08.gif b/source/web/images/parts/greyround_08.gif
index d012e57b7..6cb81e6aa 100644
Binary files a/source/web/images/parts/greyround_08.gif and b/source/web/images/parts/greyround_08.gif differ
diff --git a/source/web/images/parts/greyround_09.gif b/source/web/images/parts/greyround_09.gif
index a69b9c5df..60c70bb40 100644
Binary files a/source/web/images/parts/greyround_09.gif and b/source/web/images/parts/greyround_09.gif differ
diff --git a/source/web/images/parts/yellowInner_01.gif b/source/web/images/parts/yellowInner_01.gif
index 8d7cc10a0..b34221a59 100644
Binary files a/source/web/images/parts/yellowInner_01.gif and b/source/web/images/parts/yellowInner_01.gif differ
diff --git a/source/web/images/parts/yellowInner_02.gif b/source/web/images/parts/yellowInner_02.gif
index d511ea9dc..b8d148e93 100644
Binary files a/source/web/images/parts/yellowInner_02.gif and b/source/web/images/parts/yellowInner_02.gif differ
diff --git a/source/web/images/parts/yellowInner_03.gif b/source/web/images/parts/yellowInner_03.gif
index 1fe4c98e5..10ea4ef65 100644
Binary files a/source/web/images/parts/yellowInner_03.gif and b/source/web/images/parts/yellowInner_03.gif differ
diff --git a/source/web/images/parts/yellowInner_04.gif b/source/web/images/parts/yellowInner_04.gif
index 3212024ce..4b19ecbff 100644
Binary files a/source/web/images/parts/yellowInner_04.gif and b/source/web/images/parts/yellowInner_04.gif differ
diff --git a/source/web/images/parts/yellowInner_06.gif b/source/web/images/parts/yellowInner_06.gif
index 15e5fada6..74b4f76a6 100644
Binary files a/source/web/images/parts/yellowInner_06.gif and b/source/web/images/parts/yellowInner_06.gif differ
diff --git a/source/web/images/parts/yellowInner_07.gif b/source/web/images/parts/yellowInner_07.gif
index 3b114fa15..dae4da348 100644
Binary files a/source/web/images/parts/yellowInner_07.gif and b/source/web/images/parts/yellowInner_07.gif differ
diff --git a/source/web/images/parts/yellowInner_08.gif b/source/web/images/parts/yellowInner_08.gif
index 99a3e7903..754cef5ae 100644
Binary files a/source/web/images/parts/yellowInner_08.gif and b/source/web/images/parts/yellowInner_08.gif differ
diff --git a/source/web/images/parts/yellowInner_09.gif b/source/web/images/parts/yellowInner_09.gif
index c2da1cef2..f0a10c3fd 100644
Binary files a/source/web/images/parts/yellowInner_09.gif and b/source/web/images/parts/yellowInner_09.gif differ
diff --git a/source/web/images/parts/yellow_01.gif b/source/web/images/parts/yellow_01.gif
index f86e6b219..42f8cc907 100644
Binary files a/source/web/images/parts/yellow_01.gif and b/source/web/images/parts/yellow_01.gif differ
diff --git a/source/web/images/parts/yellow_02.gif b/source/web/images/parts/yellow_02.gif
index 83d79a719..33db922df 100644
Binary files a/source/web/images/parts/yellow_02.gif and b/source/web/images/parts/yellow_02.gif differ
diff --git a/source/web/images/parts/yellow_03.gif b/source/web/images/parts/yellow_03.gif
index c9a616b05..686be6b77 100644
Binary files a/source/web/images/parts/yellow_03.gif and b/source/web/images/parts/yellow_03.gif differ
diff --git a/source/web/images/parts/yellow_04.gif b/source/web/images/parts/yellow_04.gif
index 722235923..94974d1ff 100644
Binary files a/source/web/images/parts/yellow_04.gif and b/source/web/images/parts/yellow_04.gif differ
diff --git a/source/web/images/parts/yellow_06.gif b/source/web/images/parts/yellow_06.gif
index bb7646a73..01a112e91 100644
Binary files a/source/web/images/parts/yellow_06.gif and b/source/web/images/parts/yellow_06.gif differ
diff --git a/source/web/images/parts/yellow_07.gif b/source/web/images/parts/yellow_07.gif
index a4989c181..30eea6ba5 100644
Binary files a/source/web/images/parts/yellow_07.gif and b/source/web/images/parts/yellow_07.gif differ
diff --git a/source/web/images/parts/yellow_08.gif b/source/web/images/parts/yellow_08.gif
index 590145549..4b85fa0df 100644
Binary files a/source/web/images/parts/yellow_08.gif and b/source/web/images/parts/yellow_08.gif differ
diff --git a/source/web/images/parts/yellow_09.gif b/source/web/images/parts/yellow_09.gif
index 913341c98..de36e85e7 100644
Binary files a/source/web/images/parts/yellow_09.gif and b/source/web/images/parts/yellow_09.gif differ