diff --git a/src/AliasVault.Client/Auth/Layout/MainLayout.razor b/src/AliasVault.Client/Auth/Layout/MainLayout.razor
index 33f34e513..bc7e95f50 100644
--- a/src/AliasVault.Client/Auth/Layout/MainLayout.razor
+++ b/src/AliasVault.Client/Auth/Layout/MainLayout.razor
@@ -3,7 +3,7 @@
 
 <div class="flex flex-col items-center justify-center px-6 pt-8 pb-8 mx-auto md:h-screen pt:mt-0 dark:bg-gray-900">
     <Logo />
-    <div class="w-full max-w-xl p-6 space-y-4 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">
+    <div class="w-full max-w-xl p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">
         <GlobalNotificationDisplay />
         @Body
     </div>
diff --git a/src/AliasVault.Client/Auth/Pages/Login.razor b/src/AliasVault.Client/Auth/Pages/Login.razor
index fa52f7e7b..0a17fb846 100644
--- a/src/AliasVault.Client/Auth/Pages/Login.razor
+++ b/src/AliasVault.Client/Auth/Pages/Login.razor
@@ -173,7 +173,7 @@ else
     /// </summary>
     private async Task HandleLogin()
     {
-        _loadingIndicator.Show();
+        _loadingIndicator.Show("Logging in...");
         _serverValidationErrors.Clear();
 
         try
@@ -279,7 +279,7 @@ else
     /// </summary>
     private async Task HandleRecoveryCode()
     {
-        _loadingIndicator.Show();
+        _loadingIndicator.Show("Verifying recovery code...");
         _serverValidationErrors.Clear();
 
         try
@@ -337,7 +337,7 @@ else
     /// </summary>
     private async Task Handle2Fa()
     {
-        _loadingIndicator.Show();
+        _loadingIndicator.Show("Verifying 2FA code...");
         _serverValidationErrors.Clear();
 
         try
diff --git a/src/AliasVault.Client/Auth/Pages/Register.razor b/src/AliasVault.Client/Auth/Pages/Register.razor
index 4033dda18..3b3c0ba99 100644
--- a/src/AliasVault.Client/Auth/Pages/Register.razor
+++ b/src/AliasVault.Client/Auth/Pages/Register.razor
@@ -53,7 +53,7 @@
 
     private async Task HandleRegister()
     {
-        _loadingIndicator.Show();
+        _loadingIndicator.Show("Creating account...");
         _serverValidationErrors.Clear();
 
         var (success, errorMessage) = await UserRegistrationService.RegisterUserAsync(_registerModel.Username, _registerModel.Password);
diff --git a/src/AliasVault.Client/Auth/Pages/Unlock.razor b/src/AliasVault.Client/Auth/Pages/Unlock.razor
index d56b7623c..7a89de539 100644
--- a/src/AliasVault.Client/Auth/Pages/Unlock.razor
+++ b/src/AliasVault.Client/Auth/Pages/Unlock.razor
@@ -114,7 +114,7 @@ else
     /// </summary>
     private async Task UnlockSubmit()
     {
-        _loadingIndicator.Show();
+        _loadingIndicator.Show("Unlocking vault...");
         _serverValidationErrors.Clear();
 
         try
diff --git a/src/AliasVault.Client/Main/Components/Loading/BoldLoadingIndicator.razor b/src/AliasVault.Client/Main/Components/Loading/BoldLoadingIndicator.razor
index 9c42888ec..074ccd94e 100644
--- a/src/AliasVault.Client/Main/Components/Loading/BoldLoadingIndicator.razor
+++ b/src/AliasVault.Client/Main/Components/Loading/BoldLoadingIndicator.razor
@@ -1,4 +1,47 @@
-<svg class="mx-auto animate-spin h-12 w-12 text-primary-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-</svg>
+<div class="aliasvault-spinner mx-auto">
+  <div class="cloud-shape-inverted">
+    <div class="dot-inverted delay-1"></div>
+    <div class="dot-inverted delay-2"></div>
+    <div class="dot-inverted delay-3"></div>
+    <div class="dot-inverted delay-4"></div>
+  </div>
+</div>
+
+<style>
+.aliasvault-spinner {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 51px;
+  width: 112px;
+}
+
+.cloud-shape-inverted {
+  border: 6px solid #eabf69;
+  border-radius: 9999px;
+  padding: 13px 26px;
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  background-color: transparent;
+  box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.1);
+}
+
+.dot-inverted {
+  width: 10px;
+  height: 10px;
+  border-radius: 9999px;
+  background-color: #eabf69;
+  animation: pulse-inverted 1.4s infinite ease-in-out;
+}
+
+.delay-1 { animation-delay: 0s; }
+.delay-2 { animation-delay: 0.2s; }
+.delay-3 { animation-delay: 0.4s; }
+.delay-4 { animation-delay: 0.6s; }
+
+@@keyframes pulse-inverted {
+  0%, 100% { opacity: 0.3; transform: scale(1); }
+  50% { opacity: 1; transform: scale(1.3); }
+}
+</style>
diff --git a/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor b/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor
index 9a14f2e5e..d2a668f8c 100644
--- a/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor
+++ b/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor
@@ -1,25 +1,35 @@
 @if (IsVisible)
 {
     <div class="loading fixed inset-0 w-full h-full z-50 bg-gray-200 !m-0 !p-0 dark:bg-gray-500" style="z-index: 2147483641 !important;">
-        <div class="spinner">
-            <div class="rect1 bg-gray-900 dark:bg-white"></div>
-            <div class="rect2 bg-gray-900 dark:bg-white"></div>
-            <div class="rect3 bg-gray-900 dark:bg-white"></div>
-            <div class="rect4 bg-gray-900 dark:bg-white"></div>
-            <div class="rect5 bg-gray-900 dark:bg-white"></div>
+        <div class="aliasvault-fullscreen-spinner mx-auto">
+            <div class="cloud-shape-inverted">
+                <div class="dot-inverted delay-1"></div>
+                <div class="dot-inverted delay-2"></div>
+                <div class="dot-inverted delay-3"></div>
+                <div class="dot-inverted delay-4"></div>
+            </div>
+            @if (!string.IsNullOrEmpty(LoadingMessage))
+            {
+                <div class="loading-message mt-4 text-center text-gray-700 dark:text-gray-300">
+                    @LoadingMessage
+                </div>
+            }
         </div>
     </div>
 }
 
 @code {
     private bool IsVisible { get; set; }
+    private string LoadingMessage { get; set; } = string.Empty;
 
     /// <summary>
     /// Shows the loading indicator.
     /// </summary>
-    public void Show()
+    /// <param name="message">Optional message to display below the loading spinner.</param>
+    public void Show(string? message = null)
     {
         IsVisible = true;
+        LoadingMessage = message ?? string.Empty;
         StateHasChanged();
     }
 
@@ -29,6 +39,77 @@
     public void Hide()
     {
         IsVisible = false;
+        LoadingMessage = string.Empty;
         StateHasChanged();
     }
 }
+
+<style>
+.loading {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(255, 255, 255, 0.9);
+}
+
+.dark .loading {
+    background-color: rgba(107, 114, 128, 0.9);
+}
+
+.aliasvault-fullscreen-spinner {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 160px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.aliasvault-spinner {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 51px;
+  width: auto;
+}
+
+.cloud-shape-inverted {
+  border: 6px solid #eabf69;
+  border-radius: 9999px;
+  padding: 13px 26px;
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.1);
+}
+
+.dot-inverted {
+  width: 10px;
+  height: 10px;
+  border-radius: 9999px;
+  background-color: #eabf69;
+  animation: pulse-inverted 1.4s infinite ease-in-out;
+}
+
+.delay-1 { animation-delay: 0s; }
+.delay-2 { animation-delay: 0.2s; }
+.delay-3 { animation-delay: 0.4s; }
+.delay-4 { animation-delay: 0.6s; }
+
+@@keyframes pulse-inverted {
+  0%, 100% { opacity: 0.3; transform: scale(1); }
+  50% { opacity: 1; transform: scale(1.3); }
+}
+
+.loading-message {
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+    max-width: 300px;
+    word-wrap: break-word;
+}
+</style>
diff --git a/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor.css b/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor.css
deleted file mode 100644
index 6f18e266b..000000000
--- a/src/AliasVault.Client/Main/Components/Loading/FullScreenLoadingIndicator.razor.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.loading {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    opacity: 0.9;
-}
-
-.spinner {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    margin-top: -20px;
-    margin-left: -25px;
-    width: 50px;
-    height: 40px;
-    text-align: center;
-    font-size: 10px;
-}
-
-.spinner>div {
-    z-index: 999;
-    height: 100%;
-    width: 6px;
-    display: inline-block;
-    -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
-    animation: sk-stretchdelay 1.2s infinite ease-in-out;
-}
-
-.spinner .rect2 {
-    -webkit-animation-delay: -1.1s;
-    animation-delay: -1.1s;
-}
-
-.spinner .rect3 {
-    -webkit-animation-delay: -1.0s;
-    animation-delay: -1.0s;
-}
-
-.spinner .rect4 {
-    -webkit-animation-delay: -0.9s;
-    animation-delay: -0.9s;
-}
-
-.spinner .rect5 {
-    -webkit-animation-delay: -0.8s;
-    animation-delay: -0.8s;
-}
-
-@-webkit-keyframes sk-stretchdelay {
-    0%,
-    40%,
-    100% {
-        -webkit-transform: scaleY(0.4)
-    }
-    20% {
-        -webkit-transform: scaleY(1.0)
-    }
-}
-
-@keyframes sk-stretchdelay {
-    0%,
-    40%,
-    100% {
-        transform: scaleY(0.4);
-        -webkit-transform: scaleY(0.4);
-    }
-    20% {
-        transform: scaleY(1.0);
-        -webkit-transform: scaleY(1.0);
-    }
-}
diff --git a/src/AliasVault.Client/Main/Components/Loading/LoadingIndicator.razor b/src/AliasVault.Client/Main/Components/Loading/LoadingIndicator.razor
index 9628844fc..cb4197027 100644
--- a/src/AliasVault.Client/Main/Components/Loading/LoadingIndicator.razor
+++ b/src/AliasVault.Client/Main/Components/Loading/LoadingIndicator.razor
@@ -1,7 +1,49 @@
 <div role="status" class="px-4 mt-4">
-    <svg aria-hidden="true" class="inline w-10 h-10 text-gray-200 animate-spin dark:text-gray-600 fill-primary-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-        <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-    </svg>
-    <span class="sr-only">Loading...</span>
+  <div class="aliasvault-spinner-inline">
+    <div class="cloud-shape-inline-enhanced">
+      <div class="dot-inline delay-1"></div>
+      <div class="dot-inline delay-2"></div>
+      <div class="dot-inline delay-3"></div>
+      <div class="dot-inline delay-4"></div>
+    </div>
+  </div>
+  <span class="sr-only">Loading...</span>
 </div>
+
+<style>
+.aliasvault-spinner-inline {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  height: 32px;
+  width: auto;
+}
+
+.cloud-shape-inline-enhanced {
+  background-color: #eabf69;
+  border-radius: 9999px;
+  padding: 8px 20px;
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.dot-inline {
+  width: 8px;
+  height: 8px;
+  border-radius: 9999px;
+  background-color: #ffffff;
+  animation: pulse-inline 1.4s infinite ease-in-out;
+}
+
+.delay-1 { animation-delay: 0s; }
+.delay-2 { animation-delay: 0.2s; }
+.delay-3 { animation-delay: 0.4s; }
+.delay-4 { animation-delay: 0.6s; }
+
+@@keyframes pulse-inline {
+  0%, 100% { opacity: 0.3; transform: scale(1); }
+  50% { opacity: 1; transform: scale(1.3); }
+}
+</style>
diff --git a/src/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor b/src/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor
index 71b4d191f..bd4bdad6c 100644
--- a/src/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor
+++ b/src/AliasVault.Client/Main/Components/Widgets/CreateNewIdentityWidget.razor
@@ -146,7 +146,7 @@
         }
 
         IsCreating = true;
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Creating new alias...");
         StateHasChanged();
 
         var credential = new Credential();
diff --git a/src/AliasVault.Client/Main/Layout/MainLayout.razor b/src/AliasVault.Client/Main/Layout/MainLayout.razor
index a4517208e..2ecdafdec 100644
--- a/src/AliasVault.Client/Main/Layout/MainLayout.razor
+++ b/src/AliasVault.Client/Main/Layout/MainLayout.razor
@@ -48,13 +48,12 @@
     {
         if (GlobalLoadingService.IsLoading)
         {
-            LoadingIndicator.Show();
+            LoadingIndicator.Show(GlobalLoadingService.LoadingMessage);
         }
         else
         {
             LoadingIndicator.Hide();
         }
-
         StateHasChanged();
     }
 }
diff --git a/src/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor b/src/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
index 19a702b3c..3c517f5ad 100644
--- a/src/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
+++ b/src/AliasVault.Client/Main/Pages/Credentials/AddEdit.razor
@@ -339,7 +339,7 @@ else
     /// </summary>
     private async Task SaveAlias()
     {
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Saving vault...");
         StateHasChanged();
 
         if (EditMode)
diff --git a/src/AliasVault.Client/Main/Pages/Credentials/Delete.razor b/src/AliasVault.Client/Main/Pages/Credentials/Delete.razor
index c6d07d7dd..b7231e966 100644
--- a/src/AliasVault.Client/Main/Pages/Credentials/Delete.razor
+++ b/src/AliasVault.Client/Main/Pages/Credentials/Delete.razor
@@ -81,7 +81,7 @@ else
             return;
         }
 
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Deleting credential...");
         if (await CredentialService.SoftDeleteEntryAsync(Id))
         {
             GlobalNotificationService.AddSuccessMessage("Credentials entry successfully deleted.");
diff --git a/src/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor b/src/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
index 04589e8be..185462f5b 100644
--- a/src/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
+++ b/src/AliasVault.Client/Main/Pages/Settings/Security/ChangePassword.razor
@@ -133,7 +133,7 @@ else
     /// </summary>
     private async Task InitiatePasswordChange()
     {
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Changing password...");
         GlobalNotificationService.ClearMessages();
         StateHasChanged();
 
diff --git a/src/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor b/src/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
index 70d451dfa..afc768dbf 100644
--- a/src/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
+++ b/src/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
@@ -140,7 +140,7 @@
     /// </summary>
     private async Task DeleteAccountConfirmed()
     {
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Deleting account...");
         GlobalNotificationService.ClearMessages();
 
         try
diff --git a/src/AliasVault.Client/Main/Pages/Welcome.razor b/src/AliasVault.Client/Main/Pages/Welcome.razor
index 485678e50..3927fc817 100644
--- a/src/AliasVault.Client/Main/Pages/Welcome.razor
+++ b/src/AliasVault.Client/Main/Pages/Welcome.razor
@@ -181,7 +181,7 @@
 
     private async Task FinishTutorial()
     {
-        GlobalLoadingSpinner.Show();
+        GlobalLoadingSpinner.Show("Finishing tutorial...");
         await DbService.Settings.SetTutorialDoneAsync(true);
         NavigationManager.NavigateTo("credentials");
         GlobalLoadingSpinner.Hide();
diff --git a/src/AliasVault.Client/Services/GlobalLoadingService.cs b/src/AliasVault.Client/Services/GlobalLoadingService.cs
index afc3c51c4..8c01dae79 100644
--- a/src/AliasVault.Client/Services/GlobalLoadingService.cs
+++ b/src/AliasVault.Client/Services/GlobalLoadingService.cs
@@ -13,6 +13,7 @@ namespace AliasVault.Client.Services;
 public sealed class GlobalLoadingService
 {
     private bool _isLoading;
+    private string _loadingMessage = string.Empty;
 
     /// <summary>
     /// Occurs when the loading state changes.
@@ -35,13 +36,38 @@ public sealed class GlobalLoadingService
         }
     }
 
+    /// <summary>
+    /// Gets the current loading message.
+    /// </summary>
+    public string LoadingMessage
+    {
+        get => _loadingMessage;
+        private set
+        {
+            if (_loadingMessage != value)
+            {
+                _loadingMessage = value;
+                OnChange?.Invoke();
+            }
+        }
+    }
+
     /// <summary>
     /// Show the global loading spinner.
     /// </summary>
-    public void Show() => IsLoading = true;
+    /// <param name="message">Optional message to display below the loading spinner.</param>
+    public void Show(string? message = null)
+    {
+        LoadingMessage = message ?? string.Empty;
+        IsLoading = true;
+    }
 
     /// <summary>
     /// Hide the global loading spinner.
     /// </summary>
-    public void Hide() => IsLoading = false;
+    public void Hide()
+    {
+        IsLoading = false;
+        LoadingMessage = string.Empty;
+    }
 }
diff --git a/src/AliasVault.Client/wwwroot/css/tailwind.css b/src/AliasVault.Client/wwwroot/css/tailwind.css
index 16d93475d..a187ff265 100644
--- a/src/AliasVault.Client/wwwroot/css/tailwind.css
+++ b/src/AliasVault.Client/wwwroot/css/tailwind.css
@@ -1600,6 +1600,11 @@ video {
   background-color: rgb(254 252 232 / var(--tw-bg-opacity));
 }
 
+.bg-amber-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(254 243 199 / var(--tw-bg-opacity));
+}
+
 .bg-opacity-50 {
   --tw-bg-opacity: 0.5;
 }
@@ -2031,6 +2036,11 @@ video {
   color: rgb(133 77 14 / var(--tw-text-opacity));
 }
 
+.text-amber-700 {
+  --tw-text-opacity: 1;
+  color: rgb(180 83 9 / var(--tw-text-opacity));
+}
+
 .opacity-0 {
   opacity: 0;
 }
@@ -2744,6 +2754,11 @@ video {
   color: rgb(250 204 21 / var(--tw-text-opacity));
 }
 
+.dark\:text-amber-300:is(.dark *) {
+  --tw-text-opacity: 1;
+  color: rgb(252 211 77 / var(--tw-text-opacity));
+}
+
 .dark\:placeholder-gray-400:is(.dark *)::-moz-placeholder {
   --tw-placeholder-opacity: 1;
   color: rgb(156 163 175 / var(--tw-placeholder-opacity));
diff --git a/src/AliasVault.Client/wwwroot/index.template.html b/src/AliasVault.Client/wwwroot/index.template.html
index ed4cb0abf..2dddd3ed3 100644
--- a/src/AliasVault.Client/wwwroot/index.template.html
+++ b/src/AliasVault.Client/wwwroot/index.template.html
@@ -41,10 +41,14 @@
                 <div class="p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">
                     <div class="text-center">
                         <div class="inner">
-                            <svg class="mx-auto animate-spin h-12 w-12 text-primary-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-                            </svg>
+                            <div class="index-aliasvault-inline-spinner mx-auto">
+                                <div class="index-cloud-shape-inline">
+                                    <div class="index-dot-inline index-delay-1"></div>
+                                    <div class="index-dot-inline index-delay-2"></div>
+                                    <div class="index-dot-inline index-delay-3"></div>
+                                    <div class="index-dot-inline index-delay-4"></div>
+                                </div>
+                            </div>
                             <h2 class="mt-4 text-xl font-semibold text-gray-900 dark:text-white">AliasVault is loading</h2>
                             <p class="mt-2 text-sm text-gray-500 dark:text-gray-400">
                                 Initializing secure environment. AliasVault prioritizes your privacy by running entirely in your browser. The first load might take a short while.
@@ -56,6 +60,45 @@
                             <div id="error-message" class="hidden text-red-600 dark:text-red-400 mt-4"></div>
                         </div>
                     </div>
+                    
+                    <style>
+                    .index-aliasvault-inline-spinner {
+                        height: 51px;
+                        width: 112px;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                    }
+
+                    .index-cloud-shape-inline {
+                        border: 6px solid #eabf69;
+                        border-radius: 9999px;
+                        padding: 13px 26px;
+                        display: flex;
+                        gap: 10px;
+                        align-items: center;
+                        background-color: transparent;
+                        box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.1);
+                    }
+
+                    .index-dot-inline {
+                        width: 10px;
+                        height: 10px;
+                        border-radius: 9999px;
+                        background-color: #eabf69;
+                        animation: index-pulse-inverted 1.4s infinite ease-in-out;
+                    }
+
+                    .index-delay-1 { animation-delay: 0s; }
+                    .index-delay-2 { animation-delay: 0.2s; }
+                    .index-delay-3 { animation-delay: 0.4s; }
+                    .index-delay-4 { animation-delay: 0.6s; }
+                    
+                    @keyframes index-pulse-inverted {
+                        0%, 100% { opacity: 0.3; transform: scale(1); }
+                        50% { opacity: 1; transform: scale(1.3); }
+                    }
+                    </style>                    
                 </div>
 
                 <div id="refresh-button" class="text-center w-full mt-4 p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800 hidden">