diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json
index aa63b4807..f2689154e 100644
--- a/Assets/Translations/de.json
+++ b/Assets/Translations/de.json
@@ -1375,7 +1375,8 @@
           "description": "Ändern Sie Ihren Avatar.",
           "label": "Profil"
         },
-        "select-avatar": "Avatar auswählen"
+        "select-avatar": "Avatar auswählen",
+        "tooltip": "Nach Avatarbild suchen"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'Nicht stören' aktiviert",
     "enable-keep-awake": "Klicken, um 'Wach halten' zu aktivieren.\nScrollen, um Zeitlimit anzupassen.",
     "forget-network": "Netzwerk vergessen",
+    "grid-view": "Rasteransicht",
+    "hidden-files-hide": "Versteckte Dateien ausblenden",
+    "hidden-files-show": "Versteckte Dateien einblenden",
     "home": "Home",
     "input-muted": "Audio-Eingabe stummschalten",
     "keep-awake": "Wach halten",
     "keyboard-layout": "{layout} Tastaturlayout",
+    "list-view": "Listenansicht",
     "manage-vpn": "VPN-Verbindungen verwalten",
     "manage-wifi": "WLAN verwalten",
     "microphone-volume-at": "Mikrofonlautstärke bei {volume}%.\nLinksklick für Einstellungen. Rechtsklick zum Stummschalten.\nScrollen zum Ändern der Lautstärke.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Hintergrundbild-Liste aktualisieren",
     "remove-widget": "Widget entfernen",
     "screen-recorder-not-installed": "Bildschirmrekorder ist nicht installiert",
+    "search": "Suchen",
+    "search-close": "Suche schließen",
     "session-menu": "Sitzungsmenü",
     "set-power-profile": "'{profile}' Energieprofil setzen",
     "start-screen-recording": "Bildschirmaufnahme starten",
diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json
index 7c8b72fb5..7ed6dfd3d 100644
--- a/Assets/Translations/en.json
+++ b/Assets/Translations/en.json
@@ -1375,7 +1375,8 @@
           "description": "Edit your user details and avatar.",
           "label": "Profile"
         },
-        "select-avatar": "Select avatar image"
+        "select-avatar": "Select avatar image",
+        "tooltip": "Browse for avatar image"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "Do Not Disturb enabled",
     "enable-keep-awake": "Click to enable Keep Awake.\nScroll to adjust timeout",
     "forget-network": "Forget network",
+    "grid-view": "Grid view",
+    "hidden-files-hide": "Hide hidden files",
+    "hidden-files-show": "Show hidden files",
     "home": "Home",
     "input-muted": "Toggle input mute",
     "keep-awake": "Keep Awake",
     "keyboard-layout": "{layout} keyboard layout",
+    "list-view": "List view",
     "manage-vpn": "Manage VPN connections",
     "manage-wifi": "Manage Wi-Fi",
     "microphone-volume-at": "Microphone volume at {volume}%\nScroll to modify volume",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Refresh wallpaper list",
     "remove-widget": "Remove widget",
     "screen-recorder-not-installed": "Screen recorder is not installed",
+    "search": "Search",
+    "search-close": "Close search",
     "session-menu": "Session menu",
     "set-power-profile": "Set \"{profile}\" power profile",
     "start-screen-recording": "Start screen recording",
diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json
index 6204a6676..c48eb2d41 100644
--- a/Assets/Translations/es.json
+++ b/Assets/Translations/es.json
@@ -1375,7 +1375,8 @@
           "description": "Edita los detalles de tu usuario y tu avatar.",
           "label": "Perfil"
         },
-        "select-avatar": "Seleccionar imagen de avatar"
+        "select-avatar": "Seleccionar imagen de avatar",
+        "tooltip": "Buscar imagen de avatar"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'No molestar' activado",
     "enable-keep-awake": "Haz clic para activar mantener despierto.\nDesplázate para ajustar el tiempo de espera.",
     "forget-network": "Olvidar red",
+    "grid-view": "Vista de cuadrícula",
+    "hidden-files-hide": "Ocultar archivos ocultos",
+    "hidden-files-show": "Mostrar archivos ocultos",
     "home": "Inicio",
     "input-muted": "Silenciar entrada de audio",
     "keep-awake": "Mantener despierto",
     "keyboard-layout": "Distribución de teclado {layout}",
