diff --git a/module/common/control.php b/module/common/control.php
index 33ec6e4b5a..54e4dc9670 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -240,7 +240,7 @@ class common extends control
 
         if(!common::hasPriv($module, 'edit')) return false;
         echo "<span class='link-button'>";
-        echo html::a('#commentBox', '<i class="icon-comments-alt icon-large"></i>', '', "title='$lang->comment' onclick='setComment()'");
+        echo html::a('#commentBox', '<i class="icon-comments-alt"></i>', '', "title='$lang->comment' onclick='setComment()'");
         echo "</span>";
     }
 
diff --git a/www/theme/default/button.css b/www/theme/default/button.css
deleted file mode 100644
index 1f84ddb9bf..0000000000
--- a/www/theme/default/button.css
+++ /dev/null
@@ -1,219 +0,0 @@
-.button ,a.button{
-    background-color: transparent;
-    background-image: linear-gradient(top, whiteSmoke, #f1f1f1);
-    background-image: -moz-linear-gradient(top, whiteSmoke, #f1f1f1);
-    background-image: -o-linear-gradient(top, whiteSmoke, #f1f1f1);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(whiteSmoke), to(#f1f1f1));
-    background-image: -webkit-linear-gradient(top, whiteSmoke, #f1f1f1);
-    background-image: -ms-linear-gradient(top, whiteSmoke, #f1f1f1);
-    -webkit-transition: border-color .3s;
-    -moz-transition: border-color .3s;
-    -o-transition: border-color .3s;
-    transition: border-color .3s;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    border: 1px solid #dcdcdc;
-    margin: 0 10px 0 0;
-    padding: 7px 12px;
-    position: relative;
-    display: inline-block;
-    *display: inline;
-    *zoom: 1;
-    cursor: pointer;
-    text-shadow: 0 1px 0 #fff;
-    text-decoration: none;
-    line-height: 1.5;
-    font-size: 12px;
-    color: #444;
-
-    transition-delay: 0,0;
-    transition-duration: .5s,.5s;
-    transition-property: color,background-color,opacity;
-}
-/*==================================================*/
-/*  size                             */
-/*==================================================*/
-.button.mini {
-    padding: 7px 12px;
-    line-height: 1;
-}
-.button.large {
-    padding: 7px 20px;
-    line-height: 2;
-    font-size: 14px;
-}
-/*==================================================*/
-/*  $Colors                                         */
-/*==================================================*/
-.button.orange {
-    background-color: #D14836;
-    background-image: -webkit-linear-gradient(top,#DD4B39,#D14836);
-    background-image: -moz-linear-gradient(top,#DD4B39,#D14836);
-    background-image: -ms-linear-gradient(top,#DD4B39,#D14836);
-    background-image: -o-linear-gradient(top,#DD4B39,#D14836);
-    background-image: linear-gradient(top,#DD4B39,#D14836);
-    border-color: transparent;
-    text-shadow: none;
-    color: #fff;
-}
-
-.button.yellow {
-  color:#867343;
-  background-color:#ffe07b;
-  border:1px solid #fddb69;
-  background-image:-webkit-linear-gradient(top,#ffe896,#ffe07b);
-  background-image:-moz-linear-gradient(top,#ffe896,#ffe07b);
-  background-image:linear-gradient(top,#ffe896,#ffe07b);
-    text-shadow: none;
-}
-
-.button.blue {
-    background-color: #4D90FE;
-    background-image: -webkit-gradient(linear,left top,left bottom,from(#4D90FE),to(#4787ED));
-    background-image: -webkit-linear-gradient(top,#4D90FE,#4787ED);
-    background-image: -moz-linear-gradient(top,#4D90FE,#4787ED);
-    background-image: -ms-linear-gradient(top,#4D90FE,#4787ED);
-    background-image: -o-linear-gradient(top,#4D90FE,#4787ED);
-    background-image: linear-gradient(top,#4D90FE,#4787ED);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#4d90fe',EndColorStr='#4787ed');
-    border: 1px solid #3079ED;
-    text-shadow: none;
-    color: #fff;
-}
-/*==================================================*/
-/*  $Colors:hover                                      */
-/*==================================================*/
-.button:hover {
-    border-color: #999;
-    -webkit-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);
-    -moz-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);
-    box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);
-    text-decoration: none;
-}
-.button.orange:hover {
-    background-color: #c53727;
-    background-image: -webkit-linear-gradient(top,#dd4b39,#c53727);
-    background-image: -moz-linear-gradient(top,#dd4b39,#c53727);
-    background-image: -ms-linear-gradient(top,#dd4b39,#c53727);
-    background-image: -o-linear-gradient(top,#dd4b39,#c53727);
-    background-image: linear-gradient(top,#dd4b39,#c53727);
-    border-color: #b0281a;
-}
-.button.yellow:hover {
-  background-color:#ffda73;
-  border:1px solid #deb74f;
-  background-image:-webkit-linear-gradient(top,#ffe485,#ffda73);
-  background-image:-moz-linear-gradient(top,#ffe485,#ffda73);
-  background-image:linear-gradient(top,#ffe485,#ffda73);
-  -webkit-box-shadow:0 1px 2px rgba(0,0,0,0.2);
-  -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2);
-  box-shadow:0 1px 2px rgba(0,0,0,0.2); 
-}
-
-.button.blue:hover {
-    background-color: #357ae8;
-    background-image: -webkit-linear-gradient(top,#4d90fe,#357ae8);
-    background-image: -moz-linear-gradient(top,#4d90fe,#357ae8);
-    background-image: -ms-linear-gradient(top,#4d90fe,#357ae8);
-    background-image: -o-linear-gradient(top,#4d90fe,#357ae8);
-    background-image: linear-gradient(top,#4d90fe,#357ae8);
-    border-color: #2f5bb7;
-}
-/*==================================================*/
-/*  $Colors:active                                    */
-/*==================================================*/
-.button:active {
-    border-color: #4d90fe;
-    -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-    -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-    box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-}
-
-.button.orange:active {
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
-    background-color: #b0281a;
-    background-image: -webkit-linear-gradient(top,#dd4b39,#b0281a);
-    background-image: -moz-linear-gradient(top,#dd4b39,#b0281a);
-    background-image: -ms-linear-gradient(top,#dd4b39,#b0281a);
-    background-image: -o-linear-gradient(top,#dd4b39,#b0281a);
-    background-image: linear-gradient(top,#dd4b39,#b0281a);
-    border: 1px solid #992A1B;
-}
-.button.yellow:active {
-    -webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);
-  -moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);
-  box-shadow:inset 0 1px 2px rgba(0,0,0,0.2); 
-}
-
-.button.active {
-    background-color: #e0e0e0;
-    background-image: -webkit-linear-gradient(top,#eee,#e0e0e0);
-    background-image: -moz-linear-gradient(top,#eee,#e0e0e0);
-    background-image: -ms-linear-gradient(top,#eee,#e0e0e0);
-    background-image: -o-linear-gradient(top,#eee,#e0e0e0);
-    -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
-    -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
-    box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
-    border-color: #ccc;
-    color: #333;
-}
-/*==================================================*/
-/*  $Colors:disabled                              */
-/*==================================================*/
-.button.disabled,.button[disabled=disabled] {
-    background: #eeeeee;
-    color: #ccc;
-    border: 1px solid #dfdfdf;
-    text-shadow: 0 1px 0 #fff;
-}
-.button.disabled:hover,.button[disabled=disabled]:hover,
-.button.disabled:active,.button[disabled=disabled]:active {
-    background: #eeeeee;
-    color: #ccc;
-    border: 1px solid #dfdfdf;
-    -webkit-box-shadow:none;
-    -moz-box-shadow:none;
-    box-shadow: none;
-    cursor: text;
-    transition-delay: 0s, 0s;
-    transition-duration: 0.7s, 0.7s;
-    transition-property: color, background-color,box-shadow;
-}
-
-/*==================================================*/
-/*  $button Status                          */
-/*==================================================*/
-.button.status-ok {
-    color: #468847;
-    background-color: #DFF0D8;
-    border-color: #D6E9C6;
-}
-
-/*兼容Font-Awesome*/
-.button[class^="icon-"],
-.button[class*=" icon-"] {
-    font-family: inherit;
-    padding: 5px 12px 6px 12px;
-}
-.button[class^="icon-"]:before,
-.button[class*=" icon-"]:before {
-    font-family: FontAwesome;
-    margin-right: 0.5em;
-    filter: alpha(opacity=80);
-    -moz-opacity:0.8;
-  opacity:0.8;
-    font-size: 14px;
-    transition-delay: 0s, 0s;
-    transition-duration: 0.7s, 0.7s;
-    transition-property: color, background-color,opacity;
-}
-.button[class^="icon-"]:hover:before,
-.button[class*=" icon-"]:hover:before {
-    filter: alpha(opacity=100);
-    -moz-opacity:1;
-  opacity:1;
-    transition-delay: 0s, 0s;
-    transition-duration: 0.7s, 0.7s;
-    transition-property: color, background-color,opacity;
-}
\ No newline at end of file
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 2bf662195c..6983916303 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -26,9 +26,9 @@ a  {text-decoration:none;}
 .icon{color: #888;}
 .link-icon{color: #036;display: inline-block;}
 .link-icon:hover{color:#000;text-shadow:1px 1px 3px rgba(0,0,0,0.25);}
-i[class^="icon-"],i[class*=" icon-"],.link-icon [class^="icon-"],.link-icon [class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
+i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
 i.disabled,i.disabled:hover{color: #ccc;}
-.outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 20px;margin-right: 6px;}
+.outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 18px;margin-right: 6px;}
 
 .icon-webapp-manage:before{content: "\f085";}
 .icon-webapp-obtain:before{content: "\f07a";}
@@ -78,7 +78,17 @@ i.disabled,i.disabled:hover{color: #ccc;}
 .icon-green-build-create:before,.icon-gray-build-create:before{content: "\f067";}
 
 /*-----------------------BUTTONS -----------------------------------*/
-
+.btn,a.btn,.button-s,.button-c,.button-b{background-color: #f8f8f8;-webkit-transition: border-color .3s;-moz-transition: border-color .3s;-o-transition: border-color .3s;transition: border-color .3s;-webkit-border-radius: 2px;-moz-border-radius: 2px;border-radius: 2px;border: 1px solid #dcdcdc;margin: 0 10px 0 0;padding: 7px 12px;position: relative;display: inline-block;*display: inline;*zoom: 1;cursor: pointer;text-shadow: 0 1px 0 #fff;text-decoration: none;line-height: 1.5;font-size: 12px;color: #444;transition-delay: 0,0;transition-duration: .5s,.5s;transition-property: all;}
+.button-s,.btn-primary {background-color: #06a400;border: 1px solid #069900;text-shadow: none;color: #fff;}
+.btn.mini {padding: 7px 12px;line-height: 1;}
+.btn.large,.button-s,.button-c,.button-b {padding: 7px 20px;line-height: 2;font-size: 14px;}
+.btn.danger{background-color: #d20b0b;border-color: transparent;text-shadow: none;color: #fff;}
+.btn:hover,.button-c:hover,.button-b:hover {background-color: #eee; border-color: #999;-webkit-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);box-shadow: 0 2px 1px rgba(0, 0, 0, 0.05);text-decoration: none;}
+.btn.danger:hover{background-color: #d92525;border-color: #ca0000;}
+.btn.btn-primary:hover,.button-s:hover {background-color: #10ab00;border-color: #0b7700;}
+.btn.disabled,.btn[disabled=disabled] {background: #eeeeee;color: #ccc; border: 1px solid #dfdfdf;text-shadow: 0 1px 0 #fff;}
+.button-s,.button-c{min-width: 80px;}
+.groupButton .button-c,.groupButton .button-s{margin-right: 0}
 
 /*-----------------------LAYOUT SETTING ----------------------------*/
 #wrap{ padding:0 19px; background:#e5e5e5;}
@@ -598,6 +608,7 @@ table.data-table td:last-child{padding-right: 20px;}
 .icon-green-testcase-confirmStoryChange {padding:2px 8px;  background:url(images/main/zt-icons.png) -40px -282px;}
 
 .link-button a{color:#036; font-weight:normal; font-size:14px;} 
+.link-button a i{font-size: 18px;}
 .link-button a:hover {color:#000;}
 
 /* Effort icons. */