diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
index 40a11f5843..99c57e0b24 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
@@ -169,13 +169,11 @@ a.docfilterLinkSelected:link, a.docfilterLinkSelected:visited
    font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
    font-size: 14px;
    color: #515D6B;
-   margin: 0px 0px 0px 24px;
-   padding: 0px 8px 6px 8px;
+   padding: 0px 8px 6px 40px;
 }
 
 .docIcon
 {
-   width: 32px;
    float: left;
    padding-left: 16px;
    padding-top: 4px;
@@ -193,7 +191,7 @@ a.docfilterLinkSelected:link, a.docfilterLinkSelected:visited
    color: #000000;
    display: none;
    overflow: hidden;
-   padding-left: 48px;
+   padding-left: 16px;
 }
 
 .docItemSelected
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
index 9e0f86cc55..5e833d1641 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces_get_html.ftl
@@ -52,7 +52,10 @@
       <img src="${url.context}${home.icon16}" width="16" height="16" alt="" style="vertical-align:-25%;padding-right:6px">${home.name?html}
    </div>
    <div class="spaceActions">
-      <div class="spaceAction spaceActionUpload" title="Upload a new document">Upload</div>
+      <div class="spaceAction spaceActionUpload" title="Upload a new document" onclick="MySpaces.upload(this);">
+         Upload
+         <div class="spaceUploadPanel"><input type="file" value=""></div>
+      </div>
       <div class="spaceAction spaceActionCreateSpace" title="Create a new Space">Create Space</div>
    </div>
    <div style="text-align: center;">
@@ -195,13 +198,11 @@ a.spacefilterLinkSelected:link, a.spacefilterLinkSelected:visited
    font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
    font-size: 14px;
    color: #515D6B;
-   margin: 0px 0px 0px 24px;
-   padding: 0px 8px 6px 8px;
+   padding: 0px 8px 6px 40px;
 }
 
 .spaceIcon
 {
-   width: 32px;
    float: left;
    padding-left: 16px;
    padding-top: 4px;
@@ -219,7 +220,7 @@ a.spacefilterLinkSelected:link, a.spacefilterLinkSelected:visited
    color: #000000;
    display: none;
    overflow: hidden;
-   padding-left: 48px;
+   padding-left: 16px;
 }
 
 .spaceItemSelected
@@ -290,4 +291,14 @@ a.spaceBreadcrumbLink:link, a.spaceBreadcrumbLink:visited, a.spaceBreadcrumbLink
    background-image: url(${url.context}/images/icons/doclist_action_createspace.png);
 }
 
+.spaceUploadPanel
+{
+   position: absolute;
+   border: 1px solid #CCD4DB;
+   background-color: #EEF7FB;
+   width: 24em;
+   height: 6em;
+   display: none;
+}
+
 </STYLE>
\ No newline at end of file
diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js
index a73b4e0e3b..6eab0c37ae 100644
--- a/source/web/scripts/ajax/doclist.js
+++ b/source/web/scripts/ajax/doclist.js
@@ -104,7 +104,7 @@ var MyDocs = {
             doc.addClass('docItemSelected');
             // move the item title to the right
             animItem[i] = {
-               'margin-left': [item.getStyle('margin-left').toInt(), 89],
+               'margin-left': [item.getStyle('margin-left').toInt(), 56],
                'font-size': [item.getStyle('font-size').toInt(), 18]
             };
             // fade in the info button
@@ -241,7 +241,7 @@ var MyDocs = {
                      // continue animations that may have been going on before the click
                      // move the item title to the right
                      animItem[j] = {
-                        'margin-left': [otherItem.getStyle('margin-left').toInt(), 89],
+                        'margin-left': [otherItem.getStyle('margin-left').toInt(), 56],
                         'font-size': [otherItem.getStyle('font-size').toInt(), 18]
                      };
                      // fade in the info button
@@ -359,7 +359,7 @@ var MyDocs = {
                // continue animations that may have been going on before the click
                // move the item title to the right
                animItem[i] = {
-                  'margin-left': [item.getStyle('margin-left').toInt(), 89],
+                  'margin-left': [item.getStyle('margin-left').toInt(), 56],
                   'font-size': [item.getStyle('font-size').toInt(), 18]
                };
                // fade in the info button
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index 96c20b3e06..6ddff1adcb 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -71,7 +71,7 @@ var MySpaces = {
             space.addClass('spaceItemSelected');
             // move the item title to the right
             animItem[i] = {
-               'margin-left': [item.getStyle('margin-left').toInt(), 89],
+               'margin-left': [item.getStyle('margin-left').toInt(), 56],
                'font-size': [item.getStyle('font-size').toInt(), 18]
             };
             // fade in the info button
@@ -160,7 +160,7 @@ var MySpaces = {
                // continue animations that may have been going on before the click
                // move the item title to the right
                animItem[i] = {
-                  'margin-left': [item.getStyle('margin-left').toInt(), 89],
+                  'margin-left': [item.getStyle('margin-left').toInt(), 56],
                   'font-size': [item.getStyle('font-size').toInt(), 18]
                };
                // fade in the info button
@@ -199,6 +199,12 @@ var MySpaces = {
          fxInfo.start(animInfo);
          fxImage.start(animImage);
       });
+   },
+   
+   upload: function(actionEl)
+   {
+      var panel = $E(".spaceUploadPanel", actionEl);
+      panel.setStyle("display", "block");
    }
 };