+    "list-view": "Vista de lista",
     "manage-vpn": "Administrar conexiones VPN",
     "manage-wifi": "Gestionar Wi-Fi",
     "microphone-volume-at": "Volumen del micrófono al {volume}%.\nClic izquierdo para ajustes. Clic derecho para activar/desactivar el silencio.\nDesplázate para modificar el volumen.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Actualizar lista de fondos de pantalla",
     "remove-widget": "Eliminar widget",
     "screen-recorder-not-installed": "La grabadora de pantalla no está instalada",
+    "search": "Buscar",
+    "search-close": "Cerrar búsqueda",
     "session-menu": "Menú de sesión",
     "set-power-profile": "Establecer perfil de energía \"{profile}\"",
     "start-screen-recording": "Iniciar grabación de pantalla",
diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json
index 29c227155..151630926 100644
--- a/Assets/Translations/fr.json
+++ b/Assets/Translations/fr.json
@@ -1375,7 +1375,8 @@
           "description": "Modifiez vos informations utilisateur et votre avatar.",
           "label": "Profil"
         },
-        "select-avatar": "Sélectionner une image d'avatar"
+        "select-avatar": "Sélectionner une image d'avatar",
+        "tooltip": "Parcourir pour une image d’avatar"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'Ne pas déranger' activé",
     "enable-keep-awake": "Cliquez pour activer le mode 'rester éveillé'.\nFaites défiler pour ajuster le délai.",
     "forget-network": "Oublier le réseau",
+    "grid-view": "Vue en grille",
+    "hidden-files-hide": "Masquer les fichiers cachés",
+    "hidden-files-show": "Afficher les fichiers cachés",
     "home": "Accueil",
     "input-muted": "Couper l'entrée audio",
     "keep-awake": "Rester éveillé",
     "keyboard-layout": "Disposition du clavier {layout}",
+    "list-view": "Vue en liste",
     "manage-vpn": "Gérer les connexions VPN",
     "manage-wifi": "Gérer le Wi-Fi",
     "microphone-volume-at": "Volume du microphone à {volume}%.\nClic gauche pour les paramètres. Clic droit pour activer/désactiver le mode muet.\nFaites défiler pour modifier le volume.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Actualiser la liste des fonds d'écran",
     "remove-widget": "Supprimer le widget",
     "screen-recorder-not-installed": "L'enregistreur d'écran n'est pas installé",
+    "search": "Rechercher",
+    "search-close": "Fermer la recherche",
     "session-menu": "Menu de session",
     "set-power-profile": "Définir le profil d'alimentation \"{profile}\"",
     "start-screen-recording": "Démarrer l'enregistrement d'écran",
diff --git a/Assets/Translations/ja.json b/Assets/Translations/ja.json
index 72f816b01..128ef7b12 100644
--- a/Assets/Translations/ja.json
+++ b/Assets/Translations/ja.json
@@ -1375,7 +1375,8 @@
           "description": "ユーザーの詳細とアバターを編集します。",
           "label": "プロフィール"
         },
-        "select-avatar": "アバター画像を選択"
+        "select-avatar": "アバター画像を選択",
+        "tooltip": "アバター画像を参照"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "おやすみモード: 有効",
     "enable-keep-awake": "クリック: スリープ防止モードを有効化\nスクロール: タイムアウトを調整",
     "forget-network": "ネットワーク設定を削除",
+    "grid-view": "グリッド表示",
+    "hidden-files-hide": "隠しファイルを非表示",
+    "hidden-files-show": "隠しファイルを表示",
     "home": "ホーム",
     "input-muted": "入力ミュート切り替え",
     "keep-awake": "スリープを防止",
     "keyboard-layout": "キーボードレイアウト: {layout}",
+    "list-view": "リスト表示",
     "manage-vpn": "VPN 接続を管理",
     "manage-wifi": "Wi-Fi を管理",
     "microphone-volume-at": "マイク音量: {volume}%\nスクロールで音量を調整",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "壁紙リストを更新",
     "remove-widget": "ウィジェットを削除",
     "screen-recorder-not-installed": "スクリーンレコーダーがインストールされていません",
+    "search": "検索",
+    "search-close": "検索を閉じる",
     "session-menu": "セッションメニュー",
     "set-power-profile": "電源プロファイルを {profile} に設定",
     "start-screen-recording": "画面録画を開始",
diff --git a/Assets/Translations/nl.json b/Assets/Translations/nl.json
index 9d828700f..96685262b 100644
--- a/Assets/Translations/nl.json
+++ b/Assets/Translations/nl.json
@@ -1375,7 +1375,8 @@
           "description": "Bewerk je gebruikersgegevens en avatar.",
           "label": "Profiel"
         },
