diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5d65c14cc8..52bf7f19ed 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -218,6 +218,13 @@ address .poweredby {
     margin-right: 0px;
 }
 
+#header-search {
+    float: right;
+    position: relative;
+    top: -8px;
+    margin-left: 10px;
+}
+
 #site_notice { 
     float: right;
     width: 300px;
diff --git a/theme/neo/README b/theme/neo/README
index 9e001123cb..eff8cd6dfa 100644
--- a/theme/neo/README
+++ b/theme/neo/README
@@ -1,7 +1,7 @@
 Default avatars are modified from an image by Francesco 'Architetto' Rollandin.
 http://www.openclipart.org/detail/34957
 
-Icons by Mark James
+Some icons by Mark James
 http://www.famfamfam.com/lab/icons/silk/
 http://creativecommons.org/licenses/by/2.5/ Creative Commons Attribution 2.5 License
 
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 22634b40ea..e41cf9f87a 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -129,6 +129,37 @@ h6 {font-size: 1em;}
     text-decoration: none;
 }
 
+#header-search {
+    top: 1px;
+    margin-left: 6px;
+}
+
+#header-search #search-q {
+    position: relative;
+    width: 131px;
+    height: 12px;
+    margin-right: 10px;
+    padding: 2px 22px 2px 6px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    border: none;
+    font-size: 0.88em;
+}
+
+#header-search input[type="submit"] {
+    border: 0;
+    background: url(../images/magnifier.png) no-repeat 2px 1px;
+    text-indent: -9999px;
+    width: 20px;
+    height: 18px;
+    position: absolute;
+    right: 10px;
+    top: 2px;
+    z-index: 2;
+    cursor: pointer;
+}
+
 #site_notice {
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
diff --git a/theme/neo/images/magnifier.png b/theme/neo/images/magnifier.png
new file mode 100644
index 0000000000..cf3d97f75e
Binary files /dev/null and b/theme/neo/images/magnifier.png differ