diff --git a/DivanRazor/Pages/Auth/Login.cshtml b/DivanRazor/Pages/Auth/Login.cshtml
index b6ca6d2a..e8e9086c 100644
--- a/DivanRazor/Pages/Auth/Login.cshtml
+++ b/DivanRazor/Pages/Auth/Login.cshtml
@@ -18,7 +18,7 @@
 </head>
 <body class="bk-background">
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
     <div id="login">
         <div id="login-container">
diff --git a/DivanRazor/Pages/Auth/ResetPassword.cshtml b/DivanRazor/Pages/Auth/ResetPassword.cshtml
index 87470651..e1245c83 100644
--- a/DivanRazor/Pages/Auth/ResetPassword.cshtml
+++ b/DivanRazor/Pages/Auth/ResetPassword.cshtml
@@ -16,7 +16,7 @@
 </head>
 <body class="bk-background">
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
     <div id="login">
         <div id="main">
diff --git a/DivanRazor/Pages/Auth/SignUp.cshtml b/DivanRazor/Pages/Auth/SignUp.cshtml
index 1fe84184..256fc4cb 100644
--- a/DivanRazor/Pages/Auth/SignUp.cshtml
+++ b/DivanRazor/Pages/Auth/SignUp.cshtml
@@ -17,7 +17,7 @@
 </head>
 <body class="bk-background">
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
     <div id="login">
         <div id="main">
diff --git a/DivanRazor/Pages/Error.cshtml b/DivanRazor/Pages/Error.cshtml
index e8660d85..4019e869 100644
--- a/DivanRazor/Pages/Error.cshtml
+++ b/DivanRazor/Pages/Error.cshtml
@@ -61,7 +61,7 @@
 
 <body>
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
 
     <h1 class="text-danger">غیر متوقع خرابی</h1>
