diff --git a/apps/server/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor b/apps/server/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
index 2822dfa3b..4da37d428 100644
--- a/apps/server/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Credentials/FormattedNote.razor
@@ -1,13 +1,17 @@
 @using System.Text.RegularExpressions
+@using Microsoft.Extensions.Localization
+@inject IStringLocalizerFactory LocalizerFactory
 
 <div class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-    <h3 class="mb-4 text-xl font-semibold dark:text-white">Notes</h3>
+    <h3 class="mb-4 text-xl font-semibold dark:text-white">@SharedLocalizer["Notes"]</h3>
     <div class="dark:text-gray-300">
         @((MarkupString)ConvertUrlsToLinks(Notes).Replace(Environment.NewLine, "<br>"))
     </div>
 </div>
 
 @code {
+    private IStringLocalizer SharedLocalizer => LocalizerFactory.Create("SharedResources", "AliasVault.Client");
+
     /// <summary>
     /// The notes to display.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Layout/DbLockButton.razor b/apps/server/AliasVault.Client/Main/Layout/DbLockButton.razor
index 072074182..85f8501b5 100644
--- a/apps/server/AliasVault.Client/Main/Layout/DbLockButton.razor
+++ b/apps/server/AliasVault.Client/Main/Layout/DbLockButton.razor
@@ -1,9 +1,11 @@
-@inject DbService DbService
+@using Microsoft.Extensions.Localization
+@inject DbService DbService
 @inject AuthService AuthService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizerFactory LocalizerFactory
 
 <div class="ms-2 items-center hidden lg:flex">
-    <button class="p-2 hover:bg-gray-200 rounded-2xl" @onclick="OnLockClick" title="Lock vault">
+    <button class="p-2 hover:bg-gray-200 rounded-2xl" @onclick="OnLockClick" title="@SharedLocalizer["LockVault"]">
         <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-gray-400" viewBox="0 0 20 20" fill="currentColor">
             <path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd" />
         </svg>
@@ -11,6 +13,8 @@
 </div>
 
 @code {
+    private IStringLocalizer SharedLocalizer => LocalizerFactory.Create("SharedResources", "AliasVault.Client");
+
     /// <summary>
     /// Lock the database.
     /// </summary>
diff --git a/apps/server/AliasVault.Client/Main/Layout/DbStatusIndicator.razor b/apps/server/AliasVault.Client/Main/Layout/DbStatusIndicator.razor
index d9b2bab12..bb3d131c8 100644
--- a/apps/server/AliasVault.Client/Main/Layout/DbStatusIndicator.razor
+++ b/apps/server/AliasVault.Client/Main/Layout/DbStatusIndicator.razor
@@ -1,8 +1,10 @@
-@implements IDisposable
+@using Microsoft.Extensions.Localization
+@implements IDisposable
 @inject DbService DbService
+@inject IStringLocalizerFactory LocalizerFactory
 
 <div class="ms-1 items-center flex">
-    <SmallLoadingIndicator Title="Sync vault data" Spinning="@Loading">
+    <SmallLoadingIndicator Title="@SharedLocalizer["SyncVaultData"]" Spinning="@Loading">
         @if (!Loading)
         {
             <button class="absolute p-2 hover:bg-gray-200 rounded-2xl" id="vault-refresh-btn" @onclick="OnRefreshClick">
@@ -15,6 +17,8 @@
 </div>
 
 @code {
+    private IStringLocalizer SharedLocalizer => LocalizerFactory.Create("SharedResources", "AliasVault.Client");
+
     private bool Loading { get; set; } = false;
     private string LoadingIndicatorMessage { get; set; } = "";
     private bool DatabaseLoading { get; set; } = false;
diff --git a/apps/server/AliasVault.Client/Main/Pages/MainBase.cs b/apps/server/AliasVault.Client/Main/Pages/MainBase.cs
index c6c4cd7c1..28089a3d1 100644
--- a/apps/server/AliasVault.Client/Main/Pages/MainBase.cs
+++ b/apps/server/AliasVault.Client/Main/Pages/MainBase.cs
@@ -117,7 +117,7 @@ public abstract class MainBase : OwningComponentBase
         _parametersInitialSet = false;
 
         // Add base breadcrumbs
-        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Home", Url = NavigationManager.BaseUri });
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = SharedLocalizer["Home"], Url = NavigationManager.BaseUri });
 
         bool willRedirect = await RedirectIfNoEncryptionKey();
         if (willRedirect)
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
index c349141cf..dabf0441a 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/Security/DeleteAccount.razor
@@ -42,7 +42,7 @@
 
                 <div class="flex space-x-3">
                     <Button Type="submit" Color="danger">@Localizer["ContinueWithAccountDeletion"]</Button>
-                    <Button Type="button" Color="secondary" OnClick="Cancel">Cancel</Button>
+                    <Button Type="button" Color="secondary" OnClick="Cancel">@SharedLocalizer["Cancel"]</Button>
                 </div>
             </EditForm>
         </div>
@@ -70,7 +70,7 @@
 
                 <div class="flex space-x-3">
                     <Button Type="submit" Color="danger">@Localizer["DeleteMyAccount"]</Button>
-                    <Button Type="button" Color="secondary" OnClick="Cancel">Cancel</Button>
+                    <Button Type="button" Color="secondary" OnClick="Cancel">@SharedLocalizer["Cancel"]</Button>
                 </div>
             </EditForm>
         </div>
diff --git a/apps/server/AliasVault.Client/Resources/SharedResources.en.resx b/apps/server/AliasVault.Client/Resources/SharedResources.en.resx
index f0d3ae151..900b1516a 100644
--- a/apps/server/AliasVault.Client/Resources/SharedResources.en.resx
+++ b/apps/server/AliasVault.Client/Resources/SharedResources.en.resx
@@ -293,4 +293,22 @@
     <value>Password is required</value>
     <comment>Error message when password is required</comment>
   </data>
+  
+  <!-- General UI text -->
+  <data name="LockVault" xml:space="preserve">
+    <value>Lock vault</value>
+    <comment>Tooltip text for lock vault button</comment>
+  </data>
+  <data name="Home" xml:space="preserve">
+    <value>Home</value>
+    <comment>Home breadcrumb text</comment>
+  </data>
+  <data name="Notes" xml:space="preserve">
+    <value>Notes</value>
+    <comment>Notes section heading</comment>
+  </data>
+  <data name="SyncVaultData" xml:space="preserve">
+    <value>Sync vault data</value>
+    <comment>Tooltip text for sync vault data button</comment>
+  </data>
 </root>
\ No newline at end of file