diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html
index 300f113..70d2f39 100644
--- a/src/main/twirl/gitbucket/core/issues/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/list.scala.html
@@ -21,15 +21,22 @@
         <a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
       </li>
     </ul>
-    <form method="GET" id="search-filter-form" class="form-inline pull-right">
-    @if(isEditable){
-      @if(target == "issues"){
-        <a class="btn btn-success" href="@helpers.url(repository)/issues/new">New issue</a>
+    <form method="GET" action="@helpers.url(repository)/search" id="search-filter-form" class="form-inline pull-right">
+      <div class="input-group">
+        <input type="text" class="form-control" name="q" placeholder="Search..."/>
+        <input type="hidden" name="type" value="issue"/>
+        <span class="input-group-btn">
+          <button type="submit" id="search-btn" class="btn btn-default"><i class="fa fa-search"></i></button>
+        </span>
+      </div>
+      @if(isEditable){
+        @if(target == "issues"){
+          <a class="btn btn-success" href="@helpers.url(repository)/issues/new">New issue</a>
+        }
+        @if(target == "pulls"){
+          <a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
+        }
       }
-      @if(target == "pulls"){
-        <a class="btn btn-success" href="@helpers.url(repository)/compare">New pull request</a>
-      }
-    }
     </form>
     @gitbucket.core.issues.html.listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), isManageable)
     @if(isManageable){
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 7186ab1..e75d7f8 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -67,7 +67,6 @@
           <div class="head">
             @gitbucket.core.helper.html.repositoryicon(repository, true)
             <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
-            <a href="@helpers.url(repository)/search"><i class="octicon octicon-search"></i></a>
 
             @defining(repository.repository){ x =>
               @if(repository.repository.originRepositoryName.isDefined){
diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
index de5190f..30b7943 100644
--- a/src/main/twirl/gitbucket/core/search/code.scala.html
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -5,7 +5,7 @@
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("code", query, repository){
+  @gitbucket.core.search.html.menu("files", query, repository){
     @if(query.nonEmpty) {
       @if(files.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
diff --git a/src/main/twirl/gitbucket/core/search/issues.scala.html b/src/main/twirl/gitbucket/core/search/issues.scala.html
index 143d07b..817b47a 100644
--- a/src/main/twirl/gitbucket/core/search/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/search/issues.scala.html
@@ -5,7 +5,7 @@
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("issue", query, repository){
+  @gitbucket.core.search.html.menu("issues", query, repository){
     @if(query.nonEmpty) {
       @if(issues.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
index d280f17..d3b1d93 100644
--- a/src/main/twirl/gitbucket/core/search/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -1,14 +1,18 @@
 @(active: String, query: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.html.menu("", repository){
+@gitbucket.core.html.menu(active, repository){
   <form action="@helpers.url(repository)/search" method="GET" class="form-inline">
     <select class="form-control" name="type">
-      <option value="code"  @if(active=="code" ){ selected }>Files</option>
-      <option value="issue" @if(active=="issue"){ selected }>Issues</option>
-      <option value="wiki"  @if(active=="wiki" ){ selected }>Wiki</option>
+      <option value="code" @if(active == "files"){ selected }>Files</option>
+      @if(repository.repository.options.issuesOption != "DISABLE") {
+        <option value="issue" @if(active == "issues"){ selected }>Issues</option>
+      }
+      @if(repository.repository.options.wikiOption != "DISABLE") {
+        <option value="wiki" @if(active == "wiki"){ selected }>Wiki</option>
+      }
     </select>
-    <input type="text" name="q" value="@query" class="form-control" style="width: 250px; margin-bottom: 0px;"/>
+    <input type="text" name="q" value="@query" class="form-control" style="width: 250px;" placeholder="Search..."/>
     <input type="submit" value="Search" class="btn btn-default"/>
     <input type="hidden" name="type" value="@active"/>
   </form>
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 05b3264..9a6bf08 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -7,10 +7,9 @@
   @gitbucket.core.html.menu("wiki", repository){
     <div class="pull-right">
       @if(page.isDefined){
-        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
-        <a class="btn btn-small btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
+        <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
+        <a class="btn btn-danger" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_delete" id="delete">Delete Page</a>
       }
-      <a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
     </div>
     <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
     <form action="@helpers.url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html
index 5a7cad2..731ea02 100644
--- a/src/main/twirl/gitbucket/core/wiki/history.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html
@@ -8,12 +8,12 @@
     @if(isEditable) {
       <div class="pull-right">
         @if(pageName.isEmpty) {
-          <a class="btn btn-small" href="@helpers.url(repository)/wiki/_new">New Page</a>
+          <a class="btn" href="@helpers.url(repository)/wiki/_new">New Page</a>
         } else {
-          <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
-          <a class="btn btn-small btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
+          <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
+          <a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
         }
-        </div>
+      </div>
     }
     <h1 class="wiki-title">
     @if(pageName.isEmpty){
@@ -28,7 +28,7 @@
           <th colspan="3">
             <div class="pull-left" style="padding-top: 4px;">Revisions</div>
             <div class="pull-right">
-              <input type="button" id="compare" value="Compare Revisions" class="btn btn-dm btn-default"/>
+              <input type="button" id="compare" value="Compare Revisions" class="btn btn-sm btn-default"/>
             </div>
           </th>
         </tr>
diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html
index f4c0b49..90fc9d1 100644
--- a/src/main/twirl/gitbucket/core/wiki/page.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -10,13 +10,20 @@
 @gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @gitbucket.core.html.menu("wiki", repository){
     <div>
-      <div class="pull-right">
-        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
+      <form method="GET" action="@helpers.url(repository)/search" id="search-filter-form" class="form-inline pull-right">
+        <div class="input-group">
+          <input type="text" class="form-control" name="q" placeholder="Search..."/>
+          <input type="hidden" name="type" value="wiki"/>
+          <span class="input-group-btn">
+            <button type="submit" id="search-btn" class="btn btn-default"><i class="fa fa-search"></i></button>
+          </span>
+        </div>
+        <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
         @if(isEditable){
           <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
           <a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
         }
-      </div>
+      </form>
       <h1 class="body-title">@pageName</h1>
       <div>
         <span class="muted"><strong>@page.committer</strong> edited this page @gitbucket.core.helper.html.datetimeago(page.time)</span>
diff --git a/src/main/twirl/gitbucket/core/wiki/pages.scala.html b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
index e947f21..c88b76c 100644
--- a/src/main/twirl/gitbucket/core/wiki/pages.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/pages.scala.html
@@ -9,11 +9,9 @@
         <h1 class="wiki-title"><span class="muted">Pages</span></h1>
       </li>
       <li class="pull-right">
-        <div class="btn-group">
-          @if(isEditable){
-            <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
-          }
-        </div>
+        @if(isEditable){
+          <a class="btn btn-default" href="@helpers.url(repository)/wiki/_new">New Page</a>
+        }
       </li>
     </ul>
     <ul class="pull-left">