diff --git a/search/indico_search/plugin.py b/search/indico_search/plugin.py
index d74a587..57c016e 100644
--- a/search/indico_search/plugin.py
+++ b/search/indico_search/plugin.py
@@ -37,7 +37,7 @@ class SearchPlugin(IndicoPlugin):
     def init(self):
         super(SearchPlugin, self).init()
         self.connect(plugins_loaded, self._plugins_loaded, sender=self.app)
-        self.template_hook('conference-header', self._add_conference_search_box)
+        self.template_hook('conference-header-right-column', self._add_conference_search_box)
         self.template_hook('page-header', self._add_category_search_box)
         self.inject_js('search_js')
         self.inject_css('search_css')
diff --git a/search/indico_search/templates/searchbox_conference.html b/search/indico_search/templates/searchbox_conference.html
index d94432c..d875c32 100644
--- a/search/indico_search/templates/searchbox_conference.html
+++ b/search/indico_search/templates/searchbox_conference.html
@@ -1,9 +1,11 @@
 {% from 'forms/_form.html' import form_header, form_footer %}
 
-<div class="confSearchBox">
-    {{ form_header(form, method='get', action=url_for_plugin('search.search', event), classes='UIForm', i_form=false) }}
-        <input class="searchButton" type="submit" value="{% trans %}Search{% endtrans %}">
-        {{ form.phrase(class_='searchField', id='conference-search-phrase') }}
-        {% block extra_fields %}{% endblock %}
-    {{ form_footer(form, i_form=false) }}
-</div>
+{{ form_header(form, method='get', action=url_for_plugin('search.search', event), i_form=false) }}
+    <div class="toolbar thin f-j-end">
+        <div class="group">
+            {{ form.phrase(id='conference-search-phrase', placeholder=_("Search...")) }}
+            <button class="i-button highlight text-color color-on-hover icon-search" type="submit"></button>
+            {% block extra_fields %}{% endblock %}
+        </div>
+    </div>
+{{ form_footer(form, i_form=false) }}