diff --git a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.html b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.html
index 9439161716..62f899725f 100644
--- a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.html
+++ b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="style === 'calendar' && type !=='year'">
   <div *ngIf="!isRange" class="igo-col igo-col-100 igo-col-100-m">
     <mat-form-field>
-      <mat-datetimepicker-toggle [for]="datetimePicker" matSuffix></mat-datetimepicker-toggle>
+      <mat-datetimepicker-toggle class="time-filter-mat-datetimepicker-toggle" [for]="datetimePicker" matSuffix></mat-datetimepicker-toggle>
       <mat-datetimepicker #datetimePicker type="{{type}}" openOnFocus="true" timeInterval="5"></mat-datetimepicker>
       <input matInput autocomplete="false"
         placeholder="{{'igo.geo.timeFilter.date' | translate}}"
@@ -18,7 +18,7 @@
   <div *ngIf="isRange">
     <div class="igo-col igo-col-100">
       <mat-form-field>
-        <mat-datetimepicker-toggle [for]="minDatetimePicker" matSuffix></mat-datetimepicker-toggle>
+        <mat-datetimepicker-toggle class="time-filter-mat-datetimepicker-toggle" [for]="minDatetimePicker" matSuffix></mat-datetimepicker-toggle>
         <mat-datetimepicker #minDatetimePicker type="{{type}}" openOnFocus="true" timeInterval="5"></mat-datetimepicker>
         <input matInput autocomplete="false"
           placeholder="{{'igo.geo.timeFilter.startDate' | translate}}"
@@ -34,7 +34,7 @@
 
     <div class="igo-col igo-col-100">
       <mat-form-field>
-        <mat-datetimepicker-toggle [for]="maxDatetimePicker" matSuffix></mat-datetimepicker-toggle>
+        <mat-datetimepicker-toggle class="time-filter-mat-datetimepicker-toggle" [for]="maxDatetimePicker" matSuffix></mat-datetimepicker-toggle>
         <mat-datetimepicker #maxDatetimePicker type="{{type}}" openOnFocus="true" timeInterval="5"></mat-datetimepicker>
         <input matInput autocomplete="false"
           placeholder="{{'igo.geo.timeFilter.endDate' | translate}}"
diff --git a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.scss b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.scss
index 7ccc2f17fd..23c9291157 100644
--- a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.scss
+++ b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.scss
@@ -39,4 +39,8 @@ mat-datetimepicker-toggle ::ng-deep .mat-icon {
 
 .igo-layer-actions-container > .mat-slide-toggle {
   vertical-align: middle;
-}
\ No newline at end of file
+}
+
+.time-filter-mat-datetimepicker-toggle ::ng-deep .mat-icon {
+  width: auto;
+}