diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index c4c52cad1a..46da39c78e 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -486,7 +486,7 @@ span.et2_date_duration input.et2_date_duration{
     margin-left: 3px;
     text-indent: 20px;
     background-size: contain;
-    background-image: url(images/today.png);
+    background-image: url(images/datepopup.svg);
 }
 .ui-timepicker-div dl dd { margin: 0 0px 10px 30%; }
 .ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input {
diff --git a/api/templates/default/images/datepopup.svg b/api/templates/default/images/datepopup.svg
new file mode 100644
index 0000000000..6c200f4607
--- /dev/null
+++ b/api/templates/default/images/datepopup.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#696969" d="M8.556,7.46c1.172,0,2.127-0.952,2.127-2.127v-3.19c0-1.174-0.955-2.127-2.127-2.127
+			c-1.174,0-2.128,0.953-2.128,2.127v3.19C6.428,6.508,7.382,7.46,8.556,7.46z"/>
+		<path fill="#696969" d="M23.445,7.46c1.174,0,2.128-0.952,2.128-2.127v-3.19c0-1.174-0.954-2.127-2.128-2.127
+			c-1.175,0-2.127,0.953-2.127,2.127v3.19C21.318,6.508,22.271,7.46,23.445,7.46z"/>
+		<path fill="#696969" d="M27.699,3.207h-1.063h-0.001v3.19c0,0.483-0.167,0.924-0.438,1.282c-0.389,0.511-0.998,0.846-1.688,0.846
+			h-2.127c-1.174,0-2.127-0.953-2.127-2.127v-3.19h-0.001h-8.507h-0.001v3.19c0,1.175-0.954,2.127-2.127,2.127H7.492
+			c-0.69,0-1.299-0.335-1.687-0.846C5.533,7.321,5.365,6.88,5.365,6.396v-3.19H5.364H4.301c-1.173,0-2.127,0.952-2.127,2.126v11.978
+			v12.484c0,1.173,0.954,2.127,2.127,2.127h5.615h12.168h5.615c1.174,0,2.127-0.954,2.127-2.127V17.311V5.333
+			C29.826,4.159,28.873,3.207,27.699,3.207z M11.745,28.73h-6.38v-5.316h6.38V28.73z M11.745,22.358h-6.38v-5.372h6.38V22.358z
+			 M11.745,15.972h-6.38v-5.317h6.38V15.972z M12.81,10.655h6.38v5.317h-6.38V10.655z M12.81,16.986h6.38v5.372h-6.38V16.986z
+			 M19.191,25.559c0-0.006-0.001-0.012-0.001-0.019v3.19h-6.38v-3.19c0,0.007-0.001,0.013-0.001,0.019v-0.034
+			c0,0.006,0.001,0.011,0.001,0.016v-2.126h6.38v2.126c0-0.005,0.001-0.01,0.001-0.015V25.559z M26.635,28.73h-6.38v-5.316h6.38
+			V28.73z M26.636,22.358h-6.38v-0.008h-0.001v-5.317h0.001v-0.047h6.38V22.358z M26.636,15.972h-6.38v-5.317h6.38V15.972z"/>
+	</g>
+</g>
+</svg>
diff --git a/pixelegg/images/datepopup.svg b/pixelegg/images/datepopup.svg
new file mode 100644
index 0000000000..6c200f4607
--- /dev/null
+++ b/pixelegg/images/datepopup.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#696969" d="M8.556,7.46c1.172,0,2.127-0.952,2.127-2.127v-3.19c0-1.174-0.955-2.127-2.127-2.127
+			c-1.174,0-2.128,0.953-2.128,2.127v3.19C6.428,6.508,7.382,7.46,8.556,7.46z"/>
+		<path fill="#696969" d="M23.445,7.46c1.174,0,2.128-0.952,2.128-2.127v-3.19c0-1.174-0.954-2.127-2.128-2.127
+			c-1.175,0-2.127,0.953-2.127,2.127v3.19C21.318,6.508,22.271,7.46,23.445,7.46z"/>
+		<path fill="#696969" d="M27.699,3.207h-1.063h-0.001v3.19c0,0.483-0.167,0.924-0.438,1.282c-0.389,0.511-0.998,0.846-1.688,0.846
+			h-2.127c-1.174,0-2.127-0.953-2.127-2.127v-3.19h-0.001h-8.507h-0.001v3.19c0,1.175-0.954,2.127-2.127,2.127H7.492
+			c-0.69,0-1.299-0.335-1.687-0.846C5.533,7.321,5.365,6.88,5.365,6.396v-3.19H5.364H4.301c-1.173,0-2.127,0.952-2.127,2.126v11.978
+			v12.484c0,1.173,0.954,2.127,2.127,2.127h5.615h12.168h5.615c1.174,0,2.127-0.954,2.127-2.127V17.311V5.333
+			C29.826,4.159,28.873,3.207,27.699,3.207z M11.745,28.73h-6.38v-5.316h6.38V28.73z M11.745,22.358h-6.38v-5.372h6.38V22.358z
+			 M11.745,15.972h-6.38v-5.317h6.38V15.972z M12.81,10.655h6.38v5.317h-6.38V10.655z M12.81,16.986h6.38v5.372h-6.38V16.986z
+			 M19.191,25.559c0-0.006-0.001-0.012-0.001-0.019v3.19h-6.38v-3.19c0,0.007-0.001,0.013-0.001,0.019v-0.034
+			c0,0.006,0.001,0.011,0.001,0.016v-2.126h6.38v2.126c0-0.005,0.001-0.01,0.001-0.015V25.559z M26.635,28.73h-6.38v-5.316h6.38
+			V28.73z M26.636,22.358h-6.38v-0.008h-0.001v-5.317h0.001v-0.047h6.38V22.358z M26.636,15.972h-6.38v-5.317h6.38V15.972z"/>
+	</g>
+</g>
+</svg>