diff --git a/css/osticket.css b/css/osticket.css
index bc4ac6c5b8371758482251fb69214095f08cb241..5ec2e8e295a2dd2c6d555e62f0c162c63a838b29 100644
--- a/css/osticket.css
+++ b/css/osticket.css
@@ -54,3 +54,16 @@ div.section-break {
 input.dp {
     width: 10em;
 }
+
+/* Custom css for datepicker */
+.ui-datepicker-trigger {
+    display:inline-block;
+    border:0;
+    padding:0;
+    margin-left:2px;
+    position:relative;
+    top:-2px;
+    width:16px;
+    height:16px;
+    background:inherit;
+}
diff --git a/images/cal.gif b/images/cal.gif
deleted file mode 100644
index 8526cf5d19a915aa8073cf344873c4505491970d..0000000000000000000000000000000000000000
Binary files a/images/cal.gif and /dev/null differ
diff --git a/images/cal.png b/images/cal.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cff76c1dbb71dfe2fcf35dec28cdf935ebc945d
Binary files /dev/null and b/images/cal.png differ
diff --git a/js/osticket.js b/js/osticket.js
index 3f38a6ec357dcd712e1823f264abd860da44507e..da56eae131c794635febbb6de75618282327cdb0 100644
--- a/js/osticket.js
+++ b/js/osticket.js
@@ -107,6 +107,23 @@ $(document).ready(function(){
             });
         });
     }
+
+    $.translate_format = function(str) {
+        var translation = {
+            'd':'dd',
+            'j':'d',
+            'z':'o',
+            'm':'mm',
+            'F':'MM',
+            'n':'m',
+            'Y':'yy'
+        };
+        // Change PHP formats to datepicker ones
+        $.each(translation, function(php, jqdp) {
+            str = str.replace(php, jqdp);
+        });
+        return str;
+    };
 });
 
 showImagesInline = function(urls, thread_id) {
diff --git a/scp/images/cal.gif b/scp/images/cal.gif
deleted file mode 100644
index 8526cf5d19a915aa8073cf344873c4505491970d..0000000000000000000000000000000000000000
Binary files a/scp/images/cal.gif and /dev/null differ