diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b259eee64..d3808f09e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -201,8 +201,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:label="@string/AndroidManifest__select_contacts"
-              android:windowSoftInputMode="stateVisible"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
diff --git a/res/drawable-hdpi/ic_dialpad_white_24dp.png b/res/drawable-hdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 000000000..761be162a
Binary files /dev/null and b/res/drawable-hdpi/ic_dialpad_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/res/drawable-hdpi/ic_keyboard_white_24dp.png
index d68a8edfb..9a6646188 100644
Binary files a/res/drawable-hdpi/ic_keyboard_white_24dp.png and b/res/drawable-hdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_dialpad_white_24dp.png b/res/drawable-mdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 000000000..fb534ab5b
Binary files /dev/null and b/res/drawable-mdpi/ic_dialpad_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.png b/res/drawable-mdpi/ic_keyboard_white_24dp.png
index 14d1b5d82..5fd959bc2 100644
Binary files a/res/drawable-mdpi/ic_keyboard_white_24dp.png and b/res/drawable-mdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_dialpad_white_24dp.png b/res/drawable-xhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 000000000..1079772e7
Binary files /dev/null and b/res/drawable-xhdpi/ic_dialpad_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_white_24dp.png
index d2b42b3a7..f0050c5f7 100644
Binary files a/res/drawable-xhdpi/ic_keyboard_white_24dp.png and b/res/drawable-xhdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_dialpad_white_24dp.png b/res/drawable-xxhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 000000000..e33194bd0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_dialpad_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png b/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 000000000..36a9ba77f
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 000000000..84365a576
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml
new file mode 100644
index 000000000..08f995fc2
--- /dev/null
+++ b/res/layout/contact_selection_activity.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_gravity="center"
+              android:layout_height="fill_parent"
+              android:layout_width="fill_parent"
+              android:orientation="vertical"
+              xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_width="match_parent"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/TextSecure.LightActionBar">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="horizontal">
+
+            <ImageView android:id="@+id/action_icon"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center_vertical"
+                       android:gravity="center_vertical"
+                       android:clickable="true"
+                       android:background="@drawable/circle_touch_highlight_background"
+                       android:src="@drawable/ic_search_white_24dp" />
+
+            <EditText android:id="@+id/search_view"
+                      android:layout_height="wrap_content"
+                      android:layout_width="0px"
+                      android:layout_weight="1"
+                      android:layout_marginLeft="5dp"
+                      android:hint="Enter name or number"
+                      android:inputType="textPersonName"
+                      android:theme="@style/TextSecure.TitleTextStyle"
+                      android:background="@android:color/transparent"
+                      android:layout_gravity="center_vertical"
+                      android:gravity="center_vertical"/>
+
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <ImageView android:id="@+id/search_dialpad"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_dialpad_white_24dp" />
+
+                <ImageView android:id="@+id/search_keyboard"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_keyboard_white_24dp" />
+
+
+                <ImageView android:id="@+id/search_clear"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_clear_white_24dp" />
+
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.Toolbar>
+
+    <fragment
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/contact_selection_list_fragment"
+        android:name="org.thoughtcrime.securesms.ContactSelectionListFragment">
+        </fragment>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/contact_selection_list_fragment.xml b/res/layout/contact_selection_list_fragment.xml
new file mode 100644
index 000000000..f54bcb98c
--- /dev/null
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -0,0 +1,26 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    
+    <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center|center_vertical"
+            android:layout_marginTop="15dp"
+            android:text="@string/contact_selection_group_activity__finding_contacts"
+            android:textSize="20sp" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+</LinearLayout>
diff --git a/res/layout/push_contact_selection_list_header.xml b/res/layout/contact_selection_list_header.xml
similarity index 68%
rename from res/layout/push_contact_selection_list_header.xml
rename to res/layout/contact_selection_list_header.xml
index a386bd04a..040602aeb 100644
--- a/res/layout/push_contact_selection_list_header.xml
+++ b/res/layout/contact_selection_list_header.xml
@@ -14,12 +14,7 @@
               android:layout_centerVertical="true"
               android:layout_alignParentLeft="true"
               android:textSize="15sp"
