diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index c2eff61362..09a9b78687 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -10,7 +10,7 @@ function browseByModule(active)
 
 $(document).ready(function()
 {
-    $("a.iframe").colorbox({width:600, height:340, iframe:true, transition:'none'});
+    $("a.icon-green-big-bug-customFields").colorbox({width:600, height:340, iframe:true, transition:'none'});
     $('#' + browseType + 'Tab').addClass('active'); 
     $('#module' + moduleID).addClass('active'); 
 
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 567a22b187..1b9a02e3a8 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -38,7 +38,7 @@ var customed   = <?php echo (int)$customed;?>;
   </div>
   <div class='f-right'>
     <?php if($browseType != 'needconfirm') common::printIcon('bug', 'export', "productID=$productID&orderBy=$orderBy", '', 'big');?>
-    <?php common::printLink('bug', 'customFields', '', $lang->bug->customFields, '', "class='iframe'"); ?>
+    <?php common::printIcon('bug', 'customFields', '', '', 'big'); ?>
     <?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'big');?>
     <?php common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID", '', 'big'); ?>
   </div>
@@ -102,11 +102,8 @@ var customed   = <?php echo (int)$customed;?>;
         <?php $bugLink = inlink('view', "bugID=$bug->id");?>
         <tr class='a-center'>
           <td class='<?php echo $bug->status;?>' style="font-weight:bold"><?php echo html::a($bugLink, sprintf('%03d', $bug->id));?></td>
-          <td>
-            <span class='<?php echo 'severity' . $bug->severity;?>'>&nbsp;</span>
-            <?php echo $lang->bug->severityList[$bug->severity]?>
-          </td>
-          <td><?php echo $lang->bug->priList[$bug->pri]?></td>
+          <td><span class='<?php echo 'severity' . $bug->severity;?>'>&nbsp;</span></td>
+          <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri];?>'>&nbsp;</span></td>
 
           <?php $class = 'confirm' . $bug->confirmed;?>
           <td class='a-left nobr'><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
diff --git a/www/theme/default/images/main/zt-gray.png b/www/theme/default/images/main/zt-gray.png
index 78808ca22d..3c7d3581ee 100644
Binary files a/www/theme/default/images/main/zt-gray.png and b/www/theme/default/images/main/zt-gray.png differ
diff --git a/www/theme/default/images/main/zt-green.png b/www/theme/default/images/main/zt-green.png
index 2f288c2c44..e0315f6916 100644
Binary files a/www/theme/default/images/main/zt-green.png and b/www/theme/default/images/main/zt-green.png differ
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 9fb188125f..4a97eb2470 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -435,6 +435,13 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 
 .icon-green-big-common-splitLine        {padding:2px 10px; background:url(images/main/zt-green.png) -60px -40px;} 
 
+.pri1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px    -140px no-repeat;}
+.pri2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px  -140px no-repeat;}
+.pri3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -140px no-repeat;}
+.pri4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -140px no-repeat;}
+.pri5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -140px no-repeat;}
+.pri6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -140px no-repeat;}
+
 /* Story icons. */
 #featurebar .f-right .icon-green-big-story-create      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -200px;} 
 #featurebar .f-right .icon-green-big-story-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -200px;} 
@@ -460,6 +467,8 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 /* Bug icons. */
 #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;} 
 
+#featurebar .f-right .icon-green-big-bug-customFields {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) -160px   -280px;} 
+
 .icon-green-small-bug-createBug {padding:2px 8px;  background:url(images/main/zt-green.png) -40px -340px;} 
 .icon-gray-small-bug-createBug  {padding:2px 8px;  background:url(images/main/zt-gray.png)  -40px -340px;} 
 
@@ -469,13 +478,15 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .icon-green-small-bug-close      {padding:2px 8px;  background:url(images/main/zt-green.png) -80px -300px;} 
 .icon-gray-small-bug-close       {padding:2px 8px;  background:url(images/main/zt-gray.png)  -80px -300px;} 
 
-.severity1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px   -380px no-repeat;}
-.severity2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px -380px no-repeat;}
-.severity3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px -380px no-repeat;}
-.severity4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px -380px no-repeat;}
+.severity1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px    -380px no-repeat;}
+.severity2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px  -380px no-repeat;}
+.severity3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -380px no-repeat;}
+.severity4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -380px no-repeat;}
+.severity5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -380px no-repeat;}
+.severity6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -380px no-repeat;}
 
 /* Case icons. */
 #featurebar .f-right .icon-green-big-testcase-create      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -320px;} 
 #featurebar .f-right .icon-green-big-testcase-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -320px;} 
 
-.icon-green-small-testcase-createCase      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -120px   -221px;} 
+.icon-green-small-testcase-createCase      {padding:1px 7px 1px 10px; background:url(images/main/zt-green.png) -120px   -222px;}