diff --git a/modoboa/extensions/webmail/templates/webmail/attachments.html b/modoboa/extensions/webmail/templates/webmail/attachments.html
index e4b56afce..1fbfb7f34 100644
--- a/modoboa/extensions/webmail/templates/webmail/attachments.html
+++ b/modoboa/extensions/webmail/templates/webmail/attachments.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block modalbody %}
 {{ block.super }}
-<div id="test" style="text-align: center">
+<div id="test" class="col-lg-offset-1 col-md-offset-2 col-sm-offset-2">
 <input type="button" class="btn btn-primary" id="submit" name="submit" value="{% trans 'Attach' %}" />
 </div>
 <div id="upload_status" style="display:none">
diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html
index 645d56b43..73e1e006a 100644
--- a/modoboa/extensions/webmail/templates/webmail/compose.html
+++ b/modoboa/extensions/webmail/templates/webmail/compose.html
@@ -4,7 +4,7 @@
     <div id="mailheader" class="well">
       {% render_field form.to %}
       <div class="options">
-        {% if not form.cc.value %}<a id="add_cc" href="#">{% trans "Add Cc field" %}</a>{% endif %} <a id="add_cci" href="#">{% trans "Add Cci field" %}</a>
+        {% if not form.cc.value %}<a id="add_cc" href="#" class="btn btn-xs btn-default glyphicon glyphicon-plus">{% trans "Cc field" %}</a>{% endif %} <a id="add_cci" href="#" class="btn btn-xs btn-default glyphicon glyphicon-plus">{% trans "Cci field" %}</a>
       </div>
       {% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %}
       {% render_and_hide_field form.cci %}