diff --git a/res/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml
index ae9172603327a82d53e80620c9330ca3e5a8e7ba..a7de3c02378bafd74d67787b1b2996441804302a 100644
--- a/res/layout/account_selector_list_item_condensed.xml
+++ b/res/layout/account_selector_list_item_condensed.xml
@@ -38,19 +38,9 @@
             android:layout_marginRight="8dip"
             android:layout_marginEnd="8dip"
             android:textSize="16sp"
-            android:textColor="@color/contacts_text_color"
+            android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:singleLine="true"
             android:ellipsize="end"/>
-
-        <TextView android:id="@android:id/text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:textSize="14sp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:singleLine="true"
-            android:ellipsize="end"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml
index 45f5f736769e60c7b92c7cc540fb9da390f1d4a1..63fcf0b23270121d92fd4d3fe7c9d17cef52def4 100644
--- a/res/layout/dialog_title.xml
+++ b/res/layout/dialog_title.xml
@@ -22,7 +22,7 @@
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
     android:textSize="20sp"
-    android:textColor="@color/contacts_text_color"
+    android:textColor="?android:attr/textColorPrimary"
     android:textAlignment="viewStart"
     android:fontFamily="sans-serif-medium"
     android:ellipsize="end"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9af3e1f9b82c197fb4a28b8d3c5a53e56f9475a0..bbb825c9926ee7958d0268dd451c085e5a989743 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -298,7 +298,7 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
 
-    <style name="ContactEditorAccountsChangedActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar.MinWidth">
+    <style name="ContactEditorAccountsChangedActivityTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
         <item name="android:windowCloseOnTouchOutside">true</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 2b226d0a101b596db8f954bfa4e3bdcf4b49f9e8..4cf2a88c8545ff21c9ded63260adc7197d2d9dda 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -116,7 +116,6 @@ public class AccountSelectionUtil {
                 }
 
                 final TextView text1 = (TextView) convertView.findViewById(android.R.id.text1);
-                final TextView text2 = (TextView) convertView.findViewById(android.R.id.text2);
                 final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
 
                 final AccountWithDataSet account = this.getItem(position);
@@ -124,10 +123,7 @@ public class AccountSelectionUtil {
                         account.type, account.dataSet);
                 final Context context = getContext();
 
-                text1.setText(accountType.getDisplayLabel(context));
-                text2.setText(account.name);
-                text2.setVisibility(context.getPackageName().equals(account.type) ?
-                        View.GONE : View.VISIBLE);
+                text1.setText(account.name);
                 icon.setImageDrawable(accountType.getDisplayIcon(getContext()));
 
                 return convertView;
diff --git a/src/com/android/contacts/util/AccountsListAdapter.java b/src/com/android/contacts/util/AccountsListAdapter.java
index cc80b7985f9f551e5afb0b8e0831909004dda175..63f9935cdd5cd6f9fae2be5bab6860e0f466592e 100644
--- a/src/com/android/contacts/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -90,13 +90,9 @@ public final class AccountsListAdapter extends BaseAdapter {
                         R.layout.account_selector_list_item_condensed, parent, false);
 
         final TextView text1 = (TextView) resultView.findViewById(android.R.id.text1);
-        final TextView text2 = (TextView) resultView.findViewById(android.R.id.text2);
         final ImageView icon = (ImageView) resultView.findViewById(android.R.id.icon);
 
-        text1.setText(mAccounts.get(position).getTypeLabel());
-        text2.setText(mAccounts.get(position).getNameLabel());
-        text2.setVisibility(mAccounts.get(position).getNameLabel().equals(
-                mAccounts.get(position).getTypeLabel()) ? View.GONE : View.VISIBLE);
+        text1.setText(mAccounts.get(position).getNameLabel());
 
         icon.setImageDrawable(mAccounts.get(position).getIcon());