diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 57daddb3ee..e9fcfd1fc4 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -47,7 +47,7 @@
           <td colspan='2'><?php echo html::radio('modifyPasswordFirstLogin', $lang->admin->safe->modifyPasswordList, isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0)?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index c1d63908e6..6a140d4055 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -41,7 +41,7 @@
           <td><?php echo html::input('key', $key, "class='form-control' autocomplete='off'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'>
+          <td colspan='2' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 5219296768..dff71442d6 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -43,7 +43,7 @@ js::set('page', 'assignedto');
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index b6e8d1b501..e3fde06adb 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -161,7 +161,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'>
+          <td colspan='<?php echo count($visibleFields) + 3?>' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 6be54ead98..09fabdc5fa 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -138,7 +138,12 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo $branchProduct ? $columns : ($columns - 1);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+        <tr>
+          <td colspan='<?php echo $branchProduct ? $columns : ($columns - 1);?>' class='text-center form-actions'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
       </tfoot>
     </table>
   </form>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 3c1ff1b9b8..1c8e8a23c9 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -70,7 +70,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
           </div>
 
-          <div class='actions actions-form text-center'>
+          <div class='actions form-actions text-center'>
             <?php
             echo html::hidden('lastEditedDate', $bug->lastEditedDate);
             echo html::submitButton('', '', 'btn btn-wide btn-primary');
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 1a80cdc8aa..3ba13af23c 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -82,7 +82,7 @@ js::set('productID' , $bug->product);
           <td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
         </tr>
         <tr>
-          <td class='text-center' colspan='4'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
+          <td class='text-center form-actions' colspan='4'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>