diff --git a/config/alfresco/web-client-config-wcm-actions.xml b/config/alfresco/web-client-config-wcm-actions.xml
index 562374f979..e77da049b2 100644
--- a/config/alfresco/web-client-config-wcm-actions.xml
+++ b/config/alfresco/web-client-config-wcm-actions.xml
@@ -246,6 +246,35 @@
             </params>
          </action>
          
+         <!-- Cut a file or folder to the clipboard -->
+         <action id="cut_avm_node">
+            <evaluator>org.alfresco.web.action.evaluator.WCMWorkflowEvaluator</evaluator>
+            <permissions>
+               <permission allow="true">Delete</permission>
+            </permissions>
+            <label-id>cut</label-id>
+            <image>/images/icons/cut.gif</image>
+            <action-listener>#{ClipboardBean.cutNode}</action-listener>
+            <params>
+               <param name="ref">#{actionContext.nodeRef}</param>
+               <!--<param name="parent">#{NavigationBean.currentNodeId}</param>-->
+            </params>
+         </action>
+         
+         <!-- Copy a file or folder to the clipboard -->
+         <action id="copy_avm_node">
+            <permissions>
+               <permission allow="true">Read</permission>
+            </permissions>
+            <label-id>copy</label-id>
+            <image>/images/icons/copy.gif</image>
+            <action-listener>#{ClipboardBean.copyNode}</action-listener>
+            <params>
+               <param name="ref">#{actionContext.nodeRef}</param>
+               <!--<param name="parent">#{NavigationBean.currentNodeId}</param>-->
+            </params>
+         </action>
+         
          
          <!-- Actions for a file in the AVM Browse screen -->
          <action-group id="avm_file_browse">
@@ -253,6 +282,8 @@
             <action idref="edit_file" />
             <action idref="update_file" />
             <action idref="preview_file" />
+            <action idref="cut_avm_node" />
+            <action idref="copy_avm_node" />
             <action idref="file_details" />
             <action idref="delete_file_browse" />
          </action-group>
@@ -261,6 +292,8 @@
          <action-group id="avm_folder_browse">
             <show-link>false</show-link>
             <action idref="preview_folder" />
+            <action idref="cut_avm_node" />
+            <action idref="copy_avm_node" />
             <action idref="folder_details" />
             <action idref="delete_folder_browse" />
          </action-group>
@@ -273,6 +306,7 @@
             <action idref="submit" />
             <action idref="revert" />
             <action idref="preview_file" />
+            <action idref="copy_avm_node" />
             <action idref="file_details" />
             <action idref="delete_file" />
          </action-group>
@@ -283,6 +317,7 @@
             <action idref="submit" />
             <action idref="revert" />
             <action idref="preview_folder" />
+            <action idref="copy_avm_node" />
             <action idref="folder_details" />
             <action idref="delete_folder" />
          </action-group>
@@ -311,6 +346,8 @@
          <!-- Actions for the File Details action menu -->
          <action-group id="avm_file_details">
             <show-link>false</show-link>
+            <action idref="cut_avm_node" />
+            <action idref="copy_avm_node" />
             <action idref="edit_file" />
             <action idref="update_file" />
             <action idref="delete_file_browse" />
@@ -319,6 +356,8 @@
          <!-- Actions for the Folder Details action menu -->
          <action-group id="avm_folder_details">
             <show-link>false</show-link>
+            <action idref="cut_avm_node" />
+            <action idref="copy_avm_node" />
             <action idref="delete_folder_browse" />
          </action-group>
          
diff --git a/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
index 982f2cfdb4..198b49e235 100644
--- a/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
@@ -33,4 +33,12 @@ public class AVMClipboardItem extends AbstractClipboardItem
    {
       super(ref, mode);
    }
