diff --git a/scss/vendor/_flatpickr.scss b/scss/vendor/_flatpickr.scss
index ad493fd2261e5dc41ab7c4f9271ad371aaa5bb53..836a9b6828c5ff16c99f08c4733ff06f67786514 100644
--- a/scss/vendor/_flatpickr.scss
+++ b/scss/vendor/_flatpickr.scss
@@ -1,11 +1,25 @@
 .flatpickr-input {
   background: $input-bg !important;
+
+  &.active {
+    border-color: $input-focus-border-color;
+    box-shadow: $input-focus-box-shadow;
+  }
 }
 
 .flatpickr-calendar {
   border: $input-border-width solid $input-border-color;
   border-radius: $input-border-radius;
   padding: .5rem;
+  font-size: inherit;
+  box-shadow: $dropdown-box-shadow;
+  user-select: none;
+  margin-top: -1px;
+
+  &:before,
+  &:after {
+    content: none;
+  }
 
   .flatpickr-innerContainer,
   .flatpickr-rContainer,
@@ -14,22 +28,22 @@
     width: 100%;
   }
 
+  .dayContainer,
+  .flatpickr-day {
+    max-width: 100%;
+    min-width: 0;
+  }
+
   &.inline {
     width: 100%;
     box-shadow: none;
-
-    .dayContainer,
-    .flatpickr-day {
-      max-width: 100%;
-      min-width: 0;
-    }
+    margin: 0;
   }
 }
 
 .flatpickr-day {
   color: inherit;
   border-radius: $border-radius;
-  user-select: none;
 
   &.today {
     border-color: $border-color;
@@ -45,13 +59,40 @@ span.flatpickr-weekday {
 }
 
 .flatpickr-months {
+  margin-bottom: .5rem;
+
+  .flatpickr-current-month {
+    font-weight: 400;
+  }
+
   .flatpickr-monthDropdown-months {
     appearance: none;
     font-weight: inherit;
   }
 
-  .flatpickr-prev-month svg,
-  .flatpickr-next-month svg {
-    display: block;
+  .flatpickr-prev-month,
+  .flatpickr-next-month {
+    position: static;
+    color: $text-muted;
+
+    &:hover {
+      color: $body-color;
+    }
+
+    svg {
+      display: block;
+      fill: currentColor !important;
+    }
+  }
+
+  .numInputWrapper {
+    .cur-year {
+      font-weight: inherit;
+    }
+
+    .arrowUp,
+    .arrowDown {
+      display: none;
+    }
   }
 }
\ No newline at end of file
diff --git a/scss/vendor/_selectize.scss b/scss/vendor/_selectize.scss
index 9a22e0b889a93ffb7e763258547bf33009ae3fbc..a5047dedbecf3e8b1d00bb57a4ebcdac1d852c8c 100644
--- a/scss/vendor/_selectize.scss
+++ b/scss/vendor/_selectize.scss
@@ -36,6 +36,10 @@
   background-color: inherit !important;
   color: inherit !important;
 
+  &.dropdown-active {
+    border-radius: $border-radius;
+  }
+
   .selectize-control.single & {
     background: $form-select-bg escape-svg($form-select-indicator) $form-select-background;
   }