diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 45fe485060..a032cd4038 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -68,7 +68,7 @@ $lang->bug->lastEditedDateAB = '修改日期';
 $lang->bug->index              = '首页';
 $lang->bug->create             = '创建';
 $lang->bug->confirmBug         = '确认';
-$lang->bug->edit               = '编辑Bug';
+$lang->bug->edit               = '编辑';
 $lang->bug->assignTo           = '指派';
 $lang->bug->browse             = 'Bug列表';
 $lang->bug->view               = 'Bug详情';
@@ -77,7 +77,7 @@ $lang->bug->close              = '关闭';
 $lang->bug->activate           = '激活Bug';
 $lang->bug->reportChart        = '报表统计';
 $lang->bug->export             = '导出';
-$lang->bug->delete             = '删除Bug';
+$lang->bug->delete             = '删除';
 $lang->bug->saveTemplate       = '保存模板';
 $lang->bug->deleteTemplate     = '删除模板';
 $lang->bug->customFields       = '自定义字段';
diff --git a/module/common/control.php b/module/common/control.php
index e74d4b6647..020a23eaf4 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -234,6 +234,7 @@ class common extends control
         if(!common::hasPriv($module, 'edit')) return false;
         echo "<span class='link-button'>";
         echo html::a('#comment', '&nbsp;', '', "class='icon-black-common-comment' title='$lang->comment' onclick='setComment()'");
+        echo html::a('#comment', $lang->comment);
         echo "</span>";
     }
 
@@ -300,10 +301,7 @@ class common extends control
             {
                 echo "<span class='link-button'>";
                 echo html::a($link, '&nbsp;', $target, "class='$class' title='$title'", true);
-                if($method != 'edit' and $method != 'delete' and $method != 'copy')
-                {
-                    echo html::a($link, $title, $target, "class='$extraClass'", true);
-                }
+                echo html::a($link, $title, $target, "class='$extraClass'", true);
                 echo "</span>";
             }
             else
diff --git a/module/project/css/bug.css b/module/project/css/bug.css
new file mode 100644
index 0000000000..fa1e337bb7
--- /dev/null
+++ b/module/project/css/bug.css
@@ -0,0 +1,2 @@
+caption {margin-bottom:10px}
+caption a{padding:5px}
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 932db207c6..a4cf6c33bc 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -20,7 +20,7 @@
       if($build) echo '<span class="red">(Build:' . $build->name . ')</span>';
       ?>
     </div>
-    <div class='f-right'><?php common::printLink('bug', 'create', "productID=$productID&extra=projectID=$project->id", '&nbsp;', '', "class='icon-green-big-bug-create' title='{$lang->bug->create}'");?></div>
+    <div class='f-right'><?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?></div>
   </caption>
   <thead>
   <tr class='colhead'>
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index a3c792c834..d26e125fbc 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -16,11 +16,11 @@ $lang->story->batchCreate = "批量添加";
 $lang->story->change      = "变更";
 $lang->story->changed     = '需求变更';
 $lang->story->review      = '评审';
-$lang->story->edit        = "编辑需求";
+$lang->story->edit        = "编辑";
 $lang->story->close       = '关闭';
 $lang->story->batchClose  = '批量关闭';
 $lang->story->activate    = '激活';
-$lang->story->delete      = "删除需求";
+$lang->story->delete      = "删除";
 $lang->story->view        = "需求详情";
 $lang->story->tasks       = "相关任务";
 $lang->story->taskCount   = '任务数';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 91e34d45f8..b907e01f4e 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -53,8 +53,8 @@ $lang->testcase->create             = "建用例";
 $lang->testcase->batchCreate        = "批量添加";
 $lang->testcase->delete             = "删除用例";
 $lang->testcase->view               = "用例详情";
-$lang->testcase->edit               = "编辑用例";
-$lang->testcase->delete             = "删除用例";
+$lang->testcase->edit               = "编辑";
+$lang->testcase->delete             = "删除";
 $lang->testcase->browse             = "用例列表";
 $lang->testcase->import             = "导入用例";
 $lang->testcase->export             = "导出";