diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php
index b1f7bbfbc2..1951b19550 100644
--- a/module/bug/view/buildtemplates.html.php
+++ b/module/bug/view/buildtemplates.html.php
@@ -7,7 +7,7 @@ foreach($templates as $key => $template)
 {
     echo "<span id='tplBox$template->id'>";
     echo $lang->arrow. "<span id='tplTitleBox$template->id' onclick='setTemplate($template->id)' style='text-decoration:underline; color:blue' class='hand'>$template->title</span>";
-    echo html::commonButton('&nbsp;', "onclick=deleteTemplate($template->id) class='icon-delete'");
+    echo html::commonButton('&nbsp;', "onclick=deleteTemplate($template->id) class='icon-remove icon-large'");
     echo "<span id='template$template->id' class='hidden'>$template->content</span>";
     echo '<br /></span>';
 }
diff --git a/module/common/control.php b/module/common/control.php
index 186d03ca28..3445ff7412 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -321,7 +321,7 @@ class common extends control
             }
             else
             {
-                echo html::a($link, '<i class="$class"></i>', $target, "class='icon-link' title='$title'", false);
+                echo html::a($link, "<i class='$class'></i><i class='icon-bolt'></i>", $target, "class='link-icon' title='$title'", false);
             }
         }
         else
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 2f2da7eda3..310b9b71d0 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -196,7 +196,7 @@ foreach($fieldParams as $fieldName => $param)
 <form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='searchform'>
 <table class='table-1'>
   <tr valign='middle'>
-    <th width='10'><span id='searchicon'>&nbsp;</span></th>
+    <th width='50'><i class="icon icon-search icon-large"></i></th>
     <td class='a-right'>
       <nobr>
       <?php
@@ -296,12 +296,12 @@ foreach($fieldParams as $fieldName => $param)
     <td width='250' class='a-center'>
       <?php
       echo html::select('queryID', $queries, $queryID, 'class=select-1 onchange=executeQuery(this.value)');
-      if(common::hasPriv('search', 'deleteQuery')) echo html::a('javascript:deleteQuery()', '&nbsp;', '', 'class="icon-delete"');
+      if(common::hasPriv('search', 'deleteQuery')) echo html::a('javascript:deleteQuery()', '<i class="link-icon icon-remove"></i>', '', '');
       ?>
     </td>
-    <th width='10' class='a-center' style='cursor:pointer; padding:0'>
-      <span id='searchmore' onclick='showmore()'>&nbsp;</span>
-      <span id='searchlite' onclick='showlite()' class='hidden'>&nbsp;</span>
+    <th width='50' class='a-center' style='cursor:pointer; padding:0'>
+      <a id="searchmore" href="javascript:showmore()"><i class="icon-double-angle-down icon-2x link-icon"></i></a>
+      <a id="searchlite" href="javascript:showlite()" class="hidden"><i class="icon-double-angle-up icon-2x link-icon"></i></a>
       <?php echo html::hidden('formType', 'lite');?>
     </th>
   </tr>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 52a84b9626..c80243a593 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -339,7 +339,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 #projectID {background:#e5e5e5; border:1px solid #e5e5e5}
 
 /* Feature bar. */
-#featurebar                {height:34px; line-height:34px;background-color: #edf3fe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;}
+#featurebar                {height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;}
 #featurebar span           {font-size:14px;}
 #featurebar a              {text-decoration:none;  display: inline-block;padding: 0px 7px; line-height: 34px;height: 34px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;}
 #featurebar a:hover        {color:#000;background-color: #e5e5e5;}
@@ -352,6 +352,10 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 
 #featurebar .dp-choose-date {padding:0px;}
 
+/* Querybox */
+#querybox{margin: -20px -20px 20px -20px;}
+#querybox table{border: none;border-bottom: 1px solid #e5e5e5;}
+
 /* Tree slider. */
 .treeSlider
 {
@@ -473,11 +477,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .icon-goback {padding:2px 8px; background:url(images/main/zt-icons.png) 0px    -42px;}
 .icon-pre    {padding:2px 8px; background:url(images/main/zt-icons.png) -20px  -42px;}
 .icon-next   {padding:2px 8px; background:url(images/main/zt-icons.png) -40px  -42px;}
-#searchicon  {padding:2px 8px; background:url(images/main/zt-icons.png) -102px -80px; margin-left:10px;}
-#searchmore  {padding:2px 8px; background:url(images/main/zt-icons.png) -62px  -80px no-repeat; margin-right:10px;}
-#searchlite  {padding:2px 8px; background:url(images/main/zt-icons.png) -82px  -80px no-repeat; margin-right:10px}
 .icon-add    {border:none; width:16px; padding:2px 8px; background:url(images/main/zt-icons.png) -120px  -3px no-repeat;}
-.icon-delete {border:none; width:16px; padding:2px 8px; background:url(images/main/zt-icons.png) -100px  -3px no-repeat;}
 .icon-add:hover, .icon-delete:hover {cursor:pointer}
 .icon-allProducts, .icon-allProjects {padding:2px 10px 2px 8px; background:url(images/main/zt-icons.png) 0px  -161px;}