diff --git a/components/Collection/templates/collection/notes.html.twig b/components/Collection/templates/collection/notes.html.twig
index a227295318..7c6af08feb 100644
--- a/components/Collection/templates/collection/notes.html.twig
+++ b/components/Collection/templates/collection/notes.html.twig
@@ -13,45 +13,47 @@
         {{ block | raw }}
     {% endfor %}
 
-    <header class="feed-header">
-        {% if page_title is defined %}
-            <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
-        {% endif %}
-        <nav class="feed-actions">
-            <details class="feed-actions-details">
-                <summary>
-                    {{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #}
-                </summary>
-                <div class="feed-actions-details-dropdown">
-                    <ul>
-                        {% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
-                            {{ block | raw }}
-                        {% endfor %}
-                    </ul>
-                </div>
-            </details>
-        </nav>
-    </header>
+    {% if notes is defined %}
+        <section>
+            <header class="feed-header">
+                {% if page_title is defined %}
+                    <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
+                {% else %}
+                    <h1 class="heading-no-margin">{{ 'Notes' | trans }}</h1>
+                {% endif %}
+                <nav class="feed-actions">
+                    <details class="feed-actions-details">
+                        <summary>
+                            {{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #}
+                        </summary>
+                        <div class="feed-actions-details-dropdown">
+                            <ul>
+                                {% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
+                                    {{ block | raw }}
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </details>
+                </nav>
+            </header>
 
-    {# Backwards compatibility with hAtom 0.1 #}
-    <main class="feed" tabindex="0" role="feed">
-        <div class="h-feed hfeed notes">
-            {% if notes is defined and notes is not empty %}
-                {% for conversation in notes %}
-                    {% block current_note %}
-                        {% if conversation is instanceof('array') %}
-                            {{ noteView.macro_note(conversation['note'], conversation['replies']) }}
-                        {% else %}
-                            {{ noteView.macro_note(conversation) }}
-                        {% endif %}
-                        <hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
-                    {% endblock current_note %}
-                {% endfor %}
-            {% else %}
-                <div class="feed-empty">
-                    {{ icon('logo', 'icon feed-background') | raw }}
+            {% if notes is not empty %}
+            {# Backwards compatibility with hAtom 0.1 #}
+            <main class="feed" tabindex="0" role="feed">
+                <div class="h-feed hfeed notes">
+                    {% for conversation in notes %}
+                        {% block current_note %}
+                            {% if conversation is instanceof('array') %}
+                                {{ noteView.macro_note(conversation['note'], conversation['replies']) }}
+                            {% else %}
+                                {{ noteView.macro_note(conversation) }}
+                            {% endif %}
+                            <hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
+                        {% endblock current_note %}
+                    {% endfor %}
                 </div>
+            </main>
             {% endif %}
-        </div>
-    </main>
+        </section>
+    {% endif %}
 {% endblock body %}
diff --git a/templates/cards/note/view.html.twig b/templates/cards/note/view.html.twig
index 534550e41e..2893a85cdd 100644
--- a/templates/cards/note/view.html.twig
+++ b/templates/cards/note/view.html.twig
@@ -107,18 +107,14 @@
 {% endblock note_sidebar %}
 
 {% block note_info %}
-    <div class="note-info">
-        <div class="note-info-start">
-            {{ block('note_author') }}
-            <small class="note-conversation-info">
-                <a href="{{ note.getConversationUrl() }}"
-                   class="note-conversation-url">{{ 'in conversation' | trans }}</a>
-                <a href="{{ note.getUrl() }}"
-                   class="note-url">{{ note.getModified() | ago }}</a>
-            </small>
-        </div>
-
-        {{ block('note_actions') }}
+    <div class="note-info-start">
+        {{ block('note_author') }}
+        <small class="note-conversation-info">
+            <a href="{{ note.getConversationUrl() }}"
+               class="note-conversation-url">{{ 'in conversation' | trans }}</a>
+            <a href="{{ note.getUrl() }}"
+               class="note-url">{{ note.getModified() | ago }}</a>
+        </small>
     </div>
 {% endblock note_info %}
 
@@ -162,7 +158,10 @@
              class="h-entry hentry note" lang={{ note.getLanguageLocale() }}>
         {{ block('note_sidebar') }}
         <div class="note-wrapper">
-            {{ block('note_info') }}
+            <div class="note-info">
+                {{ block('note_info') }}
+                {{ block('note_actions') }}
+            </div>
 
             <section role="dialog" class="e-content entry-content note-content">
                 {{ block('note_text') }}
@@ -188,7 +187,9 @@
     <article class="h-entry hentry note" lang={{ note.getLanguageLocale() }}>
         {{ block('note_sidebar') }}
         <div class="note-wrapper">
-            {{ block('note_info') }}
+            <div class="note-info">
+                {{ block('note_info') }}
+            </div>
 
             <section role="dialog" class="e-content entry-content note-content">
                 {{ block('note_text') }}