diff --git a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html
index 4261b6d..3e868c6 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html
+++ b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html
@@ -7,9 +7,9 @@
   header="فیلتر صورت‌حساب‌ها"
   styleClass="w-full md:w-[28rem]"
   (visibleChange)="visibleChange.emit($event)">
-  <div class="flex h-full flex-col overflow-y-auto">
+  <div class="flex h-full flex-col">
     <hr />
-    <form class="grow py-4" [formGroup]="form" (ngSubmit)="submit()">
+    <form class="grow py-0" [formGroup]="form" (ngSubmit)="submit()">
       <app-input label="شماره صورت‌حساب" [control]="form.controls.invoice_number" name="invoice_number" />
 
       <app-enum-select type="fiscalResponseStatus" [control]="form.controls.status" />
@@ -23,12 +23,26 @@
         type="nationalId" />
       <app-input label="شناسه اقتصادی" [control]="form.controls.customer_economic_code" name="customer_economic_code" />
 
-      <!-- <div class="grid grid-cols-2 gap-2">
-      <uikit-datepicker label="از تاریخ صورت‌حساب‌" [control]="form.controls.invoice_date_from" name="invoice_date_from" />
-      <uikit-datepicker label="تا تاریخ صورت‌حساب‌" [control]="form.controls.invoice_date_to" name="invoice_date_to" />
-    </div>
+      <app-datepicker
+        label="از تاریخ صورت‌حساب‌"
+        [control]="form.controls.invoice_date_from"
+        [max]="form.controls.invoice_date_to.value || now"
+        name="invoice_date_from" />
+      <app-datepicker
+        label="تا تاریخ صورت‌حساب‌"
+        [control]="form.controls.invoice_date_to"
+        [min]="form.controls.invoice_date_from.value || undefined"
+        [max]="now"
+        name="invoice_date_to" />
 
-    <div class="grid grid-cols-2 gap-2">
+      <app-datepicker
+        label="از تاریخ ایجاد"
+        [control]="form.controls.created_at_from"
+        [max]="form.controls.invoice_date_to.value || now"
+        name="created_at_from" />
+      <app-datepicker label="تا تاریخ ایجاد" [control]="form.controls.created_at_to" [max]="now" name="created_at_to" />
+
+      <!-- <div class="grid grid-cols-2 gap-2">
       <uikit-datepicker label="از تاریخ صدور" [control]="form.controls.created_at_from" name="created_at_from" />
       <uikit-datepicker label="تا تاریخ صدور" [control]="form.controls.created_at_to" name="created_at_to" />
     </div> -->
@@ -38,7 +52,7 @@
         <app-input label="تا مبلغ" [control]="form.controls.total_amount_to" name="total_amount_to" type="price" />
       </div>
     </form>
-    <div class="bg-surface-card sticky bottom-0 mt-auto shrink-0">
+    <div class="bg-surface-card mt-auto shrink-0 pb-4">
       <hr />
       <div class="grid grid-cols-2 gap-2 pt-2">
         <button pButton type="button" outlined label="حذف" (click)="clear()"></button>
diff --git a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.ts b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.ts
index 5bd1734..8bb2ce6 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.ts
+++ b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.ts
@@ -2,6 +2,8 @@ import { Maybe } from '@/core';
 import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
 import { TspProviderResponseStatus } from '@/shared/catalog';
 import { InputComponent } from '@/shared/components';
