diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
index 0fddebb2f..b692bb5ec 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
@@ -34,6 +34,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
     }
 
     fun getMonth(targetDate: DateTime) {
+        days.clear()
         updateMonthlyCalendar(targetDate)
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
index 6b33609c4..097907876 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
@@ -8,9 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
 import android.graphics.*
-import android.graphics.drawable.Drawable
-import android.text.SpannableString
-import android.text.style.UnderlineSpan
 import android.view.View
 import android.widget.RemoteViews
 import com.simplemobiletools.calendar.R
@@ -20,6 +17,7 @@ import com.simplemobiletools.calendar.extensions.launchNewEventIntent
 import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
 import com.simplemobiletools.calendar.models.DayMonthly
 import com.simplemobiletools.commons.extensions.adjustAlpha
+import com.simplemobiletools.commons.extensions.getContrastColor
 import com.simplemobiletools.commons.extensions.setBackgroundColor
 import com.simplemobiletools.commons.extensions.setTextSize
 import org.joda.time.DateTime
@@ -30,7 +28,6 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
     private val NEW_EVENT = "new_event"
 
     private var mTextColor = 0
-    private var mWeakTextColor = 0
     private var mCalendar: MonthlyCalendarImpl? = null
     private var mRemoteViews: RemoteViews? = null
 
@@ -61,7 +58,6 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
 
         context.config.apply {
             mTextColor = widgetTextColor
-            mWeakTextColor = widgetTextColor.adjustAlpha(LOW_ALPHA)
             mMediumFontSize = getFontSize()
             mSmallerFontSize = getFontSize() - 3f
             mLargerFontSize = getFontSize() + 3f
@@ -116,6 +112,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
     override fun onReceive(context: Context, intent: Intent) {
         if (mCalendar == null || mRemoteViews == null) {
             initVariables(context)
+            return
         }
 
         val action = intent.action
@@ -137,11 +134,14 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
         mCalendar?.getMonth(mTargetDate)
     }
 
-    fun updateDays(days: List<DayMonthly>) {
+    private fun updateDays(days: List<DayMonthly>) {
+        if (mRemoteViews == null)
+            return
+
         val displayWeekNumbers = mContext.config.displayWeekNumbers
         val len = days.size
         val packageName = mContext.packageName
-        mRemoteViews?.apply {
+        mRemoteViews!!.apply {
             setTextColor(R.id.week_num, mTextColor)
             setTextSize(R.id.week_num, mSmallerFontSize)
             setViewVisibility(R.id.week_num, if (displayWeekNumbers) View.VISIBLE else View.GONE)
@@ -149,58 +149,41 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
 
         for (i in 0..5) {
             val id = mRes.getIdentifier("week_num_$i", "id", packageName)
-            mRemoteViews?.apply {
-                setTextViewText(id, days[i * 7 + 3].weekOfYear.toString() + ":")
+            mRemoteViews!!.apply {
+                setTextViewText(id, "${days[i * 7 + 3].weekOfYear}:")    // fourth day of the week matters
                 setTextColor(id, mTextColor)
                 setTextSize(id, mSmallerFontSize)
                 setViewVisibility(id, if (displayWeekNumbers) View.VISIBLE else View.GONE)
             }
         }
 
+        val weakTextColor = mTextColor.adjustAlpha(LOW_ALPHA)
         for (i in 0 until len) {
             val day = days[i]
+            var textColor = if (day.isThisMonth) mTextColor else weakTextColor
+            val primaryColor = mContext.config.primaryColor
+            if (day.isToday)
+                textColor = primaryColor.getContrastColor()
+
             val id = mRes.getIdentifier("day_$i", "id", packageName)
-            var curTextColor = mWeakTextColor
 
-            if (day.isThisMonth) {
-                curTextColor = mTextColor
+            mRemoteViews!!.apply {
+                removeAllViews(id)
+                val newRemoteView = RemoteViews(packageName, R.layout.day_monthly_item_view).apply {
+                    setTextViewText(R.id.day_monthly_number_id, day.value.toString())
+                    setTextColor(R.id.day_monthly_number_id, textColor)
+
+                    if (day.isToday) {
+                        setViewPadding(R.id.day_monthly_number_id, 10, 0, 10, 0)
+                        setBackgroundColor(R.id.day_monthly_number_id, primaryColor)
+                    }
+                }
+                addView(id, newRemoteView)
+                setupDayOpenIntent(id, day.code)
             }
-
-            val text = day.value.toString()
-            if (day.hasEvent()) {
-                val underlinedText = SpannableString(text)
-                underlinedText.setSpan(UnderlineSpan(), 0, text.length, 0)
-                mRemoteViews?.setTextViewText(id, underlinedText)
-            } else {
-                mRemoteViews?.setTextViewText(id, text)
-            }
-
-            val circleId = mRes.getIdentifier("day_${i}_circle", "id", packageName)
-            if (day.isToday) {
-                val wantedSize = mContext.resources.displayMetrics.widthPixels / 7
-                val drawable = mContext.resources.getDrawable(R.drawable.circle_empty)
-                drawable.setColorFilter(mTextColor, PorterDuff.Mode.SRC_IN)
-                mRemoteViews?.setImageViewBitmap(circleId, drawableToBitmap(drawable, wantedSize))
-                mRemoteViews?.setViewVisibility(circleId, View.VISIBLE)
-            } else {
-                mRemoteViews?.setViewVisibility(circleId, View.GONE)
-            }
-
-            mRemoteViews?.setTextColor(id, curTextColor)
-            mRemoteViews?.setTextSize(id, mMediumFontSize)
-            setupDayOpenIntent(id, day.code)
         }
     }
 
-    fun drawableToBitmap(drawable: Drawable, size: Int): Bitmap {
-        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
-        Canvas(bitmap).apply {
-            drawable.setBounds(0, 0, width, height)
-            drawable.draw(this)
-        }
-        return bitmap
-    }
-
     private fun updateTopViews() {
         mRemoteViews?.setTextColor(R.id.top_value, mTextColor)
         mRemoteViews?.setTextSize(R.id.top_value, mLargerFontSize)
@@ -215,7 +198,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
         mRemoteViews?.setImageViewBitmap(R.id.top_new_event, bmp)
     }
 
-    fun updateMonth(month: String) {
+    private fun updateMonth(month: String) {
         mRemoteViews?.setTextViewText(R.id.top_value, month)
     }
 
diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml
index 4b995f82e..7a24b10c6 100644
--- a/app/src/main/res/layout/fragment_month_widget.xml
+++ b/app/src/main/res/layout/fragment_month_widget.xml
@@ -22,6 +22,7 @@
             android:layout_weight="1"/>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_1"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -33,136 +34,67 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:visibility="gone"/>
+                android:visibility="visible"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_0"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_0_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_0"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_1"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_1_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_1"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_2"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_2_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_2"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_3"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_3_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_3"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_4"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_4_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_4"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_5"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_5_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_5"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_6"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_6_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_6"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -174,137 +106,67 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:visibility="gone"/>
+                android:visibility="visible"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_7"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_7_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_7"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_8"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_8_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_8"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_9"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_9_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_9"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_10"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_10_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_10"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_11"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_11_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_11"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_12"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_12_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_12"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_13"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_13_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_13"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_3"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -318,134 +180,65 @@
                 android:layout_weight="1"
                 android:visibility="gone"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_14"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_14_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_14"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_15"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_15_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_15"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_16"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_16_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_16"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_17"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_17_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_17"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_18"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_18_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_18"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_19"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_19_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_19"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_20"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_20_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_20"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_4"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -459,134 +252,65 @@
                 android:layout_weight="1"
                 android:visibility="gone"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_21"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_21_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_21"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_22"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_22_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_22"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_23"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_23_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_23"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_24"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_24_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_24"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_25"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_25_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_25"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_26"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_26_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_26"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_27"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_27_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_27"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_5"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -600,134 +324,65 @@
                 android:layout_weight="1"
                 android:visibility="gone"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_28"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_28_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_28"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_29"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_29_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_29"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_30"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_30_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_30"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_31"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_31_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_31"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_32"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_32_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_32"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_33"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_33_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_33"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_34"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_34_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_34"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/month_line_holder_6"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -741,131 +396,61 @@
                 android:layout_weight="1"
                 android:visibility="gone"/>
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_35"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_35_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_35"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_36"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_36_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_36"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_37"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_37_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_37"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_38"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_38_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_38"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_39"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_39_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_39"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_40"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
 
-                <ImageView
-                    android:id="@+id/day_40_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_40"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/day_41"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/day_41_circle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/day_41"
-                    style="@style/DayView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </RelativeLayout>
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>