diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index ffef983157..f037d4dfde 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -91,10 +91,10 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <td class='c-actions'>
             <div class='more'>
               <?php
-              if($user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
-              if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
+              if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
+              if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
               {
-                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin");
+                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
               }
               ?>
             </div>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 02ed975ed1..5152c420b3 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -54,11 +54,11 @@
         if(common::hasPriv('group', 'delete') and $group->role != 'limited')
         {
             $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-sm icon-close"></i>', '', "title='{$lang->group->delete}' class='btn'");
+            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
         }
         else
         {
-            echo "<button class='btn disabled'><i class='icon icon-sm icon-close disabled' title='{$lang->group->delete}'></i></button>";
+            echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
         }
         ?>
       </td>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index f574012cb4..f0b1f638ab 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -36,17 +36,17 @@
     </div>
     <form id="recordForm" method='post' target='hiddenwin' style='margin-top:25px'>
       <table class='table table-form table-fixed'>
-        <?php if(count($estimates)):?>
         <thead>
           <tr class='text-center'>
             <th class="w-id"><?php echo $lang->idAB;?></th>
-            <th class="w-100px"><?php echo $lang->task->date;?></th>
+            <th class="w-120px"><?php echo $lang->task->date;?></th>
             <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
             <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
             <th><?php echo $lang->comment;?></th>
-            <th class="w-60px"><?php echo $lang->actions;?></th>
+            <th class='w-10px'></th>
           </tr>
         </thead>
+        <?php if(count($estimates)):?>
         <?php foreach($estimates as $estimate):?>
         <tr class="text-center">
           <td><?php echo $estimate->id;?></td>
@@ -67,16 +67,6 @@
         <?php endforeach;?>
         <?php endif;?>
         <?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
-        <thead>
-          <tr class='text-center'>
-            <th class="w-id"><?php echo $lang->idAB;?></th>
-            <th class="w-120px"><?php echo $lang->task->date;?></th>
-            <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
-            <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
-            <th><?php echo $lang->comment;?></th>
-            <th class='w-10px'></th>
-          </tr>
-        </thead>
         <?php for($i = 1; $i <= 3; $i++):?>
         <tr class="text-center">
           <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
@@ -87,14 +77,13 @@
           <td></td>
         </tr>
         <?php endfor;?>
+        <?php endif;?>
         <tr>
           <td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
         </tr>
       </table>
-      <?php endif;?>
     </form>
     <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
-<?php endif;?>