diff --git a/res/drawable-hdpi/ic_emoji_recent_light.png b/res/drawable-hdpi/ic_emoji_recent_light.png
deleted file mode 100644
index e1db45ed0..000000000
Binary files a/res/drawable-hdpi/ic_emoji_recent_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png
deleted file mode 100644
index 7e18626ac..000000000
Binary files a/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png
deleted file mode 100644
index f7ae52ef1..000000000
Binary files a/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png b/res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png
deleted file mode 100644
index fc5766304..000000000
Binary files a/res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png
deleted file mode 100644
index 559abfca2..000000000
Binary files a/res/drawable-hdpi/ic_menu_settings.png and /dev/null differ
diff --git a/res/drawable-hdpi/padlock_prompt.png b/res/drawable-hdpi/padlock_prompt.png
deleted file mode 100644
index b26073ac3..000000000
Binary files a/res/drawable-hdpi/padlock_prompt.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recent_light.png b/res/drawable-mdpi/ic_emoji_recent_light.png
deleted file mode 100644
index 95f85674b..000000000
Binary files a/res/drawable-mdpi/ic_emoji_recent_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png
deleted file mode 100644
index a0d1ccf90..000000000
Binary files a/res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png
deleted file mode 100644
index b5ab21971..000000000
Binary files a/res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_msg_compose_holo_dark.png b/res/drawable-mdpi/ic_menu_msg_compose_holo_dark.png
deleted file mode 100644
index 59fe4a033..000000000
Binary files a/res/drawable-mdpi/ic_menu_msg_compose_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_settings.png b/res/drawable-mdpi/ic_menu_settings.png
deleted file mode 100644
index 59c484848..000000000
Binary files a/res/drawable-mdpi/ic_menu_settings.png and /dev/null differ
diff --git a/res/drawable-mdpi/padlock_prompt.png b/res/drawable-mdpi/padlock_prompt.png
deleted file mode 100644
index 833d0fd63..000000000
Binary files a/res/drawable-mdpi/padlock_prompt.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recent_light.png b/res/drawable-xhdpi/ic_emoji_recent_light.png
deleted file mode 100644
index bf67fab48..000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recent_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png
deleted file mode 100644
index d70f7c209..000000000
Binary files a/res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png
deleted file mode 100644
index 153c9282c..000000000
Binary files a/res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_msg_compose_holo_dark.png b/res/drawable-xhdpi/ic_menu_msg_compose_holo_dark.png
deleted file mode 100644
index c161f9ca9..000000000
Binary files a/res/drawable-xhdpi/ic_menu_msg_compose_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_settings.png b/res/drawable-xhdpi/ic_menu_settings.png
deleted file mode 100644
index 2c71fccbb..000000000
Binary files a/res/drawable-xhdpi/ic_menu_settings.png and /dev/null differ
diff --git a/res/drawable-xhdpi/padlock_prompt.png b/res/drawable-xhdpi/padlock_prompt.png
deleted file mode 100644
index 287628fa8..000000000
Binary files a/res/drawable-xhdpi/padlock_prompt.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png
deleted file mode 100644
index 5fc9f0db6..000000000
Binary files a/res/drawable-xxhdpi/ic_action_add_person.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_help.png b/res/drawable-xxhdpi/ic_action_help.png
deleted file mode 100644
index c5cf45c80..000000000
Binary files a/res/drawable-xxhdpi/ic_action_help.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_menu_settings.png b/res/drawable-xxhdpi/ic_menu_settings.png
deleted file mode 100644
index 7fd79824b..000000000
Binary files a/res/drawable-xxhdpi/ic_menu_settings.png and /dev/null differ
diff --git a/res/drawable/ic_emoji_recent.xml b/res/drawable/ic_emoji_recent.xml
deleted file mode 100644
index aa39b4f50..000000000
--- a/res/drawable/ic_emoji_recent.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:enterFadeDuration="200"
-	android:exitFadeDuration="300"
-	>
-	<item
-		android:state_selected="true"
-		android:drawable="@drawable/ic_smiles_recent_active"
-		>
-	</item>
-	<item
-		android:drawable="@drawable/ic_smiles_recent"
-		>
-	</item>
-</selector>
diff --git a/res/drawable/thin_border.xml b/res/drawable/thin_border.xml
deleted file mode 100644
index a0fdb888c..000000000
--- a/res/drawable/thin_border.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00ffffff" />
-    <stroke android:width="1px" android:color="#22000000" />
-    <corners android:radius="4dp"/>
-    <padding android:left="4dp" android:top="4dp" android:right="4dp" android:bottom="4dp" />
-</shape>
\ No newline at end of file
diff --git a/res/layout/migration_notification_progress.xml b/res/layout/migration_notification_progress.xml
deleted file mode 100644
index 225c39f6a..000000000
--- a/res/layout/migration_notification_progress.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:padding="5dp">
-
-    <ImageView android:id="@+id/status_icon"
-               android:layout_width="wrap_content"
-               android:layout_height="fill_parent"
-               android:layout_alignParentLeft="true" />
-
-    <RelativeLayout android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_toRightOf="@id/status_icon">
-
-        <TextView android:id="@+id/status_text"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentTop="true" />
-
-        <ProgressBar android:id="@+id/status_progress"
-                     android:layout_width="fill_parent"
-                     android:layout_height="wrap_content"
-                     android:layout_below="@id/status_text"
-                     android:progressDrawable="@android:drawable/progress_horizontal"
-                     android:indeterminate="false"
-                     android:indeterminateOnly="false" />
-
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/recipients_panel.xml b/res/layout/recipients_panel.xml
deleted file mode 100644
index 9eba27466..000000000
--- a/res/layout/recipients_panel.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/recipients_panel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
-        android:background="?conversation_background"
-        android:orientation="vertical" >
-
-        <org.thoughtcrime.securesms.contacts.RecipientsEditor android:id="@+id/recipients_text"
-           android:layout_height="wrap_content"
-            android:capitalize="sentences"
-            android:autoText="true"
-            android:singleLine="true"
-            android:hint="@string/recipients_panel__to"
-            android:paddingRight="45dip"
-            android:textColor="?conversation_editor_text_color"
-            android:layout_width="fill_parent"/>
-
-        <ImageButton android:id="@+id/contacts_button"
-                     android:background="#00000000"
-                     android:layout_width="40dip"
-                     android:layout_height="35dip"
-                     android:layout_marginRight="5dip"
-                     android:layout_marginTop="4dip"
-                     android:src="@drawable/ic_menu_add_field_holo_light"
-                     android:layout_alignRight="@id/recipients_text"
-                     android:maxWidth="32dip"
-                     android:maxHeight="32dip" />
-
-    </RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/conversation_secure_no_identity.xml b/res/menu/conversation_secure_no_identity.xml
deleted file mode 100644
index 28fff6389..000000000
--- a/res/menu/conversation_secure_no_identity.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/conversation_secure_verified__menu_security"
-          android:id="@+id/menu_security"
-          android:icon="?menu_lock_icon"
-          android:showAsAction="ifRoom">
-          <menu>
-              <item android:title="@string/conversation_secure_verified__menu_no_identity"
-                    android:enabled="false"
-                    android:id="@+id/menu_no_identity" />
-          </menu>
-    </item>
-</menu>
\ No newline at end of file