diff --git a/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java b/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index 522fb1818b404d9704b7dd3f222e277900c9ca43..685f341811cffb79fad8d4bfd8fd9c52a7b3c5ce 100644
--- a/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
+++ b/app/src/main/java/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -19,6 +19,7 @@ package com.android.calendar.selectcalendars;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.provider.CalendarContract.Calendars;
 import android.view.LayoutInflater;
@@ -28,6 +29,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
@@ -181,8 +183,8 @@ public class SelectCalendarsSimpleAdapter extends BaseAdapter implements ListAda
         TextView calendarName = (TextView) view.findViewById(R.id.calendar);
         calendarName.setText(name);
 
-        View colorView = view.findViewById(R.id.color);
-        colorView.setBackgroundColor(color);
+        ImageView colorView = view.findViewById(R.id.color);
+        colorView.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
         colorView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -207,8 +209,10 @@ public class SelectCalendarsSimpleAdapter extends BaseAdapter implements ListAda
         int textColor;
         if (selected) {
             textColor = mColorCalendarVisible;
+            colorView.setImageResource(R.drawable.circle);
         } else {
             textColor = mColorCalendarHidden;
+            colorView.setImageResource(R.drawable.circle_outline);
         }
         calendarName.setTextColor(textColor);
 
diff --git a/app/src/main/res/layout/mini_calendar_item.xml b/app/src/main/res/layout/mini_calendar_item.xml
index 7310d015efefdb792580a5d04803bc1fa602b25c..23b5dfbc0bd598969dd1a9d807e17d91332ded58 100644
--- a/app/src/main/res/layout/mini_calendar_item.xml
+++ b/app/src/main/res/layout/mini_calendar_item.xml
@@ -20,14 +20,14 @@
     android:layout_height="48dip"
     android:minHeight="?android:attr/listPreferredItemHeight" >
 
-    <com.android.calendar.selectcalendars.CalendarColorSquare
+    <ImageView
         android:id="@+id/color"
-        style="?android:attr/quickContactBadgeStyleWindowMedium"
         android:layout_width="20dip"
         android:layout_height="20dip"
         android:layout_marginStart="16dp"
         android:contentDescription="@string/calendar_square_color_picker_description"
         android:cropToPadding="true"
+        android:src="@drawable/circle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a7747a591aa0fd15ec309ae3ff7929c986f08652..81ca80e0eb2d468c1648b2dbabef5dc1070425a3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -105,8 +105,8 @@
     <color name="edit_event_separator">@android:color/transparent</color>
     <color name="edit_event_small">@color/color_default_primary_text</color>
 
-    <color name="calendar_visible">@color/background_color</color>
-    <color name="calendar_hidden">@color/foreground_color</color>
+    <color name="calendar_visible">@color/e_primary_text_color</color>
+    <color name="calendar_hidden">@color/e_disabled_color</color>
     <color name="calendar_secondary_visible">@color/color_default_primary_text</color>
     <color name="calendar_secondary_hidden">@color/color_default_secondary_text</color>
     <color name="calendar_item_disabled">#61000000</color>
@@ -215,7 +215,7 @@
     <color name="grid_line_black">#303030</color>
 
     <color name="month_bgcolor_black">@color/bg_black</color>
-    <color name="month_selected_week_bgcolor_black">#FFDDDDDD</color>
+    <color name="month_selected_week_bgcolor_black">@color/colorPrimary</color>
     <color name="month_mini_day_number_black">@color/color_default_primary_text</color>
     <color name="month_other_month_day_number_black">@color/color_default_secondary_text</color>
     <color name="month_grid_lines_black">@color/grid_line_black</color>
@@ -293,8 +293,8 @@
     <color name="event_info_label_background_color_black">#FFDDDDDD</color>
 
     <!-- calendar_sync_item colors -->
-    <color name="calendar_visible_black">#ffffff</color>
-    <color name="calendar_hidden_black">#757575</color>
+    <color name="calendar_visible_black">@color/calendar_visible</color>
+    <color name="calendar_hidden_black">@color/calendar_hidden</color>
     <color name="calendar_secondary_visible_black">#ffffff</color>
     <color name="calendar_secondary_hidden_black">#757575</color>
     <color name="calendar_item_disabled_black">#61ffffff</color>
@@ -322,7 +322,7 @@
     <color name="grid_line_dark">#424242</color>
 
     <color name="month_bgcolor_dark">@color/color_non_focus_item_bg</color>
-    <color name="month_selected_week_bgcolor_dark">#FFDDDDDD</color>
+    <color name="month_selected_week_bgcolor_dark">@color/colorPrimary</color>
     <color name="month_mini_day_number_dark">@color/color_default_primary_text</color>
     <color name="month_other_month_day_number_dark">@color/color_default_secondary_text</color>
     <color name="month_grid_lines_dark">@color/grid_line_dark</color>
@@ -399,8 +399,8 @@
     <color name="event_info_label_background_color_dark">#FFDDDDDD</color>
 
     <!-- calendar_sync_item colors -->
-    <color name="calendar_visible_dark">#ffffff</color>
-    <color name="calendar_hidden_dark">#757575</color>
+    <color name="calendar_visible_dark">@color/calendar_visible</color>
+    <color name="calendar_hidden_dark">@color/calendar_hidden</color>
     <color name="calendar_secondary_visible_dark">#ffffff</color>
     <color name="calendar_secondary_hidden_dark">#757575</color>
     <color name="calendar_item_disabled_dark">#61ffffff</color>