diff --git a/appview/pages/templates/fragments/comment/edit.html b/appview/pages/templates/fragments/comment/edit.html
index be0d74e0..3c060801 100644
--- a/appview/pages/templates/fragments/comment/edit.html
+++ b/appview/pages/templates/fragments/comment/edit.html
@@ -19,7 +19,7 @@
 {{ end }}
 
 {{ define "editActions" }}
-  <div class="flex flex-wrap items-center justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm pt-2">
+  <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm pt-2">
     {{ template "cancel" . }}
     {{ template "save" . }}
   </div>
@@ -28,7 +28,7 @@
 {{ define "save" }}
   <button
     type="submit"
-    class="btn-create py-0 flex gap-1 items-center group text-sm"
+    class="btn-create flex gap-1 items-center group text-sm"
   >
     {{ i "check" "size-4" }}
     Save
@@ -38,7 +38,7 @@
 
 {{ define "cancel" }}
   <button
-    class="btn py-0 text-red-500 dark:text-red-400 flex gap-1 items-center group"
+    class="btn-flat text-red-500 dark:text-red-400 flex gap-1 items-center group"
     hx-get="/comment?aturi={{ .Comment.AtUri }}"
     hx-target="closest form"
     hx-swap="outerHTML"
diff --git a/appview/pages/templates/fragments/comment/reply.html b/appview/pages/templates/fragments/comment/reply.html
index 42e61068..e115627c 100644
--- a/appview/pages/templates/fragments/comment/reply.html
+++ b/appview/pages/templates/fragments/comment/reply.html
@@ -20,7 +20,7 @@
 {{ end }}
 
 {{ define "replyActions" }}
-  <div class="flex flex-wrap items-center justify-end gap-2 text-gray-500 dark:text-gray-400">
+  <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400">
     <div id="comment-error" class="error ml-auto"></div>
     {{ template "cancel" . }}
     {{ template "reply" . }}
@@ -29,7 +29,7 @@
 
 {{ define "cancel" }}
   <button
-    class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group"
+    class="btn-flat text-red-500 dark:text-red-400 flex gap-2 items-center group"
     hx-get="/comment/reply/placeholder"
     hx-target="closest form"
     hx-swap="outerHTML"
@@ -42,7 +42,7 @@
 {{ define "reply" }}
   <button
     type="submit"
-    class="btn-create flex items-center gap-2 no-underline hover:no-underline"
+    class="btn-create-flat flex items-center gap-2 no-underline hover:no-underline"
   >
     {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
diff --git a/appview/pages/templates/repo/issues/fragments/putIssue.html b/appview/pages/templates/repo/issues/fragments/putIssue.html
index b91aa146..0353cb4a 100644
--- a/appview/pages/templates/repo/issues/fragments/putIssue.html
+++ b/appview/pages/templates/repo/issues/fragments/putIssue.html
@@ -28,7 +28,7 @@
       <div id="issues" class="error"></div>
       <div class="flex gap-2 items-stretch">
         <a 
-          class="btn flex items-center gap-2 no-underline hover:no-underline"
+          class="btn-flat flex items-center gap-2 no-underline hover:no-underline"
           type="button"
           {{ if .Issue }}
             href="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}"
@@ -39,7 +39,7 @@
           {{ i "x" "w-4 h-4" }}
           Cancel
         </a>
-        <button type="submit" class="btn-create flex items-center gap-2">
+        <button type="submit" class="btn-create-flat flex items-center gap-2">
           {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
           {{ if eq .Action "edit" }}
             {{ i "pencil" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
index 80142c11..496f99dc 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
@@ -6,7 +6,6 @@
     hx-post="/comment"
     hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea"
     hx-swap="none"
-    hx-indicator="find button[type='submit']"
     hx-disabled-elt="find button[type='submit']"
     hx-on::after-request="if(event.detail.successful) this.reset()"
   >