diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index b0a8954b3d..aedb358f9b 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -87,7 +87,7 @@ class html extends baseHTML
      * @access public
      * @return string the submit button tag.
      */
-    public static function submitButton($label = '', $misc = '', $class = 'btn btn-primary')
+    public static function submitButton($label = '', $misc = '', $class = 'btn btn-wide btn-primary')
     {
         return parent::submitButton($label, $class, $misc);
     }
diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php
index 31f6273a58..65b264cde1 100644
--- a/module/admin/view/bind.html.php
+++ b/module/admin/view/bind.html.php
@@ -36,7 +36,7 @@
         <tr>
           <td colspan='2' class="text-center">
             <?php
-            echo html::submitButton('', '', 'btn btn-wide btn-primary');
+            echo html::submitButton();
             echo html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());
             ?>
           </td>
diff --git a/module/admin/view/certifyztemail.html.php b/module/admin/view/certifyztemail.html.php
index dba72af3c3..6f4ddf0cc3 100644
--- a/module/admin/view/certifyztemail.html.php
+++ b/module/admin/view/certifyztemail.html.php
@@ -28,7 +28,7 @@
           <td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
     </form>
diff --git a/module/admin/view/certifyztmobile.html.php b/module/admin/view/certifyztmobile.html.php
index 235bc8b385..bfb96d57b0 100644
--- a/module/admin/view/certifyztmobile.html.php
+++ b/module/admin/view/certifyztmobile.html.php
@@ -28,7 +28,7 @@
           <td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
     </form>
diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php
index d88ed6e073..5e0a6f1013 100644
--- a/module/admin/view/register.html.php
+++ b/module/admin/view/register.html.php
@@ -84,7 +84,7 @@
           </tr>
           <tr>
             <td colspan='2' class='text-center'>
