diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0451f53229f33aa86787312a739e41f24221e320..9591d971bdf03b1f110a90cbd6fd9bebe280816c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,8 @@
     <dimen name="current_date_circle_single_x">12dp</dimen>
     <dimen name="current_date_circle_y">5dp</dimen>
     <dimen name="current_date_text_x">7dp</dimen>
-    <dimen name="current_date_text_y">0dp</dimen>
+    <dimen name="current_date_text_y">5dp</dimen>
+    <dimen name="current_date_text_event_margin">3dp</dimen>
 
 
 </resources>
diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java
index bff9ae703e82090d491b490f8c81ca1b6141c6ae..226b57e44889c14ed1be691be6050491736e18e3 100644
--- a/src/com/android/calendar/month/MonthWeekEventsView.java
+++ b/src/com/android/calendar/month/MonthWeekEventsView.java
@@ -34,6 +34,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
+import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.provider.CalendarContract.Attendees;
@@ -617,6 +618,10 @@ public class MonthWeekEventsView extends SimpleWeekView {
         Time time = new Time(mTimeZone);
         time.setJulianDay(julianMonday);
 
+        int current_date_text_x=getResources().getDimensionPixelSize(R.dimen.current_date_text_x);
+        int current_date_text_y=getResources().getDimensionPixelSize(R.dimen.current_date_text_y);
+        int current_date_event_margin=getResources().getDimensionPixelSize(R.dimen.current_date_text_event_margin);
+
         for (; i < numCount; i++) {
             x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber);
 
@@ -630,17 +635,17 @@ public class MonthWeekEventsView extends SimpleWeekView {
                 }
                 mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.color_default_blue1));
                 int current_date_bg_size=getResources().getDimensionPixelSize(R.dimen.current_date_bg_size);
-                int current_date_circle_x=getResources().getDimensionPixelSize(R.dimen.current_date_circle_x);
-                int current_date_circle_y=getResources().getDimensionPixelSize(R.dimen.current_date_circle_y);
 
-                int size=mDayNumbers[i].length();
+                //check text width & height to calculate circle cx and cy values
+                Rect bounds = new Rect();
+                mMonthNumPaint.getTextBounds(mDayNumbers[i], 0, mDayNumbers[i].length(), bounds);
 
-                if(size==1){
-                   // mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.colorRedAccent));
-                    current_date_circle_x=getResources().getDimensionPixelSize(R.dimen.current_date_circle_single_x);
-                }
+                int text_height =  bounds.height();
+                int text_width =  bounds.width();
 
-                canvas.drawCircle(x-current_date_circle_x, y-current_date_circle_y, current_date_bg_size,mMonthNumPaint);
+                canvas.drawCircle(x - current_date_text_x - (text_width / 2),
+                    y + current_date_text_y - (text_height / 2) - current_date_event_margin,
+                      current_date_bg_size, mMonthNumPaint);
                 mMonthNumPaint.setColor(mMonthNumTodayColor);
             } else if (mFocusDay[i] != isFocusMonth) {
                 isFocusMonth = mFocusDay[i];
@@ -648,10 +653,9 @@ public class MonthWeekEventsView extends SimpleWeekView {
             }
             double relation = Math.sqrt(canvas.getWidth() * canvas.getHeight());
             mMonthNumPaint.setTextSize((int)relation / 12);
-            int current_date_text_x=getResources().getDimensionPixelSize(R.dimen.current_date_text_x);
-            int current_date_text_y=getResources().getDimensionPixelSize(R.dimen.current_date_text_y);
 
-            canvas.drawText(mDayNumbers[i], x-current_date_text_x, y-current_date_text_y, mMonthNumPaint);
+            canvas.drawText(mDayNumbers[i], x-current_date_text_x,
+                  y+current_date_text_y - current_date_event_margin, mMonthNumPaint);
 
             if (isBold) {
                 mMonthNumPaint.setFakeBoldText(isBold = false);