diff --git a/resources/comments.scss b/resources/comments.scss
index 54118e7..9abca9e 100644
--- a/resources/comments.scss
+++ b/resources/comments.scss
@@ -37,6 +37,11 @@ a {
         border: 1px solid #CCC;
     }
 
+    .comment-img {
+        display: flex;
+        margin-right: 4px;
+    }
+
     .new-comments .comment-display {
         display: flex;
         margin-top: -0.25em !important;
@@ -47,9 +52,8 @@ a {
     }
 
     .new-comments .comment .detail {
-        margin: 0px 15px 0px;
         width: 100%;
-        max-width: calc(100% - 134px);
+        padding-right: 1em;
     }
 
     .new-comments .comment-edits {
@@ -64,6 +68,7 @@ a {
         border-bottom: 1px #888 solid;
         color: #888;
         text-align: right;
+        align-items: center;
     }
 
     .previous-revision, .next-revision {
@@ -80,8 +85,8 @@ a {
     }
 
     .new-comments .gravatar {
-        width: 75px;
-        max-width: 75px;
+        width: 1.5em;
+        border-radius: 50%;
     }
 
     .new-comments .vote {
diff --git a/templates/comments/list.html b/templates/comments/list.html
index 44c2515..6adf903 100644
--- a/templates/comments/list.html
+++ b/templates/comments/list.html
@@ -64,16 +64,16 @@
                     class="downvote-link fa fa-chevron-down fa-fw"></a>
                 {% endif %}
               </div>
-              {% with author=node.author, user=node.author.user %}
-                <a href="{{ url('user_page', user.username) }}" class="user">
-                  <img src="{{ gravatar(author, 135) }}" class="gravatar">
-                </a>
-              {% endwith %}
             </div>
             <div class="detail">
               <div class="header">
-                {{ link_user(node.author) }}&nbsp;
-                {{ relative_time(node.time, abs=_('commented on {time}'), rel=_('commented {time}')) }}
+                {% with author=node.author, user=node.author.user %}
+                  <a href="{{ url('user_page', user.username) }}" class="user comment-img">
+                    <img src="{{ gravatar(author, 135) }}" class="gravatar">
+                  </a>
+                {% endwith %}
+                {{ link_user(node.author) }},&nbsp;
+                {{ relative_time(node.time, abs=_('{time}'), rel=_('{time}')) }}
                 <span class="comment-spacer"></span>
                 <span class="comment-operation">
                   {% if node.revisions > 1 %}