diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py
index 1444b2265..12c361797 100644
--- a/modoboa/core/forms.py
+++ b/modoboa/core/forms.py
@@ -8,11 +8,11 @@ from modoboa.lib import parameters
 class LoginForm(forms.Form):
     username = forms.CharField(
         label=ugettext_lazy("Username"),
-        widget=forms.TextInput(attrs={"class": "input-block-level form-control"})
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
     password = forms.CharField(
         label=ugettext_lazy("Password"),
-        widget=forms.PasswordInput(attrs={"class": "input-block-level form-control"})
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     rememberme = forms.BooleanField(
         initial=False,
diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js
index 0ed43c300..d10a48804 100644
--- a/modoboa/extensions/admin/static/admin/js/admin.js
+++ b/modoboa/extensions/admin/static/admin/js/admin.js
@@ -69,8 +69,8 @@ Admin.prototype = {
     },
 
     make_tag: function(text, type) {
-        var $tag = $("<a />", {"name": type, "class" : "btn btn-mini", "html": text});
-        var $i = $("<i />", {"class" : "icon-remove"}).prependTo($tag);
+        var $tag = $("<a />", {"name": type, "class" : "btn btn-xs", "html": text});
+        var $i = $("<i />", {"class" : "glyphicon glyphicon-remove"}).prependTo($tag);
 
         $tag.click($.proxy(this.remove_tag, this));
         return $tag;
@@ -116,7 +116,7 @@ Admin.prototype = {
                 return;
             }
             $("#import_status").css("display", "block");
-            $("#import_result").html("").removeClass("alert alert-error");
+            $("#import_result").html("").removeClass("alert alert-danger");
             $("#importform").submit();
         });
     },
@@ -127,7 +127,7 @@ Admin.prototype = {
             $("#modalbox").modal('hide');
             this.reload_listing(msg);
         } else {
-            $("#import_result").addClass("alert alert-error");
+            $("#import_result").addClass("alert alert-danger");
             $("#import_result").html(msg);
             this.importform_cb();
         }
diff --git a/modoboa/extensions/amavis/templates/amavis/mailheaders.html b/modoboa/extensions/amavis/templates/amavis/mailheaders.html
index 4dcc0b0ca..0ed8b3d61 100644
--- a/modoboa/extensions/amavis/templates/amavis/mailheaders.html
+++ b/modoboa/extensions/amavis/templates/amavis/mailheaders.html
@@ -1,5 +1,5 @@
 {% extends "common/mailheaders.html" %}
 {% block emailheaders %}
-{% if qtype %}<div class="alert alert-error"><strong>{{ qtype }}</strong> {{ qreason }}</div>{% endif %}
+{% if qtype %}<div class="alert alert-danger"><strong>{{ qtype }}</strong> {{ qreason }}</div>{% endif %}
 {{ block.super }}
 {% endblock %}
diff --git a/modoboa/extensions/sievefilters/forms.py b/modoboa/extensions/sievefilters/forms.py
index 27e7be344..8e30f940f 100644
--- a/modoboa/extensions/sievefilters/forms.py
+++ b/modoboa/extensions/sievefilters/forms.py
@@ -33,7 +33,7 @@ class CustomRadioInput(RadioInput):
             label_for = ''
         choice_label = conditional_escape(force_unicode(self.choice_label))
         return mark_safe(
-            u'<label%s class="radio inline">%s %s</label>'
+            u'<label%s class="radio-inline">%s %s</label>'
             % (label_for, self.tag(), choice_label)
         )
 
@@ -65,7 +65,7 @@ class FilterForm(forms.Form):
                      ("anyof", _("Any of the following")),
                      ("all", _("All messages"))],
             initial="anyof",
-            widget=CustomRadioSelect(attrs={"class": "inline", "type": "checkbox"})
+            widget=CustomRadioSelect(attrs={"class": "checkbox-inline", "type": "checkbox"})
         )
 
         self.header_operators = [
diff --git a/modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js b/modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js
index c0bed1be9..1271bbb7d 100644
--- a/modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js
+++ b/modoboa/extensions/sievefilters/static/sievefilters/js/jquery.dynfields.js
@@ -54,7 +54,7 @@
             return $('<a />', {
                 href: '#',
                 id: 'condition_' + this.nextid + '_rmbtn',
-                html: '<i class="icon-trash"></i>'
+                html: '<i class="glyphicon glyphicon-trash"></i>'
             }).click($.proxy(this.removefields, this));
         },
 
