diff --git a/appview/pages/templates/fragments/starBtn.html b/appview/pages/templates/fragments/starBtn.html
index 08982701..12c8d505 100644
--- a/appview/pages/templates/fragments/starBtn.html
+++ b/appview/pages/templates/fragments/starBtn.html
@@ -15,13 +15,13 @@
         hx-disabled-elt="#starBtn"
     >
         {{ if .IsStarred }}
-            {{ i "star" "w-4 h-4 fill-current" }}
+            {{ i "star" "w-4 h-4 fill-current inline group-[.htmx-request]:hidden" }}
         {{ else }}
-            {{ i "star" "w-4 h-4" }}
+            {{ i "star" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
         {{ end }}
+        {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
         <span class="text-sm">
             {{ .StarCount }}
         </span>
-        {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
     </button>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html
index 9ffb0b4e..10d3126c 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullActions.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html
@@ -38,9 +38,9 @@
         hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }'
         hx-swap="none"
         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 "git-branch" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
           {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+          delete branch
       </button>
     {{ end }}
     {{ if and $isPushAllowed $isOpen $isLastRound }}
diff --git a/appview/pages/templates/user/fragments/follow.html b/appview/pages/templates/user/fragments/follow.html
index b5214caa..08c0166d 100644
--- a/appview/pages/templates/user/fragments/follow.html
+++ b/appview/pages/templates/user/fragments/follow.html
@@ -13,10 +13,13 @@
     hx-swap="outerHTML"
     >
     {{ if eq .FollowStatus.String "IsNotFollowing" }}
-      {{ i "user-round-plus" "w-4 h-4" }} follow
+      {{ i "user-round-plus" "size-4 inline group-[.htmx-request]:hidden" }} 
+      {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+      follow
     {{ else }}
-      {{ i "user-round-minus" "w-4 h-4" }} unfollow
+      {{ i "user-round-minus" "size-4 inline group-[.htmx-request]:hidden" }} 
+      {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+      unfollow
     {{ end }}
-    {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
   </button>
 {{ end }}