diff --git a/public/assets/css/base.css b/public/assets/css/base.css
index d78d66567a..ed582149f2 100644
--- a/public/assets/css/base.css
+++ b/public/assets/css/base.css
@@ -168,9 +168,12 @@ summary:focus {
 }
 
 /* NOTES */
-.notes hr {
+.h-entry hr {
+    margin-top: 5px;
+}
+
+.h-entry {
     margin-top: var(--unit-size);
-    margin-bottom: var(--small-size);
 }
 
 .h-entry,
@@ -179,6 +182,12 @@ summary:focus {
     border-radius: var(--unit-size);
 }
 
+.h-entry .replies .h-entry {
+    background-color: unset;
+    padding: 0 var(--unit-size) var(--unit-size) 0;
+    margin-left: var(--medium-size);
+}
+
 .note-info {
     display: flex;
     justify-content: space-between;
diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig
index 3f3aea239e..922594e18d 100644
--- a/templates/note/view.html.twig
+++ b/templates/note/view.html.twig
@@ -17,7 +17,7 @@
         {% endif %}
 
         {% if app.user %}
-        <div class="note-actions" aria-roledescription={{ 'Favourite, reply and recycle this note' | trans }}>
+        <div class="note-actions" aria-roledescription="{{ 'Favourite, reply and recycle this note.' | trans }}">
             {% if have_user %}
                 {% for current_action in get_note_actions(note) %}
                     {{ form_start(current_action) }}
@@ -42,7 +42,7 @@
         </div>
         {% endif %}
     </div>
-    <div class="e-content entry-content note-content" aria-roledescription={{ 'This note content.' | trans }}>
+    <div class="e-content entry-content note-content" aria-roledescription="{{ 'The note content.'  | trans }}">
         {% block markdown %}
             {% apply markdown_to_html %}
                 {{ note.getContent() }}
@@ -69,13 +69,14 @@
         </div>
     </div>
 
-    {% if replies is defined %}
+    {% if replies is defined and replies is not empty %}
         <div class="u-in-reply-to replies">
             {% for conversation in replies %}
                 {% include '/note/view.html.twig' with {'note': conversation['note'], 'skip_reply_to': true, 'have_user': have_user, 'replies': conversation['replies']} only %}
             {% endfor %}
         </div>
     {% endif %}
-</article>
-
-<hr>
\ No newline at end of file
+    {% if reply_to is not empty %}
+        <hr>
+    {% endif %}
+</article>
\ No newline at end of file