diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index 80a10ad651..e077d455af 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -10,5 +10,4 @@
 #taskList .c-progress{padding-right: 8px; text-align: right;}
 #datatable-taskList .c-progress{padding-right: 8px; text-align: right;}
 .c-finishedBy, .c-lastEditedBy {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-#executionTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
-#executionTaskForm table thead th[data-width="auto"] {width: unset;}
\ No newline at end of file
+#executionTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
\ No newline at end of file
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index cbbc03ed83..e953e365e8 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -11,7 +11,7 @@ $(function()
         var $title = $('#storyList thead th.c-title');
         var headerWidth = $('#storyList thead th.c-title a').innerWidth();
         var buttonWidth = $('#storyList thead th.c-title button').innerWidth();
-        if($title.width() < headerWidth + buttonWidth) $title.width(headerWidth + buttonWidth + 10);
+        if($title.width() < headerWidth + buttonWidth) $title.width(headerWidth + buttonWidth + 20);
     });
 
     $('#storyList td.has-child .story-toggle').each(function()
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index cd3ff1520e..ca7d6172d0 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -41,7 +41,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 .btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
 .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
-#productStoryForm table thead th[data-width="auto"] {width: unset;}
 #productStoryForm table tbody tr td.c-actions {overflow: visible;}
 #productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
 </style>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index af3df6cca9..defe102c4f 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -836,7 +836,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
 
     var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
     var nameClass   = ['product', 'productplan'].indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
-    $form.find('th.' + nameClass).addClass('flex-between').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
+    $form.find('th.' + nameClass).addClass('clearfix').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 
     var allUnfold = true;
     $parentTd.each(function()
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 1a92036b23..6aafe372ec 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -136,6 +136,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #executionTableList .c-name .label-danger,
 
 .flex-between {display: flex !important;align-items: center;justify-content: space-between;}
+#toggleFold {float: right;}
 #toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);}
 #toggleFold.collapsed > .icon {transform: rotate(90deg);}