diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php
index 01a89a8f14..56746f92cf 100644
--- a/module/block/view/admin.html.php
+++ b/module/block/view/admin.html.php
@@ -40,7 +40,7 @@ include '../../common/view/chosen.html.php';
   <div class="form-group form-actions">
     <div class="col-sm-7 col-sm-offset-3">
       <button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
-      <button type="cancel" class="btn btn-wide btn-gray" data-dismiss="modal"><?php echo $lang->cancel;?></button>
+      <button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
     </div>
   </div>
 </form>
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index bfe4b75ead..96b2000d26 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -75,7 +75,7 @@
         <tr>
           <td colspan="3" class="text-center">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index ff4adde391..56f99f8bf8 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -69,7 +69,7 @@
         <tr>
           <td colspan="3" class="text-center">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
             <?php echo $this->config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
           </td>
         </tr>
diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php
index bd8df84bdc..702c2b1205 100644
--- a/module/common/view/customfield.html.php
+++ b/module/common/view/customfield.html.php
@@ -26,7 +26,7 @@
       </div>
       <div>
         <?php echo html::submitButton($lang->save);?>
-        <?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
+        <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
       </div>
     </form>
   </div>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index 297015a2cb..6babe903c2 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -66,7 +66,7 @@
               <td></td>
               <td>
                 <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-                <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+                <?php echo html::backButton('', '', 'btn btn-wide');?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
                 <?php echo html::hidden('parentDeptID', $deptID);?>
               </td>
diff --git a/module/doc/model.php b/module/doc/model.php
index c32deeda72..100157c26d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -157,7 +157,7 @@ class docModel extends model
                     if(isset($menu['link']))
                     {
                         list($menuLabel, $module, $method, $vars) = explode('|', $menu['link']);
-                        $actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn btn-gray'");
+                        $actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn'");
                     }
                         
                 }
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index ab485fb744..f877746312 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -40,8 +40,8 @@ var browseType = '<?php echo $browseType;?>';
         </div>
         <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
-            <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
+            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
+            <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
           </div>
         </nav>
       </div>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index 379596f9a2..d20af49704 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -4,8 +4,8 @@
       <div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $title;?></div>
       <nav class="panel-actions btn-toolbar">
         <div class="btn-group">
-          <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
-          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
+          <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
+          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
         </div>
       </nav>
     </div>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index 86eb0f11f0..4336b72ef9 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -77,7 +77,7 @@
           </tr>
           <tr>
             <td colspan='3' class='text-center'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray') . html::hidden('lib', $libID);?>
+              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
             </td>
           </tr>
         </tbody>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index 8064e4b0a7..6ccf23f233 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -74,7 +74,7 @@
         </tr>
           <tr>
             <td colspan='3' class='text-center'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
       </table>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 511143d5d4..20cac33c9b 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -23,7 +23,7 @@
         </div>
         <nav class="panel-actions btn-toolbar">
           <div class="dropdown">
-            <button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-gray btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
+            <button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
             <div class="dropdown-menu pull-right col-lg" id="pageSetting">
               <form class='with-padding load-indicator' id='pageSettingForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('custom', 'ajaxSaveCustomFields', 'module=doc&section=custom&key=objectLibs');?>'>
                 <div><?php echo $lang->customConfig;?></div>
@@ -40,7 +40,7 @@
                 </div>
                 <div>
                   <?php echo html::submitButton($lang->save);?>
-                  <?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
+                  <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
                 </div>
               </form>
             </div>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index db080fcd53..134f584366 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -39,8 +39,8 @@
             </form>
           </div>
           <div class="btn-group">
-            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '',  "title={$lang->doc->browseTypeList['list']} class='btn btn-gray btn-icon text-primary'");?>
-            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-gray btn-gray btn-icon'");?>
+            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '',  "title={$lang->doc->browseTypeList['list']} class='btn btn-icon text-primary'");?>
+            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon'");?>
           </div>
         </nav>
       </div>
diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php
index 430f46b557..a2c107f71e 100644
--- a/module/file/view/buildform.html.php
+++ b/module/file/view/buildform.html.php
@@ -8,7 +8,7 @@
       <input type="text" name="labels[]" class="form-control file-editbox" placeholder="<?php echo $lang->file->title;?>">
       <div class="input-group-btn">
         <button type="button" class="btn btn-success file-name-confirm"><i class="icon icon-check"></i></button>
-        <button type="button" class="btn btn-gray file-name-cancel"><i class="icon icon-close"></i></button>
+        <button type="button" class="btn file-name-cancel"><i class="icon icon-close"></i></button>
       </div>
     </div>
     <div class="file-input-normal input-group">
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index f598a4b599..78e822ebcc 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -65,7 +65,7 @@
         <th><span class='hidden'><?php echo html::selectAll('', 'checkbox')?></span></th>
         <td colspan='2'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
         </td>
       </tr>
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index 7616851ab1..0d36b15c26 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -38,7 +38,7 @@
         <th class='text-right'></th>
         <td>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
       </tr>
@@ -122,7 +122,7 @@
         </th>
         <td>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
       </tr>
diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php
index a08bdd13dd..091d7a8c4d 100644
--- a/module/group/view/privbymodule.html.php
+++ b/module/group/view/privbymodule.html.php
@@ -42,7 +42,7 @@
       <tr>
         <td class='text-center' colspan='3'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just make $_POST not empty..?>
         </td>
       </tr>
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 06caec89ac..8f1a270edb 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -72,7 +72,7 @@
         <tr>
           <td colspan="<?php echo count($visibleFields) + 4?>" class="text-center">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
+            <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index df4613da93..47189f0a1f 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -84,7 +84,7 @@
           <tr>
             <td colspan='3' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
         </tbody>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 6b62c9d0ac..403da55ade 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -73,7 +73,7 @@
           <tr>
             <td colspan='3' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
         </tbody>
diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php
index 73d2a5846d..baa4c55c3f 100644
--- a/module/productplan/view/batchedit.html.php
+++ b/module/productplan/view/batchedit.html.php
@@ -42,7 +42,7 @@
         <tr>
           <td colspan='5' class="text-center">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
+            <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 990e70a989..e1a890bca1 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -59,7 +59,7 @@
           <tr>
             <td colspan='4' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $product->id);?>
             </td>
           </tr>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 336f317116..fcb8384d4e 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -59,7 +59,7 @@
           <tr>
             <td colspan='4' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $product->id);?>
             </td>
           </tr>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index a09442fed6..d825727c9e 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -138,7 +138,7 @@
           <td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
         </tr>
         <tr>
-          <td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td>
+          <td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index bc8469d1fc..b928c20b9f 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -145,7 +145,7 @@
           <th><?php echo $lang->project->whitelist;?></th>
           <td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
         </tr>
-        <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
+        <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 5a35954310..7daf7a0979 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -50,7 +50,7 @@
           <tr>
             <td colspan='3' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
         </tbody>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index dae9757248..b860913653 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -58,7 +58,7 @@
           <tr>
             <td colspan='3' class='text-center'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $release->product);?>
             </td>
           </tr>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 7f7880602d..fd26071b73 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -211,7 +211,7 @@ foreach($fieldParams as $fieldName => $param)
         if($style != 'simple')
         {
             if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary btn-wide'") . "&nbsp;";
-            echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-gray btn-wide');
+            echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-wide');
         }
         echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
         echo html::hidden('formType', 'lite');
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index 6e38655985..d3edd397a7 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -56,7 +56,7 @@
       <tr>
         <td colspan='5' class='text-center'>
           <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
         </td>
       </tr>
     </table>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 393865fde3..3c5252dac1 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -92,7 +92,7 @@
         <tr>
           <td colspan="<?php echo count($visibleFields) + 3?>" class="text-center form-actions">
             <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
+            <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 95dec5380a..7dceb1f76f 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -149,7 +149,7 @@ foreach(explode(',', $showFields) as $field)
       <tr>
         <td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center form-actions'>
           <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          <?php echo html::backButton('', '', 'btn btn-wide');?>
         </td>
       </tr>
     </tfoot>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 7d5906c48e..b9399f37bc 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -186,7 +186,7 @@
           <tr>
             <td colspan="5" class="text-center">
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
         </tfoot>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index f9c0e33ff1..e43ae048be 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -135,7 +135,7 @@
         <tr>
           <td colspan='<?php echo $colspan?>' class='text-center'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </tbody>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index c47af5bb03..9eef705605 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -111,7 +111,7 @@
         <tr>
           <td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 5ef8e92306..a96ae4d545 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -166,7 +166,7 @@
         <tr>
           <td colspan='4' class='text-center'>
             <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
-            <?php echo html::backButton('', '', 'btn btn-gray btn-wide');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index d7c8fdccbb..81c9faa221 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -83,7 +83,7 @@
       <?php endfor;?>
       </tbody>
       <tfoot>
-        <tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
+        <tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </tfoot>
     </table>
     <div class="hidden">
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 34123b8f1d..f9f35c1e15 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -138,7 +138,7 @@
     <div class="row form-group form-actions">
       <div class="col-sm-offset-2 col-sm-10">
         <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-        <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+        <?php echo html::backButton('', '', 'btn btn-wide');?>
       </div>
     </div>
   </form>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 404f495cb4..1a98572f2a 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -126,7 +126,7 @@
               <?php endif;?>
               <td colspan="2">
                 <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
-                <?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide btn-gray') : html::backButton('', '', 'btn btn-wide btn-gray');?>
+                <?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
               </td>
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 4ff95607fc..1428a09401 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -103,7 +103,7 @@
         <tr>
           <td colspan="<?php echo count($visibleFields) + 6?>" class="text-center">
             <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
+            <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index d05b6c8fff..649d841759 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -95,7 +95,7 @@
         <tr>
           <td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center">
             <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
+            <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index f0b8d773b2..af2ea92391 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -85,7 +85,7 @@
         <tr>
           <td colspan='3' class='text-center'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index fac092cda2..c5d8e32795 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -117,7 +117,7 @@
         <tr>
           <td colspan='2' class='text-center'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>