diff --git a/securedrop/sass/modules/_flash.sass b/securedrop/sass/modules/_flash.sass
index 49dfa914d2..37ed7ac083 100644
--- a/securedrop/sass/modules/_flash.sass
+++ b/securedrop/sass/modules/_flash.sass
@@ -9,6 +9,10 @@
     text-align: left
     font-size: medium
 
+    background-position-y: center
+    background-position-x: 10px
+    background-repeat: no-repeat
+
     &:dir(rtl)
       text-align: right
 
@@ -25,8 +29,11 @@
     &.notification
       border: 1px solid #8ed9f6
       background-color: #e3f7fc
+      background-image: url(/static/i/font-awesome/info-circle-black.png)
+      background-size: 20px 16px
       font-size: medium
       font-weight: normal
+      padding-left: 10px + 20px
 
       i
         color: #4f7685
@@ -34,6 +41,9 @@
     &.error
       border: 1px solid $color_error_border
       background-color: $color_error_background
+      background-image: url(/static/i/font-awesome/exclamation-triangle-black.png)
+      background-size: 20px 17px
+      padding-left: 10px + 20px
 
       i
         color: #D62727
@@ -52,6 +62,9 @@
       padding-left: 20px
       padding-right: 8px
       background-color: #FDFDFD
+      background-image: url(/static/i/bang-stop.png)
+      background-size: 22px 22px
+      padding-left: 10px + 22px
       color: #383838
       align-items: center
 
diff --git a/securedrop/source_templates/flashed.html b/securedrop/source_templates/flashed.html
index d980d4b34a..deeabfe20b 100644
--- a/securedrop/source_templates/flashed.html
+++ b/securedrop/source_templates/flashed.html
@@ -5,15 +5,6 @@
   {% for category, message in messages %}
     {% if category != 'banner-warning' %}
       <li class="flash {{ category }}">
-        {# FIXME:
-        {% if category == 'notification' %}
-        <img src="{{ url_for('static', filename='i/font-awesome/info-circle-black.png') }}" alt="{{ gettext('Notification') }} width="20" height="16">
-        {% elif category == 'error' %}
-        <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/exclamation-triangle-black.png') }}" alt="{{ gettext('Error') }}" width="20" height="17">
-        {% elif category == 'important' %}
-        <img src="{{ url_for('static', filename='i/bang-stop.png') }}" alt="{{ gettext('Important') }}" width="22" height="22">
-        {% endif %}
-        #}
         {{ message }}
       </li>
     {% endif %}