+
+   /**
+    * @see org.alfresco.web.bean.clipboard.ClipboardItem#supportsLink()
+    */
+   public boolean supportsLink()
+   {
+      return false;
+   }
 }
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
index 0bbc6fa6bc..d3003d4e68 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -438,7 +438,7 @@ public class ClipboardBean
    }
    
    /**
-    * Add a clipboard node for an operation to the clipboard
+    * Add a clipboard node to the clipboard ready for a cut/copy operation
     * 
     * @param ref     NodeRef of the item for the operation
     * @param mode    ClipboardStatus for the operation
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
index f9d9c16ecf..2b8fe47785 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardItem.java
@@ -44,4 +44,6 @@ public interface ClipboardItem
    public String getId();
    
    public NodeRef getNodeRef();
+   
+   public boolean supportsLink();
 }
diff --git a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
index bceab9c044..b39158b93e 100644
--- a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
@@ -33,4 +33,12 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
    {
       super(ref, mode);
    }
+   
+   /**
+    * @see org.alfresco.web.bean.clipboard.ClipboardItem#supportsLink()
+    */
+   public boolean supportsLink()
+   {
+      return true;
+   }
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMNode.java b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
index 59786253e1..a5eeb724bc 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMNode.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
@@ -194,6 +194,7 @@ public class AVMNode extends Node implements Map<String, Object>
          }
          
          this.properties.put("id", this.id);
+         this.properties.put("nodeRef", this.nodeRef);
          this.properties.put("size", this.avmRef.getLength());
          this.properties.put("name", this.avmRef.getName());
          this.properties.put("created", this.avmRef.getCreateDate());
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java b/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
index ecc375ff66..ef0f86d571 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISimpleSearch.java
@@ -195,7 +195,7 @@ public class UISimpleSearch extends UICommand
       
       // dynamic DIV area containing search options
       out.write("<br><div id='_alfsearch' style='position:absolute;display:none'>");
-      out.write("<table border=0 bgcolor='#eeeeee' style='border-top:thin solid #FFFFFF;border-left:thin solid #FFFFFF;border-right:thin solid #444444;border-bottom:thin solid #444444;' cellspacing=4 cellpadding=0>");
+      out.write("<table border=0 class='moreActionsMenu' cellspacing=4 cellpadding=0>");
       
       // output each option - setting the current one to CHECKED
       String optionFieldName = getClientId(context) + NamingContainer.SEPARATOR_CHAR + OPTION_PARAM;
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 63a3f936bd..9267aa7746 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
@@ -32,8 +32,10 @@ import javax.faces.event.ActionEvent;
 import javax.faces.event.FacesEvent;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.bean.clipboard.ClipboardItem;
 import org.alfresco.web.bean.clipboard.ClipboardStatus;
 import org.alfresco.web.bean.repository.Repository;
@@ -170,7 +172,8 @@ public class UIClipboardShelfItem extends UIShelfItem
             }
             out.write("</td><td width=16>");
             
-            if (dd.isSubClass(item.getType(), ContentModel.TYPE_FOLDER))
+            boolean isFolder = (dd.isSubClass(item.getType(), ContentModel.TYPE_FOLDER));
+            if (isFolder)
             {
                // start row with correct node icon
                String icon = (String)item.getIcon();
@@ -193,14 +196,28 @@ public class UIClipboardShelfItem extends UIShelfItem
             // output cropped item label - we also output with no breaks, this is ok
             // as the copped label will ensure a sensible maximum width
             out.write("</td><td width=100%><nobr>&nbsp;");
-            out.write(Utils.cropEncode(item.getName()));
+            if (isFolder)
+            {
+               out.write(Utils.cropEncode(item.getName()));
+            }
+            else
+            {
+               // output as a content download link
+               out.write("<a href='");
+               out.write(context.getExternalContext().getRequestContextPath());
+               out.write(DownloadContentServlet.generateBrowserURL(item.getNodeRef(), item.getName()));
+               out.write("' target='new'>");
+               out.write(Utils.cropEncode(item.getName()));
+               out.write("</a>");
+            }
             
             // output actions
             out.write("</nobr></td><td align=right><nobr>");
             out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE));
             out.write("&nbsp;");
             out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE));
-            if (item.getMode() == ClipboardStatus.COPY && dd.isSubClass(item.getType(), ContentModel.TYPE_LINK) == false)
+            if (item.supportsLink() && item.getMode() == ClipboardStatus.COPY &&
+                dd.isSubClass(item.getType(), ContentModel.TYPE_LINK) == false)
             {
                out.write("&nbsp;");
                out.write(buildActionLink(ACTION_PASTE_LINK, i, bundle.getString(MSG_PASTE_LINK), WebResources.IMAGE_PASTE_LINK));