@@ -250,7 +250,7 @@
             return $('<a />', {
                 href: '#',
                 id: 'action_' + this.nextid + '_rmbtn',
-                html: '<i class="icon-trash"></i>'
+                html: '<i class="glyphicon glyphicon-trash"></i>'
             }).click($.proxy(this.removefields, this));
         },
 
diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index 29022d443..a7490a93b 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -1049,10 +1049,10 @@ Webmail.prototype = {
         var $delbtn = $("<a />", {
             name: "delattachment",
             href: this.options.delattachment_url + "?name=" + tmpname,
-            html: "<i class='icon-remove'></i>"
+            html: "<i class='glyphicon glyphicon-remove'></i>"
         });
         var $label = $("<label />", {html: fname});
-        var $div = $("<div />", {'class': "row-fluid"}).append($delbtn, $label);
+        var $div = $("<div />", {'class': "row"}).append($delbtn, $label);
 
         $delbtn.click(this.del_attachment);
         $("#id_attachment").val("");
diff --git a/modoboa/extensions/webmail/templates/webmail/attachments.html b/modoboa/extensions/webmail/templates/webmail/attachments.html
index 1fbfb7f34..c11999541 100644
--- a/modoboa/extensions/webmail/templates/webmail/attachments.html
+++ b/modoboa/extensions/webmail/templates/webmail/attachments.html
@@ -12,7 +12,7 @@
         style="width:0;height:0;border:0px solid #fff;"></iframe>
 <div class="well" id="attachment_list">
 {% for att in attachments %}
-<div class="row-fluid">
+<div class="row">
   <a href="{% url 'modoboa.extensions.webmail.views.delattachment' %}?name={{ att.tmpname }}"
      name="delattachment">
     <i class="glyphicon glyphicon-remove"></i>
diff --git a/modoboa/static/css/viewmail.css b/modoboa/static/css/viewmail.css
index 744620167..e73b2d307 100644
--- a/modoboa/static/css/viewmail.css
+++ b/modoboa/static/css/viewmail.css
@@ -8,7 +8,7 @@ body{margin:5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-siz
 .alert-heading{color:inherit;}
 .alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
 .alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
-.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-danger{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
 .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
 .alert-block{padding-top:14px;padding-bottom:14px;}
 .alert-block>p,.alert-block>ul{margin-bottom:0;}
diff --git a/modoboa/static/js/confirmation.js b/modoboa/static/js/confirmation.js
index 629ac0b85..a987d1041 100644
--- a/modoboa/static/js/confirmation.js
+++ b/modoboa/static/js/confirmation.js
@@ -44,7 +44,7 @@
              var $container = $("<div />", {"class" : "container-fluid"});
              box.append($container);
              if (this.options.warning) {
-                 $container.append($("<div />", {"class" : "row-fluid"})
+                 $container.append($("<div />", {"class" : "row"})
                      .append($("<div />", {
                          "class": "alert alert-danger",
                          html: "<h4>" + gettext("Warning") + "</h4>" + this.options.warning
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index f33e69628..bb33cb826 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -126,8 +126,8 @@ function display_form_errors(formid, data) {
         var spanid = fullid + "-error";
         var $span = $("#" + spanid);
 
-        if (!$widget.parents(".control-group").hasClass("error")) {
-            $widget.parents(".control-group").addClass("error");
+        if (!$widget.parents(".form-group").hasClass("has-error")) {
+            $widget.parents(".form-group").addClass("has-error");
         }
         if (!$span.length) {
             $span = $("<span />", {
diff --git a/modoboa/static/js/jquery.sortable.js b/modoboa/static/js/jquery.sortable.js
index d864de075..dfc3dbf06 100644
--- a/modoboa/static/js/jquery.sortable.js
+++ b/modoboa/static/js/jquery.sortable.js
@@ -51,7 +51,7 @@
                  }
              }
              this.$element.append($("<i/>", {
-                 "class": "sort-selection icon-chevron-" + ((dir == 'asc') ? 'up' : 'down')
+                 "class": "sort-selection glyphicon glyphicon-chevron-" + ((dir == 'asc') ? 'up' : 'down')
              }));
              return dir;
          }
diff --git a/modoboa/static/js/twocols_nav.js b/modoboa/static/js/twocols_nav.js
index 2c2642957..69f821163 100644
--- a/modoboa/static/js/twocols_nav.js
+++ b/modoboa/static/js/twocols_nav.js
@@ -78,7 +78,7 @@ TwocolsNav.prototype = {
     select_change: function(e) {
         var instance = this;
         var $target = $(e.target);
-        var $parent = $target.parents("div.control-group");
+        var $parent = $target.parents("div.form-group");
 
         $('div[data-visibility-field="' + $target.attr("id") + '"]').each(function(idx) {
             instance.toggle_field_visibility($(this), $parent, $target.val());
@@ -91,7 +91,7 @@ TwocolsNav.prototype = {
     radio_clicked: function(e) {
         var instance = this;
         var $target = $(e.target);
-        var $parent = $target.parents("div.control-group");
+        var $parent = $target.parents("div.form-group");
         var realid = $target.attr("id");
 
         realid = realid.substr(0, realid.length - 2);
diff --git a/modoboa/templates/500.html b/modoboa/templates/500.html
index 4864a78fb..810229bfa 100644
--- a/modoboa/templates/500.html
+++ b/modoboa/templates/500.html
@@ -1,6 +1,6 @@
 {% extends "layout_simple.html" %}{% load i18n %}
 {% block content %}
-<div class="alert alert-error">
+<div class="alert alert-danger">
   <h4>{% trans "Sorry" %}</h4>
   <p>{% trans "An internal error occured." %}</p>
 </div>
diff --git a/modoboa/templates/common/error.html b/modoboa/templates/common/error.html
index 74c95a380..c4215fde9 100644
--- a/modoboa/templates/common/error.html
+++ b/modoboa/templates/common/error.html
@@ -1,5 +1,5 @@
 {% extends "layout_simple.html" %}
 {% load i18n %}
 {% block content %}
-<div class="alert alert-error"><strong>{% trans "Error:" %}</strong> {{ error }}</div>
+<div class="alert alert-danger"><strong>{% trans "Error:" %}</strong> {{ error }}</div>
 {% endblock %}
diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index 3ba77b341..010162bde 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -4,7 +4,7 @@
   <div class="col-lg-5 col-md-5 col-sm-5">
     {% if appended_text %}<div class="input-group">{% endif %}
     {{ field }}{% if appended_text %}<span class="input-group-addon">{{ appended_text }}</span></div>{% endif %}{% if help_display_mode == "inline" and field.help_text %}<span class="help-block pull-right">{{ field.help_text }}</span>{% endif %}{% if inline_message %}<span class="help-block pull-right">{{ inline_message }}</span>{% endif %}
-    {% if activator %}<div class="checkbox"><label class="checkbox inline" for="id_{{ field.name }}_act">
+    {% if activator %}<div class="checkbox"><label class="checkbox-inline" for="id_{{ field.name }}_act">
       <input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act" {% if activator_value %}checked='checked'{% else %}{% if deactivate_if_empty and field.value == None %}checked='checked'{% endif %}{% endif %}/>{{ activator_label }}
     </label></div>{% endif %}
     {% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
diff --git a/modoboa/templates/common/generic_modal_form.html b/modoboa/templates/common/generic_modal_form.html
index 6e2129050..a30a63d04 100644
--- a/modoboa/templates/common/generic_modal_form.html
+++ b/modoboa/templates/common/generic_modal_form.html
@@ -1,7 +1,7 @@
 {% extends "common/generic_modal.html" %}
 {% load lib_tags %}
 {% block modalbody %}
-{% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %}
+{% if error %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
 <form class="form-horizontal" action="{{ action }}" enctype="{{ enctype }}" 
       method="POST" id="{{ formid }}" name="{{ formid }}"
       target="{{ target }}">{% csrf_token %}
diff --git a/modoboa/templates/fluid.html b/modoboa/templates/fluid.html
index 9c9c2191c..98ce7df7f 100644
--- a/modoboa/templates/fluid.html
+++ b/modoboa/templates/fluid.html
@@ -1,8 +1,6 @@
 {% extends "nlayout.html" %}
 {% block content %}
 <div class="container-fluid">
-  <div class="row-fluid">
     {% block rowcontent %}{% endblock %}
-  </div>
 </div>
 {% endblock %}
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index c8b1fed0a..a74d62f0d 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -56,7 +56,7 @@
       </div>
       </div>
       {% for annoucement in annoucements %}
-      <div class="offset3 span5 well">{{ annoucement|safe }}</div>
+      <div class="col-lg-offset-3 col-lg-5 well">{{ annoucement|safe }}</div>
       {% endfor %}
      </body>
 </html>