diff --git a/res/anim/slide_to_left.xml b/res/anim/slide_to_left.xml
deleted file mode 100644
index a57e424d5e..0000000000
--- a/res/anim/slide_to_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
-    <translate
-            android:duration="150"
-            android:fromXDelta="0%"
-            android:toXDelta="-100%" />
-</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/dialog_full_holo_light.9.png b/res/drawable-hdpi/dialog_full_holo_light.9.png
deleted file mode 100644
index 9e6c8c3b62..0000000000
Binary files a/res/drawable-hdpi/dialog_full_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_amazon.png b/res/drawable-hdpi/ic_amazon.png
deleted file mode 100644
index 504f2b1f47..0000000000
Binary files a/res/drawable-hdpi/ic_amazon.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_check_white_36dp.png b/res/drawable-hdpi/ic_check_white_36dp.png
deleted file mode 100644
index 9e3f948c93..0000000000
Binary files a/res/drawable-hdpi/ic_check_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_done_all_white_18dp.png b/res/drawable-hdpi/ic_done_all_white_18dp.png
deleted file mode 100644
index dd8722e4d0..0000000000
Binary files a/res/drawable-hdpi/ic_done_all_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_done_white_18dp.png b/res/drawable-hdpi/ic_done_white_18dp.png
deleted file mode 100644
index e67a7c4e40..0000000000
Binary files a/res/drawable-hdpi/ic_done_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png
deleted file mode 100644
index 785feac7db..0000000000
Binary files a/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_hourglass_full_white_18dp.png b/res/drawable-hdpi/ic_hourglass_full_white_18dp.png
deleted file mode 100644
index 323c14dc33..0000000000
Binary files a/res/drawable-hdpi/ic_hourglass_full_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_insert_photo_white_18dp.png b/res/drawable-hdpi/ic_insert_photo_white_18dp.png
deleted file mode 100644
index c596091436..0000000000
Binary files a/res/drawable-hdpi/ic_insert_photo_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/res/drawable-hdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index 57c9fa5460..0000000000
Binary files a/res/drawable-hdpi/ic_play_arrow_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png
deleted file mode 100644
index 6e1b578c54..0000000000
Binary files a/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_timer_white_24dp.png b/res/drawable-hdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 10619fc8c5..0000000000
Binary files a/res/drawable-hdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_in_call_touch_handle_normal.png b/res/drawable-hdpi/redphone_ic_in_call_touch_handle_normal.png
deleted file mode 100644
index e852534893..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_in_call_touch_handle_normal.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_answer_active.png b/res/drawable-hdpi/redphone_ic_lockscreen_answer_active.png
deleted file mode 100644
index d201bfb754..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_answer_active.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_answer_normal.png b/res/drawable-hdpi/redphone_ic_lockscreen_answer_normal.png
deleted file mode 100644
index 176d448968..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_down.png b/res/drawable-hdpi/redphone_ic_lockscreen_chevron_down.png
deleted file mode 100644
index bc718b57b4..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_down.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_left.png b/res/drawable-hdpi/redphone_ic_lockscreen_chevron_left.png
deleted file mode 100644
index 0892c31863..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_left.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_right.png b/res/drawable-hdpi/redphone_ic_lockscreen_chevron_right.png
deleted file mode 100644
index 04cc0a23b4..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_right.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_up.png b/res/drawable-hdpi/redphone_ic_lockscreen_chevron_up.png
deleted file mode 100644
index bb553b1fc2..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_chevron_up.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_decline_activated.png b/res/drawable-hdpi/redphone_ic_lockscreen_decline_activated.png
deleted file mode 100644
index 9866769708..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_decline_activated.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_decline_normal.png b/res/drawable-hdpi/redphone_ic_lockscreen_decline_normal.png
deleted file mode 100644
index d88087b44a..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_decline_normal.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_handle_pressed.png b/res/drawable-hdpi/redphone_ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 58a5f16dfb..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_lockscreen_outerring.png b/res/drawable-hdpi/redphone_ic_lockscreen_outerring.png
deleted file mode 100644
index 5294bc5c80..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_lockscreen_outerring.png and /dev/null differ
diff --git a/res/drawable-hdpi/video_24dp.png b/res/drawable-hdpi/video_24dp.png
deleted file mode 100644
index 90805cbc17..0000000000
Binary files a/res/drawable-hdpi/video_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/dialog_full_holo_light.9.png b/res/drawable-mdpi/dialog_full_holo_light.9.png
deleted file mode 100644
index 78e4033be1..0000000000
Binary files a/res/drawable-mdpi/dialog_full_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_amazon.png b/res/drawable-mdpi/ic_amazon.png
deleted file mode 100644
index d1e94ffbc5..0000000000
Binary files a/res/drawable-mdpi/ic_amazon.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_check_white_36dp.png b/res/drawable-mdpi/ic_check_white_36dp.png
deleted file mode 100644
index 729f290104..0000000000
Binary files a/res/drawable-mdpi/ic_check_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_done_all_white_18dp.png b/res/drawable-mdpi/ic_done_all_white_18dp.png
deleted file mode 100644
index 285c210b53..0000000000
Binary files a/res/drawable-mdpi/ic_done_all_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_done_white_18dp.png b/res/drawable-mdpi/ic_done_white_18dp.png
deleted file mode 100644
index ad9ef659bf..0000000000
Binary files a/res/drawable-mdpi/ic_done_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png
deleted file mode 100644
index e1db32b3cb..0000000000
Binary files a/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_hourglass_full_white_18dp.png b/res/drawable-mdpi/ic_hourglass_full_white_18dp.png
deleted file mode 100644
index 1b7feed9bb..0000000000
Binary files a/res/drawable-mdpi/ic_hourglass_full_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_insert_photo_white_18dp.png b/res/drawable-mdpi/ic_insert_photo_white_18dp.png
deleted file mode 100644
index 112e981d2b..0000000000
Binary files a/res/drawable-mdpi/ic_insert_photo_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/res/drawable-mdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index c61e948bbf..0000000000
Binary files a/res/drawable-mdpi/ic_play_arrow_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png
deleted file mode 100644
index 615b80d085..0000000000
Binary files a/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_timer_white_24dp.png b/res/drawable-mdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 72e1320c46..0000000000
Binary files a/res/drawable-mdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_in_call_touch_handle_normal.png b/res/drawable-mdpi/redphone_ic_in_call_touch_handle_normal.png
deleted file mode 100644
index cebdc4deed..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_in_call_touch_handle_normal.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_answer_active.png b/res/drawable-mdpi/redphone_ic_lockscreen_answer_active.png
deleted file mode 100644
index 0ad03c0f21..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_answer_active.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_answer_normal.png b/res/drawable-mdpi/redphone_ic_lockscreen_answer_normal.png
deleted file mode 100644
index ddeeb18fc0..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_down.png b/res/drawable-mdpi/redphone_ic_lockscreen_chevron_down.png
deleted file mode 100644
index 308fe8a293..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_down.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_left.png b/res/drawable-mdpi/redphone_ic_lockscreen_chevron_left.png
deleted file mode 100644
index 9a2563433d..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_left.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_right.png b/res/drawable-mdpi/redphone_ic_lockscreen_chevron_right.png
deleted file mode 100644
index 77240d0345..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_right.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_up.png b/res/drawable-mdpi/redphone_ic_lockscreen_chevron_up.png
deleted file mode 100644
index e0b013425e..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_chevron_up.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_decline_activated.png b/res/drawable-mdpi/redphone_ic_lockscreen_decline_activated.png
deleted file mode 100644
index d1aae18344..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_decline_activated.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_decline_normal.png b/res/drawable-mdpi/redphone_ic_lockscreen_decline_normal.png
deleted file mode 100644
index 722027ec08..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_decline_normal.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_handle_pressed.png b/res/drawable-mdpi/redphone_ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 0187a02afc..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_lockscreen_outerring.png b/res/drawable-mdpi/redphone_ic_lockscreen_outerring.png
deleted file mode 100644
index 4151f73a61..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_lockscreen_outerring.png and /dev/null differ
diff --git a/res/drawable-mdpi/video_24dp.png b/res/drawable-mdpi/video_24dp.png
deleted file mode 100644
index 79d2d4363c..0000000000
Binary files a/res/drawable-mdpi/video_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/dialog_full_holo_light.9.png b/res/drawable-xhdpi/dialog_full_holo_light.9.png
deleted file mode 100644
index 2064bbb36e..0000000000
Binary files a/res/drawable-xhdpi/dialog_full_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_amazon.png b/res/drawable-xhdpi/ic_amazon.png
deleted file mode 100644
index e087841db0..0000000000
Binary files a/res/drawable-xhdpi/ic_amazon.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_check_white_36dp.png b/res/drawable-xhdpi/ic_check_white_36dp.png
deleted file mode 100644
index 2c2ad771f7..0000000000
Binary files a/res/drawable-xhdpi/ic_check_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_done_all_white_18dp.png b/res/drawable-xhdpi/ic_done_all_white_18dp.png
deleted file mode 100644
index 2331eec2cd..0000000000
Binary files a/res/drawable-xhdpi/ic_done_all_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_done_white_18dp.png b/res/drawable-xhdpi/ic_done_white_18dp.png
deleted file mode 100644
index f42a0e2d23..0000000000
Binary files a/res/drawable-xhdpi/ic_done_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png
deleted file mode 100644
index b24e375a5a..0000000000
Binary files a/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png
deleted file mode 100644
index 29ee1d09b3..0000000000
Binary files a/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_insert_photo_white_18dp.png b/res/drawable-xhdpi/ic_insert_photo_white_18dp.png
deleted file mode 100644
index 25a9576ddd..0000000000
Binary files a/res/drawable-xhdpi/ic_insert_photo_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index a3c80e73da..0000000000
Binary files a/res/drawable-xhdpi/ic_play_arrow_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png
deleted file mode 100644
index 516f643269..0000000000
Binary files a/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_timer_white_24dp.png b/res/drawable-xhdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 9d239966f3..0000000000
Binary files a/res/drawable-xhdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_in_call_touch_handle_normal.png b/res/drawable-xhdpi/redphone_ic_in_call_touch_handle_normal.png
deleted file mode 100644
index 1d112f2aa0..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_in_call_touch_handle_normal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_answer_active.png b/res/drawable-xhdpi/redphone_ic_lockscreen_answer_active.png
deleted file mode 100644
index 8edf62dd2e..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_answer_active.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_answer_normal.png b/res/drawable-xhdpi/redphone_ic_lockscreen_answer_normal.png
deleted file mode 100644
index f049dc9966..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_down.png b/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_down.png
deleted file mode 100644
index b8e5733522..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_down.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_left.png b/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_left.png
deleted file mode 100644
index ce5da43fc6..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_left.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_right.png b/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_right.png
deleted file mode 100644
index c16f143112..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_right.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_up.png b/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_up.png
deleted file mode 100644
index 9bed39a3e3..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_chevron_up.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_decline_activated.png b/res/drawable-xhdpi/redphone_ic_lockscreen_decline_activated.png
deleted file mode 100644
index 4244ca0886..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_decline_activated.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_decline_normal.png b/res/drawable-xhdpi/redphone_ic_lockscreen_decline_normal.png
deleted file mode 100644
index fa2a0f466e..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_decline_normal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_handle_pressed.png b/res/drawable-xhdpi/redphone_ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 2d28009f22..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_handle_pressed.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_lockscreen_outerring.png b/res/drawable-xhdpi/redphone_ic_lockscreen_outerring.png
deleted file mode 100644
index 0b4b260538..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_lockscreen_outerring.png and /dev/null differ
diff --git a/res/drawable-xhdpi/video_24dp.png b/res/drawable-xhdpi/video_24dp.png
deleted file mode 100644
index a76d5484de..0000000000
Binary files a/res/drawable-xhdpi/video_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_amazon.png b/res/drawable-xxhdpi/ic_amazon.png
deleted file mode 100644
index 050c99ec38..0000000000
Binary files a/res/drawable-xxhdpi/ic_amazon.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_check_white_36dp.png b/res/drawable-xxhdpi/ic_check_white_36dp.png
deleted file mode 100644
index 9b91350bc2..0000000000
Binary files a/res/drawable-xxhdpi/ic_check_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_done_all_white_18dp.png b/res/drawable-xxhdpi/ic_done_all_white_18dp.png
deleted file mode 100644
index 9926c3d6e7..0000000000
Binary files a/res/drawable-xxhdpi/ic_done_all_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_done_white_18dp.png b/res/drawable-xxhdpi/ic_done_white_18dp.png
deleted file mode 100644
index 36d1ab203d..0000000000
Binary files a/res/drawable-xxhdpi/ic_done_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_error_red_18dp.png b/res/drawable-xxhdpi/ic_error_red_18dp.png
deleted file mode 100644
index ed4faed504..0000000000
Binary files a/res/drawable-xxhdpi/ic_error_red_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_error_red_24dp.png b/res/drawable-xxhdpi/ic_error_red_24dp.png
deleted file mode 100644
index 0a272ad41a..0000000000
Binary files a/res/drawable-xxhdpi/ic_error_red_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png
deleted file mode 100644
index c7d64b6352..0000000000
Binary files a/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png
deleted file mode 100644
index 4f5a2ecc38..0000000000
Binary files a/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_info_outline_grey600_24dp.png b/res/drawable-xxhdpi/ic_info_outline_grey600_24dp.png
deleted file mode 100644
index af621e2da1..0000000000
Binary files a/res/drawable-xxhdpi/ic_info_outline_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_insert_photo_white_18dp.png b/res/drawable-xxhdpi/ic_insert_photo_white_18dp.png
deleted file mode 100644
index 5dd7b66eff..0000000000
Binary files a/res/drawable-xxhdpi/ic_insert_photo_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index 547ef30aac..0000000000
Binary files a/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png
deleted file mode 100644
index 0311f899dd..0000000000
Binary files a/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_timer_white_24dp.png b/res/drawable-xxhdpi/ic_timer_white_24dp.png
deleted file mode 100644
index bb6f9a63b5..0000000000
Binary files a/res/drawable-xxhdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/last_seen_background.9.png b/res/drawable-xxhdpi/last_seen_background.9.png
deleted file mode 100644
index e84de6dd3d..0000000000
Binary files a/res/drawable-xxhdpi/last_seen_background.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/video_24dp.png b/res/drawable-xxhdpi/video_24dp.png
deleted file mode 100644
index 80cf463276..0000000000
Binary files a/res/drawable-xxhdpi/video_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_amazon.png b/res/drawable-xxxhdpi/ic_amazon.png
deleted file mode 100644
index 1146472498..0000000000
Binary files a/res/drawable-xxxhdpi/ic_amazon.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_check_white_36dp.png b/res/drawable-xxxhdpi/ic_check_white_36dp.png
deleted file mode 100644
index bfd7b82aaa..0000000000
Binary files a/res/drawable-xxxhdpi/ic_check_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_done_all_white_18dp.png b/res/drawable-xxxhdpi/ic_done_all_white_18dp.png
deleted file mode 100644
index d62acbf986..0000000000
Binary files a/res/drawable-xxxhdpi/ic_done_all_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_done_white_18dp.png b/res/drawable-xxxhdpi/ic_done_white_18dp.png
deleted file mode 100644
index f801e7ab32..0000000000
Binary files a/res/drawable-xxxhdpi/ic_done_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png
deleted file mode 100644
index e2e2d74f59..0000000000
Binary files a/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png
deleted file mode 100644
index 908b6a098a..0000000000
Binary files a/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_insert_photo_white_18dp.png b/res/drawable-xxxhdpi/ic_insert_photo_white_18dp.png
deleted file mode 100644
index f9f1defa6d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_insert_photo_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index be5c062b5f..0000000000
Binary files a/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png
deleted file mode 100644
index 7a5a16858b..0000000000
Binary files a/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_timer_white_24dp.png b/res/drawable-xxxhdpi/ic_timer_white_24dp.png
deleted file mode 100644
index b8914c4a21..0000000000
Binary files a/res/drawable-xxxhdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/icon_circle.png b/res/drawable-xxxhdpi/icon_circle.png
deleted file mode 100644
index 9d39deb142..0000000000
Binary files a/res/drawable-xxxhdpi/icon_circle.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/video_24dp.png b/res/drawable-xxxhdpi/video_24dp.png
deleted file mode 100644
index 9fd6cda2f6..0000000000
Binary files a/res/drawable-xxxhdpi/video_24dp.png and /dev/null differ
diff --git a/res/drawable/baseline_email_24.xml b/res/drawable/baseline_email_24.xml
deleted file mode 100755
index ee249cce65..0000000000
--- a/res/drawable/baseline_email_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
-</vector>
diff --git a/res/drawable/conversation_item_header_background.xml b/res/drawable/conversation_item_header_background.xml
deleted file mode 100644
index 6cc80221f1..0000000000
--- a/res/drawable/conversation_item_header_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="#bb999999" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable/conversation_item_header_background_dark.xml b/res/drawable/conversation_item_header_background_dark.xml
deleted file mode 100644
index 2cc83dbe26..0000000000
--- a/res/drawable/conversation_item_header_background_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="#bb444444" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml
deleted file mode 100644
index 40d57023eb..0000000000
--- a/res/drawable/ic_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="?colorAccent"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>
\ No newline at end of file
diff --git a/res/drawable/last_seen_divider_text_background_dark.xml b/res/drawable/last_seen_divider_text_background_dark.xml
deleted file mode 100644
index ca657c96bb..0000000000
--- a/res/drawable/last_seen_divider_text_background_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="#ff333333"/>
-
-    <corners android:radius="65dp"/>
-    <padding android:bottom="10dp" android:left="15dp" android:right="15dp" android:top="10dp"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/last_seen_divider_text_background_light.xml b/res/drawable/last_seen_divider_text_background_light.xml
deleted file mode 100644
index 63ce366562..0000000000
--- a/res/drawable/last_seen_divider_text_background_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/white"/>
-
-    <corners android:radius="65dp"/>
-    <padding android:bottom="10dp" android:left="15dp" android:right="15dp" android:top="10dp"/>
-</shape>
diff --git a/res/drawable/quote_bar.xml b/res/drawable/quote_bar.xml
deleted file mode 100644
index 5a139a97b4..0000000000
--- a/res/drawable/quote_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-
-    <solid android:color="@color/white"/>
-    <stroke android:color="@color/transparent"/>
-    <corners android:topLeftRadius="5dp" android:bottomLeftRadius="5dp"/>
-
-</shape>
\ No newline at end of file
diff --git a/res/drawable/redphone_ic_in_call_touch_handle.xml b/res/drawable/redphone_ic_in_call_touch_handle.xml
deleted file mode 100644
index a4b6f192fe..0000000000
--- a/res/drawable/redphone_ic_in_call_touch_handle.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Touch handle for the MultiWaveView widget on the incoming call screen -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:constantSize="true">
-
-    <item
-            android:state_enabled="true"
-            android:state_active="false"
-            android:state_focused="false"
-            android:drawable="@drawable/redphone_ic_in_call_touch_handle_normal" />
-
-    <!-- "Pressed" state uses the same simple "ring" image as on the lockscreen -->
-    <item
-            android:state_enabled="true"
-            android:state_active="true"
-            android:state_focused="false"
-            android:drawable="@drawable/redphone_ic_lockscreen_handle_pressed" />
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/redphone_ic_lockscreen_answer.xml b/res/drawable/redphone_ic_lockscreen_answer.xml
deleted file mode 100644
index f1f8b06fd3..0000000000
--- a/res/drawable/redphone_ic_lockscreen_answer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:constantSize="true">
-
-    <item
-        android:state_enabled="true"
-        android:state_active="false"
-        android:state_focused="false"
-        android:drawable="@drawable/redphone_ic_lockscreen_answer_normal" />
-
-    <item
-        android:state_enabled="true"
-        android:state_active="true"
-        android:state_focused="false"
-        android:drawable="@drawable/redphone_ic_lockscreen_answer_active" />
-
-</selector>
diff --git a/res/drawable/redphone_ic_lockscreen_decline.xml b/res/drawable/redphone_ic_lockscreen_decline.xml
deleted file mode 100644
index dbff56466f..0000000000
--- a/res/drawable/redphone_ic_lockscreen_decline.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
-
-    <item
-        android:state_enabled="true"
-        android:state_active="false"
-        android:state_focused="false"
-        android:drawable="@drawable/redphone_ic_lockscreen_decline_normal" />
-
-    <item
-        android:state_enabled="true"
-        android:state_active="true"
-        android:state_focused="false"
-        android:drawable="@drawable/redphone_ic_lockscreen_decline_activated" />
-
-</selector>
diff --git a/res/drawable/vertical_separator.xml b/res/drawable/vertical_separator.xml
deleted file mode 100644
index ac3f47aa34..0000000000
--- a/res/drawable/vertical_separator.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle" >
-    <stroke android:width="1dp" android:color="@color/white" />
-    <size android:width="2dp" />
-</shape>
diff --git a/res/layout/activity_contact_share_select.xml b/res/layout/activity_contact_share_select.xml
deleted file mode 100644
index d4212d13dc..0000000000
--- a/res/layout/activity_contact_share_select.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/add_ringtone_item.xml b/res/layout/add_ringtone_item.xml
deleted file mode 100644
index 836123eebd..0000000000
--- a/res/layout/add_ringtone_item.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     Copyright (C) 2016 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:background="?android:attr/selectableItemBackground"
-              android:gravity="center_vertical">
-
-    <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:scaleType="centerCrop"
-            app:srcCompat="@drawable/ic_add" />
-
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/add_ringtone_text"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:drawablePadding="20dp"
-              android:ellipsize="marquee"
-              android:gravity="center_vertical"
-              android:maxLines="3"
-              android:minHeight="?android:attr/listPreferredItemHeightSmall"
-              android:paddingEnd="?dialogPreferredPadding"
-              android:paddingRight="?dialogPreferredPadding"
-              android:text="@string/RingtonePreference_add_ringtone_text"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textColor="?colorAccent" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/centered_app_title.xml b/res/layout/centered_app_title.xml
deleted file mode 100644
index 877b8748f3..0000000000
--- a/res/layout/centered_app_title.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:layout_gravity="center">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/app_name"
-        android:textColor="?attr/centered_app_title_color"
-        android:fontFamily="sans-serif-light"
-        android:id="@+id/title"
-        android:textSize="23sp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_item_pending.xml b/res/layout/conversation_item_pending.xml
deleted file mode 100644
index fd402078d0..0000000000
--- a/res/layout/conversation_item_pending.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView android:id="@+id/pending_indicator"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceSmall"
-              android:fontFamily="sans-serif-light"
-              android:textColor="?conversation_item_sent_text_secondary_color"
-              android:textSize="@dimen/conversation_item_date_text_size"
-              android:paddingTop="1dip"
-              android:paddingLeft="2dip"
-              android:paddingBottom="5dp"
-              android:text="..."/>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/conversation_item_pending_v11.xml b/res/layout/conversation_item_pending_v11.xml
deleted file mode 100644
index 4fdfccd4a0..0000000000
--- a/res/layout/conversation_item_pending_v11.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:dots="http://schemas.android.com/apk/res-auto">
-
-    <pl.tajchert.sample.DotsTextView
-            android:id="@+id/pending_indicator"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:fontFamily="sans-serif-light"
-            android:textColor="?conversation_item_sent_text_secondary_color"
-            android:textSize="@dimen/conversation_item_date_text_size"
-            android:paddingTop="1dip"
-            android:paddingLeft="2dip"
-            android:paddingBottom="5dp"
-            dots:period="150"
-            dots:autoplay="true"/>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/import_export_fragment.xml b/res/layout/import_export_fragment.xml
deleted file mode 100644
index c1dca04775..0000000000
--- a/res/layout/import_export_fragment.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical">
-
-<LinearLayout android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:gravity="center_vertical"
-        android:text="@string/ImportExportActivity_import"
-        android:textSize="14sp"
-        android:fontFamily="sans-serif-medium"
-        android:textColor="@color/signal_primary_dark"/>
-
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <LinearLayout android:id="@+id/import_sms"
-                      android:clickable="true"
-                      android:orientation="horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:paddingTop="12dp"
-                      android:paddingBottom="12dp"
-                      android:gravity="center_vertical"
-                      android:background="?selectableItemBackground">
-
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginLeft="16dp"
-                       android:layout_marginStart="16dp"
-                       android:layout_marginRight="32dp"
-                       android:layout_marginEnd="32dp"
-                       android:src="@drawable/ic_message_white_24dp"
-                       android:tint="?attr/pref_icon_tint"/>
-
-            <LinearLayout android:orientation="vertical"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginRight="16dp"
-                          android:layout_marginEnd="16dp">
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          style="@style/Registration.Description"
-                          android:text="@string/import_fragment__import_system_sms_database"/>
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:text="@string/import_fragment__import_the_database_from_the_default_system"/>
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"/>
-
-        <LinearLayout android:id="@+id/import_plaintext_backup"
-                      android:clickable="true"
-                      android:orientation="horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:paddingTop="12dp"
-                      android:paddingBottom="12dp"
-                      android:gravity="center_vertical"
-                      android:background="?selectableItemBackground">
-
-            <ImageView android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginLeft="16dp"
-                       android:layout_marginStart="16dp"
-                       android:layout_marginRight="32dip"
-                       android:layout_marginEnd="32dip"
-                       android:src="@drawable/ic_content_copy_white_24dp"
-                       android:tint="?attr/pref_icon_tint"/>
-
-            <LinearLayout android:orientation="vertical"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_marginRight="16dp"
-                          android:layout_marginEnd="16dp">
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          style="@style/Registration.Description"
-                          android:text="@string/import_fragment__import_plaintext_backup"/>
-
-                <TextView android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="start"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:text="@string/import_fragment__import_a_plaintext_backup_file"/>
-            </LinearLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-</LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/scribble_toolbar.xml b/res/layout/scribble_toolbar.xml
deleted file mode 100644
index 4d460d0d80..0000000000
--- a/res/layout/scribble_toolbar.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout android:layout_marginLeft="16dp"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentLeft="true"
-                  android:gravity="left|center_vertical"
-                  android:layout_gravity="left">
-
-        <ImageView android:id="@+id/save"
-                   android:src="@drawable/ic_check_white_36dp"
-                   android:tint="@color/grey_800"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-    <LinearLayout android:id="@+id/tools_view"
-                  android:layout_marginRight="16dp"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentRight="true"
-                  android:gravity="right"
-                  android:animateLayoutChanges="true"
-                  android:layout_gravity="right">
-
-        <ImageView android:id="@+id/delete"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="6dp"
-                   android:padding="7dp"
-                   android:tint="@color/grey_800"
-                   android:src="@drawable/ic_delete_white_24dp"
-                   android:visibility="gone"
-                   tools:visibility="visible"/>
-
-        <ImageView android:id="@+id/undo"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="6dp"
-                   android:padding="7dp"
-                   android:visibility="gone"
-                   android:tint="@color/grey_800"
-                   android:src="@drawable/ic_replay_white_24dp"/>
-
-        <ImageView android:id="@+id/separator"
-                   android:layout_width="wrap_content"
-                   android:layout_height="24dp"
-                   android:layout_marginTop="7dp"
-                   android:layout_marginLeft="6dp"
-                   android:tint="@color/grey_800"
-                   android:src="@drawable/vertical_separator"
-                   android:visibility="gone"
-                   tools:visibility="visible"/>
-
-        <ImageView android:id="@+id/sticker_button"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="6dp"
-                   android:tint="@color/grey_800"
-                   android:padding="7dp"
-                   android:src="@drawable/ic_tag_faces_white_24dp"/>
-
-        <ImageView android:id="@+id/text_button"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="6dp"
-                   android:tint="@color/grey_800"
-                   android:padding="7dp"
-                   android:src="@drawable/ic_text_fields_white_24dp"/>
-
-        <ImageView android:id="@+id/brush_button"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:layout_marginLeft="6dp"
-                   android:tint="@color/grey_800"
-                   android:padding="7dp"
-                   android:src="@drawable/ic_brush_white_24dp"/>
-
-    </LinearLayout>
-</merge>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9f59573e6b..538b701f93 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -243,28 +243,6 @@
 
     <!-- RedPhone -->
 