-              android:textColor="?conversation_selection_header_text"
+              android:textColor="?contact_selection_header_text"
               android:textStyle="bold" />
 
-    <View android:layout_width="match_parent"
-          android:layout_height="3dp"
-          android:layout_alignParentBottom="true"
-          android:layout_marginTop="2dp"
-          android:background="?conversation_selection_header_text" />
 </RelativeLayout>
diff --git a/res/layout/push_contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
similarity index 100%
rename from res/layout/push_contact_selection_list_item.xml
rename to res/layout/contact_selection_list_item.xml
diff --git a/res/layout/new_conversation_activity.xml b/res/layout/new_conversation_activity.xml
deleted file mode 100644
index e3bf93e1f..000000000
--- a/res/layout/new_conversation_activity.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/push_contact_selection_activity.xml b/res/layout/push_contact_selection_activity.xml
deleted file mode 100644
index e3bf93e1f..000000000
--- a/res/layout/push_contact_selection_activity.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/push_contact_selection_list_activity.xml b/res/layout/push_contact_selection_list_activity.xml
deleted file mode 100644
index e45ff7657..000000000
--- a/res/layout/push_contact_selection_list_activity.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <EditText android:id="@+id/filter"
-              android:inputType="textPersonName"
-              android:layout_width="match_parent"
-              android:layout_height="45sp"
-              android:hint="@string/recipients_panel__to"
-              android:textColor="?conversation_editor_text_color" />
-
-    <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|center_vertical"
-        android:layout_marginTop="15dp"
-        android:text="@string/contact_selection_group_activity__finding_contacts"
-        android:textSize="20sp" />
-
-</LinearLayout>
diff --git a/res/menu/new_conversation_activity_number_pad.xml b/res/menu/new_conversation_activity_number_pad.xml
new file mode 100644
index 000000000..8c6dd923a
--- /dev/null
+++ b/res/menu/new_conversation_activity_number_pad.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Number pad"
+          android:id="@+id/menu_number_pad"
+          android:icon="@drawable/ic_dialpad_white_24dp"
+          app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/res/menu/new_conversation_activity_search.xml b/res/menu/new_conversation_activity_search.xml
new file mode 100644
index 000000000..13a5a920a
--- /dev/null
+++ b/res/menu/new_conversation_activity_search.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Search contacts"
+          android:id="@+id/menu_search"
+          android:icon="?attr/menu_search_icon"
+          app:actionViewClass="android.support.v7.widget.SearchView"
+          app:showAsAction="always|collapseActionView" />
+
+</menu>
diff --git a/res/menu/new_conversation_activity_text_pad.xml b/res/menu/new_conversation_activity_text_pad.xml
new file mode 100644
index 000000000..86978ce33
--- /dev/null
+++ b/res/menu/new_conversation_activity_text_pad.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Text input"
+          android:id="@+id/menu_text_pad"
+          android:icon="@drawable/ic_keyboard_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/push_directory.xml b/res/menu/push_directory.xml
index 0644a91b9..4c89c705b 100644
--- a/res/menu/push_directory.xml
+++ b/res/menu/push_directory.xml
@@ -4,6 +4,6 @@
     <item android:title="@string/push_directory__menu_refresh"
           android:id="@+id/menu_refresh_directory"
           android:icon="?menu_refresh_directory"
-          app:showAsAction="ifRoom"
+          app:showAsAction="always"
         />
 </menu>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9b8142d0c..67e9de4a1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -72,7 +72,7 @@
     <attr name="contact_selection_push_user" format="reference|color" />
     <attr name="contact_selection_lay_user" format="reference|color" />
     <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="conversation_selection_header_text" format="reference|color" />
+    <attr name="contact_selection_header_text" format="reference|color" />
 
     <attr name="import_export_item_background_color" format="reference|color" />
     <attr name="import_export_item_background_shadow_color" format="reference|color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2f5973324..4b81c4388 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,6 +58,7 @@
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/white</item>
+        <item name="android:textColorHint">#BFffffff</item>
     </style>
 
     <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b91ef0a2a..2520a6ae4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,7 +9,12 @@
         <item name="colorPrimary">@color/textsecure_primary</item>
         <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