-              <?php echo html::submitButton($lang->admin->register->submit, '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
+              <?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
             </td>
           </tr>
         </table>
@@ -109,7 +109,7 @@
             <td><?php echo html::password('password', '', "class='form-control'");?></td>
           </tr>
           <tr>
-            <td colspan='2' class="text-center"><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
+            <td colspan='2' class="text-center"><?php echo html::submitButton() . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
           </tr>
         </table>
       </form>
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 13c482958a..daf91360a1 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -48,7 +48,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index 527210003f..7bf3469cc5 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -42,7 +42,7 @@
         </tr>
         <tr>
           <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
          </tr>
diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php
index 5f922f6e64..8b4fda9dc9 100644
--- a/module/admin/view/ztcompany.html.php
+++ b/module/admin/view/ztcompany.html.php
@@ -25,7 +25,7 @@
         </tr>
         <?php endforeach;?>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
     </form>
diff --git a/module/api/view/debug.html.php b/module/api/view/debug.html.php
index 51cc2bd6d0..a0c2a7f61a 100644
--- a/module/api/view/debug.html.php
+++ b/module/api/view/debug.html.php
@@ -25,12 +25,12 @@
         <?php endforeach;?>
         <tr>
           <td align='center' colspan="2">
-            <?php echo html::submitButton($lang->api->submit, '', 'btn btn-primary btn-wide')?>
+            <?php echo html::submitButton($lang->api->submit)?>
           </td>
         </tr>
       </table>
       <?php else:?>
-      <?php echo html::hidden('noparam', '0') . $lang->api->noParam . html::submitButton($lang->api->submit, '', 'btn btn-primary btn-wide');?>
+      <?php echo html::hidden('noparam', '0') . $lang->api->noParam . html::submitButton($lang->api->submit);?>
       <?php endif;?>
       <?php if($method->post) echo "<p>{$lang->api->post}</p>"?>
     </form>
diff --git a/module/backup/view/change.html.php b/module/backup/view/change.html.php
index a15eca7ea5..07d352dddc 100644
--- a/module/backup/view/change.html.php
+++ b/module/backup/view/change.html.php
@@ -24,7 +24,7 @@
             <strong class='input-group-addon'><?php echo $lang->day;?></strong>
           </div>
         </td>
-        <td><?php echo html::submitButton();?></td>
+        <td><?php echo html::submitButton('', '', 'btn btn-primary');?></td>
       </tr>
     </table>
   </form>
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 92206bd748..000c403a40 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid']  = 8;
 
 $lang->block->default['product']['1']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['1']['params']['type']    = 'all';
-$lang->block->default['product']['1']['params']['num']     = 5;
 
 $lang->block->default['product']['2']['title'] = $lang->productCommon . ' Overview';
 $lang->block->default['product']['2']['block'] = 'overview';
@@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
 $lang->block->default['project']['1']['params']['type']    = 'all';
-$lang->block->default['project']['1']['params']['num']     = 5;
 
 $lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Overview';
 $lang->block->default['project']['2']['block'] = 'overview';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index a6d6472d6b..e52a7cb2b4 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid']  = 8;
 
 $lang->block->default['product']['1']['params']['orderBy'] = 'id_desc';
 $lang->block->default['product']['1']['params']['type']    = 'all';
-$lang->block->default['product']['1']['params']['num']     = 5;
 
 $lang->block->default['product']['2']['title'] = $lang->productCommon . '总览';
 $lang->block->default['product']['2']['block'] = 'overview';
@@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
 $lang->block->default['project']['1']['params']['type']    = 'all';
-$lang->block->default['project']['1']['params']['num']     = 5;
 
 $lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览';
 $lang->block->default['project']['2']['block'] = 'overview';
diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php
index f9dfd7a25d..c58c2ae73a 100644
--- a/module/branch/view/manage.html.php
+++ b/module/branch/view/manage.html.php
@@ -47,7 +47,7 @@
           <td></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?> </td><td></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?> </td><td></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 540cab2360..2c0dd95469 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -43,7 +43,7 @@
           <td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
         </tr>
         <tr>
-          <td class='text-center' colspan='3'><?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' colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 817b2beff8..9d9e1866c8 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 form-actions'><?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() . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php
index 3beb63991d..5090cf657d 100644
--- a/module/bug/view/batchactivate.html.php
+++ b/module/bug/view/batchactivate.html.php
@@ -38,7 +38,7 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='5' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+        <tr><td colspan='5' class='text-center'><?php echo html::submitButton();?></td></tr>
       </tfoot>
     </table>
   </form>
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index c1c1a10455..eaa4aa6245 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -163,7 +163,7 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo count($visibleFields) + 3?>' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 0d704acb8d..60d10b004b 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -141,7 +141,7 @@
         <tfoot>
           <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::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index a3c08842f8..86e05df53d 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -31,7 +31,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 499a170e70..7d1660e89c 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -54,7 +54,7 @@ js::set('page', 'confirmbug');
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
         </tr>
         <tr>
-          <td class='text-center form-actions' colspan='3'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
+          <td class='text-center form-actions' colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index e21cac8787..6891a31a90 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -298,7 +298,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
         <tfoot>
           <tr>
             <td colspan="3" class="text-center form-actions">
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
               <?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', (int)$testtask);?>
@@ -322,7 +322,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
           <?php if(common::hasPriv('bug', 'setPublic')):?>
           <span class='input-group-addon'><?php echo html::checkbox('public', array('1' => $lang->public))?></span>
           <?php endif;?>
-          <span class='input-group-btn'><?php echo html::submitButton()?></span>
+          <span class='input-group-btn'><?php echo html::submitButton('', '', 'btn btn-primary')?></span>
         </div>
       </div>
     </div>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 4d377a4b99..b83dd94114 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='actions form-actions text-center'>
             <?php
             echo html::hidden('lastEditedDate', $bug->lastEditedDate);
-            echo html::submitButton('', '', 'btn btn-wide btn-primary');
+            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");
             ?>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index e9237afc6b..243ae23315 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 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>
+          <td class='text-center form-actions' colspan='4'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 60265f81b7..8bbc06695f 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -74,7 +74,7 @@
         </tr>  
         <tr>
           <td colspan="3" class="text-center form-actions">
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index b0fc8a106c..f5c0cd0afd 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -68,7 +68,7 @@
         </tr>
         <tr>
           <td colspan="3" class="text-center form-actions">
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
             <?php echo $config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
           </td>
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 3fdbb29b0a..738543af1d 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -89,15 +89,14 @@ $lang->report->menuOrder[15] = 'test';
 $lang->report->menuOrder[20] = 'staff';
 
 /* company menu order. */
-$lang->company->menuOrder[5]  = 'name';
-$lang->company->menuOrder[10]  = 'browseUser';
-$lang->company->menuOrder[15] = 'dept';
-$lang->company->menuOrder[20] = 'browseGroup';
-$lang->company->menuOrder[25] = 'dynamic';
-$lang->company->menuOrder[30] = 'view';
-$lang->company->menuOrder[35] = 'addGroup';
-$lang->company->menuOrder[40] = 'batchAddUser';
-$lang->company->menuOrder[45] = 'addUser';
+$lang->company->menuOrder[5]  = 'browseUser';
+$lang->company->menuOrder[10] = 'dept';
+$lang->company->menuOrder[15] = 'browseGroup';
+$lang->company->menuOrder[20] = 'dynamic';
+$lang->company->menuOrder[25] = 'view';
+$lang->company->menuOrder[30] = 'addGroup';
+$lang->company->menuOrder[35] = 'batchAddUser';
+$lang->company->menuOrder[40] = 'addUser';
 $lang->dept->menuOrder        = $lang->company->menuOrder;
 $lang->group->menuOrder       = $lang->company->menuOrder;
 $lang->user->menuOrder        = $lang->company->menuOrder;
diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index a796ef5066..abc975a995 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -74,7 +74,7 @@
           <?php echo html::textarea('lastComment', htmlspecialchars($action->comment), "rows='8' autofocus='autofocus'");?>
           </div>
           <div class="form-group form-actions">
-          <?php echo html::submitButton($lang->save, '', 'btn btn-primary btn-wide');?>
+          <?php echo html::submitButton($lang->save);?>
           <?php echo html::commonButton($lang->close, '', 'btn btn-wide btn-hide-form');?>
           </div>
         </form>
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index 1cf75634a5..30d99d63ac 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -54,7 +54,7 @@
         <th><?php echo $lang->company->guest;?></th>
         <td><?php echo html::radio('guest', $lang->company->guestOptions, $company->guest);?></td>
       </tr>  
-      <tr><td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+      <tr><td class='text-center' colspan='2'><?php echo html::submitButton();?></td></tr>
     </table>
   </form>
 </div>
diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php
index 4298fdebb7..965b41813d 100644
--- a/module/cron/view/create.html.php
+++ b/module/cron/view/create.html.php
@@ -59,7 +59,7 @@
           <td><?php echo html::select('type', $lang->cron->typeList, 'system', "class='form-control'")?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
+          <td colspan='3' class='text-center'><?php echo html::submitButton()?></td>
         </tr>
       </table>
     </form>
diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php
index 5ada99942e..262fff2d71 100644
--- a/module/cron/view/edit.html.php
+++ b/module/cron/view/edit.html.php
@@ -59,7 +59,7 @@
           <td><?php echo html::select('type', $lang->cron->typeList, $cron->type, "class='form-control'")?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
     </form>
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php
index 9e9fb217b2..d825b45823 100644
--- a/module/custom/view/flow.html.php
+++ b/module/custom/view/flow.html.php
@@ -28,7 +28,7 @@
           <?php endforeach;?>
         </td>
       </tr>
-      <tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
+      <tr><td></td><td><?php echo html::submitButton()?></td></tr>
       <tr>
         <td colspan='2' class='pd-0'>
           <div class='alert alert-info alert-block'><strong><?php echo $lang->custom->productProject->notice?></strong></div>
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index 031cbf4b68..1c54fae597 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -57,7 +57,7 @@
         <?php endforeach;?>
         <tr>
           <td colspan='2' class='text-center form-actions'>
-          <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+          <?php echo html::submitButton();?>
           <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
           </td>
         </tr>
diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php
index 30e89f4732..60c32c319f 100644
--- a/module/custom/view/score.html.php
+++ b/module/custom/view/score.html.php
@@ -30,7 +30,7 @@
       <tr>
         <th></th>
         <td class='form-actions'>
-          <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+          <?php echo html::submitButton();?>
           <?php common::printLink('score', 'reset', '', "<i class='icon-refresh'></i> " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn btn-wide iframe" data-width="480"', true, true);?>
         </td>
       </tr>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 3cb46a3e05..023baa73d8 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -71,7 +71,7 @@ EOT;
         </tr>
         <?php endif;?>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
       <?php elseif($module == 'task' and $field == 'hours'):?>
@@ -86,7 +86,7 @@ EOT;
           <td><?php echo html::radio('weekend', $lang->custom->weekendList, $weekend);?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
       <?php elseif($module == 'bug' and $field == 'longlife'):?>
@@ -99,7 +99,7 @@ EOT;
               <span class='input-group-addon'><?php echo $lang->day?></span>
             </div>
           </td>
-          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td><?php echo html::submitButton();?></td>
         </tr>
       </table>
       <div class='alert alert-info alert-block'><?php echo $lang->custom->notice->longlife;?></div>
@@ -110,7 +110,7 @@ EOT;
           <td><?php echo html::select('closed[]', $blockPairs, $closedBlock, "class='form-control chosen' multiple");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
         </tr>
       </table>
       <?php elseif($module == 'user' and $field == 'deleted'):?>
@@ -121,7 +121,7 @@ EOT;
         </tr>
         <tr>
           <td></td>
-          <td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+          <td><?php echo html::submitButton();?></td>
         </tr>
       </table>
       <?php else:?>
@@ -151,7 +151,7 @@ EOT;
           <?php
           $appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
           echo html::radio('lang', $appliedTo, $lang2Set);
-          echo html::submitButton('', '', 'btn btn-primary btn-wide');
+          echo html::submitButton();
           if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin', '', 'btn btn-wide');
           ?>
           </td>
diff --git a/module/custom/view/working.html.php b/module/custom/view/working.html.php
index 12ed80c467..52c08d0833 100644
--- a/module/custom/view/working.html.php
+++ b/module/custom/view/working.html.php
@@ -28,7 +28,7 @@
           <?php endforeach;?>
         </td>
       </tr>
-      <tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
+      <tr><td></td><td><?php echo html::submitButton()?></td></tr>
     </table>
   </form>
 </div>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index 5409952a5f..a018855d52 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -65,7 +65,7 @@
             <tr>
               <td></td>
               <td class='form-actions'>
-                <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+                <?php echo html::submitButton();?>
                 <?php echo html::backButton('', '', 'btn btn-wide');?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
                 <?php echo html::hidden('parentDeptID', $deptID);?>
diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php
index b020116598..11dae74392 100644
--- a/module/dept/view/edit.html.php
+++ b/module/dept/view/edit.html.php
@@ -37,7 +37,7 @@ $jsRoot  = $webRoot . "js/";
         </tr>
         <tr>
           <td colspan='2' class='text-center'>
-          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton();?>
           </td>
         </tr>
       </table>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index fc8b8433ed..8d44f21480 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 form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
+              <?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
             </td>
           </tr>
         </tbody>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 85984a1e37..cf124b1aa6 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -55,7 +55,7 @@
               </td>
             </tr>
             <tr>
-              <td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+              <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
             </tr>
           </table>
         </form>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index 37335c47ff..9b8dc0920c 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -76,7 +76,7 @@
           <td colspan='3' class='text-center form-actions'>
             <?php
             echo html::hidden('editedDate', $doc->editedDate);
-            echo html::submitButton('', '', 'btn btn-wide btn-primary');
+            echo html::submitButton();
             echo html::backButton('', '', 'btn btn-wide');
             ?>
           </td>
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 68cfc8afad..540ba84c69 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -56,7 +56,7 @@
         </td>
       </tr>
       <tr>
-        <td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+        <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
       </tr>
     </table>
   </form>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 41c57d24cd..ad1ca23575 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -46,7 +46,7 @@
                   <?php endforeach;?>
                 </div>
                 <div>
-                  <?php echo html::submitButton($lang->save);?> &nbsp;
+                  <?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
                   <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
                 </div>
               </form>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index 9dc663cb61..774a5c3242 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -26,7 +26,7 @@
                 <?php endforeach;?>
               </div>
               <div>
-                <?php echo html::submitButton($lang->save);?> &nbsp;
+                <?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
                 <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
               </div>
             </form>
diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php
index e488d3dd34..a1819706a4 100644
--- a/module/editor/view/edit.html.php
+++ b/module/editor/view/edit.html.php
@@ -72,7 +72,7 @@
           <?php endif;?>
         </td>
       </tr>
-      <tr><td align='center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
+      <tr><td align='center'><?php echo html::submitButton()?></td></tr>
     </table>
   </div>
 </form>
diff --git a/module/editor/view/newpage.html.php b/module/editor/view/newpage.html.php
index f7cc850077..d3abfe84f0 100644
--- a/module/editor/view/newpage.html.php
+++ b/module/editor/view/newpage.html.php
@@ -30,7 +30,7 @@
           ?>
         </td>
       </tr>
-      <tr><td colspan='2' align='center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
+      <tr><td colspan='2' align='center'><?php echo html::submitButton()?></td></tr>
     </table>
   </div>
 </form>
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index 8fb3dac71b..ec38dc4f00 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -60,7 +60,7 @@
         <tr>
           <th></th>
           <td>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
           </td>
           <td></td>
diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php
index c4211a126d..8214d64e38 100644
--- a/module/entry/view/edit.html.php
+++ b/module/entry/view/edit.html.php
@@ -58,7 +58,7 @@
       <tr>
         <th></th>
         <td>
-          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton();?>
           <?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
         </td>
       </tr>
diff --git a/module/extension/view/upload.html.php b/module/extension/view/upload.html.php
index d9339c2ff7..eba523a3ee 100644
--- a/module/extension/view/upload.html.php
+++ b/module/extension/view/upload.html.php
@@ -28,7 +28,7 @@
     <form method='post' target='hiddenwin' enctype='multipart/form-data' style='padding: 20px 20%'>
       <div class='input-group'>
         <input type='file' name='file' class='form-control' />
-        <span class='input-group-btn'><?php echo html::submitButton($lang->extension->install);?></span>
+        <span class='input-group-btn'><?php echo html::submitButton($lang->extension->install, '', 'btn btn-primary');?></span>
       </div>
     </form>
     <?php endif;?>
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 6d8d633746..dd94d5819a 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -214,7 +214,7 @@ if($isCustomExport)
             <tr>
               <th></th>
               <td>
-                <?php echo html::submitButton($lang->export, "onclick='setDownloading();' ");?>
+                <?php echo html::submitButton($lang->export, "onclick='setDownloading();'", 'btn btn-primary');?>
               </td>
             </tr>
           </tbody>
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index d4cbedb224..edd282bf93 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -30,7 +30,7 @@
         <td><?php echo html::checkbox('options', $lang->group->copyOptions, '', '', 'inline');?></td>
       </tr>  
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
+        <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
       </tr>
     </table>
   </form>
diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php
index c766d5acd7..0ba1284af7 100644
--- a/module/group/view/create.html.php
+++ b/module/group/view/create.html.php
@@ -26,7 +26,7 @@
         <td><?php echo html::textarea('desc', '', "rows=5 class=form-control");?></td>
       </tr>  
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+        <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
       </tr>
     </table>
   </form>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index 2959ed8c82..76230b7d27 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -30,7 +30,7 @@
         <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
       </tr>  
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
+        <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
       </tr>
     </table>
   </form>
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index ac5f431cd6..e2d2d13be4 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -61,7 +61,7 @@
           <tr>
             <td class='text-center form-actions' colspan='2'>
               <?php 
-              echo html::submitButton('', '', 'btn btn-wide btn-primary');
+              echo html::submitButton();
               echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
               echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty.
               ?>
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 94a4514216..fff0b33ad5 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -69,7 +69,7 @@
       </tr>
       <tr>
         <td colspan='2' class='form-actions text-center'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
         </td>
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index d590b774f1..37499211ff 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -37,7 +37,7 @@
       <tr>
         <th class='text-right'></th>
         <td class='form-actions'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php
index 4bb1eb8343..988964d16a 100644
--- a/module/group/view/privbymodule.html.php
+++ b/module/group/view/privbymodule.html.php
@@ -41,7 +41,7 @@
       </tr>
       <tr>
         <td class='text-center form-actions' colspan='3'>
-          <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just make $_POST not empty..?>
         </td>
diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php
index 9fb4ac0876..853589abc8 100644
--- a/module/mail/view/browse.html.php
+++ b/module/mail/view/browse.html.php
@@ -45,8 +45,8 @@
             <div class="checkbox-primary">
               <input type='checkbox' name='mailIDList[]'  value='<?php echo $queue->id;?>'/> 
               <label></label>
-              <?php echo $queue->id?>
             </div>
+            <?php echo $queue->id?>
           </td>
           <td><?php echo zget($users, $queue->toList, $queue->toList)?></td>
           <td class='text-left'><?php echo $queue->subject?></td>
@@ -69,7 +69,7 @@
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar">
-        <?php if(common::hasPriv('mail', 'batchDelete')) echo html::submitButton($lang->delete);?>
+        <?php if(common::hasPriv('mail', 'batchDelete')) echo html::submitButton($lang->delete, '', 'btn btn-primary');?>
       </div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php
index c55cd09369..f4297433ee 100755
--- a/module/mail/view/detect.html.php
+++ b/module/mail/view/detect.html.php
@@ -21,7 +21,7 @@
     </div>
     <form class='pdt-20' method='post' target='hiddenwin'>
       <table class='table table-form'>
-        <tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control' autocomplete='off'");?></td><td><?php echo html::submitButton($lang->mail->nextStep);?></td></tr>
+        <tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control' autocomplete='off'");?></td><td><?php echo html::submitButton($lang->mail->nextStep, '', 'btn btn-primary');?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php
index ab96ef6d81..7e06279357 100755
--- a/module/mail/view/test.html.php
+++ b/module/mail/view/test.html.php
@@ -32,7 +32,7 @@
           <td><?php echo html::select('to', $users, $app->user->account, "class='form-control chosen'");?></td>
           <td class='text-left'>
             <?php 
-            echo html::submitButton($lang->mail->test);
+            echo html::submitButton($lang->mail->test, '', 'btn btn-primary');
             $mta = $config->mail->mta;
             echo html::linkButton($lang->mail->edit, inlink(($mta == 'sendcloud' or $mta == 'ztcloud') ? $mta : 'edit'));
             ?>
diff --git a/module/mail/view/ztcloud.html.php b/module/mail/view/ztcloud.html.php
index d9638ef771..1e8e1cf2a5 100644
--- a/module/mail/view/ztcloud.html.php
+++ b/module/mail/view/ztcloud.html.php
@@ -61,7 +61,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::submitButton();?>
             <?php
             if($config->mail->turnon and $mailExist) echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-wide'");
             echo html::a(inlink('reset'), $lang->mail->reset, '', "class='btn btn-wide'");
diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php
index b810cbca09..29a43166c2 100644
--- a/module/message/view/setting.html.php
+++ b/module/message/view/setting.html.php
@@ -70,7 +70,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
+          <td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center form-actions'><?php echo html::submitButton();?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
         </tr>
       </tfoot>
     </table>
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index d8cb9b08ca..d1524d4245 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -44,7 +44,7 @@
         <td><?php echo html::password('password2', '', "class='form-control'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
       </tr>
     </table>
     <?php if(!empty($this->app->user->modifyPasswordReason)):?>
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index b240520ae8..fb4174f40b 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -103,7 +103,7 @@
         </td>
       </tr>
     </table>
-    <div class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></div>
+    <div class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></div>
   </form>
   <?php echo html::hidden('verifyRand', $rand);?>
 </div>
diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php
index 87caa429db..5edcaa0200 100644
--- a/module/my/view/managecontacts.html.php
+++ b/module/my/view/managecontacts.html.php
@@ -87,7 +87,7 @@
         <tr>
           <td></td>
           <td class="form-actions">
-          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('mode', $mode);?>
+          <?php echo html::submitButton() . html::hidden('mode', $mode);?>
           <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?>
           </td>
         </tr>
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 27414124b7..76ea6ec578 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -72,7 +72,7 @@
         <tfoot>
           <tr>
             <td colspan="<?php echo count($visibleFields) + 4?>" class="text-center form-actions">
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', "btn btn-wide");?>
             </td>
           </tr>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 3468b675d5..455bbafa3b 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -30,7 +30,7 @@
       </tr>
       <tr>
         <td colspan='2' class='text-center form-actions'>
-          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton();?>
           <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
         </td>
       </tr>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 48be3b9cb8..3d4b019b88 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -83,7 +83,7 @@
           </tr>  
           <tr>
             <td colspan='3' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index c3c0e25eda..db23def9eb 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -72,7 +72,7 @@
           </tr>  
           <tr>
             <td colspan='3' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php
index bce1af1aa6..8cdf142c9b 100644
--- a/module/productplan/view/batchedit.html.php
+++ b/module/productplan/view/batchedit.html.php
@@ -41,7 +41,7 @@
       <tfoot>
         <tr>
           <td colspan='5' class="text-center form-actions">
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
         </tr>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index c719c39ecf..a8516d6eb2 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -58,7 +58,7 @@
           </tr>
           <tr>
             <td colspan='4' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $product->id);?>
             </td>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 93a7f79ec3..1a74dcc452 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -58,7 +58,7 @@
           </tr>
           <tr>
             <td colspan='4' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $product->id);?>
             </td>
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index a15b910500..d0b060eef4 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -54,7 +54,7 @@
         <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/ajaxkanbansetting.html.php b/module/project/view/ajaxkanbansetting.html.php
index 840108c7ab..e129cedb95 100644
--- a/module/project/view/ajaxkanbansetting.html.php
+++ b/module/project/view/ajaxkanbansetting.html.php
@@ -51,7 +51,7 @@ form {padding: 30px 0 40px;}
             <tr>
               <td colspan='2' class='form-actions text-center'>
                 <?php
-                echo html::submitButton('', '', 'btn btn-wide btn-primary');
+                echo html::submitButton();
                 echo '&nbsp;' . html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn btn-wide'");
                 ?>
               </td>
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 8204fff288..4ee6c63ff4 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -85,7 +85,7 @@
           <?php endforeach;?>
         </tbody>
         <tfoot>
-          <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+          <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center form-actions'><?php echo html::submitButton();?></td></tr>
         </tfoot>
       </table>
     </div>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index 103c339838..2228de3515 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -30,7 +30,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 8626ff7d83..8e9b719b68 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -146,7 +146,7 @@
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index fed8fc47c2..b0dcacdc50 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -158,7 +158,7 @@
           <th><?php echo $lang->project->whitelist;?></th>
           <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
         </tr>
-        <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php
index 7a08e8a1fc..6fdd201263 100644
--- a/module/project/view/fixfirst.html.php
+++ b/module/project/view/fixfirst.html.php
@@ -28,7 +28,7 @@
                 <label for='withLeft'><?php echo $lang->project->fixFirstWithLeft?></label>
               </div>
             </span>
-            <span class='input-group-btn'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></span>
+            <span class='input-group-btn'><?php echo html::submitButton();?></span>
           </div>
         </td>
       </tr>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 781da07c51..2b26262539 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -120,7 +120,7 @@
         <?php $i ++; $memberCount ++;?>
         <?php endfor;?>
       </tbody>
-      <tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
+      <tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
     </table>
     <?php js::set('i', $i);?>
   </form>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 6032a29e04..22db1b9d5b 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -67,7 +67,7 @@
       </div>
       <div class="detail text-center form-actions">
         <?php echo html::hidden("post", 'post');?>
-        <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+        <?php echo html::submitButton();?>
       </div>
     </form>
   </div>
diff --git a/module/project/view/printkanban.html.php b/module/project/view/printkanban.html.php
index 32b7c4b9f3..ac7155754c 100644
--- a/module/project/view/printkanban.html.php
+++ b/module/project/view/printkanban.html.php
@@ -23,7 +23,7 @@
               <td class='text-right w-100px'><?php echo $lang->printKanban->content?>:</td>
               <td class='text-left text-middle'>
                 <?php echo html::radio('content', $lang->printKanban->typeList, 'all')?>
-                &nbsp; &nbsp; <?php echo html::submitButton($lang->printKanban->print, '', 'btn btn-primary btn-wide')?>
+                &nbsp; &nbsp; <?php echo html::submitButton($lang->printKanban->print)?>
               </td>
             </tr>
           </table>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index ff867cb6c4..6c75d43bef 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -60,7 +60,7 @@
           <td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='4' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='4' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index c23420c91b..ac42243ae7 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -30,7 +30,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->project->start, '', 'btn btn-wide btn-primary') . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->project->start) . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 1ff7ef3de1..36e153eccf 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -29,7 +29,7 @@
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index f0df364ff9..675023a349 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -49,7 +49,7 @@
           </tr>  
           <tr>
             <td colspan='3' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index eae4e9b862..ae554fea9b 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -57,7 +57,7 @@
           </tr>  
           <tr>
             <td colspan='3' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $release->product);?>
             </td>
