diff --git a/interface/app/$libraryId/location/$id.tsx b/interface/app/$libraryId/location/$id.tsx
index 01cd44388..aa5218976 100644
--- a/interface/app/$libraryId/location/$id.tsx
+++ b/interface/app/$libraryId/location/$id.tsx
@@ -1,5 +1,5 @@
 import { ArrowClockwise, Info } from '@phosphor-icons/react';
-import { memo, useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useSearchParams as useRawSearchParams } from 'react-router-dom';
 import { stringify } from 'uuid';
 import {
@@ -143,7 +143,7 @@ const LocationExplorer = ({ location }: { location: Location; path?: string }) =
 							<Folder size={22} className="mt-[-1px]" />
 							<span className="truncate text-sm font-medium">{title}</span>
 							{!locationOnline && (
-								<Tooltip label={t('location_offline_tooltip')}>
+								<Tooltip label={t('location_disconnected_tooltip')}>
 									<Info className="text-ink-faint" />
 								</Tooltip>
 							)}
diff --git a/interface/app/$libraryId/settings/library/locations/ListItem.tsx b/interface/app/$libraryId/settings/library/locations/ListItem.tsx
index b3cb7e3e2..c94e84a4b 100644
--- a/interface/app/$libraryId/settings/library/locations/ListItem.tsx
+++ b/interface/app/$libraryId/settings/library/locations/ListItem.tsx
@@ -56,23 +56,33 @@ export default ({ location }: Props) => {
 			<div className="flex grow" />
 			<div className="flex h-[45px] w-full max-w-fit space-x-2 p-2">
 				{/* This is a fake button, do not add disabled prop pls */}
-				<Button
-					onClick={(e: { stopPropagation: () => void }) => {
-						e.stopPropagation();
-					}}
-					variant="gray"
-					className="pointer-events-none flex !px-2 !py-1.5"
+				<Tooltip
+					position="top"
+					tooltipClassName="max-w-[140px]"
+					label={
+						online
+							? t('location_connected_tooltip')
+							: t('location_disconnected_tooltip')
+					}
 				>
-					<div
-						className={clsx(
-							'h-2 w-2  rounded-full',
-							online ? 'bg-green-500' : 'bg-red-500'
-						)}
-					/>
-					<span className="ml-1.5 text-xs text-ink-dull">
-						{online ? t('online') : t('offline')}
-					</span>
-				</Button>
+					<Button
+						onClick={(e: { stopPropagation: () => void }) => {
+							e.stopPropagation();
+						}}
+						variant="gray"
+						className="pointer-events-none flex !px-2 !py-1.5"
+					>
+						<div
+							className={clsx(
+								'h-2 w-2  rounded-full',
+								online ? 'bg-green-500' : 'bg-red-500'
+							)}
+						/>
+						<span className="ml-1.5 text-xs text-ink-dull">
+							{online ? t('connected') : t('disconnected')}
+						</span>
+					</Button>
+				</Tooltip>
 				<Button
 					onClick={(e: { stopPropagation: () => void }) => {
 						e.stopPropagation();
diff --git a/interface/locales/de/common.json b/interface/locales/de/common.json
index 935b3b6a3..4c42350a8 100644
--- a/interface/locales/de/common.json
+++ b/interface/locales/de/common.json
@@ -142,7 +142,6 @@
 	"failed_to_resume_job": "Aufgabe konnte nicht fortgesetzt werden.",
 	"failed_to_update_location_settings": "Standorteinstellungen konnten nicht aktualisiert werden",
 	"favorite": "Favorit",
-	"favorites": "Favoriten",
 	"file_indexing_rules": "Dateiindizierungsregeln",
 	"filters": "Filter",
 	"forward": "Vorwärts",
@@ -194,9 +193,6 @@
 	"keybinds_description": "Client-Tastenkombinationen anzeigen und verwalten",
 	"keys": "Schlüssel",
 	"kilometers": "Kilometer",
-	"labels": "Labels",
-	"language": "Sprache",
-	"language_description": "Ändern Sie die Sprache der Spacedrive-Benutzeroberfläche",
 	"learn_more_about_telemetry": "Mehr über Telemetrie erfahren",
 	"libraries": "Bibliotheken",
 	"libraries_description": "Die Datenbank enthält alle Bibliotheksdaten und Dateimetadaten.",
@@ -213,7 +209,8 @@
 	"local_node": "Lokaler Knoten",
 	"location_display_name_info": "Der Name dieses Standorts, so wird er in der Seitenleiste angezeigt. Wird den eigentlichen Ordner auf der Festplatte nicht umbenennen.",
 	"location_is_already_linked": "Standort ist bereits verknüpft",
-	"location_offline_tooltip": "Standort ist offline, Sie können immer noch durchsuchen und organisieren.",
+	"location_connected_tooltip": "Der Standort wird auf Änderungen überwacht",
+	"location_disconnected_tooltip": "Die Position wird nicht auf Änderungen überwacht",
 	"location_path_info": "Der Pfad zu diesem Standort, hier werden die Dateien auf der Festplatte gespeichert.",
 	"location_type": "Standorttyp",
 	"location_type_managed": "Spacedrive wird Dateien für Sie sortieren. Wenn der Standort nicht leer ist, wird ein \"spacedrive\" Ordner erstellt.",
@@ -287,7 +284,6 @@
 	"quick_preview": "Schnellvorschau",
 	"quick_view": "Schnellansicht",
 	"recent_jobs": "Aktuelle Aufgaben",
-	"recents": "Zuletzt verwendet",
 	"regen_labels": "Labels erneuern",
 	"regen_thumbnails": "Vorschaubilder erneuern",
 	"regenerate_thumbs": "Vorschaubilder neu generieren",
@@ -364,5 +360,10 @@
 	"your_account": "Ihr Konto",
 	"your_account_description": "Spacedrive-Konto und -Informationen.",
 	"your_local_network": "Ihr lokales Netzwerk",
-	"your_privacy": "Ihre Privatsphäre"
+	"your_privacy": "Ihre Privatsphäre",
+	"recents": "Zuletzt verwendet",
+	"favorites": "Favoriten",
+	"labels": "Labels",
+	"language": "Sprache",
+	"language_description": "Ändern Sie die Sprache der Spacedrive-Benutzeroberfläche"
 }
diff --git a/interface/locales/en/common.json b/interface/locales/en/common.json
index 45ce4ed2f..aa933b701 100644
--- a/interface/locales/en/common.json
+++ b/interface/locales/en/common.json
@@ -91,6 +91,7 @@
 	"deselect": "Deselect",
 	"details": "Details",
 	"devices": "Devices",
+	"disconnected": "Disconnected",
 	"devices_coming_soon_tooltip": "Coming soon! This alpha release doesn't include library sync, it will be ready very soon.",
 	"direction": "Direction",
 	"disabled": "Disabled",
@@ -209,7 +210,8 @@
 	"local_node": "Local Node",
 	"location_display_name_info": "The name of this Location, this is what will be displayed in the sidebar. Will not rename the actual folder on disk.",
 	"location_is_already_linked": "Location is already linked",
-	"location_offline_tooltip": "Location is offline, you can still browse and organize.",
+	"location_connected_tooltip": "Location is being watched for changes",
+	"location_disconnected_tooltip": "Location is not being watched for changes",
 	"location_path_info": "The path to this Location, this is where the files will be stored on disk.",
 	"location_type": "Location Type",
 	"location_type_managed": "Spacedrive will sort files for you. If Location isn't empty a \"spacedrive\" folder will be created.",
diff --git a/interface/locales/es/common.json b/interface/locales/es/common.json
index 18eaec669..b17a5866c 100644
--- a/interface/locales/es/common.json
+++ b/interface/locales/es/common.json
@@ -142,7 +142,6 @@
 	"failed_to_resume_job": "Error al reanudar el trabajo.",
 	"failed_to_update_location_settings": "Error al actualizar configuraciones de ubicación",
 	"favorite": "Favorito",
-	"favorites": "Favoritos",
 	"file_indexing_rules": "Reglas de indexación de archivos",
 	"filters": "Filtros",
 	"forward": "Adelante",
@@ -194,9 +193,6 @@
 	"keybinds_description": "Ver y administrar atajos de teclado del cliente",
 	"keys": "Claves",
 	"kilometers": "Kilómetros",
-	"labels": "Etiquetas",
-	"language": "Idioma",
-	"language_description": "Cambiar el idioma de la interfaz de Spacedrive",
 	"learn_more_about_telemetry": "Aprende más sobre la telemetría",
 	"libraries": "Bibliotecas",
 	"libraries_description": "La base de datos contiene todos los datos de la biblioteca y metadatos de archivos.",
@@ -213,7 +209,8 @@
 	"local_node": "Nodo Local",
 	"location_display_name_info": "El nombre de esta Ubicación, esto es lo que se mostrará en la barra lateral. No renombrará la carpeta real en el disco.",
 	"location_is_already_linked": "Ubicación ya está vinculada",
-	"location_offline_tooltip": "La ubicación está fuera de línea, aún puedes navegar y organizar.",
+	"location_connected_tooltip": "La ubicación está siendo vigilada en busca de cambios",
+	"location_disconnected_tooltip": "La ubicación no está siendo vigilada en busca de cambios",
 	"location_path_info": "La ruta a esta Ubicación, aquí es donde los archivos serán almacenados en el disco.",
 	"location_type": "Tipo de Ubicación",
 	"location_type_managed": "Spacedrive ordenará los archivos por ti. Si la Ubicación no está vacía se creará una carpeta \"spacedrive\".",
@@ -287,7 +284,6 @@
 	"quick_preview": "Vista rápida",
 	"quick_view": "Vista rápida",
 	"recent_jobs": "Trabajos recientes",
-	"recents": "Recientes",
 	"regen_labels": "Regenerar Etiquetas",
 	"regen_thumbnails": "Regenerar Miniaturas",
 	"regenerate_thumbs": "Regenerar Miniaturas",
@@ -364,5 +360,10 @@
 	"your_account": "Tu cuenta",
 	"your_account_description": "Cuenta de Spacedrive e información.",
 	"your_local_network": "Tu Red Local",
-	"your_privacy": "Tu Privacidad"
+	"your_privacy": "Tu Privacidad",
+	"recents": "Recientes",
+	"favorites": "Favoritos",
+	"labels": "Etiquetas",
+	"language": "Idioma",
+	"language_description": "Cambiar el idioma de la interfaz de Spacedrive"
 }
diff --git a/interface/locales/fr/common.json b/interface/locales/fr/common.json
index cf0eb86a5..ce9f6291b 100644
--- a/interface/locales/fr/common.json
+++ b/interface/locales/fr/common.json
@@ -141,7 +141,6 @@
 	"failed_to_resume_job": "Échec de la reprise du travail.",
 	"failed_to_update_location_settings": "Échec de la mise à jour des paramètres de l'emplacement",
 	"favorite": "Favori",
-	"favorites": "Favoris",
 	"file_indexing_rules": "Règles d'indexation des fichiers",
 	"filters": "Filtres",
 	"forward": "Avancer",
@@ -193,9 +192,6 @@
 	"keybinds_description": "Afficher et gérer les raccourcis clavier du client",
 	"keys": "Clés",
 	"kilometers": "Kilomètres",
-	"labels": "Étiquettes",
-	"language": "Langue",
-	"language_description": "Changer la langue de l'interface Spacedrive",
 	"learn_more_about_telemetry": "En savoir plus sur la télémesure",
 	"libraries": "Bibliothèques",
 	"libraries_description": "La base de données contient toutes les données de la bibliothèque et les métadonnées des fichiers.",
@@ -212,7 +208,8 @@
 	"local_node": "Nœud local",
 	"location_display_name_info": "Le nom de cet emplacement, c'est ce qui sera affiché dans la barre latérale. Ne renommera pas le dossier réel sur le disque.",
 	"location_is_already_linked": "L'emplacement est déjà lié",
-	"location_offline_tooltip": "L'emplacement est hors ligne, vous pouvez toujours parcourir et organiser.",
+	"location_connected_tooltip": "L'emplacement est surveillé pour les changements",
+	"location_disconnected_tooltip": "L'emplacement n'est pas surveillé pour les changements",
 	"location_path_info": "Le chemin vers cet emplacement, c'est là que les fichiers seront stockés sur le disque.",
 	"location_type": "Type d'emplacement",
 	"location_type_managed": "Spacedrive triera les fichiers pour vous. Si l'emplacement n'est pas vide, un dossier \"spacedrive\" sera créé.",
@@ -286,7 +283,6 @@
 	"quick_preview": "Aperçu rapide",
 	"quick_view": "Vue rapide",
 	"recent_jobs": "Travaux récents",
-	"recents": "Récents",
 	"regen_labels": "Régénérer les étiquettes",
 	"regen_thumbnails": "Régénérer les vignettes",
 	"regenerate_thumbs": "Régénérer les miniatures",
@@ -363,5 +359,10 @@
 	"your_account": "Votre compte",
 	"your_account_description": "Compte et informations Spacedrive.",
 	"your_local_network": "Votre réseau local",
-	"your_privacy": "Votre confidentialité"
+	"your_privacy": "Votre confidentialité",
+	"recents": "Récents",
+	"favorites": "Favoris",
+	"labels": "Étiquettes",
+	"language": "Langue",
+	"language_description": "Changer la langue de l'interface Spacedrive"
 }
diff --git a/interface/locales/nl/common.json b/interface/locales/nl/common.json
index b55a2bcf2..82d720a69 100644
--- a/interface/locales/nl/common.json
+++ b/interface/locales/nl/common.json
@@ -209,7 +209,8 @@
 	"local_node": "Lokale Node",
 	"location_display_name_info": "De naam van deze Locatie, deze wordt weergegeven in de zijbalk. Zal de daadwerkelijke map op schijf niet hernoemen.",
 	"location_is_already_linked": "Locatie is al gekoppeld",
-	"location_offline_tooltip": "Locatie is offline, je kunt nog steeds bladeren en organiseren.",
+	"location_connected_tooltip": "De locatie wordt in de gaten gehouden voor wijzigingen",
+	"location_disconnected_tooltip": "De locatie wordt niet in de gaten gehouden voor wijzigingen",
 	"location_path_info": "Het pad naar deze locatie, dit is waar bestanden op de schijf worden opgeslagen.",
 	"location_type": "Locatie Type",
 	"location_type_managed": "Spacedrive sorteert bestanden voor je. Als de Locatie niet leeg is, wordt er een map \"Spacedrive\" gecreëerd.",
diff --git a/interface/locales/tr/common.json b/interface/locales/tr/common.json
index ab11ea411..8894e4b10 100644
--- a/interface/locales/tr/common.json
+++ b/interface/locales/tr/common.json
@@ -142,7 +142,6 @@
 	"failed_to_resume_job": "İş devam ettirilemedi.",
 	"failed_to_update_location_settings": "Konum ayarları güncellenemedi",
 	"favorite": "Favori",
-	"favorites": "Favoriler",
 	"file_indexing_rules": "Dosya İndeksleme Kuralları",
 	"filters": "Filtreler",
 	"forward": "İleri",
@@ -194,9 +193,6 @@
 	"keybinds_description": "İstemci tuş bağlamalarını görüntüleyin ve yönetin",
 	"keys": "Anahtarlar",
 	"kilometers": "Kilometreler",
-	"labels": "Etiketler",
-	"language": "Dil",
-	"language_description": "Spacedrive arayüzünün dilini değiştirin",
 	"learn_more_about_telemetry": "Telemetri hakkında daha fazla bilgi edinin",
 	"libraries": "Kütüphaneler",
 	"libraries_description": "Veritabanı tüm kütüphane verilerini ve dosya metaverilerini içerir.",
@@ -213,7 +209,8 @@
 	"local_node": "Yerel Düğüm",
 	"location_display_name_info": "Bu Konumun adı, kenar çubuğunda gösterilecek olan budur. Diskteki gerçek klasörü yeniden adlandırmaz.",
 	"location_is_already_linked": "Konum zaten bağlantılı",
-	"location_offline_tooltip": "Konum çevrimdışı, yine de göz atabilir ve düzenleyebilirsiniz.",
+	"location_connected_tooltip": "Konum değişiklikler için izleniyor",
+	"location_disconnected_tooltip": "Konum değişiklikler için izlenmiyor",
 	"location_path_info": "Bu Konumun yolu, dosyaların disk üzerinde saklandığı yerdir.",
 	"location_type": "Konum Türü",
 	"location_type_managed": "Spacedrive sizin için dosyaları sıralar. Eğer Konum boş değilse, bir \"spacedrive\" klasörü oluşturulacak.",
@@ -287,7 +284,6 @@
 	"quick_preview": "Hızlı Önizleme",
 	"quick_view": "Hızlı bakış",
 	"recent_jobs": "Son İşler",
-	"recents": "Son Kullanılanlar",
 	"regen_labels": "Etiketleri Yeniden Oluştur",
 	"regen_thumbnails": "Küçük Resimleri Yeniden Oluştur",
 	"regenerate_thumbs": "Küçük Resimleri Yeniden Oluştur",
@@ -364,5 +360,10 @@
 	"your_account": "Hesabınız",
 	"your_account_description": "Spacedrive hesabınız ve bilgileri.",
 	"your_local_network": "Yerel Ağınız",
-	"your_privacy": "Gizliliğiniz"
+	"your_privacy": "Gizliliğiniz",
+	"recents": "Son Kullanılanlar",
+	"favorites": "Favoriler",
+	"labels": "Etiketler",
+	"language": "Dil",
+	"language_description": "Spacedrive arayüzünün dilini değiştirin"
 }
