diff --git a/.changeset/remove-spinner-hardcoded-margin.md b/.changeset/remove-spinner-hardcoded-margin.md
new file mode 100644
index 0000000000..aa1f6ac750
--- /dev/null
+++ b/.changeset/remove-spinner-hardcoded-margin.md
@@ -0,0 +1,5 @@
+---
+"@cloudoperators/juno-ui-components": patch
+---
+
+Remove hardcoded `jn:mr-3` margin from Spinner component. The margin was applied globally, causing layout issues when Spinner is used inside components like Button that manage their own spacing. Callers that relied on the built-in margin have been updated to add the margin explicitly.
diff --git a/apps/doop/src/components/shared/HintLoading.tsx b/apps/doop/src/components/shared/HintLoading.tsx
index abd558efb2..4d5df4b4cb 100644
--- a/apps/doop/src/components/shared/HintLoading.tsx
+++ b/apps/doop/src/components/shared/HintLoading.tsx
@@ -9,7 +9,7 @@ import { Stack, Spinner } from "@cloudoperators/juno-ui-components"
 const HintLoading = ({ text, className }: any) => {
   return (
     <Stack alignment="center" className={className}>
-      <Spinner variant="primary" />
+      <Spinner variant="primary" className="mr-3" />
       {text ? <span>{text}</span> : <span>Loading...</span>}
     </Stack>
   )
diff --git a/apps/greenhouse/src/components/Auth.tsx b/apps/greenhouse/src/components/Auth.tsx
index 225744383f..26a4147ceb 100644
--- a/apps/greenhouse/src/components/Auth.tsx
+++ b/apps/greenhouse/src/components/Auth.tsx
@@ -29,7 +29,7 @@ const Auth = ({ children }: any) => {
     <Stack alignment="center" distribution="center" direction="vertical" className="h-screen">
       {authIsProcessing ? (
         <>
-          <Spinner className="mx-6 mb-3" variant="primary" size="1.5rem"></Spinner>
+          <Spinner className="mx-6 mb-3 mr-3" variant="primary" size="1.5rem"></Spinner>
           Signing on...
         </>
       ) : (
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/shared/HintLoading.tsx b/apps/greenhouse/src/components/core-apps/org-admin/components/shared/HintLoading.tsx
index 2d1a401a21..f49e9fb59e 100644
--- a/apps/greenhouse/src/components/core-apps/org-admin/components/shared/HintLoading.tsx
+++ b/apps/greenhouse/src/components/core-apps/org-admin/components/shared/HintLoading.tsx
@@ -22,7 +22,7 @@ const HintLoading = ({ text, centered }: any) => {
   return (
     <Stack {...stackProps}>
       <Stack alignment="center">
-        <Spinner variant="primary" />
+        <Spinner variant="primary" className="mr-3" />
         {text ? <span>{text}</span> : <span>Loading...</span>}
       </Stack>
     </Stack>
diff --git a/apps/greenhouse/src/components/shared/HintLoading.tsx b/apps/greenhouse/src/components/shared/HintLoading.tsx
index 39d4337a89..c4edbb4a64 100644
--- a/apps/greenhouse/src/components/shared/HintLoading.tsx
+++ b/apps/greenhouse/src/components/shared/HintLoading.tsx
@@ -10,7 +10,7 @@ import { Stack, Spinner } from "@cloudoperators/juno-ui-components"
 const HintLoading = ({ text }: any) => {
   return (
     <Stack alignment="center">
-      <Spinner variant="primary" />
+      <Spinner variant="primary" className="mr-3" />
       {text ? <span>{text}</span> : <span>Loading...</span>}
     </Stack>
   )
diff --git a/packages/ui-components/src/components/Spinner/Spinner.component.tsx b/packages/ui-components/src/components/Spinner/Spinner.component.tsx
index dc15b084c5..9eecaf1d43 100644
--- a/packages/ui-components/src/components/Spinner/Spinner.component.tsx
+++ b/packages/ui-components/src/components/Spinner/Spinner.component.tsx
@@ -7,7 +7,6 @@ import React, { HTMLProps, ReactNode } from "react"
 
 const spinnerBaseStyles = `
   jn:animate-spin 
-  jn:mr-3 
   jn:h-5 
   jn:w-5 
 `