diff --git a/module/my/css/index.css b/module/my/css/index.css
index 5d39a38314..ad380a89e1 100644
--- a/module/my/css/index.css
+++ b/module/my/css/index.css
@@ -8,4 +8,7 @@
 #row1 .table-1, #row1 caption{border:none}
 #row2 .table-1, #row2 caption{border:none}
 
-caption .f-left {padding-left:0px}
\ No newline at end of file
+caption{line-height: 20px;padding-bottom: 8px;}
+caption .f-left {padding-left:0px}
+
+.outer th i[class^="icon-"], .outer th i[class*=" icon-"]{font-size: 16px;}
\ No newline at end of file
diff --git a/module/my/view/blockbugs.html.php b/module/my/view/blockbugs.html.php
index 74df408c7a..4bfa87c3e9 100644
--- a/module/my/view/blockbugs.html.php
+++ b/module/my/view/blockbugs.html.php
@@ -1,7 +1,7 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'><i class='icon icon-bug icon-large'></i>&nbsp; <?php echo $lang->my->bug;?></div>
+    <div class='f-left'><i class='icon icon-bug'></i>&nbsp; <?php echo $lang->my->bug;?></div>
     <div class='f-right'><?php echo html::a($this->createLink('my', 'bug'), $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
   </caption>
   <?php 
diff --git a/module/my/view/blockdynamic.html.php b/module/my/view/blockdynamic.html.php
index 95eccdf039..7e6fd82876 100644
--- a/module/my/view/blockdynamic.html.php
+++ b/module/my/view/blockdynamic.html.php
@@ -1,7 +1,7 @@
 <div class='dynamic'>
 <table class='table-1 colored fixed'>
   <caption>
-    <div class='f-left'><i class="icon icon-quote-right icon-large"></i>&nbsp; <?php echo $lang->my->home->latest;?></div>
+    <div class='f-left'><i class="icon icon-quote-right"></i>&nbsp; <?php echo $lang->my->home->latest;?></div>
     <div class='f-right'><?php common::printLink('company', 'dynamic', '', $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
   </caption>
   <?php 
diff --git a/module/my/view/blockproducts.html.php b/module/my/view/blockproducts.html.php
index f01931ac5f..e3af5d72e4 100644
--- a/module/my/view/blockproducts.html.php
+++ b/module/my/view/blockproducts.html.php
@@ -1,7 +1,7 @@
 <div class='block linkbox1' id='productbox'>
 <?php if(empty($productStats)):?>
 <table class='table-1 a-center' height='138px'>
-  <caption><i class="icon icon-th icon-large"></i>&nbsp; <?php echo $lang->my->home->products;?></caption>
+  <caption><i class="icon icon-th"></i>&nbsp; <?php echo $lang->my->home->products;?></caption>
   <tr>
     <td valign='middle'>
       <table class='a-left bd-none' align='center'>
@@ -16,7 +16,7 @@
 <?php else:?>
   <table class='table-1 colored fixed'>
     <tr class='colhead'>
-      <th class='w-150px'><div class='f-left'><i class="icon icon-th icon-large"></i>&nbsp; <?php echo $lang->product->name;?></div></th>
+      <th class='w-150px'><div class='f-left'><i class="icon icon-th"></i>&nbsp; <?php echo $lang->product->name;?></div></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['active'];?></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['changed'];?></th>
       <th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['draft'];?></th>
diff --git a/module/my/view/blockprojects.html.php b/module/my/view/blockprojects.html.php
index 01da6f4ca8..2ec3e67e57 100644
--- a/module/my/view/blockprojects.html.php
+++ b/module/my/view/blockprojects.html.php
@@ -1,7 +1,7 @@
 <div class='block linkbox1' id='projectbox'>
 <?php if(count($projectStats) == 0):?>
 <table class='table-1 a-center' height='138px'>
-  <caption><i class="icon icon-th-large icon-large"></i>&nbsp;<?php echo $lang->my->home->projects;?></caption>
+  <caption><i class="icon icon-th-large"></i>&nbsp;<?php echo $lang->my->home->projects;?></caption>
   <tr>
     <td valign='middle'>
       <table class='a-left bd-none' align='center'>
@@ -16,7 +16,7 @@
 <?php else:?>
   <table class='table-1 fixed colored'>
     <tr class='colhead'>
-      <th class='w-150px'><div class='f-left'><i class="icon icon-th-large icon-large"></i>&nbsp; <?php echo $lang->project->name;?></div></th>
+      <th class='w-150px'><div class='f-left'><i class="icon icon-th-large"></i>&nbsp; <?php echo $lang->project->name;?></div></th>
       <th><?php echo $lang->project->end;?></th>
       <th><?php echo $lang->statusAB;?></th>
       <th><?php echo $lang->project->totalEstimate;?></th>
diff --git a/module/my/view/blocktasks.html.php b/module/my/view/blocktasks.html.php
index affdf6f371..a48224faae 100644
--- a/module/my/view/blocktasks.html.php
+++ b/module/my/view/blocktasks.html.php
@@ -1,7 +1,7 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'><i class='icon icon-tasks icon-large'></i>&nbsp; <?php echo $lang->my->task;?></div>
+    <div class='f-left'><i class='icon icon-tasks'></i>&nbsp; <?php echo $lang->my->task;?></div>
     <div class='f-right'><?php echo html::a($this->createLink('my', 'task'), $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
   </caption>
   <?php 
diff --git a/module/my/view/blocktodoes.html.php b/module/my/view/blocktodoes.html.php
index e86e606963..8433c89ba1 100644
--- a/module/my/view/blocktodoes.html.php
+++ b/module/my/view/blocktodoes.html.php
@@ -1,7 +1,7 @@
 <div class='block linkbox2'>
 <table class='table-1 fixed colored'>
   <caption>
-    <div class='f-left'><i class='icon icon-list-ul icon-large'></i>&nbsp; <?php echo $lang->my->todo;?></div>
+    <div class='f-left'><i class='icon icon-list-ul'></i>&nbsp; <?php echo $lang->my->todo;?></div>
     <div class='f-right'><?php echo html::a($this->createLink('my', 'todo'), $lang->more . "&nbsp;<i class='icon-th icon icon-double-angle-right'></i>");?></div>
   </caption>
   <?php 
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 7f4113a43b..2bf662195c 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-"],[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 [class^="icon-"],.link-icon [class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
 i.disabled,i.disabled:hover{color: #ccc;}
-.outer td i{font-size: 20px;margin-right: 6px;}
+.outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 20px;margin-right: 6px;}
 
 .icon-webapp-manage:before{content: "\f085";}
 .icon-webapp-obtain:before{content: "\f07a";}
@@ -77,6 +77,9 @@ i.disabled,i.disabled:hover{color: #ccc;}
 .icon-green-bug-create:before,.icon-gray-bug-create:before,
 .icon-green-build-create:before,.icon-gray-build-create:before{content: "\f067";}
 
+/*-----------------------BUTTONS -----------------------------------*/
+
+
 /*-----------------------LAYOUT SETTING ----------------------------*/
 #wrap{ padding:0 19px; background:#e5e5e5;}
 #wrap .outer {text-align:left; padding:20px;background:#fff;border:1px solid #cfcfcf;-webkit-box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);box-shadow: 0 0px 6px rgba(0, 0, 0, 0.10);}
@@ -418,8 +421,9 @@ table.data-table td:last-child{padding-right: 20px;}
 #featurebar .dp-choose-date {display: inline-block; height: 16px;text-indent: -9999em;width: 16px;}
 
 /* Querybox */
-#querybox{margin: -20px -20px 20px -20px;}
+#querybox{margin: -20px -20px 20px -20px;background-color: #ffc;}
 #querybox table{border: none;border-bottom: 1px solid #e5e5e5;}
+#querybox td{vertical-align: middle;}
 
 /* Tree slider. */
 .treeSlider