diff --git a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/128x128.png b/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/128x128.png
deleted file mode 100644
index 792d2b6..0000000
Binary files a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/128x128.png and /dev/null differ
diff --git a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/32x32.png b/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/32x32.png
deleted file mode 100644
index 655191d..0000000
Binary files a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/32x32.png and /dev/null differ
diff --git a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.ico b/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.ico
deleted file mode 100644
index c772708..0000000
Binary files a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.ico and /dev/null differ
diff --git a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.png b/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.png
deleted file mode 100644
index d9a4a48..0000000
Binary files a/apps/desktop/src-tauri/apps/desktop/src-tauri/icons/icon.png and /dev/null differ
diff --git a/apps/desktop/src-tauri/icons/128x128.png b/apps/desktop/src-tauri/icons/128x128.png
index d1fd469..7c29f9b 100644
Binary files a/apps/desktop/src-tauri/icons/128x128.png and b/apps/desktop/src-tauri/icons/128x128.png differ
diff --git a/apps/desktop/src-tauri/icons/128x128@2x.png b/apps/desktop/src-tauri/icons/128x128@2x.png
new file mode 100644
index 0000000..d0fd74d
Binary files /dev/null and b/apps/desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/apps/desktop/src-tauri/icons/32x32.png b/apps/desktop/src-tauri/icons/32x32.png
new file mode 100644
index 0000000..5b89be7
Binary files /dev/null and b/apps/desktop/src-tauri/icons/32x32.png differ
diff --git a/apps/desktop/src-tauri/icons/icon.ico b/apps/desktop/src-tauri/icons/icon.ico
index 5b17153..9d13290 100644
Binary files a/apps/desktop/src-tauri/icons/icon.ico and b/apps/desktop/src-tauri/icons/icon.ico differ
diff --git a/apps/desktop/src-tauri/icons/icon.png b/apps/desktop/src-tauri/icons/icon.png
index 04d4537..d6d32da 100644
Binary files a/apps/desktop/src-tauri/icons/icon.png and b/apps/desktop/src-tauri/icons/icon.png differ
diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
index d8ab32b..81cbcdb 100644
--- a/apps/desktop/src-tauri/tauri.conf.json
+++ b/apps/desktop/src-tauri/tauri.conf.json
@@ -21,7 +21,7 @@
       }
     ],
     "security": {
-      "csp": "default-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src *; img-src * data:; font-src * data:; style-src 'self' 'unsafe-inline' *; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://unpkg.com"
+      "csp": "default-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src *; img-src * data:; font-src * data:; style-src 'self' 'unsafe-inline' *; script-src 'self' 'unsafe-inline' 'unsafe-eval'"
     }
   },
   "bundle": {
@@ -31,6 +31,9 @@
       "nsis"
     ],
     "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
       "icons/icon.png",
       "icons/icon.ico"
     ]
diff --git a/apps/desktop/src/setup.html b/apps/desktop/src/setup.html
index a4e81aa..a26560a 100644
--- a/apps/desktop/src/setup.html
+++ b/apps/desktop/src/setup.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Tessera - Setup</title>
+  <title>Tessera – Desktop-App einrichten</title>
   <style>
     * {
       margin: 0;
@@ -28,16 +28,22 @@
       max-width: 440px;
       width: 100%;
       padding: 48px 32px;
-      background: oklch(0.23 0.01 260);
+      background: oklch(0.22 0.01 260);
       border-radius: 12px;
       border: 1px solid oklch(0.30 0.01 260);
     }
 
+    .brand-mark {
+      margin: 0 auto 16px;
+      width: 56px;
+      height: 56px;
+    }
+
     h1 {
       font-size: 2rem;
       font-weight: 700;
       margin-bottom: 8px;
-      color: oklch(0.91 0.19 102);
+      color: #ffed00;
     }
 
     .subtitle {
@@ -55,6 +61,13 @@
       color: oklch(0.85 0 0);
     }
 
+    .hint {
+      text-align: left;
+      font-size: 0.8125rem;
+      color: oklch(0.60 0 0);
+      margin-bottom: 8px;
+    }
+
     input[type="url"] {
       width: 100%;
       padding: 12px 16px;
@@ -69,7 +82,7 @@
     }
 
     input[type="url"]:focus {
-      border-color: oklch(0.91 0.19 102);
+      border-color: #9c9440;
     }
 
     input[type="url"]::placeholder {
@@ -92,14 +105,22 @@
       margin-top: 6px;
     }
 
