diff --git a/messages/de-DE.json b/messages/de-DE.json
index 2b908f18..e48a080b 100644
--- a/messages/de-DE.json
+++ b/messages/de-DE.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Spalten umschalten",
     "refreshContainersList": "Container-Liste aktualisieren",
     "searching": "Suche...",
-    "noContainersFoundMatching": "Keine Container gefunden mit \"{filter}\"."
+    "noContainersFoundMatching": "Keine Container gefunden mit \"{filter}\".",
+    "light": "hell",
+    "dark": "dunkel",
+    "system": "system",
+    "theme": "Design"
 }
diff --git a/messages/en-US.json b/messages/en-US.json
index 87be4dcf..6873d7f3 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Toggle Columns",
     "refreshContainersList": "Refresh containers list",
     "searching": "Searching...",
-    "noContainersFoundMatching": "No containers found matching \"{filter}\"."
+    "noContainersFoundMatching": "No containers found matching \"{filter}\".",
+    "light": "light",
+    "dark": "dark",
+    "system": "system",
+    "theme": "Theme"
 }
\ No newline at end of file
diff --git a/messages/es-ES.json b/messages/es-ES.json
index 4c720c58..23ae5310 100644
--- a/messages/es-ES.json
+++ b/messages/es-ES.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Cambiar Columnas",
     "refreshContainersList": "Actualizar lista de contenedores",
     "searching": "Buscando...",
-    "noContainersFoundMatching": "No se han encontrado contenedores que coincidan con \"{filter}\"."
+    "noContainersFoundMatching": "No se han encontrado contenedores que coincidan con \"{filter}\".",
+    "light": "claro",
+    "dark": "oscuro",
+    "system": "sistema",
+    "theme": "Tema"
 }
\ No newline at end of file
diff --git a/messages/fr-FR.json b/messages/fr-FR.json
index 97fbb89c..e1a7dbd9 100644
--- a/messages/fr-FR.json
+++ b/messages/fr-FR.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Activer/désactiver les colonnes",
     "refreshContainersList": "Rafraîchir la liste des conteneurs",
     "searching": "Recherche en cours...",
-    "noContainersFoundMatching": "Aucun conteneur correspondant à \"{filter}\"."
+    "noContainersFoundMatching": "Aucun conteneur correspondant à \"{filter}\".",
+    "light": "clair",
+    "dark": "sombre",
+    "system": "système",
+    "theme": "Thème"
 }
\ No newline at end of file
diff --git a/messages/it-IT.json b/messages/it-IT.json
index 258b2bb1..92ea2ee3 100644
--- a/messages/it-IT.json
+++ b/messages/it-IT.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Attiva/Disattiva Colonne",
     "refreshContainersList": "Aggiorna elenco contenitori",
     "searching": "Ricerca...",
-    "noContainersFoundMatching": "Nessun contenitore trovato corrispondente \"{filter}\"."
+    "noContainersFoundMatching": "Nessun contenitore trovato corrispondente \"{filter}\".",
+    "light": "chiaro",
+    "dark": "scuro",
+    "system": "sistema",
+    "theme": "Tema"
 }
\ No newline at end of file
diff --git a/messages/nl-NL.json b/messages/nl-NL.json
index a6c4ae9f..e656544b 100644
--- a/messages/nl-NL.json
+++ b/messages/nl-NL.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Kolommen omschakelen",
     "refreshContainersList": "Vernieuw containers lijst",
     "searching": "Zoeken...",
-    "noContainersFoundMatching": "Geen containers gevonden die overeenkomen met \"{filter}\"."
+    "noContainersFoundMatching": "Geen containers gevonden die overeenkomen met \"{filter}\".",
+    "light": "licht",
+    "dark": "donker",
+    "system": "systeem",
+    "theme": "Thema"
 }
\ No newline at end of file
diff --git a/messages/pl-PL.json b/messages/pl-PL.json
index d49ec82a..fcbe1aa6 100644
--- a/messages/pl-PL.json
+++ b/messages/pl-PL.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Przełącz kolumny",
     "refreshContainersList": "Odśwież listę kontenerów",
     "searching": "Wyszukiwanie...",
-    "noContainersFoundMatching": "Nie znaleziono kontenerów pasujących do \"{filter}\"."
+    "noContainersFoundMatching": "Nie znaleziono kontenerów pasujących do \"{filter}\".",
+    "light": "jasny",
+    "dark": "ciemny",
+    "system": "system",
+    "theme": "Motyw"
 }
\ No newline at end of file
diff --git a/messages/pt-PT.json b/messages/pt-PT.json
index 05d5c1f5..15089ce7 100644
--- a/messages/pt-PT.json
+++ b/messages/pt-PT.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Alternar Colunas",
     "refreshContainersList": "Atualizar lista de contêineres",
     "searching": "Buscando...",
-    "noContainersFoundMatching": "Nenhum recipiente encontrado \"{filter}\"."
+    "noContainersFoundMatching": "Nenhum recipiente encontrado \"{filter}\".",
+    "light": "claro",
+    "dark": "escuro",
+    "system": "sistema",
+    "theme": "Tema"
 }
