diff --git a/res/layout/contact_editor_accounts_changed_activity_with_picker.xml b/res/layout/contact_editor_accounts_changed_activity_with_picker.xml
index 172c9c5..0faea20 100644
--- a/res/layout/contact_editor_accounts_changed_activity_with_picker.xml
+++ b/res/layout/contact_editor_accounts_changed_activity_with_picker.xml
@@ -24,14 +24,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="24dip"
-        android:layout_marginStart="24dip"
-        android:paddingTop="15dip"
-        android:paddingBottom="15dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
+    <include
+        android:id="@+id/text"
+        layout="@layout/dialog_title"/>
 
     <View
         android:layout_width="match_parent"
@@ -42,8 +37,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:layout_marginLeft="8dip"
-        android:layout_marginStart="8dip"
         android:fadingEdge="none"/>
 
     <View
@@ -54,7 +47,9 @@
     <Button
         android:id="@+id/add_account_button"
         style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="24dp"
+        android:layout_marginBottom="8dp"/>
 
 </LinearLayout>
diff --git a/res/layout/contact_editor_accounts_changed_activity_with_text.xml b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
index 345d937..7ee30f7 100644
--- a/res/layout/contact_editor_accounts_changed_activity_with_text.xml
+++ b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
@@ -27,7 +27,10 @@
     <TextView android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="15dip"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <View
@@ -35,7 +38,7 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"/>
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -44,20 +47,24 @@
         style="?android:attr/buttonBarStyle">
 
         <Button
-            android:id="@+id/left_button"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:layout_weight="1" />
-
-        <Button
             android:id="@+id/right_button"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"/>
 
-    </LinearLayout>
+        <Button
+            android:id="@+id/left_button"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/right_button"
+            android:layout_marginTop="8dp"/>
+
+    </RelativeLayout>
 
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ec9b4a9..ef82a26 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -697,7 +697,7 @@
     <string name="generic_no_account_prompt_title">Add an account</string>
 
     <!-- Message in the contact editor prompt that notifies the user that the newly created contact will not be saved to any account, and prompts addition of an account [CHAR LIMIT=NONE] -->
-    <string name="contact_editor_prompt_zero_accounts">Your new contact won\'t be backed up. Add an account that backs up contacts online?</string>
+    <string name="contact_editor_prompt_zero_accounts">Take a minute to add an account that will back up your contacts to Google.</string>
 
     <!-- Message in the contact editor prompt that asks the user if it's okay to save the newly created contact to the account shown. [CHAR LIMIT=NONE] -->
     <string name="contact_editor_prompt_one_account">New contacts will be saved to <xliff:g id="account_name">%1$s</xliff:g>.</string>
@@ -715,9 +715,6 @@
          at a pre-determined text size. [CHAR LIMIT=20] -->
     <string name="contact_editor_title_existing_contact">Edit contact</string>
 
-    <!-- Button label to indicate that the user wants to save the newly created contact locally (instead of backing it up online) [CHAR LIMIT=20] -->
-    <string name="keep_local">Keep local</string>
-
     <!-- Button label to prompt the user to add an account (when there are 0 existing accounts on the device) [CHAR LIMIT=30] -->
     <string name="add_account">Add account</string>
 
diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index 212f888..c4c0e27 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -148,7 +148,7 @@
 
             // This button allows the user to continue editing the contact as a phone-only
             // local contact.
-            leftButton.setText(getString(R.string.keep_local));
+            leftButton.setText(getString(android.R.string.cancel));
             leftButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {