diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 3cba627bb1..8201f74d59 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -75,22 +75,23 @@ function setTemplate(templateID)
 function deleteTemplate(templateID)
 {
     if(!templateID) return;
-	if (confirm(templateDelete)){
+	if(confirm(confirmDeleteTemplate))
+    {
 		hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
 		$('#tplBox' + templateID).addClass('hidden');
 	}
 }
 
-/*visbile template x icon*/
-function mouseOver(delTempID)
+/* Display template x icon. */
+function displayXIcon(templateID)
 {
-    $('#delTemp'+delTempID).removeClass('hidden');
+    $('#templateID' + templateID).removeClass('hidden');
 }
 
-/*hidden template x icon*/
-function mouseOut(delTempID)
+/* Hide template x icon. */
+function hideXIcon(templateID)
 {
-    $('#delTemp'+delTempID).addClass('hidden');
+    $('#templateID' + templateID).addClass('hidden');
 }
 
 $(function()
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index f7aad3df28..f718da49d7 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -140,12 +140,12 @@ $lang->bug->buttonConfirm        = 'Confirm';
 
 /* 交互提示。*/
 $lang->bug->confirmChangeProduct = "Modification on {$lang->productCommon} will cause linked {$lang->projectCommon},Story and Task change. Do you want to do this?";
-$lang->bug->confirmDelete        = 'Do you want to delete this bug?';
-$lang->bug->setTemplateTitle     = 'Please enter the title of template.';
-$lang->bug->remindTask           = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
-$lang->bug->skipClose            = 'Bug %s is not resolved. You cannot close it.';
-$lang->bug->applyTemplate        = 'Apply Template';
-$lang->bug->templateDelete       = 'Do you want to delete this template?';
+$lang->bug->confirmDelete         = 'Do you want to delete this bug?';
+$lang->bug->setTemplateTitle      = 'Please enter the title of template.';
+$lang->bug->remindTask            = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?';
+$lang->bug->skipClose             = 'Bug %s is not resolved. You cannot close it.';
+$lang->bug->applyTemplate         = 'Apply Template';
+$lang->bug->confirmDeleteTemplate = 'Do you want to delete this template?';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[Steps]</p>\n";
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 314f4c9d51..9e646824f0 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -139,13 +139,13 @@ $lang->bug->legendMisc                  = '其他相关';
 $lang->bug->buttonConfirm        = '确认';
 
 /* 交互提示。*/
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化，确定吗？";
-$lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
-$lang->bug->setTemplateTitle     = '请输入bug模板标题';
-$lang->bug->remindTask           = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
-$lang->bug->skipClose            = 'Bug %s 不是已解决状态，不能关闭。';
-$lang->bug->applyTemplate        = '应用模板';
-$lang->bug->templateDelete       = '您确认要删除该模板吗？';
+$lang->bug->confirmChangeProduct  = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、需求和任务发生变化，确定吗？";
+$lang->bug->confirmDelete         = '您确认要删除该Bug吗？';
+$lang->bug->setTemplateTitle      = '请输入bug模板标题';
+$lang->bug->remindTask            = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
+$lang->bug->skipClose             = 'Bug %s 不是已解决状态，不能关闭。';
+$lang->bug->applyTemplate         = '应用模板';
+$lang->bug->confirmDeleteTemplate = '您确认要删除该模板吗？';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p>\n";
diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php
index 41422936f9..9a8f4b9271 100644
--- a/module/bug/view/buildtemplates.html.php
+++ b/module/bug/view/buildtemplates.html.php
@@ -1,11 +1,11 @@
 <?php 
 foreach($templates as $key => $template)
 {
-    echo "<li id='tplBox$template->id' onmouseover='mouseOver($template->id)' onmouseout='mouseOut($template->id)'>";
+    echo "<li id='tplBox$template->id' onmouseover='displayXIcon($template->id)' onmouseout='hideXIcon($template->id)'>";
     echo "<a title='{$lang->bug->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
     if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
     echo $template->title . "</a>";
-    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='delTemp$template->id' class='btn-delete hidden'><i class='icon-remove'></i></a>";
+    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='templateID$template->id' class='btn-delete hidden'><i class='icon-remove'></i></a>";
     echo "<span id='template$template->id' class='hidden'>$template->content</span>";
     echo '</li>';
 }
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index f72a4aae2d..a89e538ad1 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -20,7 +20,7 @@ js::set('page', 'create');
 js::set('createRelease', $lang->release->create);
 js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
-js::set('templateDelete',$lang->bug->templateDelete);
+js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
 ?>
 <div class='container mw-1400px'>
   <div id='titlebar'>