diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 54f71e83..d1ea52a2 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1731,6 +1731,17 @@ func (p *Pages) CommentBodyFragment(w io.Writer, params CommentBodyFragmentParam
 	return p.executePlain("fragments/comment/commentBody", w, params)
 }
 
+type CommentHeaderFragmentParams struct {
+	Comment     models.Comment
+	Reactions   map[models.ReactionKind]models.ReactionDisplayData
+	UserReacted map[models.ReactionKind]bool
+	HxSwapOob   bool
+}
+
+func (p *Pages) CommentHeaderFragment(w io.Writer, params CommentHeaderFragmentParams) error {
+	return p.executePlain("fragments/comment/commentHeader", w, params)
+}
+
 type EditCommentFragmentParams struct {
 	Comment models.Comment
 }
diff --git a/appview/pages/templates/fragments/comment/commentHeader.html b/appview/pages/templates/fragments/comment/commentHeader.html
index 2092c8e2..8fcd6181 100644
--- a/appview/pages/templates/fragments/comment/commentHeader.html
+++ b/appview/pages/templates/fragments/comment/commentHeader.html
@@ -2,29 +2,25 @@
   <div
     class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "
     hx-target="next .comment-body"
+    id="comment-header-{{ .Comment.Rkey }}"
+    {{ if .HxSwapOob }}hx-swap-oob="outerHTML"{{ end }}
   >
     {{ $handle := resolve .Comment.Did.String }}
     <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="/{{ $handle }}">{{ $handle }}</a>
-    {{ template "hats" $ }}
     <span class="before:content-['·']"></span>
     {{ template "timestamp" . }}
     {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did.String) }}
     {{ if and $isCommentOwner (not .Comment.Deleted) }}
-      {{ if not .Comment.IsLegacy }}
-        {{ template "editCommentBtn" . }}
-      {{ end }}
-      {{ template "deleteCommentBtn" . }}
+      <div class="ml-auto flex items-center gap-4 opacity-0 group-hover/comment:opacity-100">
+        {{ if not .Comment.IsLegacy }}
+          {{ template "editCommentBtn" . }}
+        {{ end }}
+        {{ template "deleteCommentBtn" . }}
+      </div>
     {{ end }}
   </div>
 {{ end }}
 
-{{ define "hats" }}
-  {{ $isIssueAuthor := eq .Comment.Did .Issue.Did }}
-  {{ if $isIssueAuthor }}
-    (author)
-  {{ end }}
-{{ end }}
-
 {{ define "timestamp" }}
   <a href="#comment-{{ .Comment.Rkey }}"
      class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline"
@@ -41,21 +37,23 @@
 
 {{ define "editCommentBtn" }}
   <a
-    class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group cursor-pointer"
+    class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group cursor-pointer hover:no-underline no-underline"
     hx-get="/comment/edit?aturi={{ .Comment.AtUri }}"
   >
     {{ i "pencil" "size-3 inline group-[.htmx-request]:hidden" }}
     {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
+    edit
   </a>
 {{ end }}
 
 {{ define "deleteCommentBtn" }}
   <a
-    class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group cursor-pointer"
+    class="text-red-500 dark:text-red-400 hover:text-red-600 hover:dark:text-red-300 flex gap-1 items-center group cursor-pointer hover:no-underline no-underline"
     hx-delete="/comment?aturi={{ .Comment.AtUri }}"
     hx-confirm="Are you sure you want to delete your comment?"
   >
     {{ i "trash-2" "size-3 inline group-[.htmx-request]:hidden" }}
     {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
+    delete
   </a>
 {{ end }}
diff --git a/appview/pages/templates/fragments/comment/commentList.html b/appview/pages/templates/fragments/comment/commentList.html
index d10715e7..e7697edd 100644
--- a/appview/pages/templates/fragments/comment/commentList.html
+++ b/appview/pages/templates/fragments/comment/commentList.html
@@ -42,7 +42,7 @@
 {{ end }}
 
 {{ define "topLevelComment" }}
-<div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2 ">
+<div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2 group/comment">
   <div class="flex-shrink-0">
     {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8 mr-1" .VouchRelationship) }}
   </div>
@@ -54,7 +54,7 @@
 {{ end }}
 
 {{ define "replyComment" }}
-<div class="py-4 pr-4 w-full mx-auto flex gap-2 ">
+<div class="py-4 pr-4 w-full mx-auto flex gap-2 group/comment">
   <div class="flex-shrink-0">
     {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8 mr-1" .VouchRelationship) }}
   </div>
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index ef816edf..6b7c1df0 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -595,7 +595,6 @@
     </summary>
     <div>
       {{ range $item.Comments }}
-        {{/* template "submissionComment" . */}}
         {{ template "comment"
           (dict "LoggedInUser"      $root.LoggedInUser
                 "Reactions"         (index (asReactionMapMap $root.Reactions) .FeedCommentAtUri)
@@ -636,7 +635,7 @@
 {{ end }}
 
 {{ define "comment" }}
-<div class="flex gap-2 -ml-4 py-4 w-full mx-auto">
+<div class="flex gap-2 -ml-4 py-4 w-full mx-auto group/comment">
   <!-- left column: profile picture -->
   <div class="flex-shrink-0 h-fit relative">
     {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8") }}
diff --git a/appview/state/comment.go b/appview/state/comment.go
index 4af31d6c..207d7e93 100644
--- a/appview/state/comment.go
+++ b/appview/state/comment.go
@@ -460,4 +460,8 @@ func (s *State) DeleteComment(w http.ResponseWriter, r *http.Request) {
 	s.pages.CommentBodyFragment(w, pages.CommentBodyFragmentParams{
 		Comment: comment,
 	})
+	s.pages.CommentHeaderFragment(w, pages.CommentHeaderFragmentParams{
+		Comment:   comment,
+		HxSwapOob: true,
+	})
 }