diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 201af6572a..43a9c98480 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -26,7 +26,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
         if($moduleID)
         {
             $removeLink = $browseType == 'bymodule' ? inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("bugModule")';
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>") . '&nbsp;';
+            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
         }
         echo " <i class='icon-angle-right'></i>&nbsp; ";
         ?>
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 09631780c1..860fc5cea1 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -3,3 +3,5 @@
 .dropdown-menu > .menu-search .input-group {width:100%;}
 .dropdown-menu > .menu-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
 .pl-5px{padding-left:5px;}
+a.removeModule{color:#ddd}
+a.removeModule:hover{color:red}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index a03e21c0a2..21b9ca699c 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -22,7 +22,7 @@
         if($moduleID)
         {
             $removeLink = $browseType == 'bymodule' ? inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")';
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>") . '&nbsp;';
+            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
         }
         echo " <i class='icon-angle-right'></i>&nbsp; "
         ?>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 574c445bd0..00d873b3a8 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -1,58 +1,56 @@
 <div id='featurebar'>
   <ul class='nav'>
     <?php
-    if($this->methodName === 'task')
+    echo '<li><span>';
+    if(!empty($productID))
     {
-        echo '<li><span>';
-        if($productID)
-        {
-            $product    = $this->product->getById($productID);
-            $removeLink = $browseType == 'byproduct' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
-            echo $product->name;
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
-        }
-        elseif($moduleID)
-        {
-            $module     = $this->tree->getById($moduleID);
-            $removeLink = $browseType == 'bymodule' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
-            echo $module->name;
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
-        }
-        else
-        {
-            echo $this->lang->tree->all;
-        }
-        echo " <i class='icon-angle-right'></i>&nbsp; </span></li>";
+        $product    = $this->product->getById($productID);
+        $removeLink = $browseType == 'byproduct' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
+        echo $product->name;
+        echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
+    }
+    elseif(!empty($moduleID))
+    {
+        $module     = $this->tree->getById($moduleID);
+        $removeLink = $browseType == 'bymodule' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
+        echo $module->name;
+        echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
+    }
+    else
+    {
+        $this->app->loadLang('tree');
+        echo $this->lang->tree->all;
+    }
+    echo " <i class='icon-angle-right'></i>&nbsp; </span></li>";
 
-        foreach(customModel::getFeatureMenu('project', 'task') as $menuItem)
+    foreach(customModel::getFeatureMenu('project', 'task') as $menuItem)
+    {
+        if(isset($menuItem->hidden)) continue;
+        $type = $menuItem->name;
+        if(strpos($type, 'QUERY') === 0)
         {
-            if(isset($menuItem->hidden)) continue;
-            $type = $menuItem->name;
-            if(strpos($type, 'QUERY') === 0)
+            $queryID = (int)substr($type, 5);
+            echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
+        }
+        elseif($type != 'status')
+        {
+            echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '</li>' ;
+        }
+        elseif($type == 'status')
+        {
+            echo "<li id='statusTab' class='dropdown'>";
+            $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
+            $current        = zget($lang->project->statusSelects, $taskBrowseType, '');
+            if(empty($current)) $current = $menuItem->text;
+            echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
+            echo "<ul class='dropdown-menu'>";
+            foreach ($lang->project->statusSelects as $key => $value)
             {
-                $queryID = (int)substr($type, 5);
-                echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
-            }
-            elseif($type != 'status')
-            {
-                echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '</li>' ;
-            }
-            elseif($type == 'status')
-            {
-                echo "<li id='statusTab' class='dropdown'>";
-                $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
-                $current        = zget($lang->project->statusSelects, $taskBrowseType, '');
-                if(empty($current)) $current = $menuItem->text;
-                echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
-                echo "<ul class='dropdown-menu'>";
-                foreach ($lang->project->statusSelects as $key => $value)
-                {
-                    if($key == '') continue;
-                    echo '<li' . ($key == $taskBrowseType ? " class='active'" : '') . '>';
-                    echo html::a($this->createLink('project', 'task', "project=$projectID&type=$key"), $value);
-                }
-                echo '</ul></li>';
+                if($key == '') continue;
+                echo '<li' . ($key == $taskBrowseType ? " class='active'" : '') . '>';
+                echo html::a($this->createLink('project', 'task', "project=$projectID&type=$key"), $value);
             }
+            echo '</ul></li>';
         }
     }
 
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 5248426dfb..779e802eb3 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -8,7 +8,7 @@
         if(!empty($moduleID))
         {
             $removeLink = $browseType == 'bymodule' ? inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>") . '&nbsp;';
+            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
         }
         echo " <i class='icon-angle-right'></i>&nbsp; ";
         ?>
diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php
index 80623ee4c3..1f7844aaee 100644
--- a/module/testtask/view/caseheader.html.php
+++ b/module/testtask/view/caseheader.html.php
@@ -10,7 +10,7 @@
         if(!empty($moduleID))
         {
             $removeLink = $browseType == 'bymodule' ? inlink('cases', "taskID=$taskID&browseType=$browseType&param=0&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
-            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>") . '&nbsp;';
+            echo '&nbsp;' . html::a($removeLink, "<i class='icon icon-remove'></i>", '', "class='text-muted'") . '&nbsp;';
         }
         echo " <i class='icon-angle-right'></i>&nbsp; ";
         ?>