diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index c6ae8023..7be4b568 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -69,10 +69,28 @@
       "noData": "No existing Chatbots"
     },
     "analytics": {
-      "label": "Analytics"
+      "label": "Analytics",
+      "filterByChatbot": "Filter by chatbot",
+      "selectChatbot": "Select chatbot",
+      "filterOptions": {
+        "hour": "Hour",
+        "last24Hours": "24 Hours",
+        "last7Days": "7 Days",
+        "last15Days": "15 Days",
+        "last30Days": "30 Days"
+      },
+      "messages": "Messages",
+      "tokenUsage": "Token Usage",
+      "feedback": "Feedback",
+      "filterPlaceholder": "Filter",
+      "none": "None"
     },
     "logs": {
-      "label": "Logs"
+      "label": "Logs",
+      "filterByChatbot": "Filter by chatbot",
+      "selectChatbot": "Select chatbot",
+      "none": "None",
+      "tableHeader": "API generated / chatbot conversations"
     },
     "tools": {
       "label": "Tools"
diff --git a/frontend/src/settings/Analytics.tsx b/frontend/src/settings/Analytics.tsx
index 8baad361..8f3c45bb 100644
--- a/frontend/src/settings/Analytics.tsx
+++ b/frontend/src/settings/Analytics.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   BarElement,
   CategoryScale,
@@ -28,15 +29,29 @@ ChartJS.register(
   Legend,
 );
 
-const filterOptions = [
-  { label: 'Hour', value: 'last_hour' },
-  { label: '24 Hours', value: 'last_24_hour' },
-  { label: '7 Days', value: 'last_7_days' },
-  { label: '15 Days', value: 'last_15_days' },
-  { label: '30 Days', value: 'last_30_days' },
-];
-
 export default function Analytics() {
+  const { t } = useTranslation();
+
+  const filterOptions = [
+    { label: t('settings.analytics.filterOptions.hour'), value: 'last_hour' },
+    {
+      label: t('settings.analytics.filterOptions.last24Hours'),
+      value: 'last_24_hour',
+    },
+    {
+      label: t('settings.analytics.filterOptions.last7Days'),
+      value: 'last_7_days',
+    },
+    {
+      label: t('settings.analytics.filterOptions.last15Days'),
+      value: 'last_15_days',
+    },
+    {
+      label: t('settings.analytics.filterOptions.last30Days'),
+      value: 'last_30_days',
+    },
+  ];
+
   const [messagesData, setMessagesData] = useState<Record<
     string,
     number
@@ -165,7 +180,7 @@ export default function Analytics() {
       <div className="flex flex-col items-start">
         <div className="flex flex-col gap-3">
           <p className="font-bold text-jet dark:text-bright-gray">
-            Filter by chatbot
+            {t('settings.analytics.filterByChatbot')}
           </p>
           <Dropdown
             size="w-[55vw] sm:w-[360px]"
@@ -174,9 +189,9 @@ export default function Analytics() {
                 label: chatbot.name,
                 value: chatbot.id,
               })),
-              { label: 'None', value: '' },
+              { label: t('settings.analytics.none'), value: '' },
             ]}
