diff --git a/src/App.vue b/src/App.vue
index 0a7ace0181..90e7e30e76 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,11 @@
 <template>
   <router-view />
-  <ProgressSpinner
+  <div
     v-if="isLoading"
-    class="absolute inset-0 flex h-[unset] items-center justify-center"
-  />
+    class="absolute inset-0 flex items-center justify-center"
+  >
+    <Loader size="lg" class="text-white" />
+  </div>
   <GlobalDialog />
   <BlockUI full-screen :blocked="isLoading" />
 </template>
@@ -11,9 +13,9 @@
 <script setup lang="ts">
 import { captureException } from '@sentry/vue'
 import BlockUI from 'primevue/blockui'
-import ProgressSpinner from 'primevue/progressspinner'
 import { computed, onMounted } from 'vue'
 
+import Loader from '@/components/common/Loader.vue'
 import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
 import config from '@/config'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
diff --git a/src/components/common/Loader.stories.ts b/src/components/common/Loader.stories.ts
new file mode 100644
index 0000000000..f2ca9fb0b7
--- /dev/null
+++ b/src/components/common/Loader.stories.ts
@@ -0,0 +1,50 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Loader from './Loader.vue'
+
+const meta: Meta<typeof Loader> = {
+  title: 'Components/Common/Loader',
+  component: Loader,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'centered'
+  },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['sm', 'md', 'lg'],
+      description: 'Spinner size: sm (16px), md (32px), lg (48px)'
+    }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const Small: Story = {
+  args: { size: 'sm' }
+}
+
+export const Medium: Story = {
+  args: { size: 'md' }
+}
+
+export const Large: Story = {
+  args: { size: 'lg' }
+}
+
+export const CustomColor: Story = {
+  render: (args) => ({
+    components: { Loader },
+    setup() {
+      return { args }
+    },
+    template:
+      '<div class="flex gap-4 items-center"><Loader size="lg" class="text-white" /><Loader size="md" class="text-muted-foreground" /><Loader size="sm" class="text-base-foreground" /></div>'
+  }),
+  parameters: {
+    backgrounds: { default: 'dark' }
+  }
+}
diff --git a/src/components/common/Loader.vue b/src/components/common/Loader.vue
new file mode 100644
index 0000000000..34bfcc9d4e
--- /dev/null
+++ b/src/components/common/Loader.vue
@@ -0,0 +1,29 @@
+<template>
+  <span role="status" class="inline-flex">
+    <i
+      aria-hidden="true"
+      :class="cn('icon-[lucide--loader-circle] animate-spin', sizeClass)"
+    />
+    <span class="sr-only">{{ t('g.loading') }}</span>
+  </span>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { size } = defineProps<{
+  size?: 'sm' | 'md' | 'lg'
+}>()
+
+const { t } = useI18n()
+
+const sizeMap = {
+  sm: 'size-4',
+  md: 'size-8',
+  lg: 'size-12'
+} as const
+
+const sizeClass = size ? sizeMap[size] : ''
+</script>
diff --git a/src/components/toast/ProgressToastItem.vue b/src/components/toast/ProgressToastItem.vue
index 079be418f7..f9ee47cbb3 100644
--- a/src/components/toast/ProgressToastItem.vue
+++ b/src/components/toast/ProgressToastItem.vue
@@ -2,6 +2,7 @@
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import StatusBadge from '@/components/common/StatusBadge.vue'
 import type { AssetDownload } from '@/stores/assetDownloadStore'
 import { cn } from '@/utils/tailwindUtil'
@@ -47,9 +48,7 @@ const isPending = computed(() => job.status === 'created')
       </template>
 
       <template v-else-if="isRunning">
-        <i
-          class="icon-[lucide--loader-circle] size-4 animate-spin text-base-foreground"
-        />
+        <Loader size="sm" class="text-base-foreground" />
         <span class="text-xs text-base-foreground">
           {{ progressPercent }}%
         </span>
diff --git a/src/platform/assets/components/ActiveMediaAssetCard.vue b/src/platform/assets/components/ActiveMediaAssetCard.vue
index c0f4622410..db1fcb81bf 100644
--- a/src/platform/assets/components/ActiveMediaAssetCard.vue
+++ b/src/platform/assets/components/ActiveMediaAssetCard.vue
@@ -24,20 +24,14 @@
         class="absolute inset-0 flex items-center justify-center bg-modal-card-placeholder-background"
       >
         <!-- Spinner for queued/initialization states -->