-    <array name="incoming_call_widget_targets">
-        <item>@drawable/redphone_ic_lockscreen_answer</item>
-        <!--         <item>@drawable/ic_lockscreen_send_sms</item> -->
-        <item>@null</item>
-        <item>@drawable/redphone_ic_lockscreen_decline</item>
-        <item>@null</item>
-    </array>
-
-    <array name="incoming_call_widget_target_descriptions">
-        <item>"Answer"</item>
-        <item>"Send SMS"</item>
-        <item>"Decline"</item>
-        <item>@null</item>"
-    </array>
-
-    <array name="incoming_call_widget_direction_descriptions">
-        <item>"Right"</item>
-        <item>"Up"</item>
-        <item>"Left"</item>
-        <item>@null</item>
-    </array>
-
     <integer-array name="expiration_times">
         <item>0</item>
         <item>5</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 114af1dd36..7cefb75cf6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -36,16 +36,13 @@
 
     <dimen name="conversation_individual_right_gutter">16dp</dimen>
     <dimen name="conversation_individual_left_gutter">16dp</dimen>
-    <dimen name="conversation_group_right_gutter">16dp</dimen>
     <dimen name="conversation_group_left_gutter">52dp</dimen>
     <dimen name="conversation_vertical_message_spacing_default">16dp</dimen>
     <dimen name="conversation_vertical_message_spacing_collapse">2dp</dimen>
 
