diff --git a/assets/css/pickadate/default.date.css b/assets/css/pickadate/default.date.css
index ecbbcfeb..06c33898 100644
--- a/assets/css/pickadate/default.date.css
+++ b/assets/css/pickadate/default.date.css
@@ -72,6 +72,16 @@
   top: 8px;
   color: #fff;
 }
+.um-popup .picker__nav--prev,
+.um-popup .picker__nav--next {
+  position: absolute;
+  padding: .5em 1.25em;
+  width: 1em;
+  height: 1em;
+  box-sizing: content-box !important;
+  top: 8px;
+  color: #fff;
+}
 @media (min-width: 24.5em) {
   .um .picker__nav--prev,
   .um .picker__nav--next {
@@ -82,19 +92,33 @@
   left: 0;
   padding-right: 1.25em;
 }
+.um-popup .picker__nav--prev {
+  left: 0;
+  padding-right: 1.25em;
+}
 @media (min-width: 24.5em) {
   .um .picker__nav--prev {
     padding-right: 1.5em;
   }
+  .um-popup .picker__nav--prev {
+    padding-right: 1.5em;
+  }
 }
 .um .picker__nav--next {
   right: 0;
   padding-left: 1.25em;
 }
+.um-popup .picker__nav--next {
+  right: 0;
+  padding-left: 1.25em;
+}
 @media (min-width: 24.5em) {
   .um .picker__nav--next {
     padding-left: 1.5em;
   }
+  .um-popup .picker__nav--next {
+    padding-left: 1.5em;
+  }
 }
 .um .picker__nav--prev:before,
 .um .picker__nav--next:before {
@@ -109,17 +133,43 @@
   display: block;
   margin: 0 auto;
 }
+
+.um-popup .picker__nav--prev:before,
+.um-popup .picker__nav--next:before {
+  content: " ";
+  border-top: .5em solid transparent;
+  border-bottom: .5em solid transparent;
+
+  border-right: 0.5em solid #fff;
+
+  width: 0;
+  height: 0;
+  display: block;
+  margin: 0 auto;
+}
 .um .picker__nav--next:before {
   border-right: 0;
   
   border-left: 0.5em solid #fff;
   
+}
+.um-popup .picker__nav--next:before {
+  border-right: 0;
+
+  border-left: 0.5em solid #fff;
+
 }
 .um .picker__nav--prev:hover,
 .um .picker__nav--next:hover {
   cursor: pointer;
   color: #fff;
 }
+
+.um-popup .picker__nav--prev:hover,
+.um-popup .picker__nav--next:hover {
+  cursor: pointer;
+  color: #fff;
+}
 .um .picker__nav--disabled,
 .um .picker__nav--disabled:hover,
 .um .picker__nav--disabled:before,
@@ -127,6 +177,13 @@
   cursor: default;
   background: none;
 }
+.um-popup .picker__nav--disabled,
+.um-popup .picker__nav--disabled:hover,
+.um-popup .picker__nav--disabled:before,
+.um-popup .picker__nav--disabled:before:hover {
+  cursor: default;
+  background: none;
+}
 
 /**
  * The calendar table of dates
@@ -242,4 +299,4 @@
 .um .picker__button--today:focus,
 .um .picker__button--clear:focus {
 	cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/assets/css/pickadate/rtl.css b/assets/css/pickadate/rtl.css
index 636ab664..5a3e892b 100644
--- a/assets/css/pickadate/rtl.css
+++ b/assets/css/pickadate/rtl.css
@@ -27,3 +27,20 @@
   border-right: 0;
   border-left: 0.75em solid #000000;
 }
+
+.um-popup .picker__nav--next {
+  right: auto;
+  left: -1em;
+}
+.um-popup .picker__nav--prev {
+  left: auto;
+  right: -1em;
+}
+.um-popup .picker__nav--next:before {
+  border-left: 0;
+  border-right: 0.75em solid #000000;
+}
+.um-popup .picker__nav--prev:before {
+  border-right: 0;
+  border-left: 0.75em solid #000000;
+}