diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html
--- a/rhodecode/templates/search/search.html
+++ b/rhodecode/templates/search/search.html
@@ -2,11 +2,14 @@
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-  %if c.repo_name:
-    ${_('Search repository')} ${c.repo_name} &middot; ${c.rhodecode_name}
-  %else:
-    ${_('Search in all repositories')}
-  %endif
+    %if c.repo_name:
+        ${_('%s Search') % c.repo_name}
+    %else:
+        ${_('Search in all repositories')}
+    %endif
+    %if c.rhodecode_name:
+        &middot; ${c.rhodecode_name}
+    %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -51,7 +54,7 @@ ${self.repo_context_bar('options')}
              </div>
                 <div class="input">${h.text('q',c.cur_query,class_="small")}
                     <div class="button highlight">
-                        <input type="submit" value="${_('Search')}" class="ui-button"/>
+                        <input type="submit" value="${_('Search')}" class="btn"/>
                     </div>
                 </div>
                 <div style="font-weight: bold;clear:both;margin-left:200px">${c.runtime}</div>