diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 04f4a5ff6..e327534b1 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,6 +1,6 @@
 <% provide :title do %><%= t('debates.index.title') %><% end %>
 <% content_for :header_addon do %>
-  <%= render "shared/search_form_header",
+  <%= render "shared/search_form",
              search_path: debates_path(page: 1),
              i18n_namespace: "debates.index.search_form" %>
 <% end %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 6a08a1646..71a7a596a 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -1,6 +1,6 @@
 <% provide :title do %><%= t('proposals.index.title') %><% end %>
 <% content_for :header_addon do %>
-  <%= render "shared/search_form_header",
+  <%= render "shared/search_form",
              search_path: proposals_path(page: 1),
              i18n_namespace: "proposals.index.search_form" %>
 <% end %>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 1c0344993..9631bd4a1 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -1,27 +1,22 @@
-<% # Params:
-   #
-   #   search_path: for example debates_path
-   #   i18n_namespace: for example "debates.index.search_form"
-%>
-
-<div class="search-form">
-  <div class="sidebar-divider"></div>
-  <h3><%= t("#{i18n_namespace}.title") %></h3>
-  <br>
+<div id="search_form" class="search-form">
   <div class="row">
+
     <%= form_tag search_path, method: :get do %>
-      <div class="small-12 columns">
-        <div class="row collapse">
-
-          <div class="small-9 medium-12 large-9 columns">
-            <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
-          </div>
-          <div class="small-3 medium-12 large-3 columns">
-            <input type="submit" class="button secondary postfix" value="<%= t("#{i18n_namespace}.button") %>">
-          </div>
-
+    <div class="small-12 column">
+      <div class="row collapse">
+        <div class="small-10 column">
+          <label for="search-form-header" class="sr-only"><%= t("#{i18n_namespace}.title") %></label>
+          <input type="text" id="search-form-header" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
+        </div>
+        <div class="small-2 column">
+          <button type="submit" class="button postfix" title="<%= t("#{i18n_namespace}.button") %>">
+            <span class="sr-only"><%= t("#{i18n_namespace}.button") %></span>
+            <i class="icon-search"></i>
+          </button>
         </div>
       </div>
+    </div>
     <% end %>
+
   </div>
 </div>
diff --git a/app/views/shared/_search_form_header.html.erb b/app/views/shared/_search_form_header.html.erb
deleted file mode 100644
index 9631bd4a1..000000000
--- a/app/views/shared/_search_form_header.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="search_form" class="search-form">
-  <div class="row">
-
-    <%= form_tag search_path, method: :get do %>
-    <div class="small-12 column">
-      <div class="row collapse">
-        <div class="small-10 column">
-          <label for="search-form-header" class="sr-only"><%= t("#{i18n_namespace}.title") %></label>
-          <input type="text" id="search-form-header" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
-        </div>
-        <div class="small-2 column">
-          <button type="submit" class="button postfix" title="<%= t("#{i18n_namespace}.button") %>">
-            <span class="sr-only"><%= t("#{i18n_namespace}.button") %></span>
-            <i class="icon-search"></i>
-          </button>
-        </div>
-      </div>
-    </div>
-    <% end %>
-
-  </div>
-</div>