diff --git a/module/release/view/export.html.php b/module/release/view/export.html.php
index a376f13d02..c05272db22 100755
--- a/module/release/view/export.html.php
+++ b/module/release/view/export.html.php
@@ -47,7 +47,7 @@ function closeWindow()
             <?php echo html::select('type', $lang->release->exportTypeList, 'all', "class='form-control'")?>
           </div>
         </td>
-        <td><?php echo html::submitButton($lang->export);?></td>
+        <td><?php echo html::submitButton($lang->export, '', 'btn btn-primary');?></td>
       </tr>
     </table>
   </form>
diff --git a/module/search/view/savequery.html.php b/module/search/view/savequery.html.php
index a67fe72fd7..022d739264 100644
--- a/module/search/view/savequery.html.php
+++ b/module/search/view/savequery.html.php
@@ -22,7 +22,7 @@
       </div>
     </span>
     <?php endif;?>
-    <span class='input-group-btn'><?php echo html::submitButton() . html::hidden('module', $module)?></span>
+    <span class='input-group-btn'><?php echo html::submitButton('', '', 'btn btn-primary') . html::hidden('module', $module)?></span>
   </div>
 </form>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index 86119015ff..79641ba775 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -55,7 +55,7 @@
       <?php endforeach;?>
       <tr>
         <td colspan='5' class='text-center form-actions'>