-            placeholder="Select chatbot"
+            placeholder={t('settings.analytics.selectChatbot')}
             onSelect={(chatbot: { label: string; value: string }) => {
               setSelectedChatbot(
                 chatbots.find((item) => item.id === chatbot.value),
@@ -199,12 +214,12 @@ export default function Analytics() {
           <div className="h-[345px] [@media(min-width:1080px)]:w-1/2 w-full px-6 py-5 border rounded-2xl border-silver dark:border-silver/40 overflow-hidden">
             <div className="flex flex-row items-center justify-start gap-3">
               <p className="font-bold text-jet dark:text-bright-gray">
-                Messages
+                {t('settings.analytics.messages')}
               </p>
               <Dropdown
                 size="w-[125px]"
                 options={filterOptions}
-                placeholder="Filter"
+                placeholder={t('settings.analytics.filterPlaceholder')}
                 onSelect={(selectedOption: {
                   label: string;
                   value: string;
@@ -232,7 +247,7 @@ export default function Analytics() {
                     ),
                     datasets: [
                       {
-                        label: 'Messages',
+                        label: t('settings.analytics.messages'),
                         data: Object.values(messagesData || {}),
                         backgroundColor: '#7D54D1',
                       },
@@ -250,12 +265,12 @@ export default function Analytics() {
           <div className="h-[345px] [@media(min-width:1080px)]:w-1/2 w-full px-6 py-5 border rounded-2xl border-silver dark:border-silver/40 overflow-hidden">
             <div className="flex flex-row items-center justify-start gap-3">
               <p className="font-bold text-jet dark:text-bright-gray">
-                Token Usage
+                {t('settings.analytics.tokenUsage')}
               </p>
               <Dropdown
                 size="w-[125px]"
                 options={filterOptions}
-                placeholder="Filter"
+                placeholder={t('settings.analytics.filterPlaceholder')}
                 onSelect={(selectedOption: {
                   label: string;
                   value: string;
@@ -283,7 +298,7 @@ export default function Analytics() {
                     ),
                     datasets: [
                       {
-                        label: 'Tokens',
+                        label: t('settings.analytics.tokenUsage'),
                         data: Object.values(tokenUsageData || {}),
                         backgroundColor: '#7D54D1',
                       },
@@ -303,12 +318,12 @@ export default function Analytics() {
           <div className="h-[345px] w-full px-6 py-5 border rounded-2xl border-silver dark:border-silver/40 overflow-hidden">
             <div className="flex flex-row items-center justify-start gap-3">
               <p className="font-bold text-jet dark:text-bright-gray">
-                Feedback
+                {t('settings.analytics.feedback')}
               </p>
               <Dropdown
                 size="w-[125px]"
                 options={filterOptions}
-                placeholder="Filter"
+                placeholder={t('settings.analytics.filterPlaceholder')}
                 onSelect={(selectedOption: {
                   label: string;
                   value: string;
@@ -336,14 +351,14 @@ export default function Analytics() {
                     ),
                     datasets: [
                       {
-                        label: 'Positive Feedback',
+                        label: t('settings.analytics.positiveFeedback'),
                         data: Object.values(feedbackData || {}).map(
                           (item) => item.positive,
                         ),
                         backgroundColor: '#7D54D1',
                       },
                       {
-                        label: 'Negative Feedback',
+                        label: t('settings.analytics.negativeFeedback'),
                         data: Object.values(feedbackData || {}).map(
                           (item) => item.negative,
                         ),
diff --git a/frontend/src/settings/Logs.tsx b/frontend/src/settings/Logs.tsx
index 1e248d46..df406122 100644
--- a/frontend/src/settings/Logs.tsx
+++ b/frontend/src/settings/Logs.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import userService from '../api/services/userService';
 import ChevronRight from '../assets/chevron-right.svg';
@@ -8,6 +9,7 @@ import { APIKeyData, LogData } from './types';
 import CoppyButton from '../components/CopyButton';
 
 export default function Logs() {
+  const { t } = useTranslation();
   const [chatbots, setChatbots] = useState<APIKeyData[]>([]);
   const [selectedChatbot, setSelectedChatbot] = useState<APIKeyData | null>();
   const [logs, setLogs] = useState<LogData[]>([]);
@@ -66,7 +68,7 @@ export default function Logs() {
       <div className="flex flex-col items-start">
         <div className="flex flex-col gap-3">
           <p className="font-bold text-jet dark:text-bright-gray">
-            Filter by chatbot
+            {t('settings.logs.filterByChatbot')}
           </p>
           {loadingChatbots ? (
             <SkeletonLoader />
@@ -78,9 +80,9 @@ export default function Logs() {
                   label: chatbot.name,
                   value: chatbot.id,
                 })),
-                { label: 'None', value: '' },
+                { label: t('settings.logs.none'), value: '' },
               ]}
-              placeholder="Select chatbot"
+              placeholder={t('settings.logs.selectChatbot')}
               onSelect={(chatbot: { label: string; value: string }) => {
                 setSelectedChatbot(
                   chatbots.find((item) => item.id === chatbot.value),
@@ -120,6 +122,7 @@ type LogsTableProps = {
 };
 
 function LogsTable({ logs, setPage }: LogsTableProps) {
+  const { t } = useTranslation();
   const observerRef = useRef<any>();
   const firstObserver = useCallback((node: HTMLDivElement) => {
     if (observerRef.current) {
@@ -134,7 +137,7 @@ function LogsTable({ logs, setPage }: LogsTableProps) {
     <div className="logs-table border rounded-2xl h-[55vh] w-full overflow-hidden border-silver dark:border-silver/40">
       <div className="h-8 bg-black/10 dark:bg-chinese-black flex flex-col items-start justify-center">
         <p className="px-3 text-xs dark:text-gray-6000">
-          API generated / chatbot conversations
+          {t('settings.logs.tableHeader')}
         </p>
       </div>
       <div
@@ -156,6 +159,7 @@ function LogsTable({ logs, setPage }: LogsTableProps) {
 }
 
 function Log({ log }: { log: LogData }) {
+  const { t } = useTranslation();
   const logLevelColor = {
     info: 'text-green-500',
     error: 'text-red-500',
@@ -167,7 +171,7 @@ function Log({ log }: { log: LogData }) {
       <summary className="flex flex-row items-center gap-2 text-gray-900 cursor-pointer p-2 group-open:bg-[#F9F9F9] dark:group-open:bg-dark-charcoal">
         <img
           src={ChevronRight}
-          alt="chevron-right"
+          alt="Expand log entry"
           className="w-3 h-3 transition duration-300 group-open:rotate-90"
         />
         <span className="flex flex-row gap-2">