diff --git a/packages/ui-components/src/lib/components/ButtonLoading.svelte b/packages/ui-components/src/lib/components/ButtonLoading.svelte
new file mode 100644
index 000000000..68f80c735
--- /dev/null
+++ b/packages/ui-components/src/lib/components/ButtonLoading.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import { Button, Spinner } from 'flowbite-svelte';
+
+	export let loading = false;
+	export let disabled = false;
+</script>
+
+<Button disabled={loading || disabled} {...$$props} on:click>
+	{#if loading}
+		<Spinner class="mr-2 h-4 w-4" color="white" />
+	{/if}
+	<slot />
+</Button>
diff --git a/packages/ui-components/src/lib/index.ts b/packages/ui-components/src/lib/index.ts
index 7278e5b90..5e1495983 100644
--- a/packages/ui-components/src/lib/index.ts
+++ b/packages/ui-components/src/lib/index.ts
@@ -34,6 +34,7 @@ export { default as Heading } from './components/Heading.svelte';
 export { default as Text } from './components/Text.svelte';
 export { default as DropdownProperty } from './components/DropdownProperty.svelte';
 export { default as IconError } from './components/IconError.svelte';
+export { default as ButtonLoading } from './components/ButtonLoading.svelte';
 
 //Types
 export type { AppStoresInterface } from './types/appStores.ts';
diff --git a/tauri-app/src/lib/components/ButtonLoading.svelte b/tauri-app/src/lib/components/ButtonLoading.svelte
deleted file mode 100644
index e7a90b868..000000000
--- a/tauri-app/src/lib/components/ButtonLoading.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script lang="ts">
-  import { Button, Spinner } from 'flowbite-svelte';
-
-  export let loading = false;
-  export let disabled = false;
-</script>
-
-<Button disabled={loading || disabled} {...$$props} on:click>
-  {#if loading}
-    <Spinner class="mr-2 h-4 w-4" color="white" />
-  {/if}
-  <slot />
-</Button>
diff --git a/tauri-app/src/lib/components/FileTextarea.svelte b/tauri-app/src/lib/components/FileTextarea.svelte
index 00899bcfa..f64f37070 100644
--- a/tauri-app/src/lib/components/FileTextarea.svelte
+++ b/tauri-app/src/lib/components/FileTextarea.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { TextFileStore } from '$lib/storesGeneric/textFileStore';
-  import ButtonLoading from './ButtonLoading.svelte';
+  import { ButtonLoading } from '@rainlanguage/ui-components';
 
   export let textFile: TextFileStore;
 </script>
diff --git a/tauri-app/src/lib/components/InputLedgerWallet.svelte b/tauri-app/src/lib/components/InputLedgerWallet.svelte
index 0ca49c71f..9bde3dbc6 100644
--- a/tauri-app/src/lib/components/InputLedgerWallet.svelte
+++ b/tauri-app/src/lib/components/InputLedgerWallet.svelte
@@ -7,7 +7,7 @@
   import { reportErrorToSentry } from '$lib/services/sentry';
   import IconWarning from '$lib/components/IconWarning.svelte';
   import { ledgerWalletAddress, ledgerWalletDerivationIndex } from '$lib/stores/wallets';
-  import ButtonLoading from './ButtonLoading.svelte';
+  import { ButtonLoading } from '@rainlanguage/ui-components';
   import { Hash, HashType } from '@rainlanguage/ui-components';
 
   const maskOptions = {
diff --git a/tauri-app/src/lib/components/InputWalletConnect.svelte b/tauri-app/src/lib/components/InputWalletConnect.svelte
index 14d40f0ce..085d129a9 100644
--- a/tauri-app/src/lib/components/InputWalletConnect.svelte
+++ b/tauri-app/src/lib/components/InputWalletConnect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import IconWarning from '$lib/components/IconWarning.svelte';
   import { Alert } from 'flowbite-svelte';
-  import ButtonLoading from './ButtonLoading.svelte';
+  import { ButtonLoading } from '@rainlanguage/ui-components';
   import { Hash, HashType } from '@rainlanguage/ui-components';
   import {
     walletconnectConnect,
diff --git a/tauri-app/src/lib/components/ModalExecute.svelte b/tauri-app/src/lib/components/ModalExecute.svelte
index 3cbcf212c..c22078af7 100644
--- a/tauri-app/src/lib/components/ModalExecute.svelte
+++ b/tauri-app/src/lib/components/ModalExecute.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Button, Modal } from 'flowbite-svelte';
-  import ButtonLoading from '$lib/components/ButtonLoading.svelte';
+  import { ButtonLoading } from '@rainlanguage/ui-components';
   import { settings } from '$lib/stores/settings';
   import { ledgerWalletAddress } from '$lib/stores/wallets';
   import InputLedgerWallet from '$lib/components/InputLedgerWallet.svelte';
diff --git a/tauri-app/src/routes/orders/add/+page.svelte b/tauri-app/src/routes/orders/add/+page.svelte
index 282fd6e0d..1fd43953a 100644
--- a/tauri-app/src/routes/orders/add/+page.svelte
+++ b/tauri-app/src/routes/orders/add/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { PageHeader } from '@rainlanguage/ui-components';
   import CodeMirrorDotrain from '$lib/components/CodeMirrorDotrain.svelte';
-  import ButtonLoading from '$lib/components/ButtonLoading.svelte';
+  import { ButtonLoading } from '@rainlanguage/ui-components';
   import FileTextarea from '$lib/components/FileTextarea.svelte';
   import { Label, Button, Spinner, Tabs, TabItem } from 'flowbite-svelte';
   import { RawRainlangExtension, type Problem } from 'codemirror-rainlang';