diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index d47189d18..ffb2c6c76 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1582,7 +1582,6 @@ table {
       font-family: $font-sans;
       font-size: $small-font-size;
       line-height: $line-height;
-      margin: rem-calc(10) $line-height/2 $line-height/4 0;
 
       a {
         color: $text-light;
@@ -1603,15 +1602,12 @@ table {
     .comment-body {
       margin-left: rem-calc(42);
 
-      p {
-        font-size: $small-font-size;
-      }
-
       .reply {
         background: white;
         border: 1px solid $border;
-        font-family: $font-sans;
-        font-size: rem-calc(12);
+        border-left: 0;
+        border-right: 0;
+        font-size: $small-font-size;
         margin: rem-calc(6) 0;
         padding: rem-calc(6);
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 44e15362b..c001da74e 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -67,11 +67,11 @@
             <%= simple_format text_with_links comment.body %>
           </div>
 
-          <span id="<%= dom_id(comment) %>_votes" class="comment-votes right">
-            <%= render 'comments/votes', comment: comment %>
-          </span>
-
           <div class="reply">
+            <span id="<%= dom_id(comment) %>_votes" class="comment-votes right">
+              <%= render 'comments/votes', comment: comment %>
+            </span>
+
             <%= t("comments.comment.responses", count: comment.children.size) %>
 
             <% if user_signed_in? %>
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb
index b0c3dfb3f..4fcbdead4 100644
--- a/app/views/comments/show.html.erb
+++ b/app/views/comments/show.html.erb
@@ -1,9 +1,13 @@
-<div>
-  <%= link_to t("comments.show.return_to_commentable") + @comment.commentable.title,
-              @comment.commentable %>
+<div class="row">
+  <div class="small-12 column margin-top">
+    <%= link_to @comment.commentable, class: "left back"  do %>
+      <i class="icon-angle-left left"></i>
+      <%= t("comments.show.return_to_commentable") + @comment.commentable.title %>
+    <% end %>
+  </div>
 </div>
 
-<section class="row-full comments">
+<section class="comments">
   <div class="row">
     <div id="comments" class="small-12 column">
       <%= render @comment %>