diff --git a/ui/localization/messages/cy.json b/ui/localization/messages/cy.json
index 60608f84d..060c667a1 100644
--- a/ui/localization/messages/cy.json
+++ b/ui/localization/messages/cy.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copïo testun",
     "action_bar_extension": "Estyniad",
     "action_bar_fullscreen": "Sgrin Lawn",
+    "action_bar_screenshot": "Ciplun",
     "action_bar_settings": "Gosodiadau",
     "action_bar_virtual_keyboard": "Bysellfwrdd Rhithwir",
     "action_bar_virtual_media": "Cyfrwng Rhithwir",
@@ -74,6 +75,7 @@
     "advanced_error_download_diagnostics": "Methwyd llwytho diagnosteg i lawr: {error}",
     "advanced_error_loopback_disable": "Methwyd analluogi modd loopback yn unig: {error}",
     "advanced_error_loopback_enable": "Methwyd galluogi modd loopback yn unig: {error}",
+    "advanced_error_reset_config": "Methwyd ailosod y ffurfweddiad: {error}",
     "advanced_error_set_dev_channel": "Methwyd gosod cyflwr sianel ddatblygu: {error}",
     "advanced_error_set_dev_mode": "Methwyd gosod modd datblygwr: {error}",
     "advanced_error_set_log_level": "Methwyd gosod lefel log: {error}",
@@ -102,6 +104,9 @@
     "advanced_loopback_warning_description": "RHYBUDD: Bydd hyn yn cyfyngu mynediad rhyngwyneb gwe i localhost (127.0.0.1) yn unig.",
     "advanced_loopback_warning_ssh": "Mynediad SSH wedi'i ffurfweddu a'i brofi",
     "advanced_loopback_warning_title": "Galluogi Modd Loopback yn Unig?",
+    "advanced_reset_config_button": "Ailosod Ffurfweddiad",
+    "advanced_reset_config_description": "Ailosod y ffurfweddiad i'r rhagosodiad. Bydd hyn yn eich allgofnodi.",
+    "advanced_reset_config_title": "Ailosod y Ffurfweddiad",
     "advanced_ssh_access_description": "Ychwanegwch eich allwedd gyhoeddus SSH i alluogi mynediad diogel o bell i'r ddyfais",
     "advanced_ssh_access_title": "Mynediad SSH",
     "advanced_ssh_default_user": "Y defnyddiwr SSH rhagosodedig yw",
@@ -111,6 +116,7 @@
     "advanced_success_download_diagnostics": "Diagnosteg wedi'i llwytho i lawr yn llwyddiannus",
     "advanced_success_loopback_disabled": "Modd loopback yn unig wedi'i analluogi. Ailgychwynnwch eich dyfais i'w gymhwyso.",
     "advanced_success_loopback_enabled": "Modd loopback yn unig wedi'i alluogi. Ailgychwynnwch eich dyfais i'w gymhwyso.",
+    "advanced_success_reset_config": "Ailosodiad y ffurfweddiad i'r rhagosodiad yn llwyddiannus",
     "advanced_success_update_ssh_key": "Allwedd SSH wedi'i diweddaru'n llwyddiannus",
     "advanced_title": "Uwch",
     "advanced_troubleshooting_log_level_description": "Addaswch fanylder log ar gyfer diagnosteg. Bydd yn ailosod i Rhybudd ar ôl ailgychwyn",
@@ -779,11 +785,19 @@
     "network_settings_load_error": "Methwyd â llwytho gosodiadau rhwydwaith: {error}",
     "network_static_ipv4_header": "Ffurfweddiad IPv4 Statig",
     "network_static_ipv6_header": "Ffurfweddiad IPv6 Statig",
+    "network_time_sync_add_http_url": "Ychwanegu URL HTTP",
+    "network_time_sync_add_ntp_server": "Ychwanegu Gweinydd NTP",
+    "network_time_sync_config_header": "Cydamseru Amser Personol",
+    "network_time_sync_custom": "Personol",
     "network_time_sync_description": "Ffurfweddwch osodiadau cydamseru amser",
     "network_time_sync_http_only": "HTTP yn unig",
+    "network_time_sync_http_url_invalid": "URL annilys. Rhaid iddo ddechrau gyda http:// neu https://",
     "network_time_sync_ntp_and_http": "NTP a HTTP",
     "network_time_sync_ntp_only": "NTP yn unig",
+    "network_time_sync_ntp_server_invalid": "Gweinydd NTP annilys. Rhowch enw gwesteiwr neu gyfeiriad IP",
     "network_time_sync_title": "Cydamseru amser",