diff --git a/interface/locales/zh-CN/common.json b/interface/locales/zh-CN/common.json
index 11d655779..181a35edf 100644
--- a/interface/locales/zh-CN/common.json
+++ b/interface/locales/zh-CN/common.json
@@ -142,7 +142,6 @@
 	"failed_to_resume_job": "恢复任务失败。",
 	"failed_to_update_location_settings": "更新位置设置失败",
 	"favorite": "收藏",
-	"favorites": "收藏夹",
 	"file_indexing_rules": "文件索引规则",
 	"filters": "过滤器",
 	"forward": "前进",
@@ -194,9 +193,6 @@
 	"keybinds_description": "查看和管理客户端键绑定",
 	"keys": "密钥",
 	"kilometers": "千米",
-	"labels": "标签",
-	"language": "语言",
-	"language_description": "更改Spacedrive界面的语言",
 	"learn_more_about_telemetry": "了解更多有关遥测的信息",
 	"libraries": "库",
 	"libraries_description": "数据库包含所有库数据和文件元数据。",
@@ -213,7 +209,8 @@
 	"local_node": "本地节点",
 	"location_display_name_info": "此位置的名称，这是将显示在侧边栏的名称。不会重命名磁盘上的实际文件夹。",
 	"location_is_already_linked": "位置已经链接",
