diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 824bf15..c120e89 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -8,17 +8,6 @@
   display: table;
   vertical-align: top;
 }
-.comment .field-name-field-user-picture img {
-  margin-left: 0; /* LTR */
-}
-[dir="rtl"] .comment .field-name-field-user-picture img {
-  margin-right: 0;
-}
-.comment {
-  margin-bottom: 20px;
-  display: table;
-  vertical-align: top;
-}
 .comment__attribution {
   display: table-cell;
   padding: 0 30px 0 0; /* LTR */
@@ -30,7 +19,6 @@
   padding: 0 0 0 30px;
 }
 .comment__attribution img {
-  margin: 0;
   border: 1px solid #d3d7d9;
 }
 .comment__author {
@@ -52,17 +40,18 @@
   font-size: 0.929em;
   line-height: 1.6;
 }
-.comment-arrow {
+.comment__arrow {
   background: url(../../images/comment-arrow.gif) no-repeat 0 center transparent; /* LTR */
   border-left: 1px solid;
   border-right: 1px solid;
+  border-color: #ffffff;
   height: 40px;
   margin-left: -47px; /* LTR */
   margin-top: 10px;
   position: absolute;
   width: 20px;
 }
-[dir="rtl"] .comment-arrow {
+[dir="rtl"] .comment__arrow {
   background-image: url(../../images/comment-arrow-rtl.gif);
   margin-left: 0;
   margin-right: -47px;
@@ -100,7 +89,7 @@
   margin-right: 0;
   padding: 5px 5px 5px 2px;
 }
-.comment.unpublished .comment-arrow {
+.comment.unpublished .comment__arrow {
   border-left: 1px solid #fff4f4;
   border-right: 1px solid #fff4f4;
 }
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 9200fbf..49a5abe 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -93,7 +93,7 @@
     </div>
   </header>
   <div class="comment-text">
-    <div class="comment-arrow"></div>
+    <div class="comment__arrow"></div>
     {#
     Hide the "new" indicator by default, let a piece of JavaScript ask
     the server which comments are new for the user. Rendering the final