diff --git a/DivanRazor/Pages/Misc/Photos.cshtml b/DivanRazor/Pages/Misc/Photos.cshtml
index 79307271..4f1a42bd 100644
--- a/DivanRazor/Pages/Misc/Photos.cshtml
+++ b/DivanRazor/Pages/Misc/Photos.cshtml
@@ -108,7 +108,7 @@
             <h1>
                 @if (Model.Poet == null)
                 {
-                    <a href="/photos" title="چهره‌های دیوان"><img src="/image/gdap.png" alt="@ViewData["Title"]" class="home-logo" /></a>
+                    <a href="/photos" title="چهره‌های دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
                 }
                 else
                 {
diff --git a/DivanRazor/Pages/Shared/_AdminLayout.cshtml b/DivanRazor/Pages/Shared/_AdminLayout.cshtml
index bef07d41..5e297e98 100644
--- a/DivanRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/DivanRazor/Pages/Shared/_AdminLayout.cshtml
@@ -421,7 +421,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" style="width:auto;margin:auto;" /></a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/DivanRazor/Pages/Shared/_SearchHeaderPartial.cshtml b/DivanRazor/Pages/Shared/_SearchHeaderPartial.cshtml
index d22d71a7..142ea3c3 100644
--- a/DivanRazor/Pages/Shared/_SearchHeaderPartial.cshtml
+++ b/DivanRazor/Pages/Shared/_SearchHeaderPartial.cshtml
@@ -1,6 +1,6 @@
 @model DivanRazor.Pages._SearchHeaderPartialModel
 <div id="hdr2" class="clearfix">
-    <h1><a href="/" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" /></a></h1>
+    <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     <div class="actionbox">
         <form action="/search" method="get" id="searchform">
             <input type="text" name="s" id="s" class="inputText" value="@Model.SearchQuery" placeholder="تلاش" />
diff --git a/DivanRazor/Pages/Shared/_UserPanelLayout.cshtml b/DivanRazor/Pages/Shared/_UserPanelLayout.cshtml
index 3bda819d..91d80766 100644
--- a/DivanRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/DivanRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -87,7 +87,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" style="width:auto;margin:auto;" /></a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/DivanRazor/Pages/errors/404.cshtml b/DivanRazor/Pages/errors/404.cshtml
index b0ab2fda..5da2c874 100644
--- a/DivanRazor/Pages/errors/404.cshtml
+++ b/DivanRazor/Pages/errors/404.cshtml
@@ -22,7 +22,7 @@
 
 <body>
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
 
     <h1 class="text-danger">نہیں ملا ....</h1>
diff --git a/DivanRazor/Pages/errors/503.cshtml b/DivanRazor/Pages/errors/503.cshtml
index 2270bfce..add9edeb 100644
--- a/DivanRazor/Pages/errors/503.cshtml
+++ b/DivanRazor/Pages/errors/503.cshtml
@@ -23,7 +23,7 @@
 
 <body>
     <div id="hdr">
-        <h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
+        <h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
     </div>
 
     <h1 class="text-danger">دیوان کی تازہ کاری جاری ہے</h1>
diff --git a/DivanRazor/wwwroot/css/divan.css b/DivanRazor/wwwroot/css/divan.css
index a3fbeb34..85a38c1f 100644
--- a/DivanRazor/wwwroot/css/divan.css
+++ b/DivanRazor/wwwroot/css/divan.css
@@ -56,3 +56,8 @@ h1, h2, h3, .century, .caption a {
     background: var(--card-nested);
     transform: translateY(-2px);
 }
+
+.divan-wordmark--sm {
+    font-size: 2rem;
+    line-height: 1.6;
+}
diff --git a/DivanRazor/wwwroot/image/gdap.png b/DivanRazor/wwwroot/image/gdap.png
deleted file mode 100644
index ae3eccba..00000000
Binary files a/DivanRazor/wwwroot/image/gdap.png and /dev/null differ
diff --git a/DivanRazor/wwwroot/image/gdapk.png b/DivanRazor/wwwroot/image/gdapk.png
deleted file mode 100644
index cc8be2bb..00000000
Binary files a/DivanRazor/wwwroot/image/gdapk.png and /dev/null differ
diff --git a/RMuseum/Controllers/DivanController.cs b/RMuseum/Controllers/DivanController.cs
index 43b72d7e..27346f5e 100644
--- a/RMuseum/Controllers/DivanController.cs
+++ b/RMuseum/Controllers/DivanController.cs
@@ -2269,7 +2269,8 @@ namespace RMuseum.Controllers
         {
             try
             {
-                var res = _divanService.StartImportFromPublicDataRepo(request.UseHttp, request.Location, request.PoetId);
+                Guid userId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "UserId").Value);
+                var res = _divanService.StartImportFromPublicDataRepo(request.UseHttp, request.Location, request.PoetId, userId);
                 if (!string.IsNullOrEmpty(res.ExceptionString))
                     return BadRequest(res.ExceptionString);
                 return Ok();
diff --git a/RMuseum/Services/IDivanService.cs b/RMuseum/Services/IDivanService.cs
index a211c1cd..e4c1708e 100644
--- a/RMuseum/Services/IDivanService.cs
+++ b/RMuseum/Services/IDivanService.cs
@@ -582,7 +582,7 @@ namespace RMuseum.Services
         /// <param name="location">base URL or local folder path of the exported data tree</param>
         /// <param name="poetId">0 imports every poet; a specific id imports only that poet (useful on a slow connection)</param>
         /// <returns></returns>
-        RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0);
+        RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0, Guid userId = default);
 
         /// <summary>
         /// examine site pages for broken links
diff --git a/RMuseum/Services/Implementation/DivanService-Partials/DivanService-PublicDataImport.cs b/RMuseum/Services/Implementation/DivanService-Partials/DivanService-PublicDataImport.cs
index 55a0f0b3..6e61b66b 100644
--- a/RMuseum/Services/Implementation/DivanService-Partials/DivanService-PublicDataImport.cs
+++ b/RMuseum/Services/Implementation/DivanService-Partials/DivanService-PublicDataImport.cs
@@ -45,7 +45,7 @@ namespace RMuseum.Services.Implementation
         /// <param name="useHttp">true: fetch over HTTP (location is a base URL). false: read from a local folder (location is a path).</param>
         /// <param name="location">base URL or local folder path of the exported data tree</param>
         /// <param name="poetId">0 imports every poet in the export's manifest; a specific id imports only that poet — useful on a slow connection, or when a developer only needs one poet's data for local testing</param>
-        public RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0)
+        public RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0, Guid userId = default)
         {
             try
             {
@@ -103,6 +103,12 @@ namespace RMuseum.Services.Implementation
                                 await _RegenerateHalfCenturies(context);
                                 _memoryCache.Remove("divan/centuries"); // same cache key GetCenturiesAsync/the "periods" endpoint use
 
+                                // divan: poet/category pages are imported with empty HtmlText (upstream fills it
+                                // with a separate admin TOC job); generate the tables of contents now so poet
+                                // and category pages list their works. Needs a real user for the page edit records.
+                                if (userId != Guid.Empty)
+                                    await _RegenerateTOCsAsync(userId, context, jobProgressServiceEF);
+
                                 await jobProgressServiceEF.UpdateJob(job.Id, 100, "", true);
                             }
                             catch (Exception exp)