diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 3a7d19b..933cc4d 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -67,43 +67,39 @@
 #}
 
 <article{{ attributes }}>
-  {% if title %}
-    {{ title_prefix }}
-  {% endif %}
-
   {#
-  Hide the "new" indicator by default, let a piece of JavaScript ask
-  the server which comments are new for the user. Rendering the final
-  "new" indicator here would break the render cache.
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
   #}
   <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
-
   {% if title %}
+    {{ title_prefix }}
     <h3{{ title_attributes }}>{{ title }}</h3>
     {{ title_suffix }}
   {% endif %}
 
-
-  <footer>
+  <header>
     {{ user_picture }}
     <p>{{ submitted }}</p>
 
     {#
-      Indicate the semantic relationship between parent and child comments
-      for accessibility. The list is difficult to navigate in a screen
-      reader without this information.
+      Indicate the semantic relationship between parent and child comments for
+      accessibility. The list is difficult to navigate in a screen reader
+      without this information.
     #}
     {% if parent %}
       <p class="visually-hidden">{{ parent }}</p>
     {% endif %}
 
     {{ permalink }}
-  </footer>
+  </header>
 
   <div{{ content_attributes }}>
     {{ content|without('links') }}
+    {% if content.links %}
+      {{ content.links }}
+    {% endif %}
   </div>
-  {% if content.links %}
-    {{ content.links }}
-  {% endif %}
+
 </article>
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 21cca3c..d4f4b3d 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -73,6 +73,18 @@
   ]
 %}
 <article role="article"{{ attributes.addClass(classes)|without('role') }}>
+  {#
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
+  #}
+  <span class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
+  {% if title %}
+    {{ title_prefix }}
+    <h3{{ title_attributes }}>{{ title }}</h3>
+    {{ title_suffix }}
+  {% endif %}
+
   <header class="comment-header">
     <div class="comment__attribution">
       {{ user_picture }}
@@ -81,9 +93,9 @@
         <p class="comment__time comment__submitted__data">{{ created }}</p>
         <p class="comment__permalink comment__submitted__data">{{ permalink }}</p>
         {#
-          // Indicate the semantic relationship between parent and child comments
-          // for accessibility. The list is difficult to navigate in a screen
-          // reader without this information.
+          Indicate the semantic relationship between parent and child comments
+          for accessibility. The list is difficult to navigate in a screen
+          reader without this information.
         #}
         {% if parent %}
           <p class="visually-hidden">{{ parent }}</p>
@@ -91,18 +103,8 @@
       </div>
     </div>
   </header>
+
   <div class="comment__text">
-    {#
-    Hide the "new" indicator by default, let a piece of JavaScript ask
-    the server which comments are new for the user. Rendering the final
-    "new" indicator here would break the render cache.
-    #}
-    <span class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
-    {% if title %}
-      {{ title_prefix }}
-        <h3{{ title_attributes }}>{{ title }}</h3>
-      {{ title_suffix }}
-    {% endif %}
     <div{{ content_attributes.addClass('comment__content') }}>
       {{ content|without('links') }}
     </div>
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index 1d56d08..4ea14ca 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -73,43 +73,39 @@
   ]
 %}
 <article{{ attributes.addClass(classes) }}>
-  {% if title %}
-    {{ title_prefix }}
-  {% endif %}
-
   {#
-  Hide the "new" indicator by default, let a piece of JavaScript ask
-  the server which comments are new for the user. Rendering the final
-  "new" indicator here would break the render cache.
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
   #}
   <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
-
   {% if title %}
+    {{ title_prefix }}
     <h3{{ title_attributes }}>{{ title }}</h3>
     {{ title_suffix }}
   {% endif %}
 
-
-  <footer>
+  <header>
     {{ user_picture }}
     <p class="submitted">{{ submitted }}</p>
 
     {#
-      Indicate the semantic relationship between parent and child comments
-      for accessibility. The list is difficult to navigate in a screen
-      reader without this information.
+      Indicate the semantic relationship between parent and child comments for
+      accessibility. The list is difficult to navigate in a screen reader
+      without this information.
     #}
     {% if parent %}
       <p class="parent visually-hidden">{{ parent }}</p>
     {% endif %}
 
     {{ permalink }}
-  </footer>
+  </header>
 
   <div{{ content_attributes.addClass('content') }}>
     {{ content|without('links') }}
+    {% if content.links %}
+      {{ content.links }}
+    {% endif %}
   </div>
-  {% if content.links %}
-    {{ content.links }}
-  {% endif %}
+
 </article>