diff --git a/webapp/src/components/properties/dateRange/dateRange.scss b/webapp/src/components/properties/dateRange/dateRange.scss
index 15a966766..b7d12f04a 100644
--- a/webapp/src/components/properties/dateRange/dateRange.scss
+++ b/webapp/src/components/properties/dateRange/dateRange.scss
@@ -1,6 +1,5 @@
 .DateRange {
     width: 100%;
-    display: flex;
 
     .octo-propertyvalue {
         white-space: none;
@@ -46,6 +45,7 @@
 
     .Button {
         width: 100%;
+        height: 100%;
         justify-content: left;
 
         &.--empty {
@@ -103,7 +103,9 @@
         }
     }
 
-    .DayPicker {}
+    .DayPicker {
+        font-size: inherit;
+    }
 
     .DayPickerInput-Overlay {
         background-color: rgba(var(--center-channel-bg-rgb));
@@ -111,6 +113,10 @@
         line-height: 100%;
     }
 
+    .DayPicker-wrapper {
+        padding: 0;
+    }
+
     .DayPicker-Month {
         margin: 0;
         margin-top: 1em;
@@ -123,25 +129,39 @@
         flex-direction: column;
     }
 
+    .inputContainer {
+        max-width: 252px;
+    }
+
+    .DayPicker-Weekdays {
+        margin: 0;
+    }
+
     .DayPicker-WeekdaysRow {
         display: flex;
         flex-direction: row;
     }
 
     .DayPicker-Weekday {
-        display: block;
         width: 36px;
         height: 36px;
     }
 
+    .DayPicker-NavButton {
+        right: 0;
+    }
+
     .DayPicker-Week {
         display: flex;
         flex-direction: row;
     }
 
     .DayPicker-Day {
+        padding: 0;
+        align-items: center;
+        display: flex;
+        justify-content: center;
         border-radius: unset;
-        display: block;
         width: 36px;
         height: 36px;
     }
@@ -162,14 +182,12 @@
 
     .DayPicker-Day--selected:not(.DayPicker-Day--disabled):not(.DayPicker-Day--outside) {
         background-color: rgb(var(--button-bg-rgb));
-        ;
-        color: rgba(var(--button-color-rgb), 0.5);
+        color: rgba(var(--button-color-rgb), 1);
     }
 
     .DayPicker-Day--selected:not(.DayPicker-Day--start):not(.DayPicker-Day--end):not(.DayPicker-Day--outside) {
         color: rgb(var(--button-bg-rgb));
-        ;
-        background-color: rgba(var(--button-bg-rgb), 0.2);
+        background-color: rgba(var(--button-bg-rgb), 0.08);
     }
 
     .DayPicker:not(.DayPicker--interactionDisabled) .DayPicker-Day:not(.DayPicker-Day--disabled):not(.DayPicker-Day--selected):not(.DayPicker-Day--outside):hover {