diff --git a/lib/views/ai/bot_assistants_page.dart b/lib/views/ai/bot_assistants_page.dart
index 680dc2a..a26824b 100644
--- a/lib/views/ai/bot_assistants_page.dart
+++ b/lib/views/ai/bot_assistants_page.dart
@@ -234,7 +234,7 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                       assistants.name ?? '',
                       fontSize: 16,
                       fontWeight: FontWeight.bold,
-                      color: Theme.of(context).colorScheme.primary,
+                      color: Theme.of(context).colorScheme.checkFav,
                     ),
                     const SizedBox(
                       height: 8,
@@ -243,7 +243,7 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                       DidvanText(
                         assistants.description!,
                         fontSize: 12,
-                        color: Theme.of(context).colorScheme.disabledText,
+                        color: Theme.of(context).colorScheme.text,
                         maxLines: 2,
                         overflow: TextOverflow.ellipsis,
                       ),
@@ -256,9 +256,10 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                         Expanded(
                           child: Row(
                             children: [
-                              const Icon(
+                              Icon(
                                 DidvanIcons.calendar_day_light,
                                 size: 18,
+                                color: Theme.of(context).colorScheme.caption,
                               ),
                               const SizedBox(
                                 width: 4,
@@ -267,6 +268,7 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                                 DateTime.parse(assistants.createdAt!)
                                     .toPersianDateStr(),
                                 fontSize: 12,
+                                color: Theme.of(context).colorScheme.caption,
                               ),
                             ],
                           ),
@@ -279,19 +281,25 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                                         context, Routes.createBotAssistants,
                                         arguments: assistants.id);
                                   },
-                                  child: const Row(
+                                  child: Row(
                                     mainAxisAlignment: MainAxisAlignment.end,
                                     children: [
                                       Icon(
                                         DidvanIcons.user_edit_light,
                                         size: 18,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .caption,
                                       ),
-                                      SizedBox(
+                                      const SizedBox(
                                         width: 4,
                                       ),
                                       DidvanText(
                                         'ویرایش',
                                         fontSize: 12,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .caption,
                                       ),
                                     ],
                                   ),
@@ -313,6 +321,9 @@ class _BotAssistantsPageState extends State<BotAssistantsPage> {
                                         fontSize: 12,
                                         maxLines: 1,
                                         overflow: TextOverflow.ellipsis,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .caption,
                                       ),
                                     ),
                                   ],
diff --git a/lib/views/ai/create_bot_assistants_page.dart b/lib/views/ai/create_bot_assistants_page.dart
index 898e3b7..1e3b921 100644
--- a/lib/views/ai/create_bot_assistants_page.dart
+++ b/lib/views/ai/create_bot_assistants_page.dart
@@ -390,6 +390,8 @@ class _CreateBotAssistantsPageState extends State<CreateBotAssistantsPage> {
                                             .surface
                                             .withOpacity(0.5),
                                       ),
+                                      closedFillColor:
+                                          Theme.of(context).colorScheme.surface,
                                       closedBorder:
                                           Border.all(color: Colors.grey),
                                       expandedFillColor: Theme.of(context)