+
         <item name="recipient_preference_blocked">#8e0000</item>
+        <item name="contact_selection_label_text">#66000000</item>
+        <item name="contact_selection_push_user">#ff000000</item>
+        <item name="contact_selection_lay_user">#a0000000</item>
+        <item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
@@ -17,7 +22,12 @@
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+
         <item name="recipient_preference_blocked">#d00000</item>
+        <item name="contact_selection_label_text">#66eeeeee</item>
+        <item name="contact_selection_push_user">#ffeeeeee</item>
+        <item name="contact_selection_lay_user">#afeeeeee</item>
+        <item name="contact_selection_header_text">#66eeeeee</item>
     </style>
 
     <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
@@ -82,11 +92,6 @@
 
         <item name="conversation_group_member_name">#99000000</item>
 
-        <item name="contact_selection_push_user">#ff000000</item>
-        <item name="contact_selection_lay_user">#a0000000</item>
-        <item name="contact_selection_label_text">#66000000</item>
-        <item name="conversation_selection_header_text">#44000000</item>
-
         <item name="conversation_background">#eeeeee</item>
         <item name="conversation_editor_background">#22000000</item>
         <item name="conversation_editor_text_color">#ff111111</item>
@@ -196,11 +201,6 @@
 
         <item name="conversation_group_member_name">#99ffffff</item>
 
-        <item name="contact_selection_push_user">#ffeeeeee</item>
-        <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="conversation_selection_header_text">#66eeeeee</item>
-
         <item name="conversation_item_background">@drawable/conversation_item_background_dark</item>
         <item name="conversation_item_bubble_background">#ff333333</item>
         <item name="conversation_item_sent_text_primary_color">#ffffffff</item>
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
new file mode 100644
index 000000000..3684b384f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.Toolbar;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.AnimatingToggle;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.util.DirectoryHelper;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+import java.io.IOException;
+
+/**
+ * Base activity container for selecting a list of contacts.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+                                               implements SwipeRefreshLayout.OnRefreshListener,
+                                                          ContactSelectionListFragment.OnContactSelectedListener
+{
+  private static final String TAG             = ContactSelectionActivity.class.getSimpleName();
+  public  final static String PUSH_ONLY_EXTRA = "push_only";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  protected ContactSelectionListFragment contactsFragment;
+
+  private   Toolbar         toolbar;
+  private   EditText        searchText;
+  private   AnimatingToggle toggle;
+  protected ImageView       action;
+  private   ImageView       keyboardToggle;
+  private   ImageView       dialpadToggle;
+  private   ImageView       clearToggle;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
+    setContentView(R.layout.contact_selection_activity);
+
+    initializeToolbar();
+    initializeResources();
+    initializeSearch();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  private void initializeToolbar() {
+    this.toolbar = (Toolbar) findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+    getSupportActionBar().setDisplayShowTitleEnabled(false);
+  }
+
+  private void initializeResources() {
+    this.action         = (ImageView) findViewById(R.id.action_icon);
+    this.searchText     = (EditText) findViewById(R.id.search_view);
+    this.toggle         = (AnimatingToggle) findViewById(R.id.button_toggle);
+    this.keyboardToggle = (ImageView) findViewById(R.id.search_keyboard);
+    this.dialpadToggle  = (ImageView) findViewById(R.id.search_dialpad);
+    this.clearToggle    = (ImageView) findViewById(R.id.search_clear);
+
+    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment.setOnContactSelectedListener(this);
+    contactsFragment.setOnRefreshListener(this);
+
+    this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
+        toggle.display(dialpadToggle);
+      }
+    });
+
+    this.dialpadToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setInputType(InputType.TYPE_CLASS_PHONE);
+        toggle.display(keyboardToggle);
+      }
+    });
+
+    this.clearToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setText("");
+
+        if (SearchUtil.isTextInput(searchText)) toggle.display(dialpadToggle);
+        else                                    toggle.display(keyboardToggle);
+      }
+    });
+  }
+
+  private void initializeSearch() {
+    this.searchText.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+      }
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+      }
+
+      @Override
+      public void afterTextChanged(Editable s) {
+        if      (!SearchUtil.isEmpty(searchText))     toggle.display(clearToggle);
+        else if (SearchUtil.isTextInput(searchText))  toggle.display(dialpadToggle);
+        else if (SearchUtil.isPhoneInput(searchText)) toggle.display(keyboardToggle);
+
+        contactsFragment.setQueryFilter(searchText.getText().toString());
+      }
+    });
+  }
+
+  @Override
+  public void onRefresh() {
+    new AsyncTask<Void, Void, Void>() {
+      @Override
+      protected Void doInBackground(Void... params) {
+        try {
+          DirectoryHelper.refreshDirectory(ContactSelectionActivity.this);
+        } catch (IOException e) {
+          Log.w(TAG, e);
+        }
+
+        return null;
+      }
+
+      @Override
+      protected void onPostExecute(Void result) {
+        searchText.setText("");
+        contactsFragment.resetQueryFilter();
+      }
+    }.execute();
+  }
+
+  @Override
+  public void onContactSelected(String number) {}
+
+  private static class SearchUtil {
+
+    public static boolean isTextInput(EditText editText) {
+      return (editText.getInputType() & 0x0000000F) == InputType.TYPE_CLASS_TEXT;
+    }
+
+    public static boolean isPhoneInput(EditText editText) {
+      return (editText.getInputType() & 0x0000000F) == InputType.TYPE_CLASS_PHONE;
+    }
+
+    public static boolean isEmpty(EditText editText) {
+      return editText.getText().length() <= 0;
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
similarity index 78%
rename from src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java
rename to src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index db440ecae..067780c20 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2015 Open Whisper Systems
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,13 +23,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
@@ -49,17 +47,17 @@ import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
  * @author Moxie Marlinspike
  *
  */
