diff --git a/appview/pages/templates/repo/issues/fragments/putIssue.html b/appview/pages/templates/repo/issues/fragments/putIssue.html
index 55cb1d78..d71d4f5c 100644
--- a/appview/pages/templates/repo/issues/fragments/putIssue.html
+++ b/appview/pages/templates/repo/issues/fragments/putIssue.html
@@ -8,7 +8,7 @@
   {{ end }}
   hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(#title,#body)"
   hx-swap="none"
-  hx-indicator="#spinner">
+  class="group">
   <div class="flex flex-col gap-2">
     <div>
       <label for="title">title</label>
@@ -26,7 +26,7 @@
     </div>
     <div class="flex justify-between">
       <div id="issues" class="error"></div>
-      <div class="flex gap-2 items-center">
+      <div class="flex gap-2 items-stretch">
         <a 
           class="btn flex items-center gap-2 no-underline hover:no-underline"
           type="button"
@@ -39,17 +39,14 @@
           {{ i "x" "w-4 h-4" }}
           cancel
         </a>
-        <button type="submit" class="btn-create flex items-center gap-2">
+        <button type="submit" class="btnkcreate 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" }}
-            {{ .Action }} issue
+            {{ i "pencil" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
           {{ else }}
-            {{ i "circle-plus" "w-4 h-4" }}
-            {{ .Action }} issue
+            {{ i "circle-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
           {{ end }}
-          <span id="spinner" class="group">
-            {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-          </span>
+          {{ .Action }}
         </button>
       </div>
     </div>
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index ac485f7f..e17656f8 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -105,7 +105,7 @@
     hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/"
     hx-confirm="Are you sure you want to delete your issue?"
     hx-swap="none">
-    {{ i "trash-2" "size-3" }}
+    {{ i "trash-2" "size-3 inline group-[.htmx-request]:hidden" }}
     {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
   </a>
 {{ end }}