diff --git a/VERSION b/VERSION
index 88cf65e..93599c6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.137
+1.1.138
diff --git a/cmd/edgeguard-api/main.go b/cmd/edgeguard-api/main.go
index 46411b8..6bbb26d 100644
--- a/cmd/edgeguard-api/main.go
+++ b/cmd/edgeguard-api/main.go
@@ -60,7 +60,7 @@ import (
 	usersvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/users"
 )
 
-var version = "1.1.137"
+var version = "1.1.138"
 
 func main() {
 	addr := os.Getenv("EDGEGUARD_API_ADDR")
diff --git a/cmd/edgeguard-ctl/main.go b/cmd/edgeguard-ctl/main.go
index 846af3d..c38c290 100644
--- a/cmd/edgeguard-ctl/main.go
+++ b/cmd/edgeguard-ctl/main.go
@@ -11,7 +11,7 @@ import (
 	"git.netcell-it.de/projekte/edgeguard-native/internal/services/setup"
 )
 
-var version = "1.1.137"
+var version = "1.1.138"
 
 const usage = `edgeguard-ctl — EdgeGuard CLI
 
diff --git a/cmd/edgeguard-scheduler/main.go b/cmd/edgeguard-scheduler/main.go
index 42f057c..6d4a6ae 100644
--- a/cmd/edgeguard-scheduler/main.go
+++ b/cmd/edgeguard-scheduler/main.go
@@ -41,7 +41,7 @@ import (
 	"git.netcell-it.de/projekte/edgeguard-native/internal/services/tlscerts"
 )
 
-var version = "1.1.137"
+var version = "1.1.138"
 
 const (
 	// renewTickInterval — how often we re-evaluate expiring certs.
diff --git a/management-ui/src/i18n/locales/de/common.json b/management-ui/src/i18n/locales/de/common.json
index 5ec5221..fcdf6f2 100644
--- a/management-ui/src/i18n/locales/de/common.json
+++ b/management-ui/src/i18n/locales/de/common.json
@@ -567,6 +567,9 @@
     "backupNowFailed": "Backup-Trigger fehlgeschlagen",
     "serviceRestartCardTitle": "Dienste neu starten",
     "serviceRestartBtn": "Restart",
+    "serviceRestartConfirmTitle": "{{service}} neu starten?",
+    "serviceRestartConfirmDesc": "Der Dienst ist während des Neustarts kurz nicht erreichbar.",
+    "serviceRestartConfirmOk": "Ja, neu starten",
     "serviceRestartOk": "{{service}} wurde neu gestartet.",
     "serviceRestartFailed": "Neustart von {{service}} fehlgeschlagen",
     "serviceRestartHint": "Startet den Dienst via systemctl restart. edgeguard-api und PostgreSQL sind bewusst ausgeschlossen.",
diff --git a/management-ui/src/i18n/locales/en/common.json b/management-ui/src/i18n/locales/en/common.json
index 471f6ac..5877a6e 100644
--- a/management-ui/src/i18n/locales/en/common.json
+++ b/management-ui/src/i18n/locales/en/common.json
@@ -565,6 +565,9 @@
     "backupNowBtn": "Backup now",
     "serviceRestartCardTitle": "Restart services",
     "serviceRestartBtn": "Restart",
+    "serviceRestartConfirmTitle": "Restart {{service}}?",
+    "serviceRestartConfirmDesc": "The service will be briefly unavailable while restarting.",
+    "serviceRestartConfirmOk": "Yes, restart",
     "serviceRestartOk": "{{service}} restarted successfully.",
     "serviceRestartFailed": "Restart of {{service}} failed",
     "serviceRestartHint": "Restarts the service via systemctl restart. edgeguard-api and PostgreSQL are intentionally excluded.",
diff --git a/management-ui/src/pages/Settings/index.tsx b/management-ui/src/pages/Settings/index.tsx
index 560816f..9e5cf17 100644
--- a/management-ui/src/pages/Settings/index.tsx
+++ b/management-ui/src/pages/Settings/index.tsx
@@ -1,4 +1,4 @@
-import { Alert, Button, Card, Descriptions, Form, Input, InputNumber, Select, Space, Spin, Switch, Tooltip, Typography, message } from 'antd'
+import { Alert, Button, Card, Descriptions, Form, Input, InputNumber, Popconfirm, Select, Space, Spin, Switch, Tooltip, Typography, message } from 'antd'
 import { CloudDownloadOutlined, CloudSyncOutlined, CodeOutlined, CopyOutlined, DatabaseOutlined, DownloadOutlined, ExclamationCircleOutlined, FileSearchOutlined, GlobalOutlined, LockOutlined, MailOutlined, ReloadOutlined, SettingOutlined, StopOutlined, ToolOutlined } from '@ant-design/icons'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { useEffect, useState } from 'react'
@@ -407,13 +407,7 @@ export default function SettingsPage() {
             return (
               <Space key={svc} style={{ width: '100%', justifyContent: 'space-between' }}>
                 <Space size={6}>
-                  <span
-                    style={{
-                      display: 'inline-block', width: 8, height: 8, borderRadius: '50%',
-                      background: status?.active ? '#22c55e' : '#ef4444',
-                      flexShrink: 0,
-                    }}
-                  />
+                  <span className={`status-dot ${status?.active ? 'online' : 'offline'}`} />
                   <Typography.Text style={{ fontFamily: 'monospace', fontSize: 13 }}>{svc}</Typography.Text>
                   {status && (
                     <Typography.Text type="secondary" style={{ fontSize: 11 }}>
@@ -422,15 +416,23 @@ export default function SettingsPage() {
                   )}
                 </Space>
                 <Tooltip title={isViewer ? t('auth.viewerBadge') : undefined}>
-                  <Button
-                    size="small"
-                    icon={<ReloadOutlined />}
-                    loading={restartingService === svc}
+                  <Popconfirm
+                    title={t('settings.serviceRestartConfirmTitle', { service: svc })}
+                    description={t('settings.serviceRestartConfirmDesc')}
+                    okText={t('settings.serviceRestartConfirmOk')}
+                    cancelText={t('common.cancel')}
                     disabled={isViewer}
-                    onClick={() => serviceRestart.mutate(svc)}
+                    onConfirm={() => serviceRestart.mutate(svc)}
                   >
-                    {t('settings.serviceRestartBtn')}
-                  </Button>
+                    <Button
+                      size="small"
+                      icon={<ReloadOutlined />}
+                      loading={restartingService === svc}
+                      disabled={isViewer}
+                    >
+                      {t('settings.serviceRestartBtn')}
+                    </Button>
+                  </Popconfirm>
                 </Tooltip>
               </Space>
             )