-
-public class PushContactSelectionListFragment extends    Fragment
-                                              implements LoaderManager.LoaderCallbacks<Cursor>
+public class ContactSelectionListFragment extends    Fragment
+                                          implements LoaderManager.LoaderCallbacks<Cursor>
 {
-  private static final String TAG = "ContactSelectFragment";
+  private static final String TAG = ContactSelectionListFragment.class.getSimpleName();
 
   private TextView emptyText;
 
   private Map<Long, String>         selectedContacts;
   private OnContactSelectedListener onContactSelectedListener;
   private StickyListHeadersListView listView;
+  private SwipeRefreshLayout        swipeRefresh;
   private String                    cursorFilter;
 
   private boolean multi = false;
@@ -67,7 +65,6 @@ public class PushContactSelectionListFragment extends    Fragment
   @Override
   public void onActivityCreated(Bundle icicle) {
     super.onCreate(icicle);
-    initializeResources();
     initializeCursor();
   }
 
@@ -83,7 +80,17 @@ public class PushContactSelectionListFragment extends    Fragment
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.push_contact_selection_list_activity, container, false);
+    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
+
+    this.emptyText = (TextView)                  view.findViewById(android.R.id.empty);
+    swipeRefresh   = (SwipeRefreshLayout)        view.findViewById(R.id.swipe_refresh);
+    listView       = (StickyListHeadersListView) view.findViewById(android.R.id.list);
+    listView.setFocusable(true);
+    listView.setFastScrollEnabled(true);
+    listView.setDrawingListUnderStickyHeader(false);
+    listView.setOnItemClickListener(new ListClickListener());
+
+    return view;
   }
 
   public List<String> getSelectedContacts() {
@@ -106,42 +113,19 @@ public class PushContactSelectionListFragment extends    Fragment
     this.getLoaderManager().initLoader(0, null, this);
   }
 