-          <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+          <?php echo html::submitButton();?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
         </td>
       </tr>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 4f8be42358..3578dcd2f2 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -93,7 +93,7 @@
         <tfoot>
           <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::submitButton($lang->save);?>
               <?php echo html::backButton('', '', "btn btn-wide");?>
             </td>
           </tr>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index b7bd55aa80..874d03a4c2 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -149,7 +149,7 @@ foreach(explode(',', $showFields) as $field)
       <tfoot>
         <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::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 55e4c50009..b2827f799d 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -64,7 +64,7 @@
           <td class='text-center form-actions'>
             <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
-            echo html::submitButton('', '', 'btn btn-wide btn-primary');
+            echo html::submitButton();
             echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');
             ?>
           </td>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 0cf69f5622..79fb67156e 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -42,7 +42,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 05d40aba3a..482d5da51a 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -192,7 +192,7 @@
         <tfoot>
           <tr>
             <td colspan="5" class="text-center form-actions">
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index bf4381b52a..59b1672f7f 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -52,7 +52,7 @@
           <div class='actions form-actions text-center'>
             <?php 
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
-            echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
+            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');
             ?>
           </div>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index 3e01190381..469749a8b6 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -70,7 +70,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           </tr>
           <tr>
             <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 5ac212ac9a..bdce3dc209 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -49,7 +49,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::submitButton();?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
           </td>
         </tr>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 766cb9b177..b8804ee2dd 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -137,7 +137,7 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index a1344549ac..acd31269dd 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -117,7 +117,7 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index f04d952eea..a17f63411d 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -166,7 +166,7 @@
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index daa18c8c67..b72323359a 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -76,7 +76,7 @@
           <div class='detail text-center form-actions'>
             <?php echo html::hidden('lastEditedDate', $task->lastEditedDate);?>
             <?php echo html::hidden('consumed', $task->consumed);?>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </div>
           <?php include '../../common/view/action.html.php';?>
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index 5d1bce5342..c148d7541b 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -38,7 +38,7 @@
           <td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
         </tr>  
         <tr>
