diff --git a/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss
index 32c02fb828f..fe492353289 100644
--- a/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss
+++ b/projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss
@@ -177,7 +177,7 @@
         igx-date-picker,
         igx-time-picker {
             position: relative;
-            height: calc(100% - #{$editing-outline-width * 2});
+            height: auto;
             width: 100% !important;
             overflow: hidden;
         }
@@ -211,6 +211,10 @@
             min-height: 100% !important;
             border: none !important;
 
+            .igx-input-group__filler {
+                border: none !important;
+            }
+
             &::before {
                 content: none !important;
             }
@@ -1204,15 +1208,6 @@
 
         @extend %cell-input-overrides;
 
-        > igx-input-group,
-        igx-combo,
-        igx-simple-combo,
-        igx-select,
-        igx-date-picker,
-        igx-time-picker {
-            height: auto;
-        }
-
         igx-input-group {
             background: transparent;
         }