diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 9db73639..1501f5f9 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -7,6 +7,7 @@
                 name="viewport"
                 content="width=device-width, initial-scale=1.0"
             />
+            <meta name="htmx-config" content='{"includeIndicatorStyles": false}'>
             <script src="/static/htmx.min.js"></script>
             <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />
             <title>{{ block "title" . }}{{ end }} · tangled</title>
diff --git a/appview/pages/templates/repo/fragments/repoActions.html b/appview/pages/templates/repo/fragments/repoActions.html
index dab8386e..64fdb8db 100644
--- a/appview/pages/templates/repo/fragments/repoActions.html
+++ b/appview/pages/templates/repo/fragments/repoActions.html
@@ -2,7 +2,7 @@
     <div class="flex items-center gap-2 z-auto">
         <button
             id="starBtn"
-            class="btn disabled:opacity-50 disabled:cursor-not-allowed"
+            class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"
             {{ if .IsStarred }}
                 hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"
             {{ else }}
@@ -14,16 +14,15 @@
             hx-swap="outerHTML"
             hx-disabled-elt="#starBtn"
         >
-            <div class="flex gap-2 items-center">
-                {{ if .IsStarred }}
-                    {{ i "star" "w-4 h-4 fill-current" }}
-                {{ else }}
-                    {{ i "star" "w-4 h-4" }}
-                {{ end }}
-                <span class="text-sm">
-                    {{ .Stats.StarCount }}
-                </span>
-            </div>
+          {{ if .IsStarred }}
+              {{ i "star" "w-4 h-4 fill-current" }}
+          {{ else }}
+              {{ i "star" "w-4 h-4" }}
+          {{ end }}
+          <span class="text-sm">
+              {{ .Stats.StarCount }}
+          </span>
+          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
         </button>
         {{ if .DisableFork }}
             <button
@@ -36,11 +35,13 @@
             </button>
         {{ else }}
             <a
-                class="btn text-sm no-underline hover:no-underline flex items-center gap-2"
+                class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group"
+                hx-boost="true"
                 href="/{{ .FullName }}/fork"
             >
                 {{ i "git-fork" "w-4 h-4" }}
                 fork
