diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index d2bd4cfe..779f3b07 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -490,7 +490,7 @@
     MESSAGES_BOX: 'Messages Box',
     MESSAGES_SEND: 'Send Messages',
     ADMIN_MESSAGES_SEND: 'Send System Messages',
-    MESSAGES_SEND_BUTTON: '　　Send　　',
+    MESSAGES_SEND_BUTTON: 'Send',
     MESSAGES_IS_EMPTY: 'Messages Box is empty!',
     MESSAGES_FIELD: {
       TO: 'Send to:',
@@ -512,9 +512,9 @@
       LAST_REPLY_AT: 'Latest reply at',
       NEW_MSG: 'New messages'
     },
-    BUTTON_MESSAGE_DELETE: '　Delete　',
-    BUTTON_MESSAGE_CLOSE: ' Close (esc) ',
-    BUTTON_MESSAGE_REPLY: '　Reply　',
+    BUTTON_MESSAGE_DELETE: 'Delete',
+    BUTTON_MESSAGE_CLOSE: 'Close(esc)',
+    BUTTON_MESSAGE_REPLY: 'Reply',
 
     MESSAGE_TYPE_USER: 'User message',
     MESSAGE_TYPE_SYSTEM: 'System message',
@@ -624,12 +624,12 @@
       HOME_INDEX: 'Forums Home',
       BTN_ADD_FORUM: 'Add New Forum',
       BTN_EDIT_FORUM: 'Edit Forum',
-      BTN_ADD: '　　Add　　',
-      BTN_EDIT: '　　Edit　　',
-      BTN_SAVE: '　Save　',
-      BTN_CANCEL: ' Cancel ',
+      BTN_ADD: 'Add',
+      BTN_EDIT: 'Edit',
+      BTN_SAVE: 'Save',
+      BTN_CANCEL: 'Cancel',
       LINK_EDIT: 'Edit',
-      BTN_DELETE: ' 　Delete　 ',
+      BTN_DELETE: 'Delete',
       BTN_SUBMIT_TOPIC: 'Submit New Topic',
       BTN_SUBMIT_REPLY: 'Submit New Reply',
       BTN_POST_NEW_TOPIC: 'Post New Topic',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 1a0b4579..1764ff17 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -490,7 +490,7 @@
     MESSAGES_BOX: '站内消息',
     MESSAGES_SEND: '发送消息',
     ADMIN_MESSAGES_SEND: '发送系统消息',
-    MESSAGES_SEND_BUTTON: '　　发送　　',
+    MESSAGES_SEND_BUTTON: '发送',
     MESSAGES_IS_EMPTY: '消息盒子为空!',
     MESSAGES_FIELD: {
       TO: '发送至:',
@@ -512,9 +512,9 @@
       LAST_REPLY_AT: '最新回复于',
       NEW_MSG: '条未读消息'
     },
-    BUTTON_MESSAGE_DELETE: '　删除　',
-    BUTTON_MESSAGE_CLOSE: ' 关闭 (esc) ',
-    BUTTON_MESSAGE_REPLY: '　回复　',
+    BUTTON_MESSAGE_DELETE: '删除',
+    BUTTON_MESSAGE_CLOSE: '关闭(esc)',
+    BUTTON_MESSAGE_REPLY: '回复',
 
     MESSAGE_TYPE_USER: '用户消息',
     MESSAGE_TYPE_SYSTEM: '系统消息',
@@ -624,16 +624,16 @@
       HOME_INDEX: '论坛首页',
       BTN_ADD_FORUM: '添加版块',
       BTN_EDIT_FORUM: '编辑版块',
-      BTN_ADD: '　　添加　　',
-      BTN_EDIT: '　　编辑　　',
-      BTN_SAVE: '　保存　',
-      BTN_CANCEL: '　取消　',
+      BTN_ADD: '添加',
+      BTN_EDIT: '编辑',
+      BTN_SAVE: '保存',
+      BTN_CANCEL: '取消',
       LINK_EDIT: '编辑',