+    "network_time_sync_user_http_urls_label": "URLau HTTP",
+    "network_time_sync_user_ntp_servers_label": "Gweinyddion NTP",
     "network_title": "Rhwydwaith",
     "never_seen_online": "Byth wedi'i weld ar-lein",
     "next": "Nesaf",
diff --git a/ui/localization/messages/da.json b/ui/localization/messages/da.json
index 53734301c..ee37a8649 100644
--- a/ui/localization/messages/da.json
+++ b/ui/localization/messages/da.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Kopiér tekst",
     "action_bar_extension": "Udvidelse",
     "action_bar_fullscreen": "Fuldskærm",
+    "action_bar_screenshot": "Skærmbillede",
     "action_bar_settings": "Indstillinger",
     "action_bar_virtual_keyboard": "Virtuelt tastatur",
     "action_bar_virtual_media": "Virtuelle medier",
diff --git a/ui/localization/messages/de.json b/ui/localization/messages/de.json
index 8c69023af..908e27547 100644
--- a/ui/localization/messages/de.json
+++ b/ui/localization/messages/de.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Text kopieren",
     "action_bar_extension": "Erweiterung",
     "action_bar_fullscreen": "Vollbild",
+    "action_bar_screenshot": "Screenshot",
     "action_bar_settings": "Einstellungen",
     "action_bar_virtual_keyboard": "Virtuelle Tastatur",
     "action_bar_virtual_media": "Virtuelle Medien",
diff --git a/ui/localization/messages/en.json b/ui/localization/messages/en.json
index 219bbd3cb..d913d9d8f 100644
--- a/ui/localization/messages/en.json
+++ b/ui/localization/messages/en.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copy text",
     "action_bar_extension": "Extension",
     "action_bar_fullscreen": "Fullscreen",
+    "action_bar_screenshot": "Screenshot",
     "action_bar_settings": "Settings",
     "action_bar_virtual_keyboard": "Virtual Keyboard",
     "action_bar_virtual_media": "Virtual Media",
diff --git a/ui/localization/messages/es.json b/ui/localization/messages/es.json
index 01bbbff18..e144b3690 100644
--- a/ui/localization/messages/es.json
+++ b/ui/localization/messages/es.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copiar texto",
     "action_bar_extension": "Extensión",
     "action_bar_fullscreen": "Pantalla completa",
+    "action_bar_screenshot": "Captura de pantalla",
     "action_bar_settings": "Ajustes",
     "action_bar_virtual_keyboard": "Teclado virtual",
     "action_bar_virtual_media": "Medios virtuales",
diff --git a/ui/localization/messages/fr.json b/ui/localization/messages/fr.json
index 58f9bdbcf..e01c11447 100644
--- a/ui/localization/messages/fr.json
+++ b/ui/localization/messages/fr.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copier le texte",
     "action_bar_extension": "Extension",
     "action_bar_fullscreen": "Plein écran",
+    "action_bar_screenshot": "Capture d'écran",
     "action_bar_settings": "Paramètres",
     "action_bar_virtual_keyboard": "Clavier virtuel",
     "action_bar_virtual_media": "Médias virtuels",
diff --git a/ui/localization/messages/it.json b/ui/localization/messages/it.json
index 9cd3363e4..7e189f580 100644
--- a/ui/localization/messages/it.json
+++ b/ui/localization/messages/it.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copia il testo",
     "action_bar_extension": "Estensione",
     "action_bar_fullscreen": "A schermo intero",
+    "action_bar_screenshot": "Screenshot",
     "action_bar_settings": "Impostazioni",
     "action_bar_virtual_keyboard": "Tastiera virtuale",
     "action_bar_virtual_media": "Media virtuali",
diff --git a/ui/localization/messages/ja.json b/ui/localization/messages/ja.json
index 3bd4f3b2b..6a89b4079 100644
--- a/ui/localization/messages/ja.json
+++ b/ui/localization/messages/ja.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "テキストをコピー",
     "action_bar_extension": "拡張機能",
     "action_bar_fullscreen": "全画面",
+    "action_bar_screenshot": "スクリーンショット",
     "action_bar_settings": "設定",
     "action_bar_virtual_keyboard": "仮想キーボード",
     "action_bar_virtual_media": "仮想メディア",
