diff --git a/templates/base.html b/templates/base.html
index 6c6b2f7fb..8fff5ecea 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -136,9 +136,11 @@
 
             {# Feedback messages #}
             {% for message in messages %}
-              <div data-alert class="alert-box {% if message.tags == 'error' %}alert{% else %}{{ message.tags }}{% endif %} radius">
+              <div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade in" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                  <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                </button>
                 {{ message|safe }}
-                <a href="#" class="close">&times;</a>
               </div>
             {% endfor %}