-      BTN_DELETE: '　删除　　',
-      BTN_SUBMIT_TOPIC: ' 提交新话题 ',
-      BTN_SUBMIT_REPLY: ' 提交新回复 ',
-      BTN_POST_NEW_TOPIC: ' 发起新话题 ',
-      BTN_POST_NEW_REPLY: ' 　　回　复　　 ',
+      BTN_DELETE: '删除',
+      BTN_SUBMIT_TOPIC: '提交新话题',
+      BTN_SUBMIT_REPLY: '提交新回复',
+      BTN_POST_NEW_TOPIC: '发起新话题 ',
+      BTN_POST_NEW_REPLY: '回复',
       ADD_SUCCESSFULLY: '版块添加成功',
       ADD_FAILED: '版块添加失败',
       EDIT_SUCCESSFULLY: '版块编辑成功',
diff --git a/modules/core/client/less/btn-size.less b/modules/core/client/less/btn-size.less
new file mode 100644
index 00000000..41c6f1c3
--- /dev/null
+++ b/modules/core/client/less/btn-size.less
@@ -0,0 +1,29 @@
+@import (reference) "mt-var.less";
+
+.btn-width-50 {
+    min-width: 50px !important;
+}
+.btn-width-60 {
+    min-width: 60px !important;
+}
+.btn-width-70 {
+    min-width: 70px !important;
+}
+.btn-width-80 {
+    min-width: 80px !important;
+}
+.btn-width-90 {
+    min-width: 90px !important;
+}
+.btn-width-100 {
+    min-width: 100px !important;
+}
+.btn-width-120 {
+    min-width: 120px !important;
+}
+.btn-width-150 {
+    min-width: 150px !important;
+}
+.btn-width-200 {
+    min-width: 120px !important;
+}
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index a17a095c..568202aa 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -415,8 +415,7 @@
                 <h3 translate="WARNING_POPUP_STRING"></h3>
             </div>
             <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 text-center">
-                <button class="warning_popup_close btn btn-lg btn-success margin-top-20">{{'BUTTON_MESSAGE_CLOSE' | translate}}</button>
-                <button class="warning_popup_open btn btn-lg btn-success margin-top-20" style="display: none;"></button>
+                <button class="warning_popup_close btn btn-lg btn-success btn-width-100 margin-top-20">{{'BUTTON_MESSAGE_CLOSE' | translate}}</button>
             </div>
         </div>
     </div>
