diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala
index d423ba55..d1a80711 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -20,6 +20,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
 
     private const string FROM_CLASS = "geary-from";
     private const string MATCH_CLASS = "geary-match";
+    private const string SPOOF_CLASS = "geary-spoofed";
     private const string INTERNAL_ANCHOR_PREFIX = "geary:body#";
     private const string REPLACED_CID_TEMPLATE = "replaced_%02u@geary";
     private const string REPLACED_IMAGE_CLASS = "geary_replaced_inline_image";
@@ -128,6 +129,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
                     _("This email address may have been forged")
                 );
                 address_parts.add(spoof_img);
+                get_style_context().add_class(SPOOF_CLASS);
             }
 
             Gtk.Label primary = new Gtk.Label(null);
diff --git a/ui/conversation-contact-popover.ui b/ui/conversation-contact-popover.ui
index c899fb09..f63bd303 100644
--- a/ui/conversation-contact-popover.ui
+++ b/ui/conversation-contact-popover.ui
@@ -249,7 +249,7 @@
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="pixel_size">36</property>
+                    <property name="pixel_size">24</property>
                     <property name="icon_name">dialog-warning-symbolic</property>
                   </object>
                   <packing>
diff --git a/ui/geary.css b/ui/geary.css
index 10507392..909fb6db 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -147,6 +147,13 @@ grid.geary-message-summary {
   padding: 0;
 }
 
+.geary-headers flowboxchild.geary-spoofed image:dir(ltr) {
+  margin-right: 2px;
+}
+.geary-headers flowboxchild.geary-spoofed image:dir(rtl) {
+  margin-left: 2px;
+}
+
 .geary-headers label.geary-from {
   font-weight: bold;
 }