-          <td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+          <td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 517640881f..191232c1b1 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -70,7 +70,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton($lang->task->finish, '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton($lang->task->finish);?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index 6405443768..ea74b5b45f 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -40,7 +40,7 @@
         </tr>
         <tr>
           <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 881f923a35..ec2db89ed9 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -93,7 +93,7 @@
           </tr>
           <?php endfor;?>
           <tr>
-            <td colspan='6' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+            <td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
           </tr>
           <?php endif;?>
         </tbody>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 2749c2a643..bcd5298021 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -67,7 +67,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton($lang->task->start, '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton($lang->task->start);?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index a3ec7526bc..692ea92b82 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -105,7 +105,7 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 9843c6b897..74ca1e4da0 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -115,7 +115,7 @@
         <tfoot>
           <tr>
             <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index be05db82cf..ba80084562 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -216,7 +216,7 @@
       <tfoot>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 018f340aab..16478f6e1e 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -123,7 +123,7 @@
           </div>
           <div class='text-center detail form-actions'>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?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");?>"' />
           </div>
           <?php include '../../common/view/action.html.php';?>
diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php
index 6928d72afb..82c833ca84 100644
--- a/module/testcase/view/exporttemplet.html.php
+++ b/module/testcase/view/exporttemplet.html.php
@@ -39,7 +39,7 @@ function closeWindow()
           <?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
         </td>
         <td>
-          <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+          <?php echo html::submitButton();?>
         </td>
       </tr>
     </table>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index fda6f8f7bf..d66f910e16 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -105,7 +105,7 @@
             }
             else
             {
-                echo html::submitButton('', '', 'btn btn-primary btn-wide');
+                echo html::submitButton();
             }
             echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');
             ?>
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index 2847237173..b53d19b599 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -86,7 +86,7 @@
             </tr>
             <tr>
               <td class='text-center form-actions' colspan='4'>
-                <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+                <?php echo html::submitButton();?>
                 <?php echo html::backButton('', '', 'btn btn-wide');?>
               </td>
             </tr>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index 69e11fcbb3..d464a6d427 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -83,7 +83,7 @@
           </tr>
           <tr>
             <td class='text-center form-actions' colspan='4'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
           </tr>
diff --git a/module/testsuite/view/batchcreatecase.html.php b/module/testsuite/view/batchcreatecase.html.php
index 06f7045cfe..c84cb32cc6 100644
--- a/module/testsuite/view/batchcreatecase.html.php
+++ b/module/testsuite/view/batchcreatecase.html.php
@@ -68,7 +68,7 @@
       <?php endfor;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='8' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?> <?php echo  html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td colspan='8' class='text-center form-actions'><?php echo html::submitButton()?> <?php echo  html::backButton('', '', 'btn btn-wide');?></td></tr>
       </tfoot>
     </table>
   </form>
diff --git a/module/testsuite/view/create.html.php b/module/testsuite/view/create.html.php
index 16b93e3194..525a35b68c 100644
--- a/module/testsuite/view/create.html.php
+++ b/module/testsuite/view/create.html.php
@@ -34,7 +34,7 @@
         <tr>
           <th></th>
           <td class='text-left form-actions' colspan='2'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php
index 1cf10c239a..4dcdd87e53 100644
--- a/module/testsuite/view/createcase.html.php
+++ b/module/testsuite/view/createcase.html.php
@@ -191,7 +191,7 @@
         <tfoot>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton();?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testsuite/view/createlib.html.php b/module/testsuite/view/createlib.html.php
index 23ac52d5f2..b1f7cad134 100644
--- a/module/testsuite/view/createlib.html.php
+++ b/module/testsuite/view/createlib.html.php
@@ -29,7 +29,7 @@
         </tr>
         <tr>
           <td class='text-center form-actions' colspan='2'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testsuite/view/showimport.html.php b/module/testsuite/view/showimport.html.php
index 703ae36083..8a581602ac 100644
--- a/module/testsuite/view/showimport.html.php
+++ b/module/testsuite/view/showimport.html.php
@@ -91,7 +91,7 @@
           }
           else
           {
-            echo html::submitButton('', '', 'btn btn-primary btn-wide');
+            echo html::submitButton();
           }
           echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
           ?>
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 2ff9764cfa..8157604ec6 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -28,7 +28,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index b419ceb4d3..b0b9434887 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -67,7 +67,7 @@
         </td>
       </tr>  
       <?php endforeach;?>
