diff --git a/app/dashboard/chat-topics/page.tsx b/app/dashboard/chat-topics/page.tsx
new file mode 100644
index 0000000..749e761
--- /dev/null
+++ b/app/dashboard/chat-topics/page.tsx
@@ -0,0 +1,238 @@
+"use client";
+
+import { useState } from "react";
+import { apiFetch, ApiError } from "@/lib/api";
+import { useList } from "@/lib/useResource";
+import { useToast } from "@/components/toast";
+import { DataTable, type Column } from "@/components/DataTable";
+import {
+  Badge,
+  Button,
+  ConfirmDialog,
+  Field,
+  Input,
+  Textarea,
+  Switch,
+  Modal,
+  PageHeader,
+} from "@/components/ui";
+import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
+import { toFa } from "@/lib/utils";
+
+interface ChatTopic {
+  id: number;
+  title?: string;
+  description?: string | null;
+  order?: number | null;
+  is_active?: boolean;
+}
+
+export default function ChatTopicsPage() {
+  const { data, loading, error, reload } = useList<ChatTopic>("/chat-topics");
+  const toast = useToast();
+
+  const [editing, setEditing] = useState<ChatTopic | null>(null);
+  const [open, setOpen] = useState(false);
+  const [saving, setSaving] = useState(false);
+
+  const [title, setTitle] = useState("");
+  const [description, setDescription] = useState("");
+  const [order, setOrder] = useState("");
+  const [isActive, setIsActive] = useState(true);
+
+  const [deleting, setDeleting] = useState<ChatTopic | null>(null);
+  const [removing, setRemoving] = useState(false);
+
+  function openCreate() {
+    setEditing(null);
+    setTitle("");
+    setDescription("");
+    setOrder("");
+    setIsActive(true);
+    setOpen(true);
+  }
+  function openEdit(row: ChatTopic) {
+    setEditing(row);
+    setTitle(row.title ?? "");
+    setDescription(row.description ?? "");
+    setOrder(row.order != null ? String(row.order) : "");
+    setIsActive(row.is_active ?? true);
+    setOpen(true);
+  }
+
+  async function save(e: React.FormEvent) {
+    e.preventDefault();
+    setSaving(true);
+    try {
+      // chat-topics is a JSON apiResource (no files).
+      const payload = {
+        title,
+        description: description || null,
+        order: order === "" ? null : Number(order),
+        is_active: isActive,
+      };
+      if (editing) {
+        await apiFetch(`/chat-topics/${editing.id}`, {
+          method: "PUT",
+          body: payload,
+        });
+        toast.success("موضوع ویرایش شد.");
+      } else {
+        await apiFetch("/chat-topics", { method: "POST", body: payload });
+        toast.success("موضوع افزوده شد.");
+      }
+      setOpen(false);
+      reload();
+    } catch (err) {
+      toast.error(err instanceof ApiError ? err.message : "خطا در ذخیره‌سازی");
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  async function confirmDelete() {
+    if (!deleting) return;
+    setRemoving(true);
+    try {
+      await apiFetch(`/chat-topics/${deleting.id}`, { method: "DELETE" });
+      toast.success("موضوع حذف شد.");
+      setDeleting(null);
+      reload();
+    } catch (err) {
+      toast.error(err instanceof ApiError ? err.message : "خطا در حذف");
+    } finally {
+      setRemoving(false);
+    }
+  }
+
+  const columns: Column<ChatTopic>[] = [
+    { key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-20" },
+    { key: "title", header: "عنوان", render: (r) => r.title ?? "—" },
+    {
+      key: "description",
+      header: "توضیحات",
+      render: (r) => r.description || "—",
+    },
+    {
+      key: "order",
+      header: "ترتیب",
+      render: (r) => toFa(r.order ?? "—"),
+      className: "w-20",
+    },
+    {
+      key: "is_active",
+      header: "وضعیت",
+      render: (r) =>
+        r.is_active ? (
+          <Badge tone="success">فعال</Badge>
+        ) : (
+          <Badge tone="neutral">غیرفعال</Badge>
+        ),
+    },
+  ];
+
+  return (
+    <div>
+      <PageHeader
+        title="موضوعات پیشنهادی گفتگو"
+        subtitle="موضوعاتی که در بخش گفتگو با مشاور به کاربر پیشنهاد می‌شود"
+        action={
+          <Button icon={<PlusIcon className="h-4 w-4" />} onClick={openCreate}>
+            موضوع جدید
+          </Button>
+        }
+      />
+
+      <DataTable
+        columns={columns}
+        rows={data}
+        loading={loading}
+        error={error}
+        onRetry={reload}
+        emptyMessage="هنوز موضوعی ثبت نشده است."
+        emptyAction={
+          <Button icon={<PlusIcon className="h-4 w-4" />} onClick={openCreate}>
+            موضوع جدید
+          </Button>
+        }
+        actions={(row) => (
+          <>
+            <Button variant="ghost" onClick={() => openEdit(row)} aria-label="ویرایش">
+              <EditIcon className="h-4 w-4" />
+            </Button>
+            <Button
+              variant="ghost"
+              onClick={() => setDeleting(row)}
+              aria-label="حذف"
+              className="text-danger"
+            >
+              <TrashIcon className="h-4 w-4" />
+            </Button>
+          </>
+        )}
+      />
+
+      <Modal
+        open={open}
+        onClose={() => setOpen(false)}
+        title={editing ? "ویرایش موضوع" : "موضوع جدید"}
+        footer={
+          <>
+            <Button variant="secondary" onClick={() => setOpen(false)}>
+              انصراف
+            </Button>
+            <Button form="chat-topic-form" type="submit" loading={saving}>
+              ذخیره
+            </Button>
+          </>
+        }
+      >
+        <form id="chat-topic-form" onSubmit={save} className="flex flex-col gap-4">
+          <Field label="عنوان" required>
+            <Input
+              value={title}
+              onChange={(e) => setTitle(e.target.value)}
+              placeholder="مثلاً هیچ راه واحدی برای مدیتیشن وجود ندارد"
+              required
+              autoFocus
+            />
+          </Field>
+
+          <Field label="توضیحات">
+            <Textarea
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="توضیح اختیاری درباره موضوع"
+            />
+          </Field>
+
+          <Field label="ترتیب">
+            <Input
+              type="number"
+              dir="ltr"
+              value={order}
+              onChange={(e) => setOrder(e.target.value)}
+              placeholder="مثلاً ۱"
+            />
+          </Field>
+
+          <Field label="وضعیت">
+            <Switch
+              checked={isActive}
+              onChange={setIsActive}
+              label={isActive ? "فعال" : "غیرفعال"}
+            />
+          </Field>
+        </form>
+      </Modal>
+
+      <ConfirmDialog
+        open={!!deleting}
+        message={`آیا از حذف «${deleting?.title ?? ""}» مطمئن هستید؟`}
+        loading={removing}
+        onConfirm={confirmDelete}
+        onClose={() => setDeleting(null)}
+      />
+    </div>
+  );
+}
diff --git a/app/dashboard/media/categories/page.tsx b/app/dashboard/media/categories/page.tsx
index e5177b1..2ee1396 100644
--- a/app/dashboard/media/categories/page.tsx
+++ b/app/dashboard/media/categories/page.tsx
@@ -10,17 +10,26 @@ import {
   ConfirmDialog,
   Field,
   Input,
+  Textarea,
   Modal,
   PageHeader,
 } from "@/components/ui";
 import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
+import { MediaPreview } from "@/components/MediaPreview";
+import { pickUrl } from "@/lib/media";
 import { toFa } from "@/lib/utils";
 
 interface Category {
   id: number;
   name: string;
+  description?: string | null;
+  icon?: string | null;
+  subcategories_count?: number;
 }
 
+// The icon is a direct image-file field on the category (not an image_id ref).
+const ICON_KEYS = ["icon", "icon_url"];
+
 export default function MediaCategoriesPage() {
   const { data, loading, error, reload } = useList<Category>("/categories");
   const toast = useToast();
@@ -28,6 +37,8 @@ export default function MediaCategoriesPage() {
   const [editing, setEditing] = useState<Category | null>(null);
   const [open, setOpen] = useState(false);
   const [name, setName] = useState("");
+  const [description, setDescription] = useState("");
+  const [icon, setIcon] = useState<File | null>(null);
   const [saving, setSaving] = useState(false);
 
   const [deleting, setDeleting] = useState<Category | null>(null);
@@ -36,11 +47,15 @@ export default function MediaCategoriesPage() {
   function openCreate() {
     setEditing(null);
     setName("");
+    setDescription("");
+    setIcon(null);
     setOpen(true);
   }
   function openEdit(row: Category) {
     setEditing(row);
-    setName(row.name);
+    setName(row.name ?? "");
+    setDescription(row.description ?? "");
+    setIcon(null);
     setOpen(true);
   }
 
@@ -49,17 +64,19 @@ export default function MediaCategoriesPage() {
     setSaving(true);
     try {
       if (editing) {
-        // Update is JSON on /categories/:id
-        await apiFetch(`/categories/${editing.id}`, {
-          method: "PUT",
-          body: { name },
+        // Icon is a file, so update goes through POST + Laravel method spoofing.
+        const body = toFormData({
+          _method: "PUT",
+          name,
+          description,
+          icon,
         });
+        await apiFetch(`/categories/${editing.id}`, { method: "POST", body });
         toast.success("دسته‌بندی ویرایش شد.");
       } else {
-        // Create is multipart on /categories
         await apiFetch("/categories", {
           method: "POST",
-          body: toFormData({ name }),
+          body: toFormData({ name, description, icon }),
         });
         toast.success("دسته‌بندی افزوده شد.");
       }
@@ -88,8 +105,26 @@ export default function MediaCategoriesPage() {
   }
 
   const columns: Column<Category>[] = [
-    { key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
+    {
+      key: "icon",
+      header: "آیکن",
+      className: "w-20",
+      render: (r) => (
+        <MediaPreview kind="image" src={pickUrl(r, ICON_KEYS)} label={r.name} />
+      ),
+    },
     { key: "name", header: "نام دسته‌بندی" },
+    {
+      key: "description",
+      header: "توضیحات",
+      render: (r) => r.description || "—",
+    },
+    {
+      key: "subcategories_count",
+      header: "زیر‌دسته‌ها",
+      render: (r) => toFa(r.subcategories_count ?? 0),
+      className: "w-28",
+    },
   ];
 
   return (
@@ -148,7 +183,7 @@ export default function MediaCategoriesPage() {
           </>
         }
       >
-        <form id="category-form" onSubmit={save}>
+        <form id="category-form" onSubmit={save} className="flex flex-col gap-4">
           <Field label="نام دسته‌بندی" required>
             <Input
               value={name}
@@ -158,6 +193,29 @@ export default function MediaCategoriesPage() {
               autoFocus
             />
           </Field>
+
+          <Field label="توضیحات">
+            <Textarea
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="توضیح کوتاه درباره این دسته‌بندی"
+            />
+          </Field>
+
+          <Field
+            label="آیکن"
+            hint={
+              editing
+                ? "در صورت عدم انتخاب، آیکن فعلی حفظ می‌شود."
+                : "یک تصویر برای نمایش دسته‌بندی انتخاب کنید."
+            }
+          >
+            <Input
+              type="file"
+              accept="image/*"
+              onChange={(e) => setIcon(e.target.files?.[0] ?? null)}
+            />
+          </Field>
         </form>
       </Modal>
 
diff --git a/app/dashboard/media/sub-categories/page.tsx b/app/dashboard/media/sub-categories/page.tsx
index 0c6124a..5b85896 100644
--- a/app/dashboard/media/sub-categories/page.tsx
+++ b/app/dashboard/media/sub-categories/page.tsx
@@ -10,6 +10,7 @@ import {
   ConfirmDialog,
   Field,
   Input,
+  Textarea,
   Select,
   Modal,
   PageHeader,
@@ -25,6 +26,7 @@ interface Category {
 interface SubCategory {
   id: number;
   name?: string;
+  description?: string | null;
   category_id?: number;
   category?: { id?: number; name?: string };
 }
@@ -39,6 +41,7 @@ export default function SubCategoriesPage() {
   const [saving, setSaving] = useState(false);
 
   const [name, setName] = useState("");
+  const [description, setDescription] = useState("");
   const [categoryId, setCategoryId] = useState("");
 
   const [deleting, setDeleting] = useState<SubCategory | null>(null);
@@ -47,6 +50,7 @@ export default function SubCategoriesPage() {
   function openCreate() {
     setEditing(null);
     setName("");
+    setDescription("");
     setCategoryId("");
     setOpen(true);
   }
@@ -54,6 +58,7 @@ export default function SubCategoriesPage() {
   function openEdit(row: SubCategory) {
     setEditing(row);
     setName(row.name ?? "");
+    setDescription(row.description ?? "");
     setCategoryId(
       row.category_id != null
         ? String(row.category_id)
@@ -72,14 +77,14 @@ export default function SubCategoriesPage() {
         // Update is JSON on /sub-categories/:id
         await apiFetch(`/sub-categories/${editing.id}`, {
           method: "PUT",
-          body: { name, category_id: categoryId },
+          body: { name, category_id: categoryId, description },
         });
         toast.success("زیر‌دسته ویرایش شد.");
       } else {
         // Create is multipart on /sub-categories
         await apiFetch("/sub-categories", {
           method: "POST",
-          body: toFormData({ category_id: categoryId, name }),
+          body: toFormData({ category_id: categoryId, name, description }),
         });
         toast.success("زیر‌دسته افزوده شد.");
       }
@@ -115,6 +120,11 @@ export default function SubCategoriesPage() {
       header: "دسته‌بندی والد",
       render: (r) => r.category?.name ?? "—",
     },
+    {
+      key: "description",
+      header: "توضیحات",
+      render: (r) => r.description || "—",
+    },
   ];
 
   return (
@@ -202,6 +212,14 @@ export default function SubCategoriesPage() {
               autoFocus
             />
           </Field>
+
+          <Field label="توضیحات">
+            <Textarea
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="توضیح کوتاه درباره این زیر‌دسته"
+            />
+          </Field>
         </form>
       </Modal>
 
diff --git a/app/dashboard/questions/page.tsx b/app/dashboard/questions/page.tsx
index ca2d401..b57c5d8 100644
--- a/app/dashboard/questions/page.tsx
+++ b/app/dashboard/questions/page.tsx
@@ -20,10 +20,17 @@ import { toFa } from "@/lib/utils";
 interface Question {
   id: number;
   title?: string;
-  category?: string;
+  // Submitted as a string (name); returned by the API as a related object.
+  category?: { id?: number; name?: string } | string | null;
   tags?: string[] | string;
 }
 
+function categoryName(c: Question["category"]): string {
+  if (!c) return "";
+  if (typeof c === "string") return c;
+  return c.name ?? "";
+}
+
 function asTags(value: Question["tags"]): string[] {
   if (Array.isArray(value)) return value.map((t) => String(t));
   if (typeof value === "string" && value.trim() !== "") {
@@ -73,7 +80,7 @@ export default function QuestionsPage() {
   function openEdit(row: Question) {
     setEditing(row);
     setTitle(row.title ?? "");
-    setCategory(row.category ?? "");
+    setCategory(categoryName(row.category));
     setTagsInput(asTags(row.tags).join("، "));
     setOpen(true);
   }
@@ -125,7 +132,7 @@ export default function QuestionsPage() {
   const columns: Column<Question>[] = [
     { key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-20" },
     { key: "title", header: "عنوان", render: (r) => r.title ?? "—" },
-    { key: "category", header: "دسته", render: (r) => r.category ?? "—" },
+    { key: "category", header: "دسته", render: (r) => categoryName(r.category) || "—" },
     {
       key: "tags",
       header: "برچسب‌ها",
diff --git a/app/layout.tsx b/app/layout.tsx
index b8048dd..15e9eb7 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -24,7 +24,12 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="fa" dir="rtl" className={`${vazir.variable} h-full`}>
+    <html
+      lang="fa"
+      dir="rtl"
+      className={`${vazir.variable} h-full`}
+      suppressHydrationWarning
+    >
       <head>
         <script dangerouslySetInnerHTML={{ __html: noFlashTheme }} />
       </head>
diff --git a/components/icons.tsx b/components/icons.tsx
index eea4654..d3c59f4 100644
--- a/components/icons.tsx
+++ b/components/icons.tsx
@@ -183,6 +183,13 @@ export const TrophyIcon = (p: IconProps) => (
     <path d="M17 5h3v2a3 3 0 0 1-3 3M7 5H4v2a3 3 0 0 0 3 3" />
   </svg>
 );
+export const ChatIcon = (p: IconProps) => (
+  <svg {...base(p)}>
+    <path d="M21 11.5a8.38 8.38 0 0 1-9 8.34 9.5 9.5 0 0 1-3.4-.5L3 21l1.66-4.5A8.38 8.38 0 0 1 4 12a8.5 8.5 0 0 1 9-8.45 8.38 8.38 0 0 1 8 7.95Z" />
+    <path d="M8.5 12h.01M12 12h.01M15.5 12h.01" />
+  </svg>
+);
+
 export const TagIcon = (p: IconProps) => (
   <svg {...base(p)}>
     <path d="M3 12V5a2 2 0 0 1 2-2h7l9 9-9 9-9-9Z" />
diff --git a/docs/API.md b/docs/API.md
index ee9ad2d..10af027 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -24,8 +24,8 @@ All meditation calls send `Authorization: Bearer <meditationToken>` and `Accept:
 - POST `/media/:id` — update (same multipart fields). Playable URL is in **`external_url`**; thumbnail in nested **`image.url`**.
 - GET `/media/popular`, `/media/recently-played`, `/media/saved`
 - POST `/media/:id/play`, `/media/:id/save`, `/media/:id/note`, `/media/:id/feedback` (stars, content)
-- Categories: GET/POST/PUT/DELETE `/categories` (multipart name)
-- Sub-categories: GET/POST `/sub-categories`, PUT/DELETE `/sub-categories/:id` (category_id, name)
+- Categories: GET `/categories`, POST `/categories` (multipart: name, description, `icon`(image file)), PUT `/categories/:id` (file → POST + `_method=PUT`), DELETE `/categories/:id`. Icon path in `icon`.
+- Sub-categories: GET/POST `/sub-categories` (category_id, name, description), PUT/DELETE `/sub-categories/:id` (json: category_id, name, description)
 
 ### Track (music)
 - Categories: GET `/music-categories/:id`, POST `/music-categories`, PUT/DELETE `/music-categories/:id` (name, description, order, image_id, is_active)
@@ -75,6 +75,9 @@ All meditation calls send `Authorization: Bearer <meditationToken>` and `Accept:
 - Saves: POST `/saves/toggle`, `/saves/save`, `/saves/unsave`, `/saves/check` (type, id), GET `/saves/my-saved?type=`
 - Ratings: GET/POST/DELETE `/ratings/:type/:id` (stars), GET `/ratings/:type/:id/user`
 
+### Chat topics (موضوعات پیشنهادی گفتگو با مشاور)
+- GET `/chat-topics`, GET `/chat-topics/:id`, POST `/chat-topics`, PUT/DELETE `/chat-topics/:id` (json: title, description, order, is_active)
+
 ### Misc
 - GET `/leader-board`
 - GET `/profile`
diff --git a/export.zip b/export.zip
index 1d68f22..04e378a 100644
Binary files a/export.zip and b/export.zip differ
diff --git a/lib/nav.ts b/lib/nav.ts
index 1be218e..17d15bc 100644
--- a/lib/nav.ts
+++ b/lib/nav.ts
@@ -1,6 +1,7 @@
 import type { ComponentType, SVGProps } from "react";
 import {
   BreathIcon,
+  ChatIcon,
   HomeIcon,
   ImageIcon,
   MediaIcon,
@@ -94,6 +95,11 @@ export const NAV: NavSection[] = [
     icon: SurveyIcon,
     items: [{ href: "/dashboard/surveys", label: "پرسش‌های نظرسنجی" }],
   },
+  {
+    label: "گفتگو با مشاور",
+    icon: ChatIcon,
+    items: [{ href: "/dashboard/chat-topics", label: "موضوعات پیشنهادی" }],
+  },
   {
     label: "حال‌وهوا",
     icon: MoodIcon,