diff --git a/core/css/styles.css b/core/css/styles.css
index 48a36734e5..55e050b196 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -78,7 +78,8 @@ background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ }
 #metanav li a img { vertical-align:middle; }
 
 /* SEARCH --------------------------------------------------------------------- */
-form.searchbox { display:inline; position:fixed; top:1em; right:10em; margin:0; padding:0; }
+form.searchbox { display:inline; position:fixed; top:.9em; right:9em; margin:0; padding:0; }
+input[type="search"] { font-size:1em; padding-left:2em; background:#eee url('../img/actions/search.png') .5em center no-repeat; }
 
 /* NAVIGATION ------------------------------------------------------------- */
 #plugins { position:fixed; top:3.5em; float:left; width:15.7em; padding:0; z-index:0; }
diff --git a/core/img/actions/search.png b/core/img/actions/search.png
new file mode 100644
index 0000000000..bfedb80bb5
Binary files /dev/null and b/core/img/actions/search.png differ
diff --git a/core/templates/part.searchbox.php b/core/templates/part.searchbox.php
index 19b089ef84..efce47ecd2 100644
--- a/core/templates/part.searchbox.php
+++ b/core/templates/part.searchbox.php
@@ -1,4 +1,3 @@
 <form class="searchbox" action="<?php echo $_['searchurl']?>" method="post">
-	<input type="text" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
-	<input type="submit" value="<?php echo $l->t( 'Search' ); ?>" class="prettybutton" />
+	<input type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
 </form>