-      <tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+      <tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
     </table>
   </form>
 </div>
diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php
index f9a06d046a..d42967e7c5 100644
--- a/module/testtask/view/block.html.php
+++ b/module/testtask/view/block.html.php
@@ -29,7 +29,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index ba9f974c1c..c29a561252 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -37,7 +37,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index f4cfbd634f..31e326aade 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -88,7 +88,7 @@
         </tr>
         <tr>
           <td class='text-center form-actions' colspan='3'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index c218000c12..3453491c58 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -81,7 +81,7 @@
         </tr>
         <tr>
           <td class='text-center form-actions' colspan='3'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 6e74c5ef9a..1e275c404d 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -84,7 +84,7 @@
         <td colspan='5' class='form-actions'>
           <?php
           if($preCase)  echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn btn-wide'");
-          echo html::submitButton('', '', 'btn btn-wide btn-primary');
+          echo html::submitButton();
           if($nextCase)  echo '&nbsp;' . html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn btn-wide'");
           echo html::hidden('case',    $run->case->id);
           echo html::hidden('version', $run->case->currentVersion);
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index fa5c883846..2e7a72f121 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -31,7 +31,7 @@
         </tr>
         <tr>
           <td colspan="2" class="text-center form-actions">
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php
index 6b8387140c..c517ebd17e 100755
--- a/module/todo/view/assignto.html.php
+++ b/module/todo/view/assignto.html.php
@@ -60,7 +60,7 @@
               </td>
             </tr>
             <tfoot>