diff --git a/modules/forums/client/controllers/forums-topic.client.controller.js b/modules/forums/client/controllers/forums-topic.client.controller.js
index 718a11e2..00a6b1cf 100644
--- a/modules/forums/client/controllers/forums-topic.client.controller.js
+++ b/modules/forums/client/controllers/forums-topic.client.controller.js
@@ -156,10 +156,11 @@
         onShow: function (e) {
           e.setContent(t.content);
 
-          $('.md-footer').addClass('text-right');
+          angular.element($('.md-footer')).addClass('text-right');
+          angular.element($('.md-footer')[0].childNodes[0]).addClass('btn-width-80');
           $('.md-footer')[0].childNodes[0].innerText = $translate.instant('FORUMS.BTN_SAVE');
 
-          var cbtn = angular.element('<button class="btn btn-success margin-left-10">' + $translate.instant('FORUMS.BTN_CANCEL') + '</button>');
+          var cbtn = angular.element('<button class="btn btn-success btn-width-80 margin-left-10">' + $translate.instant('FORUMS.BTN_CANCEL') + '</button>');
           cbtn.bind('click', function (evt) {
             e.setContent(t.content);
             e.$options.hideable = true;
@@ -216,10 +217,11 @@
         onShow: function (e) {
           e.setContent(r.content);
 
-          $('.md-footer').addClass('text-right');
+          angular.element($('.md-footer')).addClass('text-right');
+          angular.element($('.md-footer')[0].childNodes[0]).addClass('btn-width-80');
           $('.md-footer')[0].childNodes[0].innerText = $translate.instant('FORUMS.BTN_SAVE');
 
-          var cbtn = angular.element('<button class="btn btn-success margin-left-10">' + $translate.instant('FORUMS.BTN_CANCEL') + '</button>');
+          var cbtn = angular.element('<button class="btn btn-success btn-width-80 margin-left-10">' + $translate.instant('FORUMS.BTN_CANCEL') + '</button>');
           cbtn.bind('click', function (evt) {
             e.setContent(r.content);
             e.$options.hideable = true;
diff --git a/modules/forums/client/views/admin/configure.client.view.html b/modules/forums/client/views/admin/configure.client.view.html
index 6834aeb9..e0ebcf08 100644
--- a/modules/forums/client/views/admin/configure.client.view.html
+++ b/modules/forums/client/views/admin/configure.client.view.html
@@ -1,7 +1,7 @@
 <section class="container padding-top-10" ng-controller="ForumsAdminController as vm" ng-init="vm.init();">
     <div class="row margin-top-20 forum-list">
         <div class="col-md-10 col-md-offset-1">
-            <button class="btn btn-success" ng-click="vm.popupCreateForum($event)">　　{{ 'FORUMS.BTN_ADD_FORUM' | translate }}　　</button>
+            <button class="btn btn-success btn-width-100" ng-click="vm.popupCreateForum($event)">　　{{ 'FORUMS.BTN_ADD_FORUM' | translate }}　　</button>
         </div>
 
         <div class="col-sm-10 col-sm-offset-1 margin-top-30">
@@ -99,17 +99,17 @@
                 </div>
                 <div class="form-group">
                     <div class="col-sm-offset-4 col-sm-8">
-                        <button type="submit" class="btn btn-success"
+                        <button type="submit" class="btn btn-success btn-width-100"
                                 ng-click="vm.createNewForum();"
                                 ng-hide="vm.isEdit"
                                 ng-disabled="!vm.forum.name || !vm.forum.desc ">{{'FORUMS.BTN_ADD' | translate}}
                         </button>
-                        <button type="submit" class="btn btn-success"
+                        <button type="submit" class="btn btn-success btn-width-100"
                                 ng-click="vm.editForum();"
                                 ng-show="vm.isEdit"
                                 ng-disabled="!vm.forum.name || !vm.forum.desc ">{{'FORUMS.BTN_EDIT' | translate}}
                         </button>
-                        <button type="submit" class="btn btn-success"
+                        <button type="submit" class="btn btn-success btn-width-100"
                                 ng-click="vm.deleteForum();"
                                 ng-show="vm.isEdit"
                                 ng-disabled="!vm.forum.name || !vm.forum.desc ">{{'FORUMS.BTN_DELETE' | translate}}
@@ -127,7 +127,7 @@
                        placeholder="{{ 'STATUS_FIELD.USERNAME' | translate }}" autofocus>
             </div>
             <div class="margin-top-10">
-                <button class="btn btn-default" ng-disabled="!vm.addModeratorPopover.username"
+                <button class="btn btn-default btn-width-80" ng-disabled="!vm.addModeratorPopover.username"
                         ng-click="vm.addModerator();">{{ 'FORUMS.BTN_ADD' | translate }}
                 </button>
             </div>
diff --git a/modules/messages/client/views/admin-send.client.view.html b/modules/messages/client/views/admin-send.client.view.html
index 4a5f588a..a8cc6666 100644
--- a/modules/messages/client/views/admin-send.client.view.html
+++ b/modules/messages/client/views/admin-send.client.view.html
@@ -59,7 +59,7 @@
                         <div>
                             <dt class="h-line"></dt>
                             <dd class="h-line">
-                                <button type="submit" class="btn btn-success">{{ 'MESSAGES_SEND_BUTTON' | translate }}</button>
+                                <button type="submit" class="btn btn-success btn-width-100">{{ 'MESSAGES_SEND_BUTTON' | translate }}</button>
                             </dd>
                         </div>
                     </dl>
@@ -111,7 +111,7 @@
 
             <div class="margin-top-20" ng-if="vm.adminMessages.length">
                 <div class="pull-right margin-top-20">
-                    <button class="btn btn-success" ng-click="vm.deleteSelected()">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
+                    <button class="btn btn-success btn-width-100" ng-click="vm.deleteSelected()">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
                 </div>
             </div>
         </div>
diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html
index 233b1a72..c910d02a 100644
--- a/modules/messages/client/views/box.client.view.html
+++ b/modules/messages/client/views/box.client.view.html
@@ -88,7 +88,7 @@
                     next-text="{{ 'PAGE_TEXT_NEXT' | translate}}" last-text="{{ 'PAGE_TEXT_LAST' | translate}}">
                 </ul>
                 <div class="pull-right margin-top-20">
-                    <button class="btn btn-success" ng-click="vm.deleteSelected()">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
+                    <button class="btn btn-success btn-width-100" ng-click="vm.deleteSelected()">{{ 'BUTTON_MESSAGE_DELETE' | translate }}</button>
                 </div>
             </div>
         </div>
@@ -135,11 +135,11 @@
         <div class="bottom-control" ng-class="{'not-user-message':  vm.selectedMessage.type!='user'}">
             <textarea class="form-control reply-textarea" id="reply-content" name="reply-content"
                       ng-model="vm.replyContent" ng-if="vm.selectedMessage.type=='user'" autofocus></textarea>
-            <button class="btn btn-default" ng-click="vm.hideMessage();">{{ 'BUTTON_MESSAGE_CLOSE' | translate }}</button>
-            <button class="btn btn-default" ng-click="vm.delete(vm.selectedMessage);"
+            <button class="btn btn-default btn-width-100" ng-click="vm.hideMessage();">{{ 'BUTTON_MESSAGE_CLOSE' | translate }}</button>
+            <button class="btn btn-default btn-width-100" ng-click="vm.delete(vm.selectedMessage);"
                     ng-if="vm.selectedMessage.type=='user'">{{ 'BUTTON_MESSAGE_DELETE' | translate }}
             </button>
-            <button class="btn btn-success pull-right" ng-disabled="!vm.replyContent"
+            <button class="btn btn-success btn-width-100 pull-right" ng-disabled="!vm.replyContent"
                     ng-click="vm.replyMessage(vm.selectedMessage);" ng-if="vm.selectedMessage.type=='user'">{{ 'BUTTON_MESSAGE_REPLY' | translate }}
             </button>
         </div>
diff --git a/modules/messages/client/views/send.client.view.html b/modules/messages/client/views/send.client.view.html
index 84c55ecc..a68a0393 100644
--- a/modules/messages/client/views/send.client.view.html
+++ b/modules/messages/client/views/send.client.view.html
@@ -61,7 +61,7 @@
                         <div>
                             <dt class="h-line"></dt>
                             <dd class="h-line">
-                                <button type="submit" class="btn btn-success">{{ 'MESSAGES_SEND_BUTTON' | translate }}</button>
+                                <button type="submit" class="btn btn-success btn-width-100">{{ 'MESSAGES_SEND_BUTTON' | translate }}</button>
                             </dd>
                         </div>
                     </dl>
diff --git a/modules/torrents/client/templates/modal-confirm.client.view.html b/modules/torrents/client/templates/modal-confirm.client.view.html
index db2e2b5a..6de08319 100644
--- a/modules/torrents/client/templates/modal-confirm.client.view.html
+++ b/modules/torrents/client/templates/modal-confirm.client.view.html
@@ -6,8 +6,8 @@
     <p ng-show="modalOptions.bodyParams">{{modalOptions.bodyParams}}</p>
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn btn-default"
+    <button type="button" class="btn btn-default btn-width-100"
             data-ng-click="modalOptions.close()">{{modalOptions.closeButtonText}}</button>
-    <button class="btn btn-primary"
+    <button class="btn btn-primary btn-width-100"
             data-ng-click="modalOptions.ok();">{{modalOptions.actionButtonText}}</button>
 </div>
\ No newline at end of file
diff --git a/modules/users/client/views/settings/change-password.client.view.html b/modules/users/client/views/settings/change-password.client.view.html
index 5fd12e14..10ce4e38 100644
--- a/modules/users/client/views/settings/change-password.client.view.html
+++ b/modules/users/client/views/settings/change-password.client.view.html
@@ -40,7 +40,7 @@
                             style="color:white; white-space:nowrap;">{{requirementsProgress}}%</span></uib-progressbar>
                 </div>
                 <div class="text-center form-group">
-                    <button type="submit" class="btn btn-primary">{{'BUTTON_SAVE_PASSWORD' | translate}}</button>
+                    <button type="submit" class="btn btn-default">{{'BUTTON_SAVE_PASSWORD' | translate}}</button>
                 </div>
             </fieldset>
         </form>
diff --git a/modules/users/client/views/settings/edit-profile.client.view.html b/modules/users/client/views/settings/edit-profile.client.view.html
index 3d68c0d9..bcf386c0 100644
--- a/modules/users/client/views/settings/edit-profile.client.view.html
+++ b/modules/users/client/views/settings/edit-profile.client.view.html
@@ -44,7 +44,7 @@
                     </div>
                 </div>
                 <div class="text-center form-group">
-                    <button type="submit" class="btn btn-primary">{{'BUTTON_SAVE_PROFILE' | translate}}</button>
+                    <button type="submit" class="btn btn-default">{{'BUTTON_SAVE_PROFILE' | translate}}</button>
                 </div>
             </fieldset>
         </form>