+    .info-message {
+      display: none;
+      text-align: left;
+      font-size: 0.8125rem;
+      color: oklch(0.70 0.15 150);
+      margin-top: 6px;
+    }
+
     button {
       margin-top: 24px;
       width: 100%;
       padding: 12px 32px;
       border-radius: 8px;
       border: none;
-      background: oklch(0.91 0.19 102);
-      color: oklch(0.20 0.02 90);
+      background: #ffed00;
+      color: #1a1a1a;
       cursor: pointer;
       font-size: 1rem;
       font-weight: 600;
@@ -123,31 +144,43 @@
 </head>
 <body>
   <div class="setup-card">
+    <svg class="brand-mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" width="56" height="56">
+      <rect x="4" y="4" width="64" height="64" rx="14" fill="#1a1a1a"></rect>
+      <g>
+        <rect x="16" y="16" width="12" height="12" rx="2.5" fill="#9c9440"></rect>
+        <rect x="30" y="16" width="12" height="12" rx="2.5" fill="#9c9440"></rect>
+        <rect x="45" y="15" width="12" height="12" rx="2.5" transform="rotate(12 51 21)" fill="#ffed00"></rect>
+        <rect x="30" y="30" width="12" height="12" rx="2.5" fill="#9c9440"></rect>
+        <rect x="30" y="44" width="12" height="12" rx="2.5" fill="#9c9440"></rect>
+      </g>
+    </svg>
     <h1>Tessera</h1>
-    <p class="subtitle">Desktop-Client einrichten</p>
+    <p class="subtitle">Desktop-App einrichten</p>
 
-    <label for="server-url">Server-URL eingeben:</label>
+    <label for="server-url">Adresse Ihres Tessera-Servers</label>
+    <p class="hint">Das ist die Adresse, unter der Sie Tessera auch im Browser öffnen.</p>
     <input
       id="server-url"
       type="url"
       placeholder="https://tessera.example.com"
-      value="http://localhost:3000"
       autocomplete="off"
       spellcheck="false"
     />
     <p id="error-msg" class="error-message"></p>
     <p id="warning-msg" class="warning-message"></p>
+    <p id="info-msg" class="info-message"></p>
 
     <button id="connect-btn" type="button">Verbinden</button>
   </div>
 
   <script type="module">
-    import { load } from '@tauri-apps/plugin-store';
+    const { invoke } = window.__TAURI__.core;
 
     const urlInput = document.getElementById('server-url');
     const connectBtn = document.getElementById('connect-btn');
     const errorMsg = document.getElementById('error-msg');
     const warningMsg = document.getElementById('warning-msg');
+    const infoMsg = document.getElementById('info-msg');
 
     /**
      * Validate a server URL using the URL constructor.
@@ -157,19 +190,23 @@
       const trimmed = input.trim();
 
       if (!trimmed) {
-        return { valid: false, warning: null, error: 'Bitte eine URL eingeben.' };
+        return { valid: false, warning: null, error: 'Bitte geben Sie die Adresse Ihres Tessera-Servers ein.' };
       }
 
       let parsed;
       try {
         parsed = new URL(trimmed);
       } catch {
-        return { valid: false, warning: null, error: 'Ungueltige URL. Bitte eine gueltige URL eingeben (z.B. https://tessera.example.com).' };
+        return {
+          valid: false,
+          warning: null,
+          error: 'Diese Adresse ist ungültig. Bitte geben Sie eine vollständige Adresse ein, z. B. https://tessera.example.com.',
+        };
       }
 
       // Only allow http and https protocols
       if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
-        return { valid: false, warning: null, error: 'Nur HTTP und HTTPS URLs sind erlaubt.' };
+        return { valid: false, warning: null, error: 'Es sind nur Adressen mit http oder https erlaubt.' };
       }
 
       // Warn on non-https for non-localhost addresses (T-06-01 mitigation)
@@ -177,7 +214,7 @@
       if (parsed.protocol === 'http:' && !isLocalhost) {
         return {
           valid: true,
-          warning: 'Warnung: Unverschluesselte Verbindung (HTTP). Fuer Produktivumgebungen wird HTTPS empfohlen.',
+          warning: 'Hinweis: Diese Verbindung ist unverschlüsselt (http). Für den Produktivbetrieb empfehlen wir https.',
           error: null,
         };
       }
@@ -189,17 +226,26 @@
       errorMsg.textContent = message;
       errorMsg.style.display = 'block';
       warningMsg.style.display = 'none';
+      infoMsg.style.display = 'none';
     }
 
     function showWarning(message) {
       warningMsg.textContent = message;
       warningMsg.style.display = 'block';
       errorMsg.style.display = 'none';
+      infoMsg.style.display = 'none';
+    }
+
+    function showInfo(message) {
+      infoMsg.textContent = message;
+      infoMsg.style.display = 'block';
+      errorMsg.style.display = 'none';
     }
 
     function clearMessages() {
       errorMsg.style.display = 'none';
       warningMsg.style.display = 'none';
+      infoMsg.style.display = 'none';
     }
 
     async function connect() {
@@ -220,18 +266,26 @@
       // Normalize the URL
       const normalizedUrl = new URL(rawUrl.trim()).href;
 
-      // Disable button during save
+      // Disable button while the address is being checked
       connectBtn.disabled = true;
-      connectBtn.textContent = 'Verbinde...';
+      connectBtn.textContent = 'Prüfe Verbindung …';
+
+      let version;
+      try {
+        version = await invoke('check_server', { url: normalizedUrl });
+      } catch (err) {
+        showError(String(err));
+        connectBtn.disabled = false;
+        connectBtn.textContent = 'Verbinden';
+        return;
+      }
+
+      showInfo('Tessera ' + version + ' gefunden – Verbindung wird hergestellt …');
 
       try {
-        const store = await load('config.json', { autoSave: true });
-        await store.set('server_url', normalizedUrl);
-
-        // Navigate the WebView to the configured server
-        window.location.href = normalizedUrl;
+        await invoke('save_server_url', { url: normalizedUrl });
       } catch (err) {
-        showError('Fehler beim Speichern der Konfiguration: ' + (err.message || err));
+        showError('Die Adresse konnte nicht gespeichert werden: ' + String(err));
         connectBtn.disabled = false;
         connectBtn.textContent = 'Verbinden';
       }