diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index 3efcdfec..e4019584 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "e.g Space for product team",
   "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
   "Edit": "Edit",
+  "Read": "Read",
   "Edit group": "Edit group",
   "Email": "Email",
   "Enter a strong password": "Enter a strong password",
@@ -500,5 +501,31 @@
   "Failed to load subpages": "Failed to load subpages",
   "No subpages": "No subpages",
   "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page"
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace." : "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/src/ee/security/components/allowed-domains.tsx b/apps/client/src/ee/security/components/allowed-domains.tsx
index 6576c460..d1050975 100644
--- a/apps/client/src/ee/security/components/allowed-domains.tsx
+++ b/apps/client/src/ee/security/components/allowed-domains.tsx
@@ -55,9 +55,11 @@ export default function AllowedDomains() {
   return (
     <>
       <div>
-        <Text size="md">Allowed email domains</Text>
+        <Text size="md">{t("Allowed email domains")}</Text>
         <Text size="sm" c="dimmed">
-          Only users with email addresses from these domains can signup via SSO.
+          {t(
+            "Only users with email addresses from these domains can signup via SSO.",
+          )}
         </Text>
       </div>
       <form onSubmit={form.onSubmit(handleSubmit)}>
diff --git a/apps/client/src/ee/security/components/sso-google-form.tsx b/apps/client/src/ee/security/components/sso-google-form.tsx
index 97a39a3b..ddd14b0f 100644
--- a/apps/client/src/ee/security/components/sso-google-form.tsx
+++ b/apps/client/src/ee/security/components/sso-google-form.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { z } from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { Box, Button, Group, Stack, Switch, TextInput } from "@mantine/core";
 import classes from "@/ee/security/components/sso.module.css";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
diff --git a/apps/client/src/ee/security/components/sso-ldap-form.tsx b/apps/client/src/ee/security/components/sso-ldap-form.tsx
index c570a51c..662e8458 100644
--- a/apps/client/src/ee/security/components/sso-ldap-form.tsx
+++ b/apps/client/src/ee/security/components/sso-ldap-form.tsx
@@ -110,7 +110,7 @@ export function SsoLDAPForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Company LDAP"
             data-autofocus
             {...form.getInputProps("name")}
@@ -155,7 +155,7 @@ export function SsoLDAPForm({ provider, onClose }: SsoFormProps) {
           <Accordion variant="separated">
             <Accordion.Item value="advanced">
               <Accordion.Control icon={<IconInfoCircle size={20} />}>
-                Advanced Settings
+                {t("Advanced Settings")}
               </Accordion.Control>
               <Accordion.Panel>
                 <Stack>
diff --git a/apps/client/src/ee/security/components/sso-oidc-form.tsx b/apps/client/src/ee/security/components/sso-oidc-form.tsx
index b1c19aa4..6f12e5d2 100644
--- a/apps/client/src/ee/security/components/sso-oidc-form.tsx
+++ b/apps/client/src/ee/security/components/sso-oidc-form.tsx
@@ -83,7 +83,7 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Google SSO"
             data-autofocus
             {...form.getInputProps("name")}
diff --git a/apps/client/src/ee/security/components/sso-provider-modal.tsx b/apps/client/src/ee/security/components/sso-provider-modal.tsx
index bf05dd54..6bc90017 100644
--- a/apps/client/src/ee/security/components/sso-provider-modal.tsx
+++ b/apps/client/src/ee/security/components/sso-provider-modal.tsx
@@ -6,6 +6,7 @@ import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { SsoOIDCForm } from "@/ee/security/components/sso-oidc-form.tsx";
 import { SsoGoogleForm } from "@/ee/security/components/sso-google-form.tsx";
 import { SsoLDAPForm } from "@/ee/security/components/sso-ldap-form.tsx";
+import { useTranslation } from "react-i18next";
 
 interface SsoModalProps {
   opened: boolean;
@@ -18,6 +19,8 @@ export default function SsoProviderModal({
   onClose,
   provider,
 }: SsoModalProps) {
+  const { t } = useTranslation();
+
   if (!provider) {
     return null;
   }
@@ -25,7 +28,9 @@ export default function SsoProviderModal({
   return (
     <Modal
       opened={opened}
-      title={`${provider.type.toUpperCase()} Configuration`}
+      title={t("{{ssoProviderType}} configuration", {
+        ssoProviderType: provider.type.toUpperCase(),
+      })}
       onClose={onClose}
     >
       {provider.type === SSO_PROVIDER.SAML && (
diff --git a/apps/client/src/ee/security/components/sso-saml-form.tsx b/apps/client/src/ee/security/components/sso-saml-form.tsx
index 696277bd..bf374697 100644
--- a/apps/client/src/ee/security/components/sso-saml-form.tsx
+++ b/apps/client/src/ee/security/components/sso-saml-form.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { z } from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import {
   Box,
   Button,
@@ -91,7 +92,7 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Azure Entra"
             data-autofocus
             {...form.getInputProps("name")}
diff --git a/apps/client/src/features/search/components/search-result-item.tsx b/apps/client/src/features/search/components/search-result-item.tsx
index 76b74f29..8b7fb80e 100644
--- a/apps/client/src/features/search/components/search-result-item.tsx
+++ b/apps/client/src/features/search/components/search-result-item.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Group, Center, Text, Badge, ActionIcon } from "@mantine/core";
+import { Group, Center, Text, Badge, ActionIcon, Tooltip } from "@mantine/core";
 import { Spotlight } from "@mantine/spotlight";
 import { Link } from "react-router-dom";
 import { IconFile, IconDownload } from "@tabler/icons-react";
@@ -10,6 +10,7 @@ import {
   IPageSearch,
 } from "@/features/search/types/search.types";
 import DOMPurify from "dompurify";
+import { useTranslation } from "react-i18next";
 
 interface SearchResultItemProps {
   result: IPageSearch | IAttachmentSearch;
@@ -22,6 +23,8 @@ export function SearchResultItem({
   isAttachmentResult,
   showSpace,
 }: SearchResultItemProps) {
+  const { t } = useTranslation();
+  
   if (isAttachmentResult) {
     const attachmentResult = result as IAttachmentSearch;
 
@@ -68,14 +71,15 @@ export function SearchResultItem({
             )}
           </div>
 
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            onClick={handleDownload}
-            title="Download attachment"
-          >
-            <IconDownload size={18} />
-          </ActionIcon>
+          <Tooltip label={t("Download attachment")} withArrow>
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              onClick={handleDownload}
+            >
+              <IconDownload size={18} />
+            </ActionIcon>
+          </Tooltip>
         </Group>
       </Spotlight.Action>
     );
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.tsx b/apps/client/src/features/search/components/search-spotlight-filters.tsx
index d8f770e7..ce8bda02 100644
--- a/apps/client/src/features/search/components/search-spotlight-filters.tsx
+++ b/apps/client/src/features/search/components/search-spotlight-filters.tsx
@@ -75,10 +75,10 @@ export function SearchSpotlightFilters({
   }, []);
 
   const contentTypeOptions = [
-    { value: "page", label: "Pages" },
+    { value: "page", label: t("Pages") },
     {
       value: "attachment",
-      label: "Attachments",
+      label: t("Attachments"),
       disabled: !hasLicenseKey,
     },
   ];
@@ -136,13 +136,13 @@ export function SearchSpotlightFilters({
             fw={500}
           >
             {selectedSpaceId
-              ? `Space: ${selectedSpaceData?.name || "Unknown"}`
-              : "Space: All spaces"}
+              ? `${t("Space")}: ${selectedSpaceData?.name || t("Unknown")}`
+              : `${t("Space")}: ${t("All spaces")}`}
           </Button>
         </Menu.Target>
         <Menu.Dropdown>
           <TextInput
-            placeholder="Find a space"
+            placeholder={t("Find a space")}
             data-autofocus
             autoFocus
             leftSection={<IconSearch size={16} />}
@@ -160,15 +160,15 @@ export function SearchSpotlightFilters({
                 <Avatar
                   color="initials"
                   variant="filled"
-                  name="All spaces"
+                  name={t("All spaces")}
                   size={20}
                 />
                 <div style={{ flex: 1 }}>
                   <Text size="sm" fw={500}>
-                    All spaces
+                    {t("All spaces")}
                   </Text>
                   <Text size="xs" c="dimmed">
-                    Search in all your spaces
+                    {t("Search in all your spaces")}
                   </Text>
                 </div>
                 {!selectedSpaceId && <IconCheck size={20} />}
@@ -217,8 +217,8 @@ export function SearchSpotlightFilters({
             fw={500}
           >
             {contentType
-              ? `Type: ${contentTypeOptions.find((opt) => opt.value === contentType)?.label || contentType}`
-              : "Type"}
+              ? `${t("Type")}: ${contentTypeOptions.find((opt) => opt.value === contentType)?.label || t(contentType === "page" ? "Pages" : "Attachments")}`
+              : t("Type")}
           </Button>
         </Menu.Target>
         <Menu.Dropdown>
@@ -237,7 +237,7 @@ export function SearchSpotlightFilters({
                   <Text size="sm">{option.label}</Text>
                   {option.disabled && (
                     <Badge size="xs" mt={4}>
-                      Enterprise
+                      {t("Enterprise")}
                     </Badge>
                   )}
                 </div>