diff --git a/modoboa/templates/common/buttons_list.html b/modoboa/templates/common/buttons_list.html
index 2d4963eee..fadb07cdf 100644
--- a/modoboa/templates/common/buttons_list.html
+++ b/modoboa/templates/common/buttons_list.html
@@ -1,12 +1,30 @@
 {% load lib_tags %}
-<div class="btn-toolbar {{ extraclasses }}">{% for entry in entries %}
-  <div class="btn-group">{% if entry.menu %}
-    <a class="btn dropdown-toggle" data-toggle="dropdown">{% if entry.img %}<i class="{{ entry.img}}"></i>{% endif %}{{ entry.label }} <span class="caret"></span></a>  
-    <ul class="dropdown-menu">{% for sentry in entry.menu %}
-      <li>{% render_link sentry %}</li>
-      {% endfor %}</ul>
-    {% else %}{% render_link entry "btn" %}{% endif %}
-  </div>
-{% endfor %}{% block extracontent %}{% endblock %}
-</div>
+<nav class="navbar" role="navigation">
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <div class="btn-toolbar {{ extraclasses }}">{% for entry in entries %}
+                <ul class=" nav navbar-nav btn-group">{% if entry.menu %}
+                    <a class="btn btn-default dropdown-toggle" data-toggle="dropdown">{% if entry.img %}<i class="{{ entry.img}}"></i>{% endif %}{{ entry.label }} <span class="caret"></span></a>
+                    <ul class="dropdown-menu">{% for sentry in entry.menu %}
+                      <li>{% render_link sentry %}</li>
+                      {% endfor %}</ul>
+                    {% else %}{% render_link entry "btn" %}{% endif %}
+                </ul>
+                {% endfor %}
+                <ul class="nav navbar-nav navbar-right">
+                    {% block extracontent %}{% endblock %}
+                </ul>
+            </div>
+        </div>
+    </div>
+</nav>
 
diff --git a/modoboa/templates/common/email_searchbar.html b/modoboa/templates/common/email_searchbar.html
index 2d4f7282c..bfd320e5a 100644
--- a/modoboa/templates/common/email_searchbar.html
+++ b/modoboa/templates/common/email_searchbar.html
@@ -1,6 +1,6 @@
 {% load i18n %}
-<div id="searchbox" class="btn-group">
-  <a href="#" class="btn dropdown-toggle" data-toggle="dropdown"><i class="icon-search" id="searchopts"></i></a>
+<div id="searchbox" class="input-group">
+  <a href="#" class="input-group-addon btn btn-default" data-toggle="dropdown"><i class="glyphicon glyphicon-search" id="searchopts"></i></a>
   <ul class="dropdown-menu" id="searchparams">
     <li><label class="radio"><input type="radio" id="crit_from_addr" name="scriteria" value="from_addr" checked>{% trans "From address" %}</label></li>
     <li><label class="radio"><input type="radio" id="crit_subject" name="scriteria" value="subject">{% trans "Subject" %}</label></li>
@@ -9,5 +9,5 @@
     {% endfor %}
     <li><label class="radio"><input type="radio" id="crit_both" name="scriteria" value="both">{% trans "Both" %}</label></li>
   </ul>
-  <input type="text" class="no-margin" name="searchfield" id="searchfield" value="{% trans "Search..." %}" />
+  <input type="text" class="no-margin form-control" name="searchfield" id="searchfield" value="{% trans "Search..." %}" />
 </div>
diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index b32351216..53c224008 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -1,5 +1,5 @@
 {% load i18n core_tags lib_tags %}
-<div class="input-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
+<div class="form-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
   {% if field.label %}<label class="control-label" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
   <div class="controls spaced">
     {% if appended_text %}<div class="input-group">{% endif %}
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 5777b16bd..c3c65c33f 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -42,12 +42,13 @@
                 </button>
             </div>
             <div id="bs-example-navbar-collapse-1" class="collapse navbar-collapse">
-                <ul class="nav">{% if selection %}
+                <ul class="nav navbar-nav">{% if selection %}
                   {% extensions_menu selection user %}{% core_menu selection user %}
                   {% else %}{% extensions_menu "" user %}{% core_menu "" user %}{% endif %}
                   {% load_optionalmenu user %}
+                    <li class="divider"></li>
                 </ul>
-                <ul class="nav pull-right">
+                <ul class="nav navbar-nav navbar-right">
                 {% if selection %}{% user_menu user selection %}{% else %}{% user_menu user "" %}{% endif %}
                 </ul>
               <div class="pull-right">{% load_notifications user %}
diff --git a/modoboa/templates/twocols.html b/modoboa/templates/twocols.html
index 2d0db63e9..ce98b9989 100644
--- a/modoboa/templates/twocols.html
+++ b/modoboa/templates/twocols.html
@@ -2,7 +2,7 @@
 {% load core_tags %}
 {% block rowcontent %}
 <div class="col-lg-2 col-md-3 col-sm-4 col-xs-12">{% block leftcol %}{% endblock %}</div>
-<div class="col-lg-10 col-md-12 col-sm-12 col-xs-12">
+<div class="col-lg-10 col-md-9 col-sm-8 col-xs-12">
   {% if messages %}{% display_messages messages %}{% endif %}
   {% block apparea %}{% endblock %}
 </div>