diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-dark-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-dark-linux.png
index 96585b67e..5794162de 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e5503a8cb896bbee8fd6b1480027cb74f291b471424e3f6691ee7f997b9a09c
-size 62177
+oid sha256:623fea0323b6542a50e7b0042745532e08f68ee57f05feb860d5fa855724bedd
+size 62167
diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-light-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-light-linux.png
index 8a0ae262b..e98026261 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caaa3c61c2f30ce7f637480998ca4beb90c296def1a7acd1f14467c59f072ce7
-size 56407
+oid sha256:d524f75b10ca63b5a0ae3e30f0c0ae7af8e8a2d1dca2059842217b5d6d758528
+size 56440
diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-dark-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-dark-linux.png
index 70749c210..8a4fb428c 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcb4f235fd0edea6a1e71e189198a5b60855b4910bf9af4d09994fe4b3122288
-size 23028
+oid sha256:17d48b79b91cb04608222d1fb477f7f8b1ab5a5cc074bbddcaec1ef0becb00cf
+size 23066
diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-light-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-light-linux.png
index 55ae1eb0b..740f42dfa 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-age-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ef95a7b9566cfc23b8aebe8397146531623e73617380d72a08f2ac85d55b515
-size 21346
+oid sha256:a79290ff8b531dcb9b9867e7e64025ccdd838edde279047149790ed1850b7cde
+size 21325
diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-dark-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-dark-linux.png
index bbd7a07ad..6c2fd3be3 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4339425a3f94903d525f6e787cd435bddc9a214ca44e153027f9bc102c514882
-size 53583
+oid sha256:15b8238c845bddd8bc4a68f0beaade4debd9e4967074b60b971ab5050f28dcdd
+size 53622
diff --git a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-light-linux.png b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-light-linux.png
index 186ea02d3..e54b8807f 100644
--- a/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/ag-grid-filter.spec.ts-snapshots/ag-grid--ag-grid-filter--ag-grid-filter-on-name-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f90f8b2b9b1515913c56e9ef052e2748508367d1c6b90c300cb3a64cc2b6fad
-size 52181
+oid sha256:aab0446b7c626321bb595969444695a15727a4e0d04dbee58ad11f69fd236eb9
+size 52227
diff --git a/projects/element-ng/ag-grid/components/ag-date-input.component.ts b/projects/element-ng/ag-grid/components/ag-date-input.component.ts
index d4903e4ec..1c385fc7a 100644
--- a/projects/element-ng/ag-grid/components/ag-date-input.component.ts
+++ b/projects/element-ng/ag-grid/components/ag-date-input.component.ts
@@ -6,7 +6,6 @@
 import { Component, ElementRef, OnDestroy, inject } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { SiCalendarButtonComponent, SiDatepickerDirective } from '@siemens/element-ng/datepicker';
-import { SiFormItemComponent } from '@siemens/element-ng/form';
 import { IDateComp, IDateParams } from 'ag-grid-community';
 
 /**
@@ -15,20 +14,18 @@ import { IDateComp, IDateParams } from 'ag-grid-community';
  */
 @Component({
   selector: 'si-ag-date-input',
-  imports: [FormsModule, SiDatepickerDirective, SiCalendarButtonComponent, SiFormItemComponent],
+  imports: [FormsModule, SiDatepickerDirective, SiCalendarButtonComponent],
   template: `
-    <si-form-item>
-      <si-calendar-button class="w-100">
-        <input
-          type="text"
-          class="form-control"
-          siDatepicker
-          [autoClose]="true"
-          [(ngModel)]="date"
-          (ngModelChange)="onDateChange()"
-        />
-      </si-calendar-button>
-    </si-form-item>
+    <si-calendar-button class="w-100">
+      <input
+        type="text"
+        class="form-control"
+        siDatepicker
+        [autoClose]="true"
+        [(ngModel)]="date"
+        (ngModelChange)="onDateChange()"
+      />
+    </si-calendar-button>
   `
 })
 export class AgDateInputComponent implements IDateComp, OnDestroy {