diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html
index ca9241a6..9ffb0b4e 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullActions.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html
@@ -22,22 +22,22 @@
   {{ $isLastRound := eq $roundNumber $lastIdx }}
   {{ $isSameRepoBranch := .Pull.IsBranchBased }}
   {{ $isUpToDate := .ResubmitCheck.No }}
-  <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative">
+  <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative p-2">
     <button 
       hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"
       hx-target="#actions-{{$roundNumber}}"
       hx-swap="outerHtml"
-      class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group">
-        {{ i "message-square-plus" "w-4 h-4" }}
-        <span>comment</span>
+      class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group">
+        {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
         {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        comment
     </button>
     {{ if .BranchDeleteStatus }}
       <button 
         hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches"
         hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }'
         hx-swap="none"
-        class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300">
+        class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300">
           {{ i "git-branch" "w-4 h-4" }}
           <span>delete branch</span>
           {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
@@ -52,10 +52,10 @@
         hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"
         hx-swap="none"
         hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?"
-        class="btn p-2 flex items-center gap-2 group" {{ $disabled }}>
-        {{ i "git-merge" "w-4 h-4" }}
-        <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span>
+        class="btn-flat p-2 flex items-center gap-2 group" {{ $disabled }}>
+        {{ i "git-merge" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
         {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        merge{{if $stackCount}} {{$stackCount}}{{end}}
       </button>
     {{ end }}
 
@@ -74,7 +74,7 @@
           {{ end }}
 
           hx-disabled-elt="#resubmitBtn"
-          class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }}
+          class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }}
 
           {{ if $disabled }}
           title="Update this branch to resubmit this pull request"
@@ -82,9 +82,9 @@
           title="Resubmit this pull request"
           {{ end }}
           >
-          {{ i "rotate-ccw" "w-4 h-4" }}
-          <span>resubmit</span>
+          {{ i "rotate-ccw" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
           {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+          resubmit
       </button>
     {{ end }}
 
@@ -92,10 +92,10 @@
     <button 
       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"
       hx-swap="none"
-      class="btn p-2 flex items-center gap-2 group">
-        {{ i "ban" "w-4 h-4" }}
-        <span>close</span>
+      class="btn-flat p-2 flex items-center gap-2 group">
+        {{ i "ban" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
         {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        close
     </button>
     {{ end }}
 
@@ -103,10 +103,10 @@
     <button 
       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"
       hx-swap="none"
-      class="btn p-2 flex items-center gap-2 group">
-        {{ i "refresh-ccw-dot" "w-4 h-4" }}
-        <span>reopen</span>
+      class="btn-flat p-2 flex items-center gap-2 group">
+        {{ i "refresh-ccw-dot" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
         {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        reopen
     </button>
     {{ end }}
   </div>