-	"location_offline_tooltip": "位置离线，您仍然可以浏览和组织。",
+	"location_connected_tooltip": "位置正在监视变化",
+	"location_disconnected_tooltip": "位置未被监视以检查更改",
 	"location_path_info": "此位置的路径，这是文件在磁盘上的存储位置。",
 	"location_type": "位置类型",
 	"location_type_managed": "Spacedrive将为您排序文件。如果位置不为空，将创建一个“spacedrive”文件夹。",
@@ -287,7 +284,6 @@
 	"quick_preview": "快速预览",
 	"quick_view": "快速查看",
 	"recent_jobs": "最近的作业",
-	"recents": "最近使用",
 	"regen_labels": "重新生成标签",
 	"regen_thumbnails": "重新生成缩略图",
 	"regenerate_thumbs": "重新生成缩略图",
@@ -364,5 +360,10 @@
 	"your_account": "您的账户",
 	"your_account_description": "Spacedrive账号和信息。",
 	"your_local_network": "您的本地网络",
-	"your_privacy": "您的隐私"
+	"your_privacy": "您的隐私",
+	"recents": "最近使用",
+	"favorites": "收藏夹",
+	"labels": "标签",
+	"language": "语言",
+	"language_description": "更改Spacedrive界面的语言"
 }
