diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index eb72789..b365076 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -275,4 +275,7 @@ Similar to bootstraps 'shadow-lg'
 }
 .tree-label.badge{
     font-size: 90%;
+}
+.alert{
+    margin-bottom: 0 !important;
 }
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index ec79ca6..0bbe976 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -27,7 +27,18 @@
     <div class="col">
         {% for message in messages %}
         <div class="row alert alert-{{ message.tags }}">
-            {{ message }}
+            <div>
+                <span class="mr-3">
+                {% if "danger" in message.tags %}
+                    {% fa5_icon 'exclamation' %}
+                {% elif "info" in message.tags %}
+                    {% fa5_icon 'info' %}
+                {% elif "success" in message.tags %}
+                    {% fa5_icon 'check' %}
+                {% endif %}
+                </span>
+                {{ message }}
+            </div>
         </div>
         {% endfor %}
     </div>
diff --git a/templates/public_base.html b/templates/public_base.html
index 69a25d9..3107544 100644
--- a/templates/public_base.html
+++ b/templates/public_base.html
@@ -23,13 +23,22 @@
         {% endblock %}
     </header>
     <div class="container-fluid mt-3 px-5">
-        <div class="">
         {% for message in messages %}
-            <div class="row alert alert-{{ message.tags }}">
+        <div class="row alert alert-{{ message.tags }}">
+            <div>
+                <span class="mr-3">
+                {% if "danger" in message.tags %}
+                    {% fa5_icon 'exclamation' %}
+                {% elif "info" in message.tags %}
+                    {% fa5_icon 'info' %}
+                {% elif "success" in message.tags %}
+                    {% fa5_icon 'check' %}
+                {% endif %}
+                </span>
                 {{ message }}
             </div>
-        {% endfor %}
         </div>
+        {% endfor %}
 
         {% block body %}