From 917e4a0e339796aedb4f452afd6f4a95f2dfe7b8 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Tue, 8 Jul 2025 13:46:10 -0600
Subject: [PATCH 1/3] Update to use spinner-solid in Button

---
 src/lib/holocene/button.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/holocene/button.svelte b/src/lib/holocene/button.svelte
index b78af0b051..1f5f1bf71f 100644
--- a/src/lib/holocene/button.svelte
+++ b/src/lib/holocene/button.svelte
@@ -134,7 +134,7 @@
   >
     {#if leadingIcon || loading}
       <span class:animate-spin={loading}>
-        <Icon name={loading ? 'spinner' : leadingIcon} />
+        <Icon name={loading ? 'spinner-solid' : leadingIcon} />
       </span>
     {/if}
     <slot />
@@ -169,7 +169,7 @@
   >
     {#if leadingIcon || loading}
       <span class:animate-spin={loading}>
-        <Icon name={loading ? 'spinner' : leadingIcon} />
+        <Icon name={loading ? 'spinner-solid' : leadingIcon} />
       </span>
     {/if}
     <slot />

From cf5030c65bb339c1fee53a727cb7077e6d073cc5 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Wed, 9 Jul 2025 10:32:26 -0600
Subject: [PATCH 2/3] Move loading icon after text

---
 src/lib/holocene/button.svelte | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/lib/holocene/button.svelte b/src/lib/holocene/button.svelte
index 1f5f1bf71f..912c623a17 100644
--- a/src/lib/holocene/button.svelte
+++ b/src/lib/holocene/button.svelte
@@ -132,15 +132,15 @@
     tabindex={href ? null : 0}
     {...$$restProps}
   >
-    {#if leadingIcon || loading}
-      <span class:animate-spin={loading}>
-        <Icon name={loading ? 'spinner-solid' : leadingIcon} />
+    {#if leadingIcon}
+      <span>
+        <Icon name={leadingIcon} />
       </span>
     {/if}
     <slot />
-    {#if trailingIcon}
-      <span>
-        <Icon name={trailingIcon} />
+    {#if trailingIcon || loading}
+      <span class:animate-spin={loading}>
+        <Icon name={loading ? 'spinner-solid' : trailingIcon} />
       </span>
     {/if}
     {#if count > 0}
@@ -167,15 +167,16 @@
     )}
     {...$$restProps}
   >
-    {#if leadingIcon || loading}
-      <span class:animate-spin={loading}>
-        <Icon name={loading ? 'spinner-solid' : leadingIcon} />
+    {#if leadingIcon}
+      <span>
+        <Icon name={leadingIcon} />
       </span>
     {/if}
     <slot />
-    {#if trailingIcon}
-      <span>
-        <Icon name={trailingIcon} />
+
+    {#if trailingIcon || loading}
+      <span class:animate-spin={loading}>
+        <Icon name={loading ? 'spinner-solid' : trailingIcon} />
       </span>
     {/if}
     {#if count > 0}

From b4d1f7f9e66735bacf67d9ce81da2612000234c3 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Wed, 9 Jul 2025 10:33:33 -0600
Subject: [PATCH 3/3] Update stroke on spinner solid icon

---
 src/lib/holocene/icon/svg/spinner-solid.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/holocene/icon/svg/spinner-solid.svelte b/src/lib/holocene/icon/svg/spinner-solid.svelte
index 3d6e37f4e8..e79ebb1423 100644
--- a/src/lib/holocene/icon/svg/spinner-solid.svelte
+++ b/src/lib/holocene/icon/svg/spinner-solid.svelte
@@ -7,8 +7,8 @@
   <path
     d="M12 3C16.9706 3 21 7.02944 21 12C21 14.4853 19.9926 16.7353 18.364 18.364"
     stroke="currentcolor"
-    stroke-width="2"
-    stroke-linecap="round"
-    stroke-linejoin="round"
+    stroke-width="3"
+    stroke-linecap="square"
+    stroke-linejoin="miter"
   />
 </Svg>