diff --git a/src/BackOffice/Pages/DiscountShop/Components/OrderDetailsDialog.razor b/src/BackOffice/Pages/DiscountShop/Components/OrderDetailsDialog.razor
index 036b8b0..44a8fd5 100644
--- a/src/BackOffice/Pages/DiscountShop/Components/OrderDetailsDialog.razor
+++ b/src/BackOffice/Pages/DiscountShop/Components/OrderDetailsDialog.razor
@@ -197,14 +197,14 @@
                             <MudTextField T="string"
                                           Label="کد رهگیری"
                                           Variant="Variant.Outlined"
-                                          Dense="true"
+                                          Margin="Margin.Dense"
                                           @bind-Value="_trackingCode" />
                         </MudItem>
                         <MudItem xs="12">
                             <MudTextField T="string"
                                           Label="یادداشت ادمین"
                                           Variant="Variant.Outlined"
-                                          Dense="true"
+                                          Margin="Margin.Dense"
                                           Lines="3"
                                           HelperText="دلیل تغییر وضعیت یا توضیحات اضافی"
                                           @bind-Value="_adminNotes" />
diff --git a/src/BackOffice/Pages/DiscountShop/DiscountCategoriesMainPage.razor b/src/BackOffice/Pages/DiscountShop/DiscountCategoriesMainPage.razor
index 600a155..f40df48 100644
--- a/src/BackOffice/Pages/DiscountShop/DiscountCategoriesMainPage.razor
+++ b/src/BackOffice/Pages/DiscountShop/DiscountCategoriesMainPage.razor
@@ -20,14 +20,14 @@
                     <MudList T="string" Dense="true">
                         <MudListItem T="string"
                                      OnClick="@(() => OnTreeNodeSelected(null))"
-                                     Selected="@(_selectedParentId == null)">
+                                     Class="@(_selectedParentId == null ? "mud-selected-item" : "")">
                             <MudText Typo="Typo.body2">همه دسته‌بندی‌ها</MudText>
                         </MudListItem>
                         @foreach (var node in _treeNodes)
                         {
                             <MudListItem T="string"
                                          OnClick="@(() => OnTreeNodeSelected(node.Id))"
-                                         Selected="@(_selectedParentId == node.Id)">
+                                         Class="@(_selectedParentId == node.Id ? "mud-selected-item" : "")">
                                 <MudStack Row="true" AlignItems="AlignItems.Center">
                                     <div style="width:@(node.Depth * 16)px;"></div>
                                     <MudText Typo="Typo.body2">@node.Title</MudText>
diff --git a/src/BackOffice/Pages/DiscountShop/DiscountOrdersMainPage.razor b/src/BackOffice/Pages/DiscountShop/DiscountOrdersMainPage.razor
index da8c2f7..dafd690 100644
--- a/src/BackOffice/Pages/DiscountShop/DiscountOrdersMainPage.razor
+++ b/src/BackOffice/Pages/DiscountShop/DiscountOrdersMainPage.razor
@@ -23,11 +23,11 @@
                          @bind-Value="@_trackingCodeFilter" Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">
-            <MudDatePicker T="DateTime?" Label="از تاریخ" @bind-Date="_fromDateFilter"
+            <MudDatePicker Label="از تاریخ" @bind-Date="_fromDateFilter"
                            Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">
-            <MudDatePicker T="DateTime?" Label="تا تاریخ" @bind-Date="_toDateFilter"
+            <MudDatePicker Label="تا تاریخ" @bind-Date="_toDateFilter"
                            Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">
diff --git a/src/BackOffice/Pages/SystemManagement/Configuration.razor b/src/BackOffice/Pages/SystemManagement/Configuration.razor
index 70dc54e..8b9d901 100644
--- a/src/BackOffice/Pages/SystemManagement/Configuration.razor
+++ b/src/BackOffice/Pages/SystemManagement/Configuration.razor
@@ -174,8 +174,7 @@
                         <MudItem xs="12">
                             <MudSwitch T="bool" @bind-Value="_networkConfig.SpilloverEnabled"
                                      Color="Color.Primary"
-                                     Label="Spillover فعال باشد"
-                                     HelperText="اعضای اضافی به پایین درخت منتقل شوند" />
+                                     Label="Spillover فعال باشد — اعضای اضافی به پایین درخت منتقل شوند" />
                         </MudItem>
                     </MudGrid>
 
@@ -340,8 +339,7 @@
                         <MudItem xs="12">
                             <MudSwitch @bind-Value="_systemConfig.MaintenanceMode"
                                      Color="Color.Warning"
-                                     Label="حالت تعمیر و نگهداری"
-                                     HelperText="غیرفعال کردن موقت سیستم برای به‌روزرسانی" />
+                                     Label="حالت تعمیر و نگهداری — غیرفعال کردن موقت سیستم برای به‌روزرسانی" />
                         </MudItem>
 
                         <MudItem xs="12">
diff --git a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
index f599c38..306569c 100644
--- a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
+++ b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
@@ -27,11 +27,11 @@
                              @bind-Value="@_request.Filter.Amount" Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">
-            <MudDatePicker T="DateTime?" Label="از تاریخ پرداخت" @bind-Date="_paymentDateFrom"
+            <MudDatePicker Label="از تاریخ پرداخت" @bind-Date="_paymentDateFrom"
                            Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">
-            <MudDatePicker T="DateTime?" Label="تا تاریخ پرداخت" @bind-Date="_paymentDateTo"
+            <MudDatePicker Label="تا تاریخ پرداخت" @bind-Date="_paymentDateTo"
                            Variant="Variant.Outlined" Margin="Margin.Dense"/>
         </MudItem>
         <MudItem xs="12" sm="6" md="3">