diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 7b118dd6d6..46bba7bf4d 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -27,7 +27,7 @@
     <th class='w-80px'><?php echo $lang->testtask->begin;?></th>
     <th class='w-80px'><?php echo $lang->testtask->end;?></th>
     <th class='w-50px'><?php echo $lang->statusAB;?></th>
-    <th class='w-130px {sorter:false}'><?php echo $lang->actions;?></th>
+    <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
   </tr>
   </thead>
   <tbody>
@@ -45,8 +45,8 @@
       <?php
       common::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
       common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
-      common::printLink('testtask', 'edit',     "taskID=$task->id", $lang->edit);
-      common::printLink('testtask', 'delete',   "taskID=$task->id", $lang->delete, 'hiddenwin');
+      common::printLink('testtask', 'edit',     "taskID=$task->id", '&nbsp;', '', "class='icon-green-small-edit' title={$lang->edit}", false);
+      common::printLink('testtask', 'delete',   "taskID=$task->id", '&nbsp;', 'hiddenwin', "class='icon-green-small-delete' title='{$lang->delete}'", false);
       ?>
     </td>
   </tr>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 6037f3a6e5..12201ddeca 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -27,9 +27,9 @@ var moduleID   = '<?php echo $moduleID;?>';
   </div>
   <div class='f-right'>
     <?php
-    common::printLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=$task->id", $lang->export, '', 'class="export"');
+    common::printLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=$task->id", '&nbsp;', '', "class='export icon-green-big-export' title='{$lang->export}'");
     common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCase);
-    echo html::a($this->session->testtaskList, $lang->goback);
+    echo html::a($this->session->testtaskList, '&nbsp;', '', "class='icon-green-big-goback' title='{$lang->goback}'");
     ?>
   </div>
 </div>
@@ -56,7 +56,7 @@ var moduleID   = '<?php echo $moduleID;?>';
             <th class='w-100px'>   <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
             <th class='w-80px'>    <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
             <th class='w-status'>  <?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='w-140px {sorter: false}'><?php echo $lang->actions;?></th>
+            <th class='w-120px {sorter: false}'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>
@@ -72,12 +72,15 @@ var moduleID   = '<?php echo $moduleID;?>';
             <td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
             <td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
             <td class='<?php echo $run->status;?>'><?php echo $lang->testtask->statusList[$run->status];?></td>
-            <td class='a-left'>
+            <td class='a-right'>
               <?php
               common::printLink('testtask', 'runcase',    "id=$run->id", $lang->testtask->runCase, '', 'class="iframe"');
               common::printLink('testtask', 'results',    "id=$run->id", $lang->testtask->results, '', 'class="iframe"');
               common::printLink('testtask', 'unlinkcase', "id=$run->id", $lang->testtask->unlinkCase, 'hiddenwin');
-              if($run->lastRunResult == 'fail') common::printLink('bug', 'create', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $lang->testtask->createBug);
+              if(!($run->lastRunResult == 'fail' and common::printLink('bug', 'create', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", '&nbsp;', '', "class='icon-green-small-case-createBug' title'{$lang->testtask->createBug}'")))
+              {
+                  echo "<span class='icon-gray-small-case-createBug'>&nbsp;</span>";
+              }
               ?>
             </td>
           </tr>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index f61c14ed6a..9c15815524 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -54,10 +54,13 @@
   {
       common::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
       common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
-      common::printLink('testtask', 'edit',   "taskID=$task->id", $lang->edit);
-      common::printLink('testtask', 'delete', "taskID=$task->id", $lang->delete, 'hiddenwin');
+      echo "<span class='icon-green-big-splitLine'>&nbsp;</span>";
+
+      common::printLink('testtask', 'edit',   "taskID=$task->id", '&nbsp;', '', "class='icon-green-big-edit' title='{$lang->edit}'");
+      common::printLink('testtask', 'delete', "taskID=$task->id", '&nbsp;', 'hiddenwin', "class='icon-green-big-delete' title='{$lang->delete}'", false);
+      echo "<span class='icon-green-big-splitLine'>&nbsp;</span>";
   }
-  echo html::a($browseLink, $lang->goback);
+  echo html::a($browseLink, '&nbsp', '', "class='icon-green-big-goback' title='{$lang->goback}'");
   ?>
 </div>
 <?php include '../../common/view/action.html.php';?>