diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
index 217e32e29f..35e66a90e9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
@@ -68,15 +68,14 @@
       </table>
    </div>
 
-   <div>   
-      <table class="taskActions" style="padding-left:16px">
-         <tr>
+   <div class="taskActionContainer">   
+      <span class="taskActions">
    <#list task.transitions as wt>
-            <td>
-               <a class="taskAction" href="#" onclick="OfficeMyTasks.transitionTask('${task.id}', '${url.context}/command/task/end/${task.id}<#if wt.id?exists>/${wt.id}</#if>', 'Workflow action \'${wt.label?html}\' completed.');">${wt.label?html}</a>
-            </td>
+         <span class="taskAction" onclick="OfficeMyTasks.transitionTask('${task.id}', '${url.context}/command/task/end/${task.id}<#if wt.id?exists>/${wt.id}</#if>', 'Workflow action \'${wt.label?html}\' completed.');">${wt.label?html}</span>
    </#list>
-         </tr>
-      </table>
+      </span>
+      <span class="taskManage">
+         <span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain&amp;ticket=${session.ticket}', OfficeMyTasks.refreshPage);">Manage...</span>
+      </span>
    </div>
 </#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
index de0df9c2d4..3931ed8af9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
@@ -163,7 +163,7 @@
             <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','checkout','${child.id}', '');"><img src="${url.context}/images/office/checkout.gif" style="padding:3px 6px 2px 0px;" alt="Check Out" title="Check Out" /></a>
       </#if>
             <a href="${url.serviceContext}/office/myTasks?p=${path?url}&amp;w=new&amp;wd=${child.id}"><img src="${url.context}/images/office/new_workflow.gif" style="padding:3px 6px 2px 0px;" alt="Create Workflow..." title="Create Workflow..." /></a>
-            <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/attach_document.gif" style="padding:3px 6px 2px 0px;" alt="Attach File to Current Document" title="Attach File to Current Document" /></a>
+            <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/insert_document.gif" style="padding:3px 6px 2px 0px;" alt="Insert File into Current Document" title="Insert File into Current Document" /></a>
       <#if !child.name?ends_with(".pdf")>
             <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','makepdf','${child.id}', '');"><img src="${url.context}/images/office/makepdf.gif" style="padding:3px 6px 2px 0px;" alt="Make PDF..." title="Make PDF" /></a>
       </#if>
diff --git a/source/web/css/office.css b/source/web/css/office.css
index f9bf1c1d27..ab494340fb 100644
--- a/source/web/css/office.css
+++ b/source/web/css/office.css
@@ -33,7 +33,7 @@ a img {
    border: 0px;
 }
 
-TABLE, TR, TD {
+TABLE, TD {
    border: 0px;
    border-collapse: collapse;
    padding: 2px;
@@ -449,6 +449,20 @@ input.button {
    overflow: auto;
 }
 
+.taskActionContainer {
+   float: left;
+   width: 272px;
+}
+
+.taskActions {
+   float: left;
+   padding-right: 2px;
+}
+
+.taskManage {
+   float: right;
+}
+
 .taskAction {
    background-color: #cce6ff;
    border: 1px solid #0073e6;
@@ -457,7 +471,7 @@ input.button {
    font-size: 11px;
    font-weight: bold;
    cursor: pointer;
-   margin: 0px 0px 0px 2px;
+   margin: 0px 0px 0px 4px;
    padding: 4px;
    filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr='#ffffff', EndColorStr='#cce6ff');
 }
diff --git a/source/web/images/office/insert_document.gif b/source/web/images/office/insert_document.gif
index 6bba036529..b2ce9a797b 100644
Binary files a/source/web/images/office/insert_document.gif and b/source/web/images/office/insert_document.gif differ
diff --git a/source/web/images/office/navigator.gif b/source/web/images/office/navigator.gif
index 2138578cfe..da1ec33147 100644
Binary files a/source/web/images/office/navigator.gif and b/source/web/images/office/navigator.gif differ
diff --git a/source/web/scripts/office/my_tasks.js b/source/web/scripts/office/my_tasks.js
index 3a40b1eee6..52dc74b916 100644
--- a/source/web/scripts/office/my_tasks.js
+++ b/source/web/scripts/office/my_tasks.js
@@ -226,6 +226,23 @@ var OfficeMyTasks =
          }
       });
       myAjax.request();
+   },
+   
+   refreshPage: function()
+   {
+      // Remove any trailing hash
+      var href = window.location.href.replace("#", "")
+      // Remove any previous "st", "w", "wd" or "t" parameters
+      href = OfficeAddin.removeParameters(href, "st|w|wd|t");
+      // Re-select a selected task after reload
+      var taskSel = $E('#taskList .taskItemSelected');
+      if (taskSel != null)
+      {
+         var taskId = taskSel.id;
+         href += (href.indexOf("?") == -1) ? "?" : "&";
+         href += "t=" + encodeURI(taskId);
+      }
+      window.location.href = href;
    }
 };
 
diff --git a/source/web/scripts/office/office_addin.js b/source/web/scripts/office/office_addin.js
index d5324b6c09..0d53d50407 100644
--- a/source/web/scripts/office/office_addin.js
+++ b/source/web/scripts/office/office_addin.js
@@ -204,6 +204,37 @@ var OfficeAddin =
       var x = a.dueDate;
       var y = b.dueDate;
       return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+   },
+   
+   openWindowCallback: function(url, callback)
+   {
+      // Store the callback function for later
+      OfficeAddin.callbackFunction = callback;
+      // Register our "well known" callback function
+      window.alfrescoCallback = OfficeAddin.openWindowOnCallback;
+      // Use a named window so that only one dialog is active at a time
+      window.open(url, 'alfrescoDialog', 'width=1024,height=768');
+   },
+   
+   openWindowOnCallback: function(fromTimeout)
+   {
+      if (typeof(fromTimeout)=='undefined')
+      {
+         window.setTimeout("OfficeAddin.openWindowOnCallback(true)", 10);
+      }
+      else
+      {
+         // Clear out the global callback function
+         window.alfrescoCallback = null;
+         try
+         {
+            OfficeAddin.callbackFunction();
+         }
+         catch (e)
+         {
+         }
+         OfficeAddin.callbackFunction = null;
+      }
    }
 };