-        "select-avatar": "Avatarafbeelding selecteren"
+        "select-avatar": "Avatarafbeelding selecteren",
+        "tooltip": "Bladeren naar avatarafbeelding"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "\"Niet storen\" ingeschakeld",
     "enable-keep-awake": "\"Wakker houden\" inschakelen",
     "forget-network": "Netwerk vergeten",
+    "grid-view": "Rasterweergave",
+    "hidden-files-hide": "Verborgen bestanden verbergen",
+    "hidden-files-show": "Verborgen bestanden tonen",
     "home": "Home",
     "input-muted": "Invoermicrofoon dempen in-/uitschakelen",
     "keep-awake": "Wakker houden",
     "keyboard-layout": "{layout}-toetsenbordindeling",
+    "list-view": "Lijstweergave",
     "manage-vpn": "VPN-verbindingen beheren",
     "manage-wifi": "Wi-Fi beheren",
     "microphone-volume-at": "Microfoonvolume {volume}%\nLinks klikken voor instellingen. Rechts klikken om te dempen.\nScroll om het volume aan te passen.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Achtergrondlijst verversen",
     "remove-widget": "Widget verwijderen",
     "screen-recorder-not-installed": "Schermrecorder is niet geïnstalleerd",
+    "search": "Zoeken",
+    "search-close": "Zoeken sluiten",
     "session-menu": "Sessiemenu",
     "set-power-profile": "\"{profile}\"-energieprofiel instellen",
     "start-screen-recording": "Schermopname starten",
diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json
index 0a5d8c9bf..9bc700abb 100644
--- a/Assets/Translations/pt.json
+++ b/Assets/Translations/pt.json
@@ -1375,7 +1375,8 @@
           "description": "Edite os detalhes do seu usuário e avatar.",
           "label": "Perfil"
         },
-        "select-avatar": "Selecionar imagem de avatar"
+        "select-avatar": "Selecionar imagem de avatar",
+        "tooltip": "Procurar imagem de avatar"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'Não perturbe' ativado",
     "enable-keep-awake": "Clique para ativar 'manter acordado'.\nRole para ajustar o tempo limite.",
     "forget-network": "Esquecer rede",
+    "grid-view": "Visualização em grade",
+    "hidden-files-hide": "Ocultar arquivos ocultos",
+    "hidden-files-show": "Mostrar arquivos ocultos",
     "home": "Início",
     "input-muted": "Silenciar entrada de áudio",
     "keep-awake": "Manter acordado",
     "keyboard-layout": "Layout de teclado {layout}",
+    "list-view": "Visualização em lista",
     "manage-vpn": "Gerenciar conexões VPN",
     "manage-wifi": "Gerenciar Wi-Fi",
     "microphone-volume-at": "Volume do microfone em {volume}%.\nClique esquerdo para configurações. Clique direito para ativar/desativar o mudo.\nRole para modificar o volume.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Atualizar lista de papéis de parede",
     "remove-widget": "Remover widget",
     "screen-recorder-not-installed": "O gravador de tela não está instalado",
+    "search": "Pesquisar",
+    "search-close": "Fechar pesquisa",
     "session-menu": "Menu da Sessão",
     "set-power-profile": "Definir perfil de energia \"{profile}\"",
     "start-screen-recording": "Iniciar gravação de tela",
diff --git a/Assets/Translations/ru.json b/Assets/Translations/ru.json
index 0711d4125..d9cfb7bae 100644
--- a/Assets/Translations/ru.json
+++ b/Assets/Translations/ru.json
@@ -1375,7 +1375,8 @@
           "description": "Редактируйте данные пользователя и аватар.",
           "label": "Профиль"
         },
-        "select-avatar": "Выбрать изображение аватара"
+        "select-avatar": "Выбрать изображение аватара",
+        "tooltip": "Выбрать изображение аватара"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "Режим 'Не беспокоить' включен",
     "enable-keep-awake": "Нажмите, чтобы включить режим 'Не засыпать'.\nПрокрутка для настройки таймаута.",
     "forget-network": "Забыть сеть",
+    "grid-view": "Вид сеткой",
+    "hidden-files-hide": "Скрыть скрытые файлы",
+    "hidden-files-show": "Показать скрытые файлы",
     "home": "Домой",
     "input-muted": "Переключить заглушение ввода",
     "keep-awake": "Не засыпать",
     "keyboard-layout": "Раскладка клавиатуры {layout}",
