diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html
index e3d4e85f..da29954a 100644
--- a/allianceauth/templates/allianceauth/base.html
+++ b/allianceauth/templates/allianceauth/base.html
@@ -30,15 +30,7 @@
                 <div class="row" id="site-body-wrapper">
                     {% include 'allianceauth/side-menu.html' %}
                     <div class="col-sm-10">
-                        {% if messages %}
-                            <br>
-                            {% for message in messages %}
-                                <div class="alert alert-{{ message.level_tag }}">{{ message }}</div>
-                                {% if not forloop.last %}
-                                    <br>
-                                {% endif %}
-                            {% endfor %}
-                        {% endif %}
+                        {% include 'allianceauth/messages.html' %}
                         {% block content %}
                         {% endblock content %}
                     </div>
diff --git a/allianceauth/templates/allianceauth/messages.html b/allianceauth/templates/allianceauth/messages.html
new file mode 100644
index 00000000..16d6c8e4
--- /dev/null
+++ b/allianceauth/templates/allianceauth/messages.html
@@ -0,0 +1,20 @@
+{% if messages %}
+    <br>
+    {% for message in messages %}        
+        <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+            {% if message.level_tag == "info" %}
+                <i class="fas fa-info-circle"></i>
+            {% elif message.level_tag == "success" %}
+                <i class="fas fa-check-circle"></i>
+            {% elif message.level_tag == "warning" %}
+                <i class="fas fa-exclamation-circle"></i>
+            {% elif message.level_tag == "danger" %}
+                <i class="fas fa-exclamation-triangle"></i>
+            {% endif %}
+            &nbsp;{{ message }}
+        </div>        
+    {% endfor %}
+{% endif %}
\ No newline at end of file