-        <i
-          v-if="isQueued"
-          class="icon-[lucide--loader-circle] size-8 animate-spin text-muted-foreground"
-        />
+        <Loader v-if="isQueued" size="md" class="text-muted-foreground" />
         <!-- Error icon for failed state -->
         <i
           v-else-if="isFailed"
           class="icon-[lucide--circle-alert] size-8 text-red-500"
         />
         <!-- Spinner for running without preview -->
-        <i
-          v-else
-          class="icon-[lucide--loader-circle] size-8 animate-spin text-muted-foreground"
-        />
+        <Loader v-else size="md" class="text-muted-foreground" />
       </div>
       <!-- Cancel/Delete button overlay -->
       <Button
@@ -80,6 +74,7 @@
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useJobActions } from '@/composables/queue/useJobActions'
 import type { JobListItem } from '@/composables/queue/useJobList'
diff --git a/src/platform/assets/components/AssetExportProgressDialog.vue b/src/platform/assets/components/AssetExportProgressDialog.vue
index da1f0f528d..24a9bd2bd6 100644
--- a/src/platform/assets/components/AssetExportProgressDialog.vue
+++ b/src/platform/assets/components/AssetExportProgressDialog.vue
@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import HoneyToast from '@/components/honeyToast/HoneyToast.vue'
 import Button from '@/components/ui/button/Button.vue'
 import type { AssetExport } from '@/stores/assetExportStore'