-  private void initializeResources() {
-    emptyText = (TextView) getView().findViewById(android.R.id.empty);
-    listView  = (StickyListHeadersListView) getView().findViewById(android.R.id.list);
-    listView.setFocusable(true);
-    listView.setFastScrollEnabled(true);
-    listView.setDrawingListUnderStickyHeader(false);
-    listView.setOnItemClickListener(new ListClickListener());
-
-    EditText filterEditText = (EditText) getView().findViewById(R.id.filter);
-    filterEditText.addTextChangedListener(new TextWatcher() {
-      @Override
-      public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
-
-      }
-
-      @Override
-      public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
-        cursorFilter = charSequence.toString();
-        update();
-      }
-
-      @Override
-      public void afterTextChanged(Editable editable) {
-
-      }
-    });
-    cursorFilter = null;
+  public void setQueryFilter(String filter) {
+    this.cursorFilter = filter;
+    this.getLoaderManager().restartLoader(0, null, this);
   }
 
-  public void update() {
-    this.getLoaderManager().restartLoader(0, null, this);
+  public void resetQueryFilter() {
+    setQueryFilter(null);
+    swipeRefresh.setRefreshing(false);
   }
 
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    boolean pushOnly    = getActivity().getIntent().getBooleanExtra(PushContactSelectionActivity.PUSH_ONLY_EXTRA, false);
+    boolean pushOnly    = getActivity().getIntent().getBooleanExtra(ContactSelectionActivity.PUSH_ONLY_EXTRA, false);
     boolean supportsSms = TextSecurePreferences.isSmsEnabled(getActivity());
 
     return new ContactsCursorLoader(getActivity(), !pushOnly && supportsSms, cursorFilter);
@@ -178,6 +162,10 @@ public class PushContactSelectionListFragment extends    Fragment
     this.onContactSelectedListener = onContactSelectedListener;
   }
 
+  public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
+    this.swipeRefresh.setOnRefreshListener(onRefreshListener);
+  }
+
   public interface OnContactSelectedListener {
     public void onContactSelected(String number);
   }
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index fa65e1a2c..f3a711288 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2015 Open Whisper Systems
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,99 +17,26 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.DirectoryHelper;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 /**
- * Activity container for selecting a list of contacts.
+ * Activity container for starting a new conversation.
  *
  * @author Moxie Marlinspike
  *
  */
-public class NewConversationActivity extends PassphraseRequiredActionBarActivity {
+public class NewConversationActivity extends ContactSelectionActivity {
+
   private static final String TAG = NewConversationActivity.class.getSimpleName();
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private PushContactSelectionListFragment contactsFragment;
-
   @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
+  public void onContactSelected(String number) {
+    Recipients recipients = RecipientFactory.getRecipientsFromString(this, number, true);
 
-  @Override
-  protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    setContentView(R.layout.new_conversation_activity);
-    initializeResources();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
-    menu.clear();
-
-    if (TextSecurePreferences.isPushRegistered(this)) inflater.inflate(R.menu.push_directory, menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-    case R.id.menu_refresh_directory:  handleDirectoryRefresh();  return true;
-    case android.R.id.home:            finish();                  return true;
-    }
-    return false;
-  }
-
-  private void initializeResources() {
-    contactsFragment = (PushContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
-    contactsFragment.setOnContactSelectedListener(new PushContactSelectionListFragment.OnContactSelectedListener() {
-      @Override
-      public void onContactSelected(String number) {
-        Log.i(TAG, "Choosing contact from list.");
-        Recipients recipients = RecipientFactory.getRecipientsFromString(NewConversationActivity.this, number, true);
-        openNewConversation(recipients);
-      }
-    });
-  }
-
-  private void handleDirectoryRefresh() {
-    DirectoryHelper.refreshDirectoryWithProgressDialog(this, new DirectoryHelper.DirectoryUpdateFinishedListener() {
-      @Override
-      public void onUpdateFinished() {
-        contactsFragment.update();
-      }
-    });
-  }
-
-  private void openNewConversation(Recipients recipients) {
     if (recipients != null) {
       Intent intent = new Intent(this, ConversationActivity.class);
       intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
@@ -117,11 +44,14 @@ public class NewConversationActivity extends PassphraseRequiredActionBarActivity
       intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_AUDIO_EXTRA));
       intent.putExtra(ConversationActivity.DRAFT_VIDEO_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_VIDEO_EXTRA));
       intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_IMAGE_EXTRA));