-            <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+            <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton();?></td></tr>
             </tfoot>
           </table>
         </form>
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index f5ecee5189..5dc44ee6e1 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 form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td class='text-center form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </tfoot>
     </table>
     <div class="hidden">
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 5cd607a68d..161991bb00 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -96,7 +96,7 @@
       <tfoot>
         <tr>
           <td colspan='<?php echo $columns?>' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 92a012bce3..28f56d252e 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -132,7 +132,7 @@
         </tr>  
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
+            <?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
       </table>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 98fc0812a3..e9d3aff7f3 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -137,7 +137,7 @@
     </div>
     <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::submitButton();?>
         <?php echo html::backButton('', '', 'btn btn-wide');?>
       </div>
     </div>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 2f9d4295ba..61b2a42fce 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -179,7 +179,7 @@
       <div class="modal-body">
         <form method='post' action='<?php echo $this->createLink('action', 'comment', "objectType=todo&objectID=$todo->id")?>' target='hiddenwin'>
           <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
-          <div class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></div>
+          <div class='text-center'><?php echo html::submitButton();?></div>
         </form>
       </div>
     </div>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 93c2cdbab7..2b01691ee6 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -141,7 +141,7 @@
               <td></td>
               <?php endif;?>
               <td colspan="2" class="form-actions">
-                <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+                <?php echo html::submitButton();?>
                 <?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'self', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 1c7d679371..df0e7f58bf 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -109,7 +109,7 @@
               <td></td>
               <td colspan='2' class="form-actions">
                 <?php
