diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index d7b76b33d7..533067b2de 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -512,6 +512,9 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['bug']['all']        = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index a87ac46f06..95cee9100c 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -512,6 +512,9 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['bug']['all']        = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = 'Mine';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index df78e79283..2b6a23c200 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -512,6 +512,9 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['bug']['all']        = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = "J'étais impliqué";
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index 242f3d7b1a..154243765a 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -418,6 +418,9 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['bug']['all']        = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = 'Tôi tham gia';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 730eecadd9..b87eef4444 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -512,6 +512,9 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['bug']['all']        = '所有';
+$lang->execution->featureBar['bug']['unresolved'] = '未解决';
+
 $lang->execution->featureBar['build']['all'] = '所有版本';
 
 $lang->execution->myExecutions = '我参与的';
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 31459d2b9a..0dcf920a7a 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -31,12 +31,17 @@
     </div>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php
-    $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
-    $module    = $type != 'bysearch' ?  "&param=$param" : '';
-    echo html::a($this->inlink('bug', "executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy=status,id_desc&build=$buildID&type=all$module"), "<span class='text'>{$lang->bug->allBugs}</span>" . ($type == 'all' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a($this->inlink('bug', "executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy=status,id_desc&build=$buildID&type=unresolved$module"), "<span class='text'>{$lang->bug->unResolved}</span>" . ($type == 'unresolved' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'");
-    ?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->execution->featureBar['bug'] as $featureType => $label):?>
+    <?php $active = $type == $featureType ? 'btn-active-text' : '';?>
+    <?php $label  = "<span class='text'>$label</span>";?>
+    <?php if($type == $featureType):?>
+    <?php $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
+    <?php $label .= $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';?>
+    <?php endif;?>
+    <?php $module = $type != 'bysearch' ? "&param=$param" : '';?>
+    <?php echo html::a(inlink('bug', "executionID=$execution->id&productID={$productID}&branch={$branchID}&orderBy=status,id_desc&build=$buildID&type={$featureType}$module"), $label, '', "class='btn btn-link $active' id='{$featureType}Tab'");?>
+    <?php endforeach;?>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
   <div class="btn-toolbar pull-right">