diff --git a/modoboa/admin/templates/admin/domains.html b/modoboa/admin/templates/admin/domains.html
index 812078c91..03cc3f609 100644
--- a/modoboa/admin/templates/admin/domains.html
+++ b/modoboa/admin/templates/admin/domains.html
@@ -19,5 +19,11 @@
     });
   </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% include "admin/searchform.html" %}
-{% domains_menu "domains" user %}</div>{{ block.super }}{% endblock %}
+{% block leftcol %}<div class="well sidebar-nav">
+<li class="nav-header">
+  {% trans "Filter" %}
+</li>{% include "admin/searchform.html" %}
+<li class="nav-header">
+  {% trans "Actions" %}
+</li>{% domains_menu "domains" user %}
+</div>{{ block.super }}{% endblock %}
diff --git a/modoboa/admin/templates/admin/identities.html b/modoboa/admin/templates/admin/identities.html
index f00881344..52b59a6fd 100644
--- a/modoboa/admin/templates/admin/identities.html
+++ b/modoboa/admin/templates/admin/identities.html
@@ -43,5 +43,11 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% include "admin/searchform.html" %}
-{% identities_menu user %}</div>{{ block.super }}{% endblock %}
+{% block leftcol %}<div class="well sidebar-nav">
+<li class="nav-header">
+  {% trans "Filter" %}
+</li>{% include "admin/searchform.html" %}
+<li class="nav-header">
+  {% trans "Actions" %}
+</li>{% identities_menu user %}
+</div>{{ block.super }}{% endblock %}
diff --git a/modoboa/admin/templates/admin/searchform.html b/modoboa/admin/templates/admin/searchform.html
index 0c6773099..96dd83e47 100644
--- a/modoboa/admin/templates/admin/searchform.html
+++ b/modoboa/admin/templates/admin/searchform.html
@@ -1,6 +1,9 @@
 {% load i18n %}
 <form id="searchform" class="form-horizontal">
-  <input class="search" type="text" 
-         value={% if squery %}"{{ squery }}"{% else %}"{% trans 'Search' %}"{% endif %}
-         id="searchquery" name="searchquery" />
+  <div class="input-prepend input-append">
+    <span class="add-on"><i class="icon-search"></i></span>
+    <input class="span10" type="text"
+           value={% if squery %}"{{ squery }}"{% else %}"{% trans 'Search' %}"{% endif %}
+           id="searchquery" name="searchquery" />
+  </div>
 </form>
diff --git a/modoboa/extensions/webmail/static/webmail/css/webmail.css b/modoboa/extensions/webmail/static/webmail/css/webmail.css
index 56ab39420..40bb10049 100644
--- a/modoboa/extensions/webmail/static/webmail/css/webmail.css
+++ b/modoboa/extensions/webmail/static/webmail/css/webmail.css
@@ -114,7 +114,7 @@ div.expanded {
 }
 
 #mailheader .options {
-    margin-left: 160px;
+    margin-left: 180px;
 }
 
 #add_cc {
@@ -136,7 +136,7 @@ div.expanded {
 #list {
     position: absolute;
     top: 5px;
-    left: 160px;
+    left: 180px;
     font-weight: bold;
 }