diff --git a/interface/locales/zh-TW/common.json b/interface/locales/zh-TW/common.json
index 8dd9b6f80..4975f36be 100644
--- a/interface/locales/zh-TW/common.json
+++ b/interface/locales/zh-TW/common.json
@@ -141,7 +141,6 @@
 	"failed_to_resume_job": "恢復工作失敗。",
 	"failed_to_update_location_settings": "更新位置設置失敗",
 	"favorite": "最愛",
-	"favorites": "收藏夾",
 	"file_indexing_rules": "文件索引規則",
 	"filters": "篩選器",
 	"forward": "前進",
@@ -193,9 +192,6 @@
 	"keybinds_description": "查看和管理客戶端鍵綁定",
 	"keys": "鍵",
 	"kilometers": "公里",
-	"labels": "標籤",
-	"language": "語言",
-	"language_description": "更改Spacedrive界面的語言",
 	"learn_more_about_telemetry": "了解更多關於遙測的信息",
 	"libraries": "圖書館",
 	"libraries_description": "數據庫包含所有圖書館數據和文件元數據。",
@@ -212,7 +208,8 @@
 	"local_node": "本地節點",
 	"location_display_name_info": "這個位置的名稱，這是在側邊欄中顯示的內容。不會重命名磁碟上的實際文件夾。",
 	"location_is_already_linked": "位置已經被連接",