+    "list-view": "Вид списком",
     "manage-vpn": "Управлять VPN-подключениями",
     "manage-wifi": "Управление Wi-Fi",
     "microphone-volume-at": "Громкость микрофона {volume}%\nЛевый клик для настроек. Правый клик для переключения заглушения.\nПрокрутка для изменения громкости.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Обновить список обоев",
     "remove-widget": "Удалить виджет",
     "screen-recorder-not-installed": "Запись экрана не установлена",
+    "search": "Поиск",
+    "search-close": "Закрыть поиск",
     "session-menu": "Меню сеанса",
     "set-power-profile": "Установить профиль питания \"{profile}\"",
     "start-screen-recording": "Начать запись экрана",
diff --git a/Assets/Translations/tr.json b/Assets/Translations/tr.json
index 21d4d178e..6fb0a7004 100644
--- a/Assets/Translations/tr.json
+++ b/Assets/Translations/tr.json
@@ -1375,7 +1375,8 @@
           "description": "Kullanıcı detaylarınızı ve avatarınızı düzenleyin.",
           "label": "Profil"
         },
-        "select-avatar": "Avatar görüntüsü seç"
+        "select-avatar": "Avatar görüntüsü seç",
+        "tooltip": "Avatar resmi ara"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'Rahatsız etme' etkin",
     "enable-keep-awake": "Uyanık kalmayı etkinleştirmek için tıklayın.\nZaman aşımını ayarlamak için kaydırın.",
     "forget-network": "Ağı unut",
+    "grid-view": "Izgara görünümü",
+    "hidden-files-hide": "Gizli dosyaları gizle",
+    "hidden-files-show": "Gizli dosyaları göster",
     "home": "Ana Sayfa",
     "input-muted": "Giriş sessizliğini değiştir",
     "keep-awake": "Uyanık kal",
     "keyboard-layout": "{layout} klavye düzeni",
+    "list-view": "Liste görünümü",
     "manage-vpn": "VPN bağlantılarını yönet",
     "manage-wifi": "Wi-Fi yönet",
     "microphone-volume-at": "Mikrofon sesi %{volume}\nAyarlar için sol tık. Sessize almak için sağ tık.\nSesi değiştirmek için kaydırın.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Duvar kağıdı listesini yenile",
     "remove-widget": "Widget kaldır",
     "screen-recorder-not-installed": "Ekran kaydedici yüklü değil",
+    "search": "Ara",
+    "search-close": "Aramayı kapat",
     "session-menu": "Oturum Menüsü",
     "set-power-profile": "\"{profile}\" güç profilini ayarla",
     "start-screen-recording": "Ekran kaydını başlat",
diff --git a/Assets/Translations/uk-UA.json b/Assets/Translations/uk-UA.json
index 2dc264648..91260301c 100644
--- a/Assets/Translations/uk-UA.json
+++ b/Assets/Translations/uk-UA.json
@@ -1375,7 +1375,8 @@
           "description": "Редагуйте дані користувача та аватар.",
           "label": "Профіль"
         },
-        "select-avatar": "Вибрати зображення аватара"
+        "select-avatar": "Вибрати зображення аватара",
+        "tooltip": "Переглянути зображення аватара"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'Не турбувати' увімкнено",
     "enable-keep-awake": "Клацніть, щоб увімкнути режим неспання.\nПрокрутіть, щоб налаштувати тайм-аут.",
     "forget-network": "Забути мережу",
+    "grid-view": "Мережевий вигляд",
+    "hidden-files-hide": "Приховати приховані файли",
+    "hidden-files-show": "Показати приховані файли",
     "home": "Додому",
     "input-muted": "Перемкнути вимкнення входу",
     "keep-awake": "Заборона сну",
     "keyboard-layout": "Розкладка клавіатури {layout}",
+    "list-view": "Список",
     "manage-vpn": "Керувати підключеннями VPN",
     "manage-wifi": "Керувати Wi-Fi",
     "microphone-volume-at": "Гучність мікрофона {volume}%\nЛівий клік для налаштувань. Правий клік для вимкнення звуку.\nПрокрутка для зміни гучності.",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "Оновити список шпалер",
     "remove-widget": "Видалити віджет",
     "screen-recorder-not-installed": "Запис екрана не встановлено",
+    "search": "Пошук",
+    "search-close": "Закрити пошук",
     "session-menu": "Меню сеансу",
     "set-power-profile": "Встановити профіль живлення \"{profile}\"",
     "start-screen-recording": "Почати запис екрана",
diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json
index eca5f701d..858a60d27 100644
--- a/Assets/Translations/zh-CN.json
+++ b/Assets/Translations/zh-CN.json
@@ -1375,7 +1375,8 @@
           "description": "编辑您的用户详细信息和头像。",
           "label": "个人资料"
         },
