diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index e8381e227da5432e16cb59c49043a42c227acdec..a10b7a0968e11cbd06e79b916942c9143ec01a26 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -86,7 +86,6 @@ class Piwik_CoreHome extends Piwik_Plugin
         $jsFiles[] = "plugins/CoreHome/javascripts/menu.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js";
-        $jsFiles[] = "plugins/CoreHome/javascripts/date.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js";
diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index e531e375a956877190c591e26c59c16a0ebdfafb..16bd26322536027e4cada4698fe30d19a03c0751 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -442,14 +442,14 @@
         });
 
         // reset date/period when opening calendar
-        var firstClick = true;
         $('#periodString #date').click(function () {
-            if (!firstClick) {
-                datepickerElem.datepicker('setDate', currentDate);
-                $('#period_id_' + piwik.period).click();
-            }
+            $("#periodMore").toggle();
+        });
 
-            firstClick = false;
+        $('body').on('click', function(e) {
+            if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && $("#periodMore").is(":visible")) {
+                $("#periodMore").hide();
+            }
         });
 
         function onDateRangeSelect(dateText, inst) {
diff --git a/plugins/CoreHome/javascripts/date.js b/plugins/CoreHome/javascripts/date.js
deleted file mode 100644
index 1c6c5971bdecfed1492cae6ee7fa5796bee2f3ff..0000000000000000000000000000000000000000
--- a/plugins/CoreHome/javascripts/date.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
- * Piwik - Web Analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-$(document).ready(function () {
-
-    //period widget handler
-    var periodWidget = {
-        show: function () {
-            this.isOpen = 1;
-            $("#periodMore").show();
-        },
-        hide: function () {
-            this.isOpen = 0;
-            $("#periodMore").hide();
-        },
-        toggle: function (e) {
-            if (!this.isOpen) this.show();
-            else this.hide();
-        }
-    };
-
-    $("#periodString #date")
-        .hover(function () {
-            $(this).css({ cursor: "pointer"});
-        }, function () {
-
-        })
-        .click(function () {
-            periodWidget.toggle();
-            if ($("#periodMore").is(":visible")) {
-                $("#periodMore .ui-state-highlight").removeClass('ui-state-highlight');
-            }
-        });
-
-    //close periodString onClickOutside
-    $('body').on('mouseup', function (e) {
-        if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && periodWidget.isOpen) {
-            periodWidget.hide();
-        }
-    });
-
-});
diff --git a/plugins/Zeitgeist/stylesheets/common.css b/plugins/Zeitgeist/stylesheets/common.css
index d62a3335e7f6d342114ffdd2722d6ca14f4a9093..7a8861002669729e8e17d656bb697bd5fbf999ee 100644
--- a/plugins/Zeitgeist/stylesheets/common.css
+++ b/plugins/Zeitgeist/stylesheets/common.css
@@ -126,7 +126,7 @@ a {
     margin-right: 12px;
     z-index: 999;
     position: absolute;
-    background: url("../images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7;
+    background: url("../images/icon-calendar.gif") no-repeat scroll right 9px top 8px #F7F7F7;
 }
 
 #periodString:hover {
@@ -136,7 +136,6 @@ a {
 
 #periodString #date {
     cursor: pointer;
-    display: inline-block;
     padding: 5px 10px 6px 10px;
     margin: -5px -10px -6px -10px;