diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 6d4d347970..320f0f5bf7 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -431,6 +431,30 @@ span.et2_date span {
 span.et2_date_duration input.et2_date_duration{
 	width: 5em;
 }
+/* customize calendar layout */
+.ui-datepicker .ui-datepicker-header .ui-datepicker-title {
+	margin-left: 2px;
+	margin-right: 4.6em;
+	text-align: left;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-prev {
+	left: initial;
+	right: 4em;
+}
+.ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
+    position: absolute;
+    top: -2px;
+    right: 24px;
+    width: 23px;
+    height: 23px;
+    overflow: hidden;
+    background-color: white;
+    margin-left: 3px;
+    text-indent: 20px;
+    background-size: contain;
+    background-image: url(images/today.png);
+}
+
 /**
  * Dialog widget
  * It uses jQueryUI, so this is just our little bits - icon on left
diff --git a/etemplate/templates/default/images/today.png b/etemplate/templates/default/images/today.png
new file mode 100644
index 0000000000..3c9e085eae
Binary files /dev/null and b/etemplate/templates/default/images/today.png differ
diff --git a/etemplate/templates/pixelegg/images/today.png b/etemplate/templates/pixelegg/images/today.png
new file mode 100755
index 0000000000..47396d1cd0
Binary files /dev/null and b/etemplate/templates/pixelegg/images/today.png differ
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 00fc838f8e..5dc5623d56 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -220,6 +220,9 @@
   span.et2_date span {
     color: #ffffff;
   }
+  .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
+    background-image: url(../images/today.png);
+  }
   .et2_file .progress li:hover div.remove {
     width: 16px;
     height: 16px;
@@ -2186,6 +2189,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4263,7 +4267,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4287,7 +4291,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4683,7 +4687,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4855,7 +4859,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -7171,7 +7175,7 @@ span.egw_tutorial_title {
     margin: 5px 0px 3px 5px;
     padding: 0px 0px 0px 15px;
     line-height: 1em;
-    font-size: 12.1px;
+    font-size: 12.100000000000001px;
     background-image: url(../images/arrow_left.png);
     background-repeat: no-repeat;
     background-position: left center;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index d7d5afee1f..a70f97b2fb 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -209,6 +209,9 @@
   span.et2_date span {
     color: #ffffff;
   }
+  .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
+    background-image: url(../images/today.png);
+  }
   .et2_file .progress li:hover div.remove {
     width: 16px;
     height: 16px;
@@ -2175,6 +2178,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4252,7 +4256,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4276,7 +4280,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4672,7 +4676,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4844,7 +4848,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
diff --git a/pixelegg/images/day.png b/pixelegg/images/day.png
new file mode 100755
index 0000000000..20a9b762ca
Binary files /dev/null and b/pixelegg/images/day.png differ
diff --git a/pixelegg/images/today.png b/pixelegg/images/today.png
index 20a9b762ca..47396d1cd0 100755
Binary files a/pixelegg/images/today.png and b/pixelegg/images/today.png differ
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 8f6427220a..b04f3c93be 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -168,6 +168,10 @@ span.et2_date span {
     color: @gray_0;
 }
 
+.ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
+    background-image: url(../images/today.png);
+}
+
 .et2_file .progress li:hover div.remove {
     .dimension_width_height_s;
 }