+import { DatepickerComponent } from '@/uikit';
+import { nowGregorian } from '@/utils';
 import {
   Component,
   EventEmitter,
@@ -29,6 +31,7 @@ import { IPosSaleInvoicesFilterDto } from '../models';
     ButtonDirective,
     EnumSelectComponent,
     InputComponent,
+    DatepickerComponent,
   ],
 })
 export class PosSaleInvoicesFilterDrawerComponent implements OnChanges {
@@ -40,6 +43,8 @@ export class PosSaleInvoicesFilterDrawerComponent implements OnChanges {
   @Output() visibleChange = new EventEmitter<boolean>();
   @Output() apply = new EventEmitter<IPosSaleInvoicesFilterDto>();
 
+  readonly now = nowGregorian();
+
   readonly form = this.fb.group({
     page: this.fb.control<number | null>(null),
     perPage: this.fb.control<number | null>(null),
diff --git a/src/app/domains/pos/modules/saleInvoices/components/list.component.ts b/src/app/domains/pos/modules/saleInvoices/components/list.component.ts
index e4dfa9a..34cd190 100644
--- a/src/app/domains/pos/modules/saleInvoices/components/list.component.ts
+++ b/src/app/domains/pos/modules/saleInvoices/components/list.component.ts
@@ -160,6 +160,7 @@ export class PosSaleInvoiceListComponent {
   }
 
   private syncFiltersToQueryParams() {
+    this.filters.update((val) => ({ ...val, page: 1 }));
     const queryParams = Object.entries(this.filters()).reduce<Record<string, string>>(
       (acc, [key, value]) => {
         if (value !== undefined && value !== null && value !== '') {
diff --git a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
index 85ae1f1..517d36b 100644
--- a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
+++ b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.html
@@ -6,16 +6,16 @@
   <div class="absolute top-0 right-0 h-full w-1" [style.backgroundColor]="preparedInfo().borderColor"></div>
   <div class="text-surface-700 flex items-center justify-between gap-2">
     <div class="text-surface-700 flex items-center gap-2">
-      <span
-        class="text-surface-700 flex h-8 w-8 items-center justify-center rounded-full border"
+      <!-- <span
+        class="text-surface-700 flex h-8 w-8 shrink-0 items-center justify-center rounded-full border"
         [style.borderColor]="preparedInfo().borderColor"
         [style.backgroundColor]="preparedInfo().borderColor + '33'">
         <i class="text-sm" [ngClass]="'pi pi-' + preparedInfo().icon" [style.color]="preparedInfo().borderColor"></i>
-      </span>
+      </span> -->
       <span class="text-surface-700 text-sm font-semibold">{{ preparedInfo().title }}</span>
     </div>
     <span
-      class="text-surface-700 rounded-full border px-2 py-1 text-xs font-bold"
+      class="text-surface-700 shrink-0 rounded-full border px-2 py-1 text-xs font-bold"
       [style.borderColor]="preparedInfo().borderColor">
       {{ count || 0 }} عدد
     </span>
diff --git a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.ts b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.ts
index b71dabb..1ec2030 100644
--- a/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.ts
+++ b/src/app/domains/pos/modules/statistics/components/invoice-type-card.component.ts
@@ -57,7 +57,7 @@ export class PosStatisticsInvoiceTypeCardComponent {
         };
       case 'pending':
         return {
-          title: 'انتظار ارسال',
+          title: taxProviderStatusTranslatorUtil('FISCAL_QUEUED'),
           icon: 'clock',
           bgColor: '#3B82F61A',
           borderColor: '#3B82F6',
diff --git a/src/app/domains/pos/modules/statistics/views/root.component.ts b/src/app/domains/pos/modules/statistics/views/root.component.ts
index d175593..1b3ae4e 100644
--- a/src/app/domains/pos/modules/statistics/views/root.component.ts
+++ b/src/app/domains/pos/modules/statistics/views/root.component.ts
@@ -62,11 +62,11 @@ export class PosStatisticsRootComponent {
       case 'failure':
         queryParams.status = 'FAILURE';
         break;
-      case 'notSended':
+      case 'not_send':
         queryParams.status = 'NOT_SEND';
         break;
       case 'pending':
-        queryParams.status = 'QUEUED';
+        queryParams.status = 'FISCAL_QUEUED';
         break;
     }
     const queryString = new URLSearchParams(queryParams as Record<string, string>).toString();
diff --git a/src/app/shared/apiEnum/select.component.html b/src/app/shared/apiEnum/select.component.html
index 32a3853..e7a7c1b 100644
--- a/src/app/shared/apiEnum/select.component.html
+++ b/src/app/shared/apiEnum/select.component.html
@@ -8,6 +8,5 @@
     [showClear]="showClear"
     [name]="name || type"
     [overlayOptions]="overlayOptions()"
-    appendTo="body"
-  />
+    appendTo="body" />
 </uikit-field>
diff --git a/src/app/uikit/datepicker/datepicker.component.html b/src/app/uikit/datepicker/datepicker.component.html
index 9edd5af..b40532e 100644
--- a/src/app/uikit/datepicker/datepicker.component.html
+++ b/src/app/uikit/datepicker/datepicker.component.html
@@ -10,7 +10,7 @@
             <i class="pi pi-chevron-right cursor-pointer" (click)="changeMonth(-1)"></i>
           </div>
 
-          <div class="flex w-32 items-center justify-center px-3 text-lg font-bold select-none">
+          <div class="flex w-36 items-center justify-center px-3 text-lg font-bold select-none">
             {{ monthInfo().monthTitle }}
           </div>
 
@@ -39,7 +39,7 @@
               [class.bg-background-default]="closedDays.includes($index)">
               @if (!(day.isNextMonth || day.isPastMonth)) {
                 <span
-                  class="flex aspect-square w-full cursor-pointer items-center justify-center rounded px-2 py-1 text-lg transition-colors select-none"
+                  class="flex aspect-square w-full cursor-pointer items-center justify-center rounded-lg px-2 py-1 text-lg transition-colors select-none"
                   [ngClass]="{
                     'bg-surface-ground font-bold': day.isCurrentDay,
                     'bg-primary! text-primary-contrast!': isSelected(day),
diff --git a/src/app/uikit/datepicker/datepicker.component.ts b/src/app/uikit/datepicker/datepicker.component.ts
index 9312e85..50ef563 100644
--- a/src/app/uikit/datepicker/datepicker.component.ts
+++ b/src/app/uikit/datepicker/datepicker.component.ts
@@ -19,7 +19,7 @@ import { InputText } from 'primeng/inputtext';
 import { Popover } from 'primeng/popover';
 
 import { Maybe } from '@/core';
-import { formatJalali } from '@/utils';
+import { GREGORIAN_DATE_FORMATS, formatDate, formatJalali } from '@/utils';
 
 import { UikitFieldComponent } from '../uikit-field.component';
 
@@ -40,44 +40,33 @@ dayjs.extend(jalaliday);
   imports: [CommonModule, Popover, InputText, UikitFieldComponent],
 })
 export class DatepickerComponent {
-  @Input({ required: true })
-  control!: FormControl<Maybe<string>>;
+  @Input({ required: true }) control!: FormControl<Maybe<string>>;
 
-  @Input()
-  alignment: 'vertical' | 'horizontal' = 'vertical';
+  @Input() alignment: 'vertical' | 'horizontal' = 'vertical';
 
-  @Input()
-  name = 'date';
+  @Input() name = 'date';
 
-  @Input()
-  label = 'تاریخ';
+  @Input() label = 'تاریخ';
 
-  @Input()
-  closeOnSelect = true;
+  @Input() closeOnSelect = true;
 
   /**
    * Gregorian YYYY-MM-DD
    */
-  @Input()
-  min?: string;
+  @Input() min?: string;
 
   /**
    * Gregorian YYYY-MM-DD
    */
-  @Input()
-  max?: string;
+  @Input() max?: string;
 
-  @Input()
-  closedDays: number[] = [];
+  @Input() closedDays: number[] = [];
 
-  @Output()
-  valueChange = new EventEmitter<string>();
+  @Output() valueChange = new EventEmitter<string>();
 
-  @Output()
-  clickOnDayEvent = new EventEmitter<MonthlyWeekDate>();
+  @Output() clickOnDayEvent = new EventEmitter<MonthlyWeekDate>();
 
-  @ViewChild('op')
-  op!: Popover;
+  @ViewChild('op') op!: Popover;
 
   readonly daysName = daysName;
 
@@ -113,7 +102,9 @@ export class DatepickerComponent {
   }
 
   get value(): Maybe<string> {
-    return this.control?.value ?? null;
+    return this.control.value
+      ? formatDate(this.control.value, 'gregory', 'en', GREGORIAN_DATE_FORMATS.NUMERIC)
+      : null;
   }
 
   get valueToShow(): Maybe<string> {
diff --git a/src/app/uikit/paginator.component.ts b/src/app/uikit/paginator.component.ts
index addd30c..90a6830 100644
--- a/src/app/uikit/paginator.component.ts
+++ b/src/app/uikit/paginator.component.ts
@@ -1,4 +1,4 @@
-import { Component, computed, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, signal, SimpleChanges } from '@angular/core';
 import { ButtonModule } from 'primeng/button';
 
 @Component({
@@ -13,24 +13,30 @@ export class PaginatorComponent {
   @Input() loading: boolean = false;
   @Output() onChange = new EventEmitter<number>();
 
-  pagesToShow = computed(() => {
+  pagesToShow = signal<number[]>([]);
+
+  init() {
     const maxVisible = 5;
 
+    let pagesToShow = [];
+
     if (this.totalPages <= maxVisible) {
-      return Array.from({ length: this.totalPages }, (_, i) => i + 1);
+      pagesToShow = Array.from({ length: this.totalPages }, (_, i) => i + 1);
+    } else {
+      let start = Math.max(1, this.currentPage - Math.floor(maxVisible / 2));
+
+      let end = start + maxVisible - 1;
+
+      if (end > this.totalPages) {
+        end = this.totalPages;
+        start = end - maxVisible + 1;
+      }
+
+      pagesToShow = Array.from({ length: end - start + 1 }, (_, i) => start + i);
     }
 
-    let start = Math.max(1, this.currentPage - Math.floor(maxVisible / 2));
-
-    let end = start + maxVisible - 1;
-
-    if (end > this.totalPages) {
-      end = this.totalPages;
-      start = end - maxVisible + 1;
-    }
-
-    return Array.from({ length: end - start + 1 }, (_, i) => start + i);
-  });
+    this.pagesToShow.set(pagesToShow);
+  }
 
   onPageChange(newPage: number) {
     this.onChange.emit(newPage);
@@ -46,4 +52,14 @@ export class PaginatorComponent {
       this.onPageChange(this.currentPage + 1);
     }
   }
+
+  ngOnInit() {
+    this.init();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes['totalPages'] || changes['currentPage']) {
+      this.init();
+    }
+  }
 }