diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index 428bb509aa..3627b95ac4 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -416,7 +416,7 @@ EOT;
             global $lang;
             $label = $lang->save;
         }
-        return " <input type='submit' id='submit' value='$label' class='button-s' $misc /> ";
+        return " <input type='submit' id='submit' value='$label' $misc class='button-s' /> ";
     }
 
     /**
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 37dce1821e..c25daaec5a 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -257,7 +257,7 @@ foreach($fieldParams as $fieldName => $param)
       echo html::hidden('module',     $module);
       echo html::hidden('actionURL',  $actionURL);
       echo html::hidden('groupItems', $groupItems);
-      echo html::submitButton($lang->search->common);
+      echo html::submitButton($lang->search->common, "class='searchButton' title='{$lang->search->common}'");
       echo html::commonButton($lang->search->reset, 'onclick=resetForm();');
       echo html::commonButton($lang->save, 'onclick=saveQuery()');
       ?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 0d6828dcb5..c507731e4d 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -371,6 +371,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .plan    {background:#ffcc00;}
 .plan a{color:green}
 .search  {display:block; float:left; clear:none; width:16px; height:16px; padding:0; margin:0 0 0 2px; text-indent:-2000px; overflow:hidden; background: url(images/main/search.gif) no-repeat;} 
+.searchButton{width:28px; height:21px; padding:0; margin:0px; text-indent:-2000px; background: url(images/main/searchButton.jpg) no-repeat;} 
 .searchleft{display:block; float:left; clear:none;} 
 .helplink {font-size:9px}
 #bysearchTab a{color:red}