diff --git a/ui/localization/messages/nb.json b/ui/localization/messages/nb.json
index f08ced348..e942d4c3c 100644
--- a/ui/localization/messages/nb.json
+++ b/ui/localization/messages/nb.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Kopier tekst",
     "action_bar_extension": "Forlengelse",
     "action_bar_fullscreen": "Fullskjerm",
+    "action_bar_screenshot": "Skjermbilde",
     "action_bar_settings": "Innstillinger",
     "action_bar_virtual_keyboard": "Virtuelt tastatur",
     "action_bar_virtual_media": "Virtuelle medier",
diff --git a/ui/localization/messages/pt.json b/ui/localization/messages/pt.json
index 33da87a09..77960f17f 100644
--- a/ui/localization/messages/pt.json
+++ b/ui/localization/messages/pt.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Copiar texto",
     "action_bar_extension": "Extensão",
     "action_bar_fullscreen": "Tela Cheia",
+    "action_bar_screenshot": "Captura de tela",
     "action_bar_settings": "Configurações",
     "action_bar_virtual_keyboard": "Teclado Virtual",
     "action_bar_virtual_media": "Mídia Virtual",
diff --git a/ui/localization/messages/ru.json b/ui/localization/messages/ru.json
index 4582ce6c5..db742b55e 100644
--- a/ui/localization/messages/ru.json
+++ b/ui/localization/messages/ru.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Копировать текст",
     "action_bar_extension": "Расширение",
     "action_bar_fullscreen": "Полный экран",
+    "action_bar_screenshot": "Скриншот",
     "action_bar_settings": "Настройки",
     "action_bar_virtual_keyboard": "Виртуальная клавиатура",
     "action_bar_virtual_media": "Виртуальный носитель",
diff --git a/ui/localization/messages/sv.json b/ui/localization/messages/sv.json
index ddd9d3db6..a3b09855c 100644
--- a/ui/localization/messages/sv.json
+++ b/ui/localization/messages/sv.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "Kopiera text",
     "action_bar_extension": "Förlängning",
     "action_bar_fullscreen": "Helskärm",
+    "action_bar_screenshot": "Skärmdump",
     "action_bar_settings": "Inställningar",
     "action_bar_virtual_keyboard": "Virtuellt tangentbord",
     "action_bar_virtual_media": "Virtuella medier",
diff --git a/ui/localization/messages/zh-tw.json b/ui/localization/messages/zh-tw.json
index c16e6c723..1c78da418 100644
--- a/ui/localization/messages/zh-tw.json
+++ b/ui/localization/messages/zh-tw.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "複製文字",
     "action_bar_extension": "擴充功能",
     "action_bar_fullscreen": "全螢幕",
+    "action_bar_screenshot": "螢幕截圖",
     "action_bar_settings": "設定",
     "action_bar_virtual_keyboard": "虛擬鍵盤",
     "action_bar_virtual_media": "虛擬媒體",
diff --git a/ui/localization/messages/zh.json b/ui/localization/messages/zh.json
index 1095a795b..708fd85c3 100644
--- a/ui/localization/messages/zh.json
+++ b/ui/localization/messages/zh.json
@@ -52,6 +52,7 @@
     "action_bar_copy_text": "复制文本",
     "action_bar_extension": "扩展功能",
     "action_bar_fullscreen": "全屏",
+    "action_bar_screenshot": "截屏",
     "action_bar_settings": "设置",
     "action_bar_virtual_keyboard": "虚拟键盘",
     "action_bar_virtual_media": "虚拟介质",
