diff --git a/res/layout-v23/edit_date_picker.xml b/res/layout-v23/edit_date_picker.xml
index 299ccec68506ecec88b2f0b4df29533b98a662b8..f65d805861ec2ead40f8b6ab8a82811aabb1fc3a 100644
--- a/res/layout-v23/edit_date_picker.xml
+++ b/res/layout-v23/edit_date_picker.xml
@@ -19,6 +19,7 @@
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_view"
+    android:theme="@style/CustomEditTextTheme"
     style="@style/SpinnerButtonStyle"
     android:layout_width="match_parent"
     android:layout_height="@dimen/editor_min_line_item_height"
diff --git a/res/layout-v23/edit_spinner.xml b/res/layout-v23/edit_spinner.xml
index 37015f716616b9381faf1fecffbf0c26af9d67e5..22737662ab700cbc974fc60b8c4c6d226f25e353 100644
--- a/res/layout-v23/edit_spinner.xml
+++ b/res/layout-v23/edit_spinner.xml
@@ -20,7 +20,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinner"
     android:layout_gravity="bottom|start"
+    android:theme="@style/CustomEditTextTheme"
     style="@android:style/Widget.Material.Spinner.Underlined"
+    android:popupBackground="@color/color_default_foreground"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml
index 3ff874f0c8db05106ea474a90d22c90a56a9d82a..4010230395d8d66646baf6d5333de01be0d66d36 100644
--- a/res/layout/date_picker.xml
+++ b/res/layout/date_picker.xml
@@ -34,6 +34,7 @@
         android:paddingTop="5dip"
         android:paddingBottom="5dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/color_default_primary_text"
         android:layout_gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/edit_date_picker.xml b/res/layout/edit_date_picker.xml
index 5d60a368596937405f927343d35b8bbe136692de..fa2bd61f4a5a5cd5654eb616037f836101ec12cb 100644
--- a/res/layout/edit_date_picker.xml
+++ b/res/layout/edit_date_picker.xml
@@ -19,6 +19,7 @@
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_view"
+    android:theme="@style/CustomEditTextTheme"
     style="@style/SpinnerButtonStyle"
     android:layout_width="match_parent"
     android:layout_height="@dimen/editor_min_line_item_height"
diff --git a/res/layout/edit_spinner.xml b/res/layout/edit_spinner.xml
index b1c879cdd9d43496b69bf9681b104223480e0a65..d1712c4f2b9735bf291f8c0a133e5ce41983951e 100644
--- a/res/layout/edit_spinner.xml
+++ b/res/layout/edit_spinner.xml
@@ -20,7 +20,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinner"
     android:layout_gravity="bottom|start"
+    android:theme="@style/CustomEditTextTheme"
     style="@android:style/Widget.Material.Spinner.Underlined"
+    android:popupBackground="@color/color_default_foreground"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 75af9a3c37bd32b17d7d824daaedf9260095b2a5..f45fcef032967569701ad845cc8e471dedabc5d9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -81,7 +81,7 @@
     <color name="list_item_pinned_header_color">@color/background_primary</color>
 
     <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
-    <color name="editor_disabled_text_color">@color/secondary_text_color</color>
+    <color name="editor_disabled_text_color">@color/color_default_secondary_text</color>
 
     <!-- Color of text on disabled link contacts button, 25% black. -->
     <color name="disabled_button_text">@color/secondary_text_color</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d285171a400e265063a122a2ac8230887267ec7e..a5d9cf1c52b4312da74f1f09c304b474e643c899 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -385,6 +385,19 @@
         <item name="android:gravity">start|center_vertical</item>
     </style>
 
+    <style name="CustomEditTextTheme" parent="@android:style/Theme.Material.Light">
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlHighlight">@color/accent</item>
+        <item name="android:colorControlNormal">@color/accent</item>
+        <item name="android:colorControlActivated">@color/accent</item>
+        <item name="android:colorControlHighlight">@color/accent</item>
+    </style>
+
     <style name="EditKindSeparatorTextViewStyle" parent="ContactListSeparatorTextViewStyle">
         <item name="android:textAppearance">@style/EditKindTextAppearanceStyle</item>
     </style>
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 1b51c520803e116ce3ac7d67cbdf2f130f05a5c6..aa941e893cfc7e2c0a5d3f8ba78140bb14c6c87a 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -17,6 +17,7 @@
 package com.android.contacts.editor;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
@@ -279,6 +280,7 @@ public class TextFieldsEditorView extends LabeledEditorView {
                     LayoutParams.WRAP_CONTENT));
             fieldView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                     getResources().getDimension(R.dimen.editor_form_text_size));
+            fieldView.setBackgroundTintList(ColorStateList.valueOf(getContext().getColor(R.color.accent)));
             fieldView.setHintTextColor(mHintTextColorUnfocused);
             mFieldEditTexts[index] = fieldView;
             fieldView.setId(vig.getId(state, kind, entry, index));