diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 3b4ffefa0b..2eae7ec696 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -327,7 +327,8 @@ js::set('moduleID', $moduleID);
             <td colspan="3" class="text-center form-actions">
               <?php $browseLink = $this->session->bugList ? $this->session->bugList : $this->inlink('browse', "productID=$productID");?>
               <?php echo html::submitButton();?>
-              <?php echo html::linkButton($lang->goback, $browseLink, 'self', '', 'btn btn-wide');?>
+              <?php if($caseID) echo html::linkButton($lang->goback, $browseLink, 'self', '', 'btn btn-wide');?>
+              <?php if(!$caseID) echo html::backButton();?>
               <?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
               <?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', empty($testtask) ? 0 : $testtask->id);?>
             </td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 898eadc3a9..e869c45568 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -98,7 +98,7 @@
         common::printIcon('bug', 'edit', $params, $bug);
         if($this->app->openApp != 'product')
         {
-            common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy', '', '', false, "data-app='qa'");
+            common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
         }
         common::printIcon('bug', 'delete', $params, $bug, 'button', 'trash', 'hiddenwin');
         ?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 4a355b44e0..112da279f7 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -169,8 +169,7 @@
             <?php
               echo html::hidden('model', $project->model);
               echo html::submitButton();
-              $browseLink = $this->session->projectList ? $this->session->projectList : $this->createLink('project', 'browse');
-              if(!isonlybody()) echo html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');
+              if(!isonlybody()) echo html::backButton();
             ?>
           </td>
         </tr>