diff --git a/DrSousan.Api/Pages/Shared/_Layout.cshtml b/DrSousan.Api/Pages/Shared/_Layout.cshtml
index 4aeb688..9157ab0 100644
--- a/DrSousan.Api/Pages/Shared/_Layout.cshtml
+++ b/DrSousan.Api/Pages/Shared/_Layout.cshtml
@@ -139,15 +139,13 @@
 <body>
 
 <header>
-  <a class="logo" href="/">
+  <a class="logo" href="/" style="display:flex;align-items:center;gap:.6rem">
     @if (!string.IsNullOrEmpty(_logoUrl))
     {
-        <img src="@_logoUrl" alt="@(ViewData["SiteName"] ?? "دکتر سوسن آل‌طه")" style="height:38px;width:auto;object-fit:contain;vertical-align:middle" />
-    }
-    else
-    {
-        @(ViewData["SiteName"] ?? "دکتر سوسن آل‌طه")
+        <img src="@_logoUrl" alt="@(ViewData["SiteName"] ?? "دکتر سوسن آل‌طه")" style="height:36px;width:auto;object-fit:contain;flex-shrink:0" />
+        <span style="color:var(--border);font-weight:300;font-size:1.1rem;line-height:1">|</span>
     }
+    <span>@(ViewData["SiteName"] ?? "دکتر سوسن آل‌طه")</span>
   </a>
   <nav>
     <a href="/#about">درباره من</a>
diff --git a/DrSousan.Api/wwwroot/admin/index.html b/DrSousan.Api/wwwroot/admin/index.html
index 2e69a28..66e53eb 100644
--- a/DrSousan.Api/wwwroot/admin/index.html
+++ b/DrSousan.Api/wwwroot/admin/index.html
@@ -1375,9 +1375,9 @@ async function deleteReq(id){if(!confirm('حذف؟'))return;await api(`/api/heal
 // ── Comments ──────────────────────────────────────────────────────────────────
 // ── Site Identity (logo / favicon) ────────────────────────────────────────────
 async function loadSiteIdentity() {
-  const data = await api('/api/settings/identity') || [];
+  const data = await api('/api/settings/identity').catch(()=>[]) || [];
   const vals = {};
-  data.forEach(s => vals[s.key] = s.value);
+  (Array.isArray(data) ? data : []).forEach(s => vals[s.key] = s.value);
   // Set hidden inputs
   document.getElementById('si-logo').value = vals.logo || '';
   document.getElementById('si-favicon').value = vals.favicon || '';
@@ -1823,8 +1823,13 @@ async function applyCrop() {
   const out = document.createElement('canvas');
   out.width = Math.round(sw); out.height = Math.round(sh);
   out.getContext('2d').drawImage(cropper.img, sx, sy, sw, sh, 0, 0, out.width, out.height);
-  // Capture targets BEFORE closing (closeCropper doesn't clear them, but be safe)
-  const _inputId = cropper.inputId, _previewId = cropper.previewId;
+  // Capture targets and mime type BEFORE the async callback
+  const _inputId  = cropper.inputId;
+  const _previewId = cropper.previewId;
+  const _mime     = cropper.mimeType || 'image/jpeg';
+  const _quality  = (_mime === 'image/jpeg' || _mime === 'image/webp') ? 0.92 : undefined;
+  const _ext      = _mime.split('/')[1].replace('jpeg','jpg').replace('vnd.microsoft.icon','ico').replace('x-icon','ico').replace('svg+xml','svg');
+
   out.toBlob(async blob => {
     closeCropper();
     const inputId = _inputId, previewId = _previewId;
@@ -1834,8 +1839,7 @@ async function applyCrop() {
     btn.disabled = true;
     try {
       const fd = new FormData();
-      const ext = _inputId && cropper.mimeType ? cropper.mimeType.split('/')[1].replace('jpeg','jpg') : 'jpg';
-      fd.append('file', new File([blob], `crop.${ext}`, {type: cropper.mimeType || 'image/jpeg'}));
+      fd.append('file', new File([blob], `crop.${_ext}`, {type: _mime}));
       const r = await fetch('/api/upload', {method:'POST', headers:{'Authorization':`Bearer ${token}`}, body:fd});
       if (!r.ok) throw new Error(await r.text());
       const { url } = await r.json();
@@ -1844,10 +1848,7 @@ async function applyCrop() {
       toast('تصویر با موفقیت آپلود شد ✓');
     } catch(e) { toast('خطا در آپلود: '+e.message,'error'); }
     finally { btn.innerHTML=orig; btn.disabled=false; }
-  // Use original mime type; only pass quality for lossy formats
-  const mime = cropper.mimeType || 'image/jpeg';
-  const quality = (mime === 'image/jpeg' || mime === 'image/webp') ? 0.92 : undefined;
-  }, mime, quality);
+  }, _mime, _quality);
 }
 
 async function uploadImage(inputId, previewId) {