-                echo html::submitButton('', '', 'btn btn-primary btn-wide');
+                echo html::submitButton();
                 echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');
                 echo html::hidden('parentModuleID', $currentModuleID);
                 echo html::hidden('maxOrder', $maxOrder);
diff --git a/module/user/control.php b/module/user/control.php
index dde17035b2..38e8ae28f2 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -957,7 +957,7 @@ class user extends control
         $users = $this->user->getPairs('noletter, noclosed');
         $html = "<form method='post' target='hiddenwin' action='" . $this->createLink('task', 'assignedTo', "taskID=$taskID&assignedTo=$assignedTo") . "'>";
         $html .= html::select('assignedTo', $users, $assignedTo);
-        $html .= html::submitButton();
+        $html .= html::submitButton('', '', 'btn btn-primary');
         $html .= '</form>';
         echo $html;
     }
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index a916d7cbdf..4faabb836a 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -103,7 +103,7 @@
         <tfoot>
           <tr>
             <td colspan="<?php echo count($visibleFields) + 6?>" class="text-center form-actions">
-              <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton($lang->save);?>
               <?php echo html::backButton('', '', "btn btn-wide");?>
             </td>
           </tr>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 83bf2cc90f..6bd8e19ff2 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -95,7 +95,7 @@
         <tfoot>
           <tr>
             <td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center form-actions">
-              <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
+              <?php echo html::submitButton($lang->save);?>
               <?php echo html::backButton('', '', "btn btn-wide");?>
             </td>
           </tr>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index f38ad94f21..74105c44d3 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -84,7 +84,7 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php
index f42bcde2ae..ca59141c3b 100644
--- a/module/user/view/delete.html.php
+++ b/module/user/view/delete.html.php
@@ -29,7 +29,7 @@
       </tr>
       <tr>
         <th></th>
-        <td><?php echo html::submitButton($lang->delete, '', 'btn btn-wide btn-primary');?></td>
+        <td><?php echo html::submitButton($lang->delete);?></td>
       </tr>
     </table>
   </form>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 5d705a5196..e283b52974 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -116,7 +116,7 @@
         </tr>
         <tr>
           <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/user/view/managecontacts.html.php b/module/user/view/managecontacts.html.php
deleted file mode 100644
index 2e3df08bbd..0000000000
--- a/module/user/view/managecontacts.html.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * The contacts manage page of user module.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      chunsheng wang <chunsheng@cnezsoft.com>
- * @package     user
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix' title='COMPANY'><?php echo html::icon($lang->icons['company']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon('cogs');?></small> <?php echo $lang->user->contacts->manage;?></strong>
-  </div>
-</div>
-<div class='row'>
-  <div class='col-md-3 col-lg-2'>
-    <div class='panel panel-sm with-list'>
-      <div class='panel-heading'>
-        <i class='icon-list-ul'></i> <strong><?php echo $lang->user->contacts->contactsList;?></strong>
-      </div>
-      <ul class='list-group'>
-        <?php 
-        foreach($lists as $id => $listName) echo html::a(inlink('managecontacts', "listID=$id"), $listName, '', "class='list-group-item'");
-        ?>
-      </ul>
-    </div>
-  </div>
-  <div class='col-md-9 col-lg-10'>
-    <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-      <div class='panel panel-sm'>
-        <div class='panel-heading'>
-          <i class='icon-cogs'></i> <strong><?php echo $lang->user->contacts->manage;?></strong>
-          <div class='panel-actions pull-right'>
-            <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger'");?>
-          </div>
-        </div>
-        <div class='panel-body'>
-          <table class='table table-form table-fixed'> 
-            <tr>
-              <th class='w-80px'><?php echo $lang->user->contacts->selectedUsers;?></th>
-              <td>
-                <?php
-                foreach($this->view->users as $account => $realname)
-                {
-                    echo "<div class='userSpan group-item'><input type='checkbox' name='users[]' value='$account' checked='checked'> $realname</div>";
-                }
-                ?>
-              </td>
-            </tr>
-            <tr>
-              <th><?php $mode == 'new' ? print($lang->user->contacts->selectList) : print($lang->user->contacts->listName);?></th>
-              <td>
-                <?php 
-                if($mode == 'new')
-                {
-                    echo "<div class='input-group clearfix mw-700px'>";
-                    if($lists)
-                    {
-                        echo "<span class='input-group-addon'>" . $lang->user->contacts->appendToList . '</span>';
-                        echo html::select('list2Append', array('' => '') + $lists, '', "class='form-control'");
-                    }
-                    echo "<span class='input-group-addon'>";
-                    if($lists) echo $lang->user->contacts->or;
-                    echo $lang->user->contacts->createList;
-                    echo '</span>';
-                    echo html::input('newList', '', "class='form-control' autocomplete='off'");
-                    echo '</div>';
-                }
-                else
-                {
-                    echo html::input('listName', $list->listName, "class='form-control' autocomplete='off'");
-                    echo html::hidden('listID',  $list->id);
-                }
-                ?>
-              </td>
-            </tr>
-            <tr><td></td><td><?php echo html::submitButton() . html::hidden('mode', $mode);?></td></tr>
-          </table>
-        </div>
-      </div>
-    </form>
-  </div>
-</div>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php
index cf5e319afd..459dd3b74f 100644
--- a/module/webhook/view/create.html.php
+++ b/module/webhook/view/create.html.php
@@ -71,7 +71,7 @@
         <tr>
           <th></th>
           <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php
index 3e80b11187..bef5c270d0 100644
--- a/module/webhook/view/edit.html.php
+++ b/module/webhook/view/edit.html.php
@@ -74,7 +74,7 @@
         <tr>
           <th></th>
           <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::submitButton();?>
             <?php echo html::backButton('', '', 'btn btn-wide')?>
           </td>
         </tr>