diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 946a0c121a..aa3cf663a3 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -20,7 +20,7 @@
       if($build) echo '<span class="red">(Build:' . $build->name . ')</span>';
       ?>
     </div>
-    <div class='f-right'><?php common::printLink('bug', 'create', "productID=$productID&extra=projectID=$project->id", $lang->bug->create);?></div>
+    <div class='f-right'><?php common::printLink('bug', 'create', "productID=$productID&extra=projectID=$project->id", '&nbsp;', '', "class='icon-green-big-bug-create' title='{$lang->bug->create}'");?></div>
   </caption>
   <thead>
   <tr class='colhead'>
@@ -47,12 +47,33 @@
     <td><?php echo $users[$bug->assignedTo];?></td>
     <td><?php echo $users[$bug->resolvedBy];?></td>
     <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
-    <td>
+    <td class='a-right'>
       <?php
       $params = "bugID=$bug->id";
-      if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
-      if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))     echo $lang->bug->buttonClose . ' ';
-      common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
+      if(common::hasPriv('bug', 'resolve'))
+      {
+          if($bug->status == 'active')
+          {
+              echo html::a($this->createLink('bug', 'resolve', $params), '&nbsp;', '', "class='icon-green-small-bug-resolve' title='{$lang->bug->buttonResolve}'", false);
+          }
+          else
+          {
+              echo "<span class='icon-gray-small-bug-resolve'>&nbsp;</span>";
+          }
+      }
+
+      if(common::hasPriv('bug', 'close'))
+      {
+          if($bug->status == 'resolved')
+          {
+              echo html::a($this->createLink('bug', 'close', $params), '&nbsp;', '', "class='icon-green-small-bug-close' title='{$lang->bug->buttonClose}'", false);
+          }
+          else
+          {
+              echo "<span class='icon-gray-small-bug-close'>&nbsp;</span>";
+          }
+      }
+      common::printLink('bug', 'edit', $params, '&nbsp;', '', "class='icon-green-small-edit' title='{$lang->bug->buttonEdit}'", false);
       ?>
     </td>
   </tr>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e1c26fed1f..20b4d07e96 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -444,7 +444,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .icon-gray-small-task-close  {padding:2px 8px; background:url(images/main/zt-gray.png)  -100px -260px;} 
 
 /* Bug icons. */
-#featurebar .f-right .icon-green-big-bug-create {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) 0px   -200px;} 
+#featurebar .f-right .icon-green-big-bug-create, caption .f-right .icon-green-big-bug-create  {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) 0px   -200px;} 
 
 .icon-green-small-bug-resolve    {padding:2px 8px;  background:url(images/main/zt-green.png) -60px -300px;} 
 .icon-gray-small-bug-resolve     {padding:2px 8px;  background:url(images/main/zt-gray.png)  -60px -300px;}