diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index a762c9b334..e293e0511f 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -72,8 +72,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
             <?php
             echo html::hidden('lastEditedDate', $bug->lastEditedDate);
             echo html::submitButton();
-            $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
-            echo html::linkButton($lang->goback, $browseLink, 'self', '', "btn btn-wide");
+            echo html::backButton();
             ?>
           </div>
           <hr class='small' />
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 0a1970af89..28ab2624f5 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -54,7 +54,7 @@
             <?php 
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::submitButton($lang->save);
-            echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');
+            echo html::backButton();
             ?>
           </div>
           <hr class='small' />
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 943f2db84e..da8bd23de2 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -125,8 +125,7 @@
           </div>
           <div class='text-center detail form-actions'>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
-            <?php echo html::submitButton();?>
-            <input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='btn btn-wide' onclick='location.href="<?php echo $isLibCase ? $this->createLink('testsuite', 'library', "libID=$libID") : $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
+            <?php echo html::submitButton(). html::backButton();;?>
           </div>
           <?php include '../../common/view/action.html.php';?>
         </div>