diff --git a/modoboa/extensions/amavis/general_callbacks.py b/modoboa/extensions/amavis/general_callbacks.py
index ce2f76e91..d7e662ca6 100644
--- a/modoboa/extensions/amavis/general_callbacks.py
+++ b/modoboa/extensions/amavis/general_callbacks.py
@@ -109,7 +109,7 @@ def display_requests(user):
     tpl = Template("""<ul class="nav pull-right {{ css }}">
   <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-      <i class="icon-white icon-bell"></i> <span id="alerts-counter" class="label label-important">{{ nbrequests }}</span>
+      <i class="glyphicon glyphicon-bell"></i> <span id="alerts-counter" class="label label-important">{{ nbrequests }}</span>
     </a>
     <ul class="dropdown-menu">
       <li>
diff --git a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
index 709460220..646aa8ddc 100644
--- a/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
+++ b/modoboa/extensions/amavis/templates/amavis/main_action_bar.html
@@ -15,12 +15,12 @@
   </div>
   <div class="btn-group">
     <a name="release-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-success disabled">
-      <i class="icon-white icon-ok"></i> {% trans "Release" %}
+      <i class="glyphicon glyphicon-ok"></i> {% trans "Release" %}
     </a>
   </div>
   <div class="btn-group">
     <a name="delete-multi" href="{% url 'modoboa.extensions.amavis.views.process' %}" class="btn btn-danger disabled">
-      <i class="icon-white icon-trash"></i> {% trans "Delete" %}
+      <i class="glyphicon glyphicon-trash"></i> {% trans "Delete" %}
     </a>
   </div>
   {% include "common/email_searchbar.html" with extraopts=extraopts %}
diff --git a/modoboa/extensions/amavis/templatetags/amavis_tags.py b/modoboa/extensions/amavis/templatetags/amavis_tags.py
index d5b0ec620..018fed33b 100644
--- a/modoboa/extensions/amavis/templatetags/amavis_tags.py
+++ b/modoboa/extensions/amavis/templatetags/amavis_tags.py
@@ -12,14 +12,14 @@ register = template.Library()
 def viewm_menu(mail_id, rcpt):
     entries = [
         {"name": "release",
-         "img": "icon-white icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "class": "btn-success",
          "url": reverse('modoboa.extensions.amavis.views.release', args=[mail_id])
          + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label": _("Release")},
         {"name": "delete",
          "class": "btn-danger",
-         "img": "icon-white icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "url": reverse('modoboa.extensions.amavis.views.delete', args=[mail_id])
          + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label": _("Delete")},
@@ -46,14 +46,14 @@ def viewm_menu(mail_id, rcpt):
 def viewm_menu_simple(user, mail_id, rcpt, secret_id=""):
     entries = [
         {"name": "release",
-         "img": "icon-white icon-ok",
+         "img": "glyphicon glyphicon-ok",
          "class": "btn-success",
          "url": reverse('modoboa.extensions.amavis.views.release', args=[mail_id]) \
              + ("?rcpt=%s" % rcpt \
                     + (("&secret_id=%s" % secret_id) if secret_id != "" else "")),
          "label": _("Release")},
         {"name": "delete",
-         "img": "icon-white icon-trash",
+         "img": "glyphicon glyphicon-trash",
          "class": "btn-danger",
          "url": reverse('modoboa.extensions.amavis.views.delete', args=[mail_id]) \
              + "?rcpt=%s" % rcpt \
diff --git a/modoboa/templates/common/pagination_bar.html b/modoboa/templates/common/pagination_bar.html
index 621c5d81c..ff07ff7fc 100644
--- a/modoboa/templates/common/pagination_bar.html
+++ b/modoboa/templates/common/pagination_bar.html
@@ -2,26 +2,26 @@
   <ul>
     <li>      
       {% if page.has_previous %}<a href="{{ baseurl }}page=1">
-        <i class="icon-white icon-fast-backward"></i></a>{% else %}
-      <i class="icon-white icon-fast-backward"></i>{% endif %}      
+        <i class="glyphicon glyphicon-fast-backward"></i></a>{% else %}
+      <i class="glyphicon glyphicon-fast-backward"></i>{% endif %}
     </li>
     <li>      
       {% if page.has_previous %}<a href="{{ baseurl }}page={{ page.previous_page_number }}">
-      <i class="icon-step-backward icon-white"></i></a>{% else %}
-      <i class="icon-step-backward icon-white"></i>{% endif %}
+      <i class="glyphicon glyphicon-step-backward icon-white"></i></a>{% else %}
+      <i class="glyphicon glyphicon-step-backward icon-white"></i>{% endif %}
     </li>
     <li class="disabled navbar-text">
       {{ page.number }}/{{ page.paginator.num_pages }}
     </li>
     <li>
       {% if page.has_next %}<a href="{{ baseurl }}page={{ page.next_page_number }}">
-      <i class="icon-step-forward icon-white"></i></a>{% else %}
-      <i class="icon-step-forward icon-white"></i>{% endif %}
+      <i class="glyphicon glyphicon-step-forward icon-white"></i></a>{% else %}
+      <i class="glyphicon glyphicon-step-forward icon-white"></i>{% endif %}
     </li>
     <li>
       {% if page.has_next %}<a href="{{ baseurl }}page={{ page.paginator.num_pages }}">
-      <i class="icon-fast-forward icon-white"></i></a>{% else %}
-      <i class="icon-fast-forward icon-white"></i>{% endif %}
+      <i class="glyphicon glyphicon-fast-forward icon-white"></i></a>{% else %}
+      <i class="glyphicon glyphicon-fast-forward icon-white"></i>{% endif %}
     </li>
   </ul>
 </div>
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 4aa13b0cf..967c15435 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -33,9 +33,9 @@
                 <div class="navbar-header">
                     <button class="navbar-toggle" data-target="#bs-example-navbar-collapse-1" data-toggle="collapse" type="button">
                         <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
+                        <span class="glyphicon glyphicon-bar"></span>
+                        <span class="glyphicon glyphicon-bar"></span>
+                        <span class="glyphicon glyphicon-bar"></span>
                     </button>
                 </div>
                 <div id="bs-example-navbar-collapse-1" class="collapse navbar-collapse">