diff --git a/static/main.css b/static/main.css
index b7e9450..58521bd 100644
--- a/static/main.css
+++ b/static/main.css
@@ -760,3 +760,7 @@ figcaption {
     height: 100px;
     margin: 20px;
 }
+
+.avatar.padded {
+    margin-right: 1em;
+}
diff --git a/templates/macros.html.tera b/templates/macros.html.tera
index 50ec315..defe013 100644
--- a/templates/macros.html.tera
+++ b/templates/macros.html.tera
@@ -46,8 +46,9 @@
 {% macro comment(comm) %}
     <div class="comment" id="comment-{{ comm.id }}">
         <a class="author" href="/@/{{ comm.author.fqn }}/">
+            <img class="avatar small padded" src="{{ comm.author.avatar }}" alt="{{ comm.author.name }}">
             <span class="display-name">{{ comm.author.name }}</span>
-            <small>@{{ comm.author.username }}</small>
+            <small>@{{ comm.author.fqn }}</small>
         </a>
         <div class="text">{{ comm.content | safe }}</div>
         <a class="button" href="?responding_to={{ comm.id }}">{{ "Respond" | _ }}</a>