-    <dimen name="quote_corner_radius">3dp</dimen>
     <dimen name="quote_corner_radius_large">10dp</dimen>
     <dimen name="quote_corner_radius_bottom">4dp</dimen>
     <dimen name="quote_corner_radius_preview">18dp</dimen>
-    <dimen name="quote_outline_width">1dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
@@ -58,11 +55,6 @@
     <dimen name="contact_selection_actions_tap_area">10dp</dimen>
 
     <!-- RedPhone -->
-    <dimen name="incoming_widget_outer_radius">135dip</dimen>
-    <dimen name="incoming_widget_horizontal_offset">0dip</dimen>
-    <dimen name="incoming_widget_vertical_offset">20dip</dimen>
-    <dimen name="incoming_widget_hit_radius">60dip</dimen>
-    <dimen name="incoming_widget_snap_margin">20dip</dimen>
 
     <!-- Height of the main row of in-call buttons. -->
 
@@ -80,11 +72,6 @@
 
     <dimen name="floating_action_button_margin">16dp</dimen>
 
-    <dimen name="text_headline_lineSpacingExtra">6sp</dimen>
-    <dimen name="text_body_lineSpacingExtra">8sp</dimen>
-    <dimen name="text_preview_lineSpacingExtra">6sp</dimen>
-    <dimen name="text_caption_lineSpacingExtra">4sp</dimen>
-
     <dimen name="alertview_small_icon_size">14dp</dimen>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d7d834e57e..1a4cbf1bf6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -97,12 +97,6 @@
         <item name="android:textColor">#BFffffff</item>
     </style>
 
-    <style name="TextSecure.IntroActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">@null</item>
-        <item name="icon">@android:color/transparent</item>
-        <item name="colorButtonNormal">@color/textsecure_primary</item>
-    </style>
-
     <style name="NotificationText">
       <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>