diff --git a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
index 025181e07..984a26427 100644
--- a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
+++ b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
@@ -1,7 +1,7 @@
 {% load i18n lib_tags %}
 {% render_field form.bypass_virus_checks %}
 {% render_field form.bypass_spam_checks %}
-<div class="control-group"> 
+<div class="input-group">
   <label class="control-label">{% trans "Thresholds" %}</label>
   <div class="controls spaced">
     {{ form.spam_tag2_level }} <span class="help-inline">{% trans "or more is spam" %}</span><br>
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index 9c45ba955..af5bc4d67 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -74,7 +74,7 @@ div.input-group{
     margin-left: 210px;
 }
 
-.form-horizontal .control-group {
+.form-horizontal .input-group {
     margin-bottom: 8px;
 }
 
diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index 0f6e6bf36..70399b347 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="control-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
+<div class="input-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-append">{% endif %}
diff --git a/modoboa/templates/common/generic_fields_group.html b/modoboa/templates/common/generic_fields_group.html
index 5157946fa..301a1a128 100644
--- a/modoboa/templates/common/generic_fields_group.html
+++ b/modoboa/templates/common/generic_fields_group.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="control-group{% if haserror %} error{% endif %}">
+<div class="input-group {% if haserror %} error{% endif %}">
   <label class="control-label">{{ label }}</label>{% if help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>{% endif %}
   <div class="controls spaced">
     {% for field in group %}