diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 933cc4d..e8b0e1f 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -73,11 +73,6 @@
     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 %}
 
   <header>
     {{ user_picture }}
@@ -96,10 +91,12 @@
   </header>
 
   <div{{ content_attributes }}>
-    {{ content|without('links') }}
-    {% if content.links %}
-      {{ content.links }}
+    {% if title %}
+      {{ title_prefix }}
+      <h3{{ title_attributes }}>{{ title }}</h3>
+      {{ title_suffix }}
     {% endif %}
+    {{ content }}
   </div>
 
 </article>
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 1f69448..ad89b66 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -103,6 +103,17 @@ function bartik_preprocess_block(&$variables) {
 }
 
 /**
++ * Implements hook_preprocess_HOOK() for comment.html.twig.
++ */
+function bartik_preprocess_comment(&$variables) {
+  if (isset($variables['content']['links'])) {
+    // Add NAV wrapper element for comment links.
+    $variables['content']['links']['#prefix'] = '<nav>';
+    $variables['content']['links']['#suffix'] = '</nav>';
+  }
+}
+
+/**
  * Implements hook_preprocess_HOOK() for menu.html.twig.
  */
 function bartik_preprocess_menu(&$variables) {
diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 9f22c51..0e89e78 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -57,6 +57,9 @@
   position: relative;
   width: 100%;
 }
+.comment__text h3 {
+  margin-top: 0;
+}
 .comment__text:before {
   content: '';
   position: absolute;
@@ -116,9 +119,6 @@
   margin-right: 0;
   padding: 5px 5px 5px 2px;
 }
-.comment-footer {
-  display: table-row;
-}
 .comment--unpublished .comment__text:after,
 .node--unpublished .comment__text:after {
   border-right-color: #fff4f4; /* LTR */
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index d4f4b3d..216f3db 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -79,11 +79,6 @@
     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">
@@ -105,13 +100,13 @@
   </header>
 
   <div class="comment__text">
+    {% if title %}
+      {{ title_prefix }}
+      <h3{{ title_attributes }}>{{ title }}</h3>
+      {{ title_suffix }}
+    {% endif %}
     <div{{ content_attributes.addClass('comment__content') }}>
-      {{ content|without('links') }}
+      {{ content }}
     </div>
-    <footer class="comment__footer">
-      {% if content.links %}
-        <nav>{{ content.links }}</nav>
-      {% endif %}
-    </footer>
   </div>
 </article>
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index 4ea14ca..3dc5a2b 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -79,11 +79,6 @@
     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 %}
 
   <header>
     {{ user_picture }}
@@ -102,10 +97,12 @@
   </header>
 
   <div{{ content_attributes.addClass('content') }}>
-    {{ content|without('links') }}
-    {% if content.links %}
-      {{ content.links }}
+    {% if title %}
+      {{ title_prefix }}
+      <h3{{ title_attributes }}>{{ title }}</h3>
+      {{ title_suffix }}
     {% endif %}
+    {{ content }}
   </div>
 
 </article>