diff --git a/res/drawable-hdpi/ic_refresh_white_24dp.png b/res/drawable-hdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 38cd52d9d..000000000
Binary files a/res/drawable-hdpi/ic_refresh_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_refresh_white_24dp.png b/res/drawable-mdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 48e37b75c..000000000
Binary files a/res/drawable-mdpi/ic_refresh_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_refresh_white_24dp.png b/res/drawable-xhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 7e5c6ef19..000000000
Binary files a/res/drawable-xhdpi/ic_refresh_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_refresh_white_18dp.png b/res/drawable-xxhdpi/ic_refresh_white_18dp.png
deleted file mode 100644
index fe4285f67..000000000
Binary files a/res/drawable-xxhdpi/ic_refresh_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/res/drawable-xxhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 72128fe69..000000000
Binary files a/res/drawable-xxhdpi/ic_refresh_white_24dp.png and /dev/null differ
diff --git a/res/layout/message_details_activity.xml b/res/layout/message_details_activity.xml
deleted file mode 100644
index 88cfb1061..000000000
--- a/res/layout/message_details_activity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/container"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <ListView android:id="@+id/recipients_list"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              tools:listitem="@layout/message_recipient_list_item" />
-
-</LinearLayout>
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
deleted file mode 100644
index 8ae2dad37..000000000
--- a/res/layout/message_details_header.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <FrameLayout android:id="@+id/item_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:paddingTop="15dp"
-                 android:paddingBottom="15dp"
-                 android:elevation="2dp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp">
-
-        <TextView android:id="@+id/error_text"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:visibility="gone"
-                  android:textSize="16sp"
-                  android:padding="5dp"
-                  tools:visibility="visible"
-                  android:text="@string/message_details_header__issues_need_your_attention"
-                  android:drawableLeft="@drawable/ic_info_outline_light"
-                  android:drawableStart="@drawable/ic_info_outline_light"
-                  android:gravity="center_vertical" />
-
-        <TableLayout android:id="@+id/metadata_container"
-                     android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:shrinkColumns="1">
-
-            <TableRow android:id="@+id/sent_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:padding="@dimen/message_details_table_row_pad">
-
-                <TextView android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/message_details_header__sent"
-                          android:gravity="right"
-                          android:textStyle="bold" />
-
-                <TextView android:id="@+id/sent_time"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
-
-            </TableRow>
-
-            <TableRow android:id="@+id/received_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:padding="@dimen/message_details_table_row_pad">
-
-                <TextView android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/message_details_header__received"
-                          android:gravity="right"
-                          android:textStyle="bold" />
-
-                <TextView android:id="@+id/received_time"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 2015, 12:31:15 AM GMT-08:00" />
-
-            </TableRow>
-
-            <TableRow android:id="@+id/expires_container"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:padding="@dimen/message_details_table_row_pad"
-                      android:visibility="gone"
-                      tools:visibility="visible">
-
-                <TextView android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/message_details_header__disappears"
-                          android:gravity="right"
-                          android:textStyle="bold"/>
-
-                <TextView android:id="@+id/expires_in"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="1 week"/>
-
-            </TableRow>
-
-            <TableRow android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:padding="@dimen/message_details_table_row_pad">
-
-                <TextView android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/message_details_header__via"
-                          android:gravity="right"
-                          android:textStyle="bold" />
-
-                <TextView android:id="@+id/transport"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Push (TextSecure)" />
-
-            </TableRow>
-
-            <TableRow android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:padding="@dimen/message_details_table_row_pad">
-
-                <TextView android:id="@+id/tofrom"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          tools:text="@string/message_details_header__to"
-                          android:textStyle="bold" />
-
-            </TableRow>
-
-        </TableLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
deleted file mode 100644
index b37888a54..000000000
--- a/res/layout/message_recipient_list_item.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.MessageRecipientListItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:gravity="center_vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
-
-    <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo_image"
-            android:foreground="@drawable/contact_photo_background"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="3dp"
-            android:layout_marginBottom="3dp"
-            android:layout_marginRight="10dp"
-            android:cropToPadding="true"
-            tools:src="@drawable/ic_contact_picture"
-            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="4dip"
-                  android:layout_marginBottom="4dip"
-                  android:layout_toRightOf="@id/contact_photo_image"
-                  android:layout_toEndOf="@id/contact_photo_image"
-                  android:layout_centerVertical="true"
-                  android:gravity="center_vertical"
-                  android:orientation="horizontal">
-
-        <LinearLayout android:layout_width="0dp"
-                      android:layout_weight="1"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.FromTextView
-                      android:id="@+id/from"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="?attr/conversation_list_item_contact_color"
-                      android:singleLine="true"
-                      android:gravity="center_vertical"
-                      android:layout_gravity="center_vertical"
-                      tools:text="Jules Bonnot"
-                      android:ellipsize="marquee" />
-
-            <TextView android:id="@+id/error_description"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textColor="#FFF44336"
-                      android:visibility="gone"
-                      tools:visibility="visible"
-                      tools:text="New identity" />
-
-            <TextView android:id="@+id/action_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                tools:visibility="visible"
-                tools:text="action" />
-
-        </LinearLayout>
-
-        <Button android:id="@+id/conflict_button"
-                android:layout_width="wrap_content"
-                android:layout_height="38sp"
-                style="@style/ErrorButton"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:layout_gravity="center_vertical"
-                android:drawableLeft="@drawable/ic_error_white_18dp"
-                android:text="@string/message_recipients_list_item__view"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-        <Button android:id="@+id/resend_button"
-                android:layout_width="wrap_content"
-                android:layout_height="38sp"
-                style="@style/InfoButton"
-                android:paddingLeft="10dp"
-                android:paddingRight="5dp"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:layout_gravity="center_vertical"
-                android:drawableLeft="@drawable/ic_refresh_white_18dp"
-                android:text="@string/message_recipients_list_item__resend"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-        <org.thoughtcrime.securesms.components.DeliveryStatusView
-                android:id="@+id/delivery_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:iconColor="?attr/conversation_item_outgoing_text_secondary_color"
-                android:visibility="gone"/>
-
-    </LinearLayout>
-
-</org.thoughtcrime.securesms.MessageRecipientListItem>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index cc4d5b895..73c2fc2ac 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -115,7 +115,6 @@
     <attr name="menu_selectall_icon" format="reference" />
     <attr name="menu_group_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
-    <attr name="menu_refresh_directory" format="reference" />
     <attr name="menu_copy_icon" format="reference" />
     <attr name="menu_info_icon" format="reference" />
     <attr name="menu_forward_icon" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 20362335f..17b0b1218 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -196,7 +196,6 @@
         <item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
         <item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
@@ -345,7 +344,6 @@
         <item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
         <item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
         <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
         <item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index a3044f966..09f3bdf0f 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -107,7 +107,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
 
     switch (item.getItemId()) {
     case android.R.id.home:   super.onBackPressed(); return true;
-    //case R.id.menu_refresh:   handleManualRefresh(); return true; -- seems unneeded for delta
     case R.id.menu_new_group: handleCreateGroup();   return true;
     case R.id.menu_invite:    handleInvite();        return true;
     }
@@ -115,13 +114,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
     return false;
   }
 
-  /* seems unneeded for delta
-  private void handleManualRefresh() {
-    contactsFragment.setRefreshing(true);
-    onRefresh();
-  }
-  */
-
   private void handleCreateGroup() {
     startActivity(new Intent(this, GroupCreateActivity.class));
   }