\ No newline at end of file
diff --git a/messages/tr-TR.json b/messages/tr-TR.json
index ba53f43d..2431373d 100644
--- a/messages/tr-TR.json
+++ b/messages/tr-TR.json
@@ -1124,5 +1124,9 @@
     "toggleColumns": "Toggle Columns",
     "refreshContainersList": "Refresh containers list",
     "searching": "Searching...",
-    "noContainersFoundMatching": "No containers found matching \"{filter}\"."
+    "noContainersFoundMatching": "No containers found matching \"{filter}\".",
+    "light": "açık",
+    "dark": "koyu",
+    "system": "sistem",
+    "theme": "Tema"
 }
\ No newline at end of file
diff --git a/messages/zh-CN.json b/messages/zh-CN.json
index 6e77af4c..ee6957de 100644
--- a/messages/zh-CN.json
+++ b/messages/zh-CN.json
@@ -1100,21 +1100,21 @@
     "containerImage": "图片",
     "containerState": "状态",
     "containerNetworks": "网络",
-    "containerHostnameIp": "Hostname/IP",
+    "containerHostnameIp": "主机名/IP",
     "containerLabels": "标签",
-    "containerLabelsCount": "{count} label{s,plural,one{} other{s}}",
+    "containerLabelsCount": "{count} 个标签",
     "containerLabelsTitle": "容器标签",
     "containerLabelEmpty": "<empty>",
     "containerPorts": "端口",
-    "containerPortsMore": "+{count} more",
+    "containerPortsMore": "+{count} 更多",
     "containerActions": "行动",
     "select": "选择",
     "noContainersMatchingFilters": "没有找到匹配当前过滤器的容器。",
     "showContainersWithoutPorts": "显示没有端口的容器",
     "showStoppedContainers": "显示已停止的容器",
     "noContainersFound": "未找到容器。请确保Docker容器正在运行。",
-    "searchContainersPlaceholder": "Search across {count} containers...",
-    "searchResultsCount": "{count} result{s,plural,one{} other{s}}",
+    "searchContainersPlaceholder": "在 {count} 个容器中搜索...",
+    "searchResultsCount": "{count} 个结果",
     "filters": "筛选器",
     "filterOptions": "过滤器选项",
     "filterPorts": "端口",
@@ -1124,5 +1124,9 @@
     "toggleColumns": "切换列",
     "refreshContainersList": "刷新容器列表",
     "searching": "搜索中...",
-    "noContainersFoundMatching": "No containers found matching \"{filter}\"."
+    "noContainersFoundMatching": "未找到与 \"{filter}\" 匹配的容器。",
+    "light": "浅色",
+    "dark": "深色",
+    "system": "系统",
+    "theme": "主题"
 }
diff --git a/src/components/LocaleSwitcherSelect.tsx b/src/components/LocaleSwitcherSelect.tsx
index 1d3f448f..53c25d8f 100644
--- a/src/components/LocaleSwitcherSelect.tsx
+++ b/src/components/LocaleSwitcherSelect.tsx
@@ -41,13 +41,15 @@ export default function LocaleSwitcherSelect({
         <Button
           variant="ghost"
           className={clsx(
-            'rounded-sm p-2 transition-colors flex items-center gap-2',
+            'w-full rounded-sm h-8 gap-2 justify-start font-normal',
             isPending && 'pointer-events-none'
           )}
           aria-label={label}
         >
           <Languages className="h-4 w-4" />
-          <span >{selected?.label ?? label}</span>
+          <span className="text-left flex-1">
+            {selected?.label ?? label}
+          </span>
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="min-w-[8rem]">
diff --git a/src/components/ProfileIcon.tsx b/src/components/ProfileIcon.tsx
index c09447fb..eab2f51d 100644
--- a/src/components/ProfileIcon.tsx
+++ b/src/components/ProfileIcon.tsx
@@ -133,7 +133,7 @@ export default function ProfileIcon() {
                                 <DropdownMenuSeparator />
                             </>
                         )}
-                        <DropdownMenuLabel>Theme</DropdownMenuLabel>
+                        <DropdownMenuLabel>{t("theme")}</DropdownMenuLabel>
                         {(["light", "dark", "system"] as const).map(
                             (themeOption) => (
                                 <DropdownMenuItem
@@ -152,7 +152,7 @@ export default function ProfileIcon() {
                                         <Laptop className="mr-2 h-4 w-4" />
                                     )}
                                     <span className="capitalize">
-                                        {themeOption}
+                                        {t(themeOption)}
                                     </span>
                                     {userTheme === themeOption && (
                                         <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
@@ -163,9 +163,7 @@ export default function ProfileIcon() {
                             )
                         )}
                         <DropdownMenuSeparator />
-                            <div>
                                 <LocaleSwitcher />
-                            </div>
                         <DropdownMenuSeparator />
                         <DropdownMenuItem onClick={() => logout()}>
                             {/* <LogOut className="mr-2 h-4 w-4" /> */}