-	"location_offline_tooltip": "位置離線，您可以繼續瀏覽和組織。",
+	"location_connected_tooltip": "正在監視位置是否有變化",
+	"location_disconnected_tooltip": "正在監視位置是否有變化",
 	"location_path_info": "這是位置的路徑，這是在磁碟上存儲文件的位置。",
 	"location_type": "位置類型",
 	"location_type_managed": "Spacedrive將為你分類文件。如果位置不是空的，將創建一個“spacedrive”文件夾。",
@@ -286,7 +283,6 @@
 	"quick_preview": "快速預覽",
 	"quick_view": "快速查看",
 	"recent_jobs": "最近的工作",
-	"recents": "最近的文件",
 	"regen_labels": "重新生成標籤",
 	"regen_thumbnails": "重新生成縮略圖",
 	"regenerate_thumbs": "重新生成縮略圖",
@@ -363,5 +359,10 @@
 	"your_account": "您的帳戶",
 	"your_account_description": "Spacedrive帳戶和資訊。",
 	"your_local_network": "您的本地網路",
-	"your_privacy": "您的隱私"
+	"your_privacy": "您的隱私",
+	"recents": "最近的文件",
+	"favorites": "收藏夾",
+	"labels": "標籤",
+	"language": "語言",
+	"language_description": "更改Spacedrive界面的語言"
 }