diff --git a/res/menu-sw580dp-w720dp/actions.xml b/res/menu-sw580dp-w720dp/actions.xml
index 3aca102..2d21676 100644
--- a/res/menu-sw580dp-w720dp/actions.xml
+++ b/res/menu-sw580dp-w720dp/actions.xml
@@ -39,21 +39,20 @@
         android:title="@string/menu_contacts_filter" />
 
     <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_settings_holo_light"
-        android:orderInCategory="2"
-        android:title="@string/menu_settings" />
-
-    <item
         android:id="@+id/menu_import_export"
         android:icon="@drawable/ic_menu_import_export_holo_light"
-        android:orderInCategory="3"
+        android:orderInCategory="2"
         android:title="@string/menu_import_export" />
 
     <item
         android:id="@+id/menu_accounts"
         android:icon="@drawable/ic_menu_accounts_holo_light"
-        android:orderInCategory="4"
+        android:orderInCategory="3"
         android:title="@string/menu_accounts" />
 
+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_menu_settings_holo_light"
+        android:orderInCategory="4"
+        android:title="@string/menu_settings" />
 </menu>
diff --git a/res/menu-sw580dp/actions.xml b/res/menu-sw580dp/actions.xml
index c2fd3e6..08fea42 100644
--- a/res/menu-sw580dp/actions.xml
+++ b/res/menu-sw580dp/actions.xml
@@ -42,21 +42,20 @@
         android:title="@string/menu_contacts_filter" />
 
     <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_settings_holo_light"
-        android:orderInCategory="2"
-        android:title="@string/menu_settings" />
-
-    <item
         android:id="@+id/menu_import_export"
         android:icon="@drawable/ic_menu_import_export_holo_light"
-        android:orderInCategory="3"
+        android:orderInCategory="2"
         android:title="@string/menu_import_export" />
 
     <item
         android:id="@+id/menu_accounts"
         android:icon="@drawable/ic_menu_accounts_holo_light"
-        android:orderInCategory="4"
+        android:orderInCategory="3"
         android:title="@string/menu_accounts" />
 
+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_menu_settings_holo_light"
+        android:orderInCategory="4"
+        android:title="@string/menu_settings" />
 </menu>
diff --git a/res/menu/actions.xml b/res/menu/actions.xml
index 2af9e92..852bfa9 100644
--- a/res/menu/actions.xml
+++ b/res/menu/actions.xml
@@ -38,11 +38,6 @@
         android:title="@string/menu_contacts_filter" />
 
     <item
-        android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_menu_settings_holo_light"
-        android:title="@string/menu_settings" />
-
-    <item
         android:id="@+id/menu_import_export"
         android:icon="@drawable/ic_menu_import_export_holo_light"
         android:title="@string/menu_import_export" />
@@ -52,4 +47,8 @@
         android:icon="@drawable/ic_menu_accounts_holo_light"
         android:title="@string/menu_accounts" />
 
+    <item
+        android:id="@+id/menu_settings"
+        android:icon="@drawable/ic_menu_settings_holo_light"
+        android:title="@string/menu_settings" />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 102ddbd..43c4107 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1490,7 +1490,7 @@
     <string name="activity_title_contacts_filter">Contacts to display</string>
 
     <!-- Menu item for the settings activity [CHAR LIMIT=64] -->
-    <string name="menu_settings">Display options</string>
+    <string name="menu_settings" msgid="377929915873428211">Settings</string>
 
     <!-- The preference section title for contact display options [CHAR LIMIT=128] -->
     <string name="preference_displayOptions">Display options</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dc209c5..0a5352a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -181,6 +181,8 @@
     </style>
 
     <style name="ContactPickerTheme" parent="@style/PeopleTheme">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
     <style name="ContactPickerLayout" parent="ContactPickerTheme">
         <item name="android:layout_width">match_parent</item>
diff --git a/src/com/android/contacts/list/ContactListFilter.java b/src/com/android/contacts/list/ContactListFilter.java
index 724098c..01d76a2 100644
--- a/src/com/android/contacts/list/ContactListFilter.java
+++ b/src/com/android/contacts/list/ContactListFilter.java
@@ -205,15 +205,13 @@
 
     /**
      * Try to obtain ContactListFilter object saved in SharedPreference.
-     * If there's no info there, return custom filter instead, assuming the user wants contacts
-     * which ContactsProvider remembers as "visible contacts".
-     * (See also {@link Contacts#IN_VISIBLE_GROUP})
+     * If there's no info there, return ALL filter instead.
      */
     public static ContactListFilter restoreDefaultPreferences(SharedPreferences prefs) {
         ContactListFilter filter = restoreFromPreferences(prefs);
         if (filter == null) {
-            // Show contacts in IN_VISIBLE_GROUP instead.
-            filter = ContactListFilter.createFilterWithType(ContactListFilter.FILTER_TYPE_CUSTOM);
+            filter = ContactListFilter.createFilterWithType(
+                    ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS);
         }
         return filter;
     }
diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
index 9a3f05e..f202522 100644
--- a/src/com/android/contacts/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -199,11 +199,7 @@
                 } else {
                     selection.append(" AND " + RawContacts.DATA_SET + " IS NULL");
                 }
-                // TODO (stopship): And also this private API, which is even worse
-                selection.append(") OR " + Contacts._ID + "=(" +
-                        "SELECT contact_id " +
-                        "FROM raw_contacts rc inner join accounts a" +
-                        " ON a.profile_raw_contact_id = rc._id)");
+                selection.append(")");
                 break;
             }
             case ContactListFilter.FILTER_TYPE_GROUP: {