diff --git a/lib/gollum/frontend/public/css/editor.css b/lib/gollum/frontend/public/css/editor.css
index ad1862e4..840408b1 100644
--- a/lib/gollum/frontend/public/css/editor.css
+++ b/lib/gollum/frontend/public/css/editor.css
@@ -215,9 +215,7 @@ a#function-image:hover span { background-position: -324px -28px; }
   height: 20em;
 }
 
-#gollum-editor input#gollum-editor-submit,
-#gollum-editor-dialog a.minibutton,
-#gollum-editor-dialog a.minibutton:visited {
+#gollum-editor input#gollum-editor-submit {
   background-color: #f7f7f7;
   border: 1px solid #d4d4d4;
   color: #333;
@@ -240,8 +238,7 @@ a#function-image:hover span { background-position: -324px -28px; }
   -webkit-border-radius: 3px;
 }
 
-#gollum-editor input#gollum-editor-submit:hover,
-#gollum-editor-dialog a.minibutton:hover {
+#gollum-editor input#gollum-editor-submit:hover {
   background: #3072b3;
   border-color: #518cc6 #518cc6 #2a65a0;
   color: #fff;
@@ -348,106 +345,4 @@ a#function-image:hover span { background-position: -324px -28px; }
   margin: 0.7em 0;
   padding: 0.5em;
   width: 98%;
-}
-
-
-
-/* @control dialog */
-
-#gollum-editor-dialog {
-  display: none;
-  top: 50%;
-  left: 50%;
-  position: absolute;
-}
-
-#gollum-editor-dialog.active {
-  display: block;
-}
-
-#gollum-editor-dialog-inner {
-  background: transparent;
-  margin: 0 0 0 -225px;
-  overflow: hidden;
-  position: relative;
-  width: 450px;
-
-  border: 7px solid rgba(0, 0, 0, 0.3);
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
-
-#gollum-editor-dialog-bg {
-  background-color: #fff;
-  overflow: hidden;
-  padding: 1em;
-  
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#ffffff');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff));
-  background: -moz-linear-gradient(top, #f7f7f7, #ffffff);
-}
-
-#gollum-editor-dialog-inner h4 {
-  border-bottom: 1px solid #ddd;
-  color: #000;
-  font-size: 1.8em;
-  line-height: normal;
-  font-weight: bold;
-  margin: 0 0 0.75em 0;
-  padding: 0 0 0.3em 0;
-}
-
-#gollum-editor-dialog-body fieldset {
-  border: 0;
-  margin: 0;
-  padding: 0;
-}
-
-#gollum-editor-dialog-body fieldset .field {
-  margin: 0 0 1.5em 0;
-  padding: 0;
-}
-
-  #gollum-editor-dialog-body fieldset .field label {
-    color: #000;
-    display: block;
-    font-size: 1.2em;
-    font-weight: bold;
-    line-height: 1.6em;
-    margin: 0;
-    padding: 0;
-    min-width: 80px;
-  }
-  
-  #gollum-editor-dialog-body fieldset .field input[type="text"] {
-    border: 1px solid #ddd;
-    display: block;
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    font-size: 1.2em;
-    line-height: 1.6em;
-    margin: 0.3em 0 0 0;
-    padding: 0.3em 0.5em;
-    width: 96.5%;
-  }
-  
-  #gollum-editor-dialog-body fieldset .field input.code {
-    font-family: 'Monaco', 'Courier New', Courier, monospace;
-  }
-  
-#gollum-editor-dialog-body fieldset .field:last-child {
-  margin: 0 0 1em 0;
-}
-
-#gollum-editor-dialog-buttons {
-  border-top: 1px solid #ddd;
-  overflow: hidden;
-  margin: 1.5em 0 0 0;
-  padding: 1em 0 0 0;
-}
-
-#gollum-editor-dialog a.minibutton {
-  float: right;
-  margin-right: 0.5em;
-  width: auto;
 }
\ No newline at end of file
diff --git a/lib/gollum/frontend/public/css/gollum.css b/lib/gollum/frontend/public/css/gollum.css
index 3f66cbba..46f9df1f 100644
--- a/lib/gollum/frontend/public/css/gollum.css
+++ b/lib/gollum/frontend/public/css/gollum.css
@@ -48,7 +48,6 @@ a:hover, a:visited {
     float: right;
   }
   
-  
 /* @section content */
 #wiki-content {
   height: 1%;
@@ -378,7 +377,8 @@ ul.actions {
    margin-left: 0.6em;
  }
 
-.minibutton a {
+.minibutton a,
+#search-submit {
   background-color: #f7f7f7;
   border: 1px solid #d4d4d4;
   color: #333;
@@ -398,7 +398,8 @@ ul.actions {
   -webkit-border-radius: 3px;
 }
 
-.minibutton a:hover {
+.minibutton a:hover,
+#search-submit:hover {
   background: #3072b3;
   border-color: #518cc6 #518cc6 #2a65a0;
   color: #fff;
@@ -450,6 +451,64 @@ ul.actions {
 }
 
 
+/* @control searchbar */
+#head #searchbar {
+  float: right;
+  margin: 1em 0 0 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+  #head #searchbar #searchbar-fauxtext {
+    background: #fff;
+    border: 1px solid #d4d4d4;
+    overflow: hidden;
+    
+    border-radius: 0.3em;
+    -moz-border-radius: 0.3em;
+    -webkit-border-radius: 0.3em;
+  }
+
+  #head #searchbar #searchbar-fauxtext input#search-query {
+    border: 0;
+    color: #000;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    font-size: 1.2em;
+    line-height: 1.6em;
+    padding: 0.4em 0.6em;
+  }
+  
+  #head #searchbar #searchbar-fauxtext #search-submit {
+    border: 0;
+    border-left: 1px solid #d4d4d4;
+    cursor: pointer;
+    margin: 0 !important;
+    padding: 0;
+    float: right;
+    font-size: 1.2em;
+    
+    border-radius: 0 3px 3px 0;
+    -moz-border-radius: 0 3px 3px 0;
+    -webkit-border-radius: 0 3px 3px 0;
+  }
+  
+  #head #searchbar #searchbar-fauxtext #search-submit span {
+    background-image: url(/images/icon-sprite.png);
+    background-position: -405px 0;
+    background-repeat: no-repeat;
+    display: block;
+    height: 25px;
+    overflow: hidden;
+    text-indent: -5000px;
+    width: 28px;
+  }
+  
+  #head #searchbar #searchbar-fauxtext #search-submit:hover span {
+    background-position: -405px -27px;
+    padding: 0;
+  }
+
+
 #MathJax_Message {
   display: none;
 }
\ No newline at end of file
diff --git a/lib/gollum/frontend/public/images/icon-sprite.png b/lib/gollum/frontend/public/images/icon-sprite.png
index bc00ae8e..05f0bf32 100644
Binary files a/lib/gollum/frontend/public/images/icon-sprite.png and b/lib/gollum/frontend/public/images/icon-sprite.png differ
diff --git a/lib/gollum/frontend/templates/searchbar.mustache b/lib/gollum/frontend/templates/searchbar.mustache
index 1f6bd4c7..effcdad3 100644
--- a/lib/gollum/frontend/templates/searchbar.mustache
+++ b/lib/gollum/frontend/templates/searchbar.mustache
@@ -1,6 +1,8 @@
 <div id="searchbar">
   <div id="searchbar-fauxtext">
     <input type="text" name="q" id="search-query">
-    <input type="submit" id="search-submit">
+    <a href="#" id="search-submit" title="Search this wiki">
+      <span>Search</span>
+    </a>
   </div>
 </div>
\ No newline at end of file