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 63dcc01399f4bea6f3b94437ecca0fdd6dd1eeb4..5e6c6d053986ad2946d7fdcb19f9fe00cb48ee2a 100644
--- a/res/layout-v23/edit_spinner.xml
+++ b/res/layout-v23/edit_spinner.xml
@@ -20,10 +20,11 @@
     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:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
     android:paddingTop="0dp"
-    android:popupBackground="@color/color_default_background"
+    android:popupBackground="@color/color_default_foreground"
     android:paddingEnd="@dimen/editor_spinner_right_padding_workaround"/>
\ No newline at end of file
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 8893ea24fde2eb7559c933bf37b4a1879bed126b..e05a94f364aef51081afd0c73f42f54d7a29b934 100644
--- a/res/layout/edit_spinner.xml
+++ b/res/layout/edit_spinner.xml
@@ -19,10 +19,11 @@
 <Spinner
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinner"
+    android:theme="@style/CustomEditTextTheme"
     android:layout_gravity="bottom|start"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
     android:paddingTop="0dp"
-    android:popupBackground="@color/color_default_background"
+    android:popupBackground="@color/color_default_foreground"
     android:paddingRight="@dimen/editor_spinner_right_padding"/>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f4f87d9686294df5f24b2780daff7fabd4dfd80a..226269f4951d37fd650c390ecca29c9d51f5a735 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -84,7 +84,7 @@
     <color name="editor_icon_color">@color/accent</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 4e382d67f45608917dbadeaef7515f4e451b5059..dd093b88bc710c67293f8c40ac0a846476b581d0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -210,7 +210,7 @@
     <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat" />
 
     <style name="PopupMenuStyle" parent="@android:style/Widget.PopupMenu">
-        <item name="android:popupBackground">@color/color_default_background</item>
+        <item name="android:popupBackground">@color/color_default_foreground</item>
     </style>
 
     <style name="CustomDropDownListViewStyle" parent="Widget.AppCompat.ListView.DropDown">
@@ -218,7 +218,7 @@
     </style>
 
     <style name="PopupMenuStyleAppCompat" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:popupBackground">@color/primary_color_dark</item>
+        <item name="android:popupBackground">@color/color_default_foreground</item>
     </style>
 
     <style name="customSpinnerItemStyle" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
@@ -707,4 +707,19 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
     <style name="Toolbar.Button.Navigation.Tinted.White" parent="Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="tint">@android:color/white</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>
+
+
 </resources>
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 957ae1bc3f4cb104cef96b723f30ae5d84f2cc1c..c67de1fa153c41cd75fc1dcf6149dacbcf4f2ae3 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().getResources().getColor(R.color.accent)));
             fieldView.setHintTextColor(mHintTextColorUnfocused);
             mFieldEditTexts[index] = fieldView;
             fieldView.setId(vig.getId(state, kind, entry, index));