diff --git a/src/components/layout/Spinner.css b/src/components/layout/Spinner.css
index 51721285..aa7cc1bc 100644
--- a/src/components/layout/Spinner.css
+++ b/src/components/layout/Spinner.css
@@ -1,5 +1,4 @@
 .spinner {
-  font-size: 48px;
   width: 1em;
   height: 1em;
   border: 0.12em solid var(--color,white);
diff --git a/src/components/player/atoms/LoadingSpinner.tsx b/src/components/player/atoms/LoadingSpinner.tsx
index 11060b4f..1f5ca202 100644
--- a/src/components/player/atoms/LoadingSpinner.tsx
+++ b/src/components/player/atoms/LoadingSpinner.tsx
@@ -6,5 +6,5 @@ export function LoadingSpinner() {
 
   if (!isLoading) return null;
 
-  return <Spinner />;
+  return <Spinner className="text-4xl" />;
 }
diff --git a/src/pages/parts/admin/BackendTestPart.tsx b/src/pages/parts/admin/BackendTestPart.tsx
index 555a20f7..12f11e36 100644
--- a/src/pages/parts/admin/BackendTestPart.tsx
+++ b/src/pages/parts/admin/BackendTestPart.tsx
@@ -115,10 +115,10 @@ export function BackendTestPart() {
           )}
           <Button
             theme="purple"
+            loading={testState.loading}
             className="whitespace-nowrap"
             onClick={runTests}
           >
-            {testState.loading ? <Spinner className="text-base mr-2" /> : null}
             Test backend
           </Button>
         </div>
diff --git a/src/pages/parts/admin/WorkerTestPart.tsx b/src/pages/parts/admin/WorkerTestPart.tsx
index 2b33d61a..6ce784f7 100644
--- a/src/pages/parts/admin/WorkerTestPart.tsx
+++ b/src/pages/parts/admin/WorkerTestPart.tsx
@@ -113,8 +113,7 @@ export function WorkerTestPart() {
         })}
         <Divider />
         <div className="flex justify-end">
-          <Button theme="purple" onClick={runTests}>
-            {testState.loading ? <Spinner className="text-base mr-2" /> : null}
+          <Button theme="purple" loading={testState.loading} onClick={runTests}>
             Test workers
           </Button>
         </div>