-        "select-avatar": "选择头像图片"
+        "select-avatar": "选择头像图片",
+        "tooltip": "浏览头像图片"
       },
       "screen-corners": {
         "radius": {
@@ -2199,10 +2200,14 @@
     "do-not-disturb-enabled": "'勿扰模式'已启用",
     "enable-keep-awake": "单击以启用保持唤醒。\n滚动以调整超时。",
     "forget-network": "忘记网络",
+    "grid-view": "网格视图",
+    "hidden-files-hide": "隐藏隐藏文件",
+    "hidden-files-show": "显示隐藏文件",
     "home": "主目录",
     "input-muted": "静音输入设备",
     "keep-awake": "保持唤醒",
     "keyboard-layout": "{layout} 键盘布局",
+    "list-view": "列表视图",
     "manage-vpn": "管理 VPN 连接",
     "manage-wifi": "管理 Wi-Fi",
     "microphone-volume-at": "麦克风音量 {volume}%\n左键点击进入设置。右键点击切换静音。\n滚动滚轮调节音量。",
@@ -2235,6 +2240,8 @@
     "refresh-wallpaper-list": "刷新壁纸列表",
     "remove-widget": "移除小部件",
     "screen-recorder-not-installed": "屏幕录制器未安装",
+    "search": "搜索",
+    "search-close": "关闭搜索",
     "session-menu": "会话菜单",
     "set-power-profile": "设置\"{profile}\"电源模式",
     "start-screen-recording": "开始屏幕录制",
diff --git a/Modules/Panels/Settings/Tabs/GeneralTab.qml b/Modules/Panels/Settings/Tabs/GeneralTab.qml
index f111222b3..261af6adc 100644
--- a/Modules/Panels/Settings/Tabs/GeneralTab.qml
+++ b/Modules/Panels/Settings/Tabs/GeneralTab.qml
@@ -40,7 +40,7 @@ ColumnLayout {
       text: Settings.data.general.avatarImage
       placeholderText: I18n.tr("placeholders.profile-picture-path")
       buttonIcon: "photo"
-      buttonTooltip: "Browse for avatar image"
+      buttonTooltip: I18n.tr("settings.general.profile.tooltip")
       onInputEditingFinished: Settings.data.general.avatarImage = text
       onButtonClicked: {
         avatarPicker.openFilePicker();
diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml
index 648fabaf0..05b907035 100644
--- a/Widgets/NFilePicker.qml
+++ b/Widgets/NFilePicker.qml
@@ -268,7 +268,7 @@ Popup {
 
           NIconButton {
             icon: filePickerPanel.showSearchBar ? "filepicker-x" : "filepicker-search"
-            tooltipText: filePickerPanel.showSearchBar ? "Close Search" : "Search"
+            tooltipText: filePickerPanel.showSearchBar ? I18n.tr("tooltips.search-close") : I18n.tr("tooltips.search")
             baseSize: Style.baseWidgetSize * 0.8
             onClicked: {
               filePickerPanel.showSearchBar = !filePickerPanel.showSearchBar;
@@ -333,13 +333,13 @@ Popup {
 
           NIconButton {
             icon: filePickerPanel.viewMode ? "filepicker-list" : "filepicker-layout-grid"
-            tooltipText: filePickerPanel.viewMode ? "List View" : "Grid View"
+            tooltipText: filePickerPanel.viewMode ? I18n.tr("tooltips.list-view") : I18n.tr("tooltips.grid-view")
             baseSize: Style.baseWidgetSize * 0.8
             onClicked: filePickerPanel.viewMode = !filePickerPanel.viewMode
           }
           NIconButton {
             icon: root.showHiddenFiles ? "filepicker-eye-off" : "filepicker-eye"
-            tooltipText: root.showHiddenFiles ? "Hide Hidden Files" : "Show Hidden Files"
+            tooltipText: root.showHiddenFiles ? I18n.tr("tooltips.hidden-files-hide") : I18n.tr("tooltips.hidden-files-show")
             baseSize: Style.baseWidgetSize * 0.8
             onClicked: {
               root.showHiddenFiles = !root.showHiddenFiles;
diff --git a/Widgets/NIconPicker.qml b/Widgets/NIconPicker.qml
index b99f69060..b52d2a802 100644
--- a/Widgets/NIconPicker.qml
+++ b/Widgets/NIconPicker.qml
@@ -60,6 +60,7 @@ Popup {
       }
       NIconButton {
         icon: "close"
+        tooltipText: I18n.tr("tooltips.close")
         onClicked: root.close()
       }
     }