+
       long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
+
       intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
       intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
       startActivity(intent);
       finish();
     }
   }
+
 }
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
index a06b46a2b..9a4472e03 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
@@ -22,10 +22,12 @@ import android.support.annotation.NonNull;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -38,81 +40,28 @@ import java.util.List;
  * @author Moxie Marlinspike
  *
  */
-public class PushContactSelectionActivity extends PassphraseRequiredActionBarActivity {
-  private final static String TAG             = "ContactSelectActivity";
-  public  final static String PUSH_ONLY_EXTRA = "push_only";
+public class PushContactSelectionActivity extends ContactSelectionActivity {
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private PushContactSelectionListFragment contactsFragment;
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
+  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
 
   @Override
   protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    setContentView(R.layout.push_contact_selection_activity);
-    initializeResources();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
-    menu.clear();
-
-    if (TextSecurePreferences.isPushRegistered(this)) inflater.inflate(R.menu.push_directory, menu);
-
-    inflater.inflate(R.menu.contact_selection, menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-    case R.id.menu_refresh_directory:  handleDirectoryRefresh();  return true;
-    case R.id.menu_selection_finished: handleSelectionFinished(); return true;
-    case android.R.id.home:            finish();                  return true;
-    }
-    return false;
-  }
-
-  private void initializeResources() {
-    contactsFragment = (PushContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    super.onCreate(icicle, masterSecret);
     contactsFragment.setMultiSelect(true);
-  }
 
-  private void handleSelectionFinished() {
-    Intent resultIntent = getIntent();
-    List<String> selectedContacts = contactsFragment.getSelectedContacts();
-
-    if (selectedContacts != null) {
-      resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-    }
-
-    setResult(RESULT_OK, resultIntent);
-    finish();
-  }
-
-  private void handleDirectoryRefresh() {
-    DirectoryHelper.refreshDirectoryWithProgressDialog(this, new DirectoryHelper.DirectoryUpdateFinishedListener() {
+    action.setImageDrawable(getResources().getDrawable(R.drawable.ic_check_white_24dp));
+    action.setOnClickListener(new View.OnClickListener() {
       @Override
-      public void onUpdateFinished() {
-        contactsFragment.update();
+      public void onClick(View v) {
+        Intent       resultIntent     = getIntent();
+        List<String> selectedContacts = contactsFragment.getSelectedContacts();
+
+        if (selectedContacts != null) {
+          resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
+        }
+
+        setResult(RESULT_OK, resultIntent);
+        finish();
       }
     });
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
index 7f1ae268b..565f870d8 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -65,7 +65,7 @@ public class ContactSelectionListAdapter extends    CursorAdapter
 
   @Override
   public View newView(Context context, Cursor cursor, ViewGroup parent) {
-    return li.inflate(R.layout.push_contact_selection_list_item, parent, false);
+    return li.inflate(R.layout.contact_selection_list_item, parent, false);
   }
 
   @Override
@@ -96,7 +96,7 @@ public class ContactSelectionListAdapter extends    CursorAdapter
 
     if (convertView == null) {
       holder      = new HeaderViewHolder();
-      convertView = li.inflate(R.layout.push_contact_selection_list_header, viewGroup, false);
+      convertView = li.inflate(R.layout.contact_selection_list_header, viewGroup, false);
       holder.text = (TextView) convertView.findViewById(R.id.text);
       convertView.setTag(holder);
     } else {
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
index b30801a15..a942dc73a 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
@@ -149,7 +149,7 @@ public class ContactsDatabase {
                                            .withSelection(BaseColumns._ID + " = ?", new String[] {String.valueOf(rowId)})
                                            .build());
   }
-  
+
   public @NonNull Cursor querySystemContacts(String filter) {
     Uri uri;