@@ -146,9 +147,7 @@ function closeDialog() {
                 </Button>
               </template>
               <template v-else-if="job.status === 'running'">
-                <i
-                  class="icon-[lucide--loader-circle] size-4 animate-spin text-base-foreground"
-                />
+                <Loader size="sm" class="text-base-foreground" />
                 <span class="text-xs text-base-foreground">
                   {{ progressPercent(job) }}%
                 </span>
diff --git a/src/platform/assets/components/ModelImportProgressDialog.vue b/src/platform/assets/components/ModelImportProgressDialog.vue
index 92b21e2823..941ce4c969 100644
--- a/src/platform/assets/components/ModelImportProgressDialog.vue
+++ b/src/platform/assets/components/ModelImportProgressDialog.vue
@@ -4,6 +4,7 @@ import Popover from 'primevue/popover'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import HoneyToast from '@/components/honeyToast/HoneyToast.vue'
 import ProgressToastItem from '@/components/toast/ProgressToastItem.vue'
 import Button from '@/components/ui/button/Button.vue'
@@ -175,9 +176,7 @@ function closeDialog() {
       >
         <div class="flex min-w-0 flex-1 items-center gap-2 text-sm">
           <template v-if="isInProgress">
-            <i
-              class="icon-[lucide--loader-circle] size-4 flex-shrink-0 animate-spin text-muted-foreground"
-            />
+            <Loader size="sm" class="flex-shrink-0 text-muted-foreground" />
             <span
               class="min-w-0 flex-1 truncate font-bold text-base-foreground"
             >
diff --git a/src/platform/assets/components/UploadModelFooter.vue b/src/platform/assets/components/UploadModelFooter.vue
index d7ad18198d..4db94dfc3d 100644
--- a/src/platform/assets/components/UploadModelFooter.vue
+++ b/src/platform/assets/components/UploadModelFooter.vue
@@ -49,10 +49,7 @@
       :disabled="!canFetchMetadata || isFetchingMetadata"
       @click="emit('fetchMetadata')"
     >
-      <i
-        v-if="isFetchingMetadata"
-        class="icon-[lucide--loader-circle] animate-spin"
-      />
+      <Loader v-if="isFetchingMetadata" />
       <span>{{ $t('g.continue') }}</span>
     </Button>
     <Button
@@ -63,7 +60,7 @@
       :disabled="!canUploadModel || isUploading"
       @click="emit('upload')"
     >
-      <i v-if="isUploading" class="icon-[lucide--loader-circle] animate-spin" />
+      <Loader v-if="isUploading" />
       <span>{{ $t('assetBrowser.upload') }}</span>
     </Button>
     <template
@@ -109,6 +106,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
+import Loader from '@/components/common/Loader.vue'
 import Button from '@/components/ui/button/Button.vue'
 import VideoHelpDialog from '@/platform/assets/components/VideoHelpDialog.vue'
 
diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.test.ts b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts
index 42e6fc4ae9..fc87bfa530 100644
--- a/src/platform/workspace/auth/WorkspaceAuthGate.test.ts
+++ b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts
@@ -1,6 +1,7 @@
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
+import { createI18n } from 'vue-i18n'
 
 import WorkspaceAuthGate from './WorkspaceAuthGate.vue'
 
@@ -50,10 +51,6 @@ vi.mock('@/platform/distribution/types', () => ({
   }
 }))
 
-vi.mock('primevue/progressspinner', () => ({
-  default: { template: '<div class="progress-spinner" />' }
-}))
-
 describe('WorkspaceAuthGate', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -66,8 +63,11 @@ describe('WorkspaceAuthGate', () => {
     mockWorkspaceStoreInitialize.mockResolvedValue(undefined)
   })
 
+  const i18n = createI18n({ legacy: false })
+
   const mountComponent = () =>
     mount(WorkspaceAuthGate, {
+      global: { plugins: [i18n] },
       slots: {
         default: '<div data-testid="slot-content">App Content</div>'
       }
@@ -81,7 +81,7 @@ describe('WorkspaceAuthGate', () => {
       await flushPromises()
 
       expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
-      expect(wrapper.find('.progress-spinner').exists()).toBe(false)
+      expect(wrapper.find('[role="status"]').exists()).toBe(false)
       expect(mockRefreshRemoteConfig).not.toHaveBeenCalled()
     })
   })
@@ -92,7 +92,7 @@ describe('WorkspaceAuthGate', () => {
 
       const wrapper = mountComponent()
 
-      expect(wrapper.find('.progress-spinner').exists()).toBe(true)
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
       expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(false)
     })
 
@@ -100,7 +100,7 @@ describe('WorkspaceAuthGate', () => {
       mockIsInitialized.value = false
 
       const wrapper = mountComponent()
-      expect(wrapper.find('.progress-spinner').exists()).toBe(true)
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
 
       mockIsInitialized.value = true
       mockCurrentUser.value = null
@@ -180,7 +180,7 @@ describe('WorkspaceAuthGate', () => {
       await flushPromises()
 
       // Still showing spinner before timeout
-      expect(wrapper.find('.progress-spinner').exists()).toBe(true)
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
 
       // Advance past the 10 second timeout
       await vi.advanceTimersByTimeAsync(10_001)
diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.vue b/src/platform/workspace/auth/WorkspaceAuthGate.vue
index 571f8aea92..41a1d60c09 100644
--- a/src/platform/workspace/auth/WorkspaceAuthGate.vue
+++ b/src/platform/workspace/auth/WorkspaceAuthGate.vue
@@ -4,7 +4,7 @@
     v-else
     class="fixed inset-0 z-[1100] flex items-center justify-center bg-[var(--p-mask-background)]"
   >
-    <ProgressSpinner />
+    <Loader size="lg" class="text-white" />
   </div>
 </template>
 
@@ -22,8 +22,8 @@
  * instead of workspace tokens when the workspace feature is enabled.
  */
 import { promiseTimeout, until } from '@vueuse/core'
+import Loader from '@/components/common/Loader.vue'
 import { storeToRefs } from 'pinia'
-import ProgressSpinner from 'primevue/progressspinner'
 import { onMounted, ref } from 'vue'
 
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
diff --git a/src/renderer/extensions/linearMode/LinearControls.vue b/src/renderer/extensions/linearMode/LinearControls.vue
index 290fb8ce78..c8a7eebd68 100644
--- a/src/renderer/extensions/linearMode/LinearControls.vue
+++ b/src/renderer/extensions/linearMode/LinearControls.vue
@@ -5,6 +5,7 @@ import { storeToRefs } from 'pinia'
 import { computed, ref, shallowRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import ScrubableNumberInput from '@/components/common/ScrubableNumberInput.vue'
 import Popover from '@/components/ui/Popover.vue'
 import Button from '@/components/ui/button/Button.vue'
@@ -266,7 +267,7 @@ defineExpose({ runButtonClick })
             </Button>
           </template>
           <template v-else>
-            <i class="icon-[lucide--loader-circle] size-4 animate-spin" />
+            <Loader size="sm" />
             <span v-text="t('queue.jobQueueing')" />
           </template>
         </div>
diff --git a/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue
index e49e08e62b..a1b5d26b52 100644
--- a/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue
+++ b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
 
+import Loader from '@/components/common/Loader.vue'
 import Popover from '@/components/ui/Popover.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCommandStore } from '@/stores/commandStore'
@@ -31,9 +32,7 @@ function clearQueue(close: () => void) {
           size="unset"
           class="size-10 rounded-sm bg-secondary-background flex items-center justify-center"
         >
-          <i
-            class="icon-[lucide--loader-circle] size-4 animate-spin text-muted-foreground"
-          />
+          <Loader size="sm" class="text-muted-foreground" />
         </Button>
       </template>
       <template #default="{ close }">