+                {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
             </a>
         {{ end }}
     </div>
diff --git a/appview/pages/templates/repo/new.html b/appview/pages/templates/repo/new.html
index 759028c7..7b912712 100644
--- a/appview/pages/templates/repo/new.html
+++ b/appview/pages/templates/repo/new.html
@@ -5,7 +5,7 @@
   <p class="text-xl font-bold dark:text-white">Create a new repository</p>
 </div>
 <div class="p-6 bg-white dark:bg-gray-800 drop-shadow-sm rounded">
-  <form hx-post="/repo/new" class="space-y-12" hx-swap="none">
+  <form hx-post="/repo/new" class="space-y-12" hx-swap="none" hx-indicator="#spinner">
     <div class="space-y-2">
       <label for="name" class="-mb-1 dark:text-white">Repository name</label>
       <input
@@ -60,7 +60,12 @@
     </fieldset>
 
     <div class="space-y-2">
-      <button type="submit" class="btn">create repo</button>
+      <button type="submit" class="btn flex gap-2 items-center">
+        create repo
+        <span id="spinner" class="group">
+          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        </span>
+      </button>
       <div id="repo" class="error"></div>
     </div>
   </form>
diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html
index 8869b453..c4e4077c 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullActions.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html
@@ -17,9 +17,10 @@
           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">
+          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>
+            {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
         </button>
         {{ if and $isPushAllowed $isOpen $isLastRound }}
           {{ $disabled := "" }}
@@ -30,9 +31,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" {{ $disabled }}>
+            class="btn p-2 flex items-center gap-2 group" {{ $disabled }}>
             {{ i "git-merge" "w-4 h-4" }}
-              <span>merge</span>
+            <span>merge</span>
+            {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
           </button>
         {{ end }}
 
@@ -51,7 +53,7 @@
               {{ end }}
 
               hx-disabled-elt="#resubmitBtn"
-              class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }}
+              class="btn 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"
@@ -59,8 +61,9 @@
               title="Resubmit this pull request"
               {{ end }}
               >
-            {{ i "rotate-ccw" "w-4 h-4" }}
+              {{ i "rotate-ccw" "w-4 h-4" }}
               <span>resubmit</span>
+              {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
           </button>
         {{ end }}
 
@@ -68,9 +71,10 @@
         <button 
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"
           hx-swap="none"
-          class="btn p-2 flex items-center gap-2">
-          {{ i "ban" "w-4 h-4" }}
+          class="btn p-2 flex items-center gap-2 group">
+            {{ i "ban" "w-4 h-4" }}
             <span>close</span>
+            {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
         </button>
         {{ end }}
 
@@ -78,9 +82,10 @@
         <button 
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"
           hx-swap="none"
-          class="btn p-2 flex items-center gap-2">
-          {{ i "refresh-ccw-dot" "w-4 h-4" }}
+          class="btn p-2 flex items-center gap-2 group">
+            {{ i "refresh-ccw-dot" "w-4 h-4" }}
             <span>reopen</span>
+            {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
         </button>
         {{ end }}
     </div>
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 69cb4594..e0115edb 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -51,16 +51,20 @@
               </span>
             </div>
 
-            <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2"
+            <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"
                hx-boost="true"
                href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}">
-              {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">diff</span>
+              {{ i "file-diff" "w-4 h-4" }} 
+              <span class="hidden md:inline">diff</span>
+              {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
             </a>
             {{ if not (eq .RoundNumber 0) }}
-            <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2"
+            <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"
                hx-boost="true"
                href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">
-              {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} <span class="hidden md:inline">interdiff</span>
+              {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}
+              <span class="hidden md:inline">interdiff</span>
+              {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
             </a>
             <span id="interdiff-error-{{.RoundNumber}}"></span>
             {{ end }}
diff --git a/appview/pages/templates/user/fragments/editBio.html b/appview/pages/templates/user/fragments/editBio.html
index b09e44d6..042acd94 100644
--- a/appview/pages/templates/user/fragments/editBio.html
+++ b/appview/pages/templates/user/fragments/editBio.html
@@ -3,7 +3,8 @@
     hx-post="/profile/bio"
     class="flex flex-col gap-4 my-2 max-w-full"
     hx-disabled-elt="#save-btn,#cancel-btn"
-    hx-swap="none">
+    hx-swap="none"
+    hx-indicator="#spinner">
     <div class="flex flex-col gap-1">
       {{ $description := "" }}
       {{ if and .Profile .Profile.Description }}
@@ -75,6 +76,9 @@
     <div class="flex items-center gap-2 justify-between">
       <button id="save-btn" type="submit" class="btn p-1 w-full flex items-center gap-2 no-underline text-sm">
         {{ i "check" "size-4" }} save
+        <span id="spinner" class="group">
+          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+        </span>
       </button>
       <a href="/{{.LoggedInUser.Did}}" class="w-full no-underline hover:no-underline">
         <button id="cancel-btn" type="button" class="btn p-1 w-full flex items-center gap-2 no-underline text-sm">
diff --git a/appview/pages/templates/user/fragments/editPins.html b/appview/pages/templates/user/fragments/editPins.html
index e1c1490f..94c762c6 100644
--- a/appview/pages/templates/user/fragments/editPins.html
+++ b/appview/pages/templates/user/fragments/editPins.html
@@ -3,12 +3,16 @@
     <form
         hx-post="/profile/pins"
         hx-disabled-elt="#save-btn,#cancel-btn"
-        hx-swap="none">
+        hx-swap="none"
+        hx-indicator="#spinner">
       <div class="flex items-center justify-between mb-2">
         <p class="text-sm font-bold p-2 dark:text-white">SELECT PINNED REPOS</p>
         <div class="flex items-center gap-2">
           <button id="save-btn" type="submit" class="btn px-2 flex items-center gap-2 no-underline text-sm">
             {{ i "check" "w-3 h-3" }} save 
+            <span id="spinner" class="group">
+              {{ i "loader-circle" "w-3 h-3 animate-spin hidden group-[.htmx-request]:inline" }}
+            </span>
           </button>
           <a href="/{{.LoggedInUser.Did}}" class="w-full no-underline hover:no-underline">
             <button id="cancel-btn" type="button" class="btn px-2 w-full flex items-center gap-2 no-underline text-sm">
diff --git a/appview/pages/templates/user/fragments/profileCard.html b/appview/pages/templates/user/fragments/profileCard.html
index d917600b..dd69d491 100644
--- a/appview/pages/templates/user/fragments/profileCard.html
+++ b/appview/pages/templates/user/fragments/profileCard.html
@@ -68,12 +68,13 @@
             {{ template "user/fragments/follow" . }}
           {{ else }}
             <button id="editBtn"
-              class="btn mt-2 w-full flex items-center gap-2"
+              class="btn mt-2 w-full flex items-center gap-2 group"
               hx-target="#profile-bio"
               hx-get="/profile/edit-bio"
               hx-swap="innerHTML">
               {{ i "pencil" "w-4 h-4" }}
               edit
+              {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
             </button>
           {{ end }}
         </div>
diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html
index 152b79d9..f69f2fd8 100644
--- a/appview/pages/templates/user/profile.html
+++ b/appview/pages/templates/user/profile.html
@@ -235,9 +235,13 @@
       </span>
     </a>
     {{ if and .LoggedInUser (eq .LoggedInUser.Did .Card.UserDid) }}
-      <button hx-get="profile/edit-pins" hx-target="#all-repos" class="btn font-normal text-sm flex gap-2 items-center">
+      <button 
+        hx-get="profile/edit-pins"
+        hx-target="#all-repos"
+        class="btn font-normal text-sm flex gap-2 items-center group">
         {{ i "pencil" "w-3 h-3" }}
         edit
+        {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
       </button>
     {{ end }}
   </div>