diff --git a/ui/src/components/ActionBar.tsx b/ui/src/components/ActionBar.tsx
index 7b5e2fdc6..c8f9368b4 100644
--- a/ui/src/components/ActionBar.tsx
+++ b/ui/src/components/ActionBar.tsx
@@ -2,6 +2,7 @@ import { Fragment, useCallback, useEffect, useRef } from "react";
 import { MdOutlineContentPasteGo } from "react-icons/md";
 import {
   LuCable,
+  LuCamera,
   LuExternalLink,
   LuHardDrive,
   LuMaximize,
@@ -37,8 +38,10 @@ import { m } from "@localizations/messages.js";
 
 export default function Actionbar({
   requestFullscreen,
+  takeScreenshot,
 }: {
   requestFullscreen: () => Promise<void>;
+  takeScreenshot: () => void;
 }) {
   const { navigateTo } = useDeviceUiNavigation();
   const { isVirtualKeyboardEnabled, setVirtualKeyboardEnabled } = useHidStore();
@@ -338,6 +341,13 @@ export default function Actionbar({
 
           <div className="hidden items-center gap-x-2 lg:flex">
             <div className="h-4 w-px bg-slate-300 dark:bg-slate-600" />
+            <Button
+              size="XS"
+              theme="light"
+              text={m.action_bar_screenshot()}
+              LeadingIcon={LuCamera}
+              onClick={() => takeScreenshot()}
+            />
             {isEmbedMode ? (
               <Button
                 size="XS"
diff --git a/ui/src/components/WebRTCVideo.tsx b/ui/src/components/WebRTCVideo.tsx
index e475dfa67..aacd65e7d 100644
--- a/ui/src/components/WebRTCVideo.tsx
+++ b/ui/src/components/WebRTCVideo.tsx
@@ -233,6 +233,31 @@ export default function WebRTCVideo({
     });
   }, [isFullscreenEnabled, requestKeyboardLock, requestPointerLock]);
 
+  const takeScreenshot = useCallback(() => {
+    const video = videoElm.current;
+    if (!video || video.videoWidth === 0 || video.videoHeight === 0) return;
+
+    const canvas = document.createElement("canvas");
+    canvas.width = video.videoWidth;
+    canvas.height = video.videoHeight;
+    const ctx = canvas.getContext("2d");
+    if (!ctx) return;
+    ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
+
+    const now = new Date();
+    const pad = (n: number) => String(n).padStart(2, "0");
+    const stamp =
+      `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}` +
+      ` at ${pad(now.getHours())}.${pad(now.getMinutes())}.${pad(now.getSeconds())}`;
+
+    const a = document.createElement("a");
+    a.download = `JetKVM ${canvas.width}x${canvas.height} ${stamp}.png`;
+    a.href = canvas.toDataURL("image/png");
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+  }, []);
+
   // setup to release the keyboard lock anytime the fullscreen ends
   useEffect(() => {
     if (!videoElm.current) return;
@@ -606,13 +631,8 @@ export default function WebRTCVideo({
     <div className="grid h-full w-full grid-rows-(--grid-layout)">
       <div className="flex min-h-[39.5px] flex-col">
         <div className="flex flex-col">
-          <fieldset
-            disabled={peerConnection?.connectionState !== "connected"}
-            className="contents"
-          >
-            <Actionbar
-              requestFullscreen={requestFullscreen}
-            />
+          <fieldset disabled={peerConnection?.connectionState !== "connected"} className="contents">
+            <Actionbar requestFullscreen={requestFullscreen} takeScreenshot={takeScreenshot} />
             <MacroBar />
           </fieldset>
         </div>
@@ -634,9 +654,7 @@ export default function WebRTCVideo({
                 <div className="grid grow grid-rows-(--grid-bodyFooter) overflow-hidden">
                   {/* In relative mouse mode and under https, we enable the pointer lock, and to do so we need a bar to show the user to click on the video to enable mouse control */}
                   <PointerLockBar show={showPointerLockBar} />
-                  <div
-                    className="relative mx-4 my-2 flex items-center justify-center overflow-hidden"
-                  >
+                  <div className="relative mx-4 my-2 flex items-center justify-center overflow-hidden">
                     <div
                       ref={fullscreenContainerRef}
                       className="relative flex h-full w-full items-center justify-center"
@@ -652,20 +670,17 @@ export default function WebRTCVideo({
                         disablePictureInPicture
                         controlsList="nofullscreen"
                         style={videoStyle}
-                        className={cx(
-                          "h-full w-full object-contain transition-all duration-1000",
-                          {
-                            "cursor-none": settings.isCursorHidden,
-                            "pointer-events-none": isOcrMode,
-                            "opacity-0!":
-                              isVideoLoading ||
-                              hdmiError ||
-                              hasConnectionIssues ||
-                              peerConnectionState !== "connected",
-                            "opacity-60!": showPointerLockBar,
-                            "animate-slideUpFade": isPlaying,
-                          },
-                        )}
+                        className={cx("h-full w-full object-contain transition-all duration-1000", {
+                          "cursor-none": settings.isCursorHidden,
+                          "pointer-events-none": isOcrMode,
+                          "opacity-0!":
+                            isVideoLoading ||
+                            hdmiError ||
+                            hasConnectionIssues ||
+                            peerConnectionState !== "connected",
+                          "opacity-60!": showPointerLockBar,
+                          "animate-slideUpFade": isPlaying,
+                        })}
                       />
                       <OcrOverlay />
                       {peerConnection?.connectionState == "connected" && !hasConnectionIssues && (