diff --git a/frontend/src/lib/forms/Button.svelte b/frontend/src/lib/forms/Button.svelte
index b2f8c1e9c..595e951ba 100644
--- a/frontend/src/lib/forms/Button.svelte
+++ b/frontend/src/lib/forms/Button.svelte
@@ -7,13 +7,16 @@
   export let type: undefined | 'submit' = undefined;
   export let size: undefined | 'btn-sm' = undefined;
   export let disabled = false;
+  export let customLoader = false;
 </script>
 
 <!-- https://daisyui.com/components/button -->
 <button on:click {...$$restProps} class="btn whitespace-nowrap {variant ?? ''} {$$restProps.class ?? ''} {size ?? ''}" {type}
   class:btn-outline={outline}
   disabled={disabled && !loading}
-  class:pointer-events-none={loading}>
-  <Loader {loading} />
+  class:pointer-events-none={loading || $$restProps.class?.includes('pointer-events-none')}>
+  {#if !customLoader}
+    <Loader {loading} />
+  {/if}
   <slot />
 </button>
diff --git a/frontend/src/lib/icons/Icon.svelte b/frontend/src/lib/icons/Icon.svelte
index 99fa52775..874b49d13 100644
--- a/frontend/src/lib/icons/Icon.svelte
+++ b/frontend/src/lib/icons/Icon.svelte
@@ -10,6 +10,8 @@
   export let size: IconSize = 'text-lg';
   export let color: `text-${string}` | undefined = undefined;
   export let pale = false;
+  export let spin = false;
+  export let spinReverse = false;
   // For pixel perfect text alignment, because the svgs often contain vertical white-space
   export let y: string | undefined = undefined;
 
@@ -17,5 +19,5 @@
 </script>
 
 {#if icon}
-  <span class="{icon} {size} {color ?? ''} shrink-0" class:pale style:transform />
+  <span class="{icon} {size} {color ?? ''} shrink-0 {spinReverse ? 'transform rotate-180' : ''}" class:pale style:transform class:animate-spin={spin} />
 {/if}
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
index ec4a4bb70..76ea3ef35 100644
--- a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
@@ -55,6 +55,7 @@
   import { onMount } from 'svelte';
   import { getSearchParamValues } from '$lib/util/query-params';
   import FlexModelVersionText from '$lib/components/Projects/FlexModelVersionText.svelte';
+  import CrdtSyncButton from './CrdtSyncButton.svelte';
 
   export let data: PageData;
   $: user = data.user;
@@ -312,6 +313,7 @@
         </a>
       {/if}
       {#if project.type === ProjectType.FlEx && $isDev}
+        <CrdtSyncButton projectId={project.id} />
         <OpenInFlexModal bind:this={openInFlexModal} {project}/>
         <OpenInFlexButton projectId={project.id} on:click={openInFlexModal.open}/>
       {:else}
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/CrdtSyncButton.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/CrdtSyncButton.svelte
new file mode 100644
index 000000000..4c27935b3
--- /dev/null
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/CrdtSyncButton.svelte
@@ -0,0 +1,43 @@
+<script lang="ts">
+  import {Button} from '$lib/forms';
+  import {Icon} from '$lib/icons';
+  import {useNotifications} from '$lib/notify';
+
+  export let projectId: string;
+
+  const {notifySuccess, notifyWarning} = useNotifications();
+
+  let syncing = false;
+
+  async function triggerSync(): Promise<void> {
+    syncing = true;
+    try {
+      const response = await fetch(`/api/crdt/crdt-sync/${projectId}`, {
+        method: 'POST',
+      });
+
+      if (response.ok) {
+        const { crdtChanges, fwdataChanges } = await response.json();
+        notifySuccess(`Synced successfully (${fwdataChanges} FwData changes. ${crdtChanges} CRDT changes)`);
+      } else {
+        const error = `Failed to sync: ${response.statusText} (${response.status})`;
+        notifyWarning(error);
+        console.error(error, await response.text());
+      }
+    } finally {
+      syncing = false;
+    }
+  }
+</script>
+
+<Button
+  variant="btn-primary"
+  class="gap-1"
+  on:click={triggerSync}
+  loading={syncing}
+  customLoader
+>
+  FwData
+  <Icon icon="i-mdi-sync" spin={syncing} spinReverse />
+  CRDT
+</Button>