diff --git a/appview/pages/templates/fragments/comment/edit.html b/appview/pages/templates/fragments/comment/edit.html
index 6689e3fa..359365e6 100644
--- a/appview/pages/templates/fragments/comment/edit.html
+++ b/appview/pages/templates/fragments/comment/edit.html
@@ -27,11 +27,11 @@
 {{ define "save" }}
   <button
     type="submit"
-    class="btn-create flex gap-1 items-center group text-sm"
+    class="btn-create-flat flex gap-1 items-center group text-sm"
   >
-    {{ i "check" "size-4" }}
+    {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+    {{ i "check" "size-4 inline group-[.htmx-request]:hidden" }}
     Save
-    {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
   </button>
 {{ end }}
 
diff --git a/appview/pages/templates/repo/issues/fragments/putIssue.html b/appview/pages/templates/repo/issues/fragments/putIssue.html
index 2fb97f63..b41aaf6f 100644
--- a/appview/pages/templates/repo/issues/fragments/putIssue.html
+++ b/appview/pages/templates/repo/issues/fragments/putIssue.html
@@ -26,8 +26,8 @@
     <div class="flex justify-between">
       <div id="issues" class="error"></div>
       <div class="flex gap-2 items-stretch">
-        <a 
-          class="btn-flat flex items-center gap-2 no-underline hover:no-underline"
+        <a
+          class="btn-flat text-red-500 dark:text-red-400 flex items-center gap-2 no-underline hover:no-underline"
           type="button"
           {{ if .Issue }}
             href="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}"
@@ -41,11 +41,12 @@
         <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" }}
+            {{ i "check" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
+            Save
           {{ else }}
             {{ i "circle-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
+            Create issue
           {{ end }}
-          {{ .Action | capitalize }}
         </button>
       </div>
     </div>
diff --git a/appview/pages/templates/repo/pulls/fragments/pullEdit.html b/appview/pages/templates/repo/pulls/fragments/pullEdit.html
index 2f956dfa..c39009f1 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullEdit.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullEdit.html
@@ -23,17 +23,17 @@
       <div id="pulls" 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 text-red-500 dark:text-red-400 flex items-center gap-2 no-underline hover:no-underline"
           type="button"
           href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}"
         >
           {{ i "x" "size-4" }}
           Cancel
         </a>
-        <button type="submit" class="btn-create group flex items-center gap-2">
-          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-          {{ i "pencil" "size-4 inline group-[.htmx-request]:hidden" }}
-          edit
+        <button type="submit" class="btn-create-flat group flex items-center gap-2">
+          {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+          {{ i "check" "size-4 inline group-[.htmx-request]:hidden" }}
+          Save
         </button>
       </div>
     </div>
diff --git a/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html b/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
index 40471cf1..daa1476b 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
@@ -71,11 +71,11 @@
             class="btn-create flex items-center gap-2"
             hx-indicator="#create-pull-spinner"
         >
-            {{ i "git-pull-request-create" "w-4 h-4" }}
-            Create pull request
-            <span id="create-pull-spinner" class="group">
+            <span id="create-pull-spinner" class="group flex items-center">
                 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+                {{ i "git-pull-request-create" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
             </span>
+            Create pull request
         </button>
     </div>
 {{ end }}