diff --git a/res/drawable-hdpi/ic_camera_white_36dp.png b/res/drawable-hdpi/ic_camera_white_36dp.png
deleted file mode 100644
index a90b8f1b21..0000000000
Binary files a/res/drawable-hdpi/ic_camera_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_delete_black.png b/res/drawable-hdpi/ic_delete_black.png
deleted file mode 100644
index 651fba938a..0000000000
Binary files a/res/drawable-hdpi/ic_delete_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_delete_gray.png b/res/drawable-hdpi/ic_delete_gray.png
deleted file mode 100644
index cae6c1f903..0000000000
Binary files a/res/drawable-hdpi/ic_delete_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_delivery_delivered_dark.png b/res/drawable-hdpi/ic_delivery_delivered_dark.png
deleted file mode 100644
index 43d7f22136..0000000000
Binary files a/res/drawable-hdpi/ic_delivery_delivered_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_devices_black_48dp.png b/res/drawable-hdpi/ic_devices_black_48dp.png
deleted file mode 100644
index 7e5dba2051..0000000000
Binary files a/res/drawable-hdpi/ic_devices_black_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_devices_grey600_48dp.png b/res/drawable-hdpi/ic_devices_grey600_48dp.png
deleted file mode 100644
index 64f9eaab15..0000000000
Binary files a/res/drawable-hdpi/ic_devices_grey600_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_objects_activated_dark.png b/res/drawable-hdpi/ic_emoji_objects_activated_dark.png
deleted file mode 100644
index 190f27a298..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_objects_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_objects_activated_light.png b/res/drawable-hdpi/ic_emoji_objects_activated_light.png
deleted file mode 100644
index 83d274bd84..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_objects_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_objects_normal_dark.png b/res/drawable-hdpi/ic_emoji_objects_normal_dark.png
deleted file mode 100644
index 140172534d..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_objects_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_objects_normal_light.png b/res/drawable-hdpi/ic_emoji_objects_normal_light.png
deleted file mode 100644
index 0b4fdc705e..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_objects_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_flag_white_24dp.png b/res/drawable-hdpi/ic_flag_white_24dp.png
deleted file mode 100644
index f0f86ad04e..0000000000
Binary files a/res/drawable-hdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_gif_white_36dp.png b/res/drawable-hdpi/ic_gif_white_36dp.png
deleted file mode 100644
index 17b6ed692e..0000000000
Binary files a/res/drawable-hdpi/ic_gif_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_group_photo.png b/res/drawable-hdpi/ic_group_photo.png
deleted file mode 100644
index 8ba3e8698d..0000000000
Binary files a/res/drawable-hdpi/ic_group_photo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_headset_white_36dp.png b/res/drawable-hdpi/ic_headset_white_36dp.png
deleted file mode 100644
index 8b8e627754..0000000000
Binary files a/res/drawable-hdpi/ic_headset_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_image_white_36dp.png b/res/drawable-hdpi/ic_image_white_36dp.png
deleted file mode 100644
index ff74932d72..0000000000
Binary files a/res/drawable-hdpi/ic_image_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_insert_drive_file_white_36dp.png b/res/drawable-hdpi/ic_insert_drive_file_white_36dp.png
deleted file mode 100644
index 52c48e639f..0000000000
Binary files a/res/drawable-hdpi/ic_insert_drive_file_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_keyboard_arrow_down_white_36dp.png b/res/drawable-hdpi/ic_keyboard_arrow_down_white_36dp.png
deleted file mode 100644
index 4afedf38f5..0000000000
Binary files a/res/drawable-hdpi/ic_keyboard_arrow_down_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png
deleted file mode 100644
index c9dd4c1ec0..0000000000
Binary files a/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_local_movies_white_36dp.png b/res/drawable-hdpi/ic_local_movies_white_36dp.png
deleted file mode 100644
index aee9d8a6a9..0000000000
Binary files a/res/drawable-hdpi/ic_local_movies_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_location_on_white_36dp.png b/res/drawable-hdpi/ic_location_on_white_36dp.png
deleted file mode 100644
index b345cffca4..0000000000
Binary files a/res/drawable-hdpi/ic_location_on_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_lock_black_18dp.png b/res/drawable-hdpi/ic_lock_black_18dp.png
deleted file mode 100644
index bc9b9496d4..0000000000
Binary files a/res/drawable-hdpi/ic_lock_black_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_barcode.png b/res/drawable-hdpi/ic_menu_barcode.png
deleted file mode 100644
index fb9c732f9f..0000000000
Binary files a/res/drawable-hdpi/ic_menu_barcode.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_search_holo_dark.png b/res/drawable-hdpi/ic_menu_search_holo_dark.png
deleted file mode 100644
index 2cc3885207..0000000000
Binary files a/res/drawable-hdpi/ic_menu_search_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_message_gray.png b/res/drawable-hdpi/ic_message_gray.png
deleted file mode 100644
index 165be3c950..0000000000
Binary files a/res/drawable-hdpi/ic_message_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_person_white_36dp.png b/res/drawable-hdpi/ic_person_white_36dp.png
deleted file mode 100644
index cdebb089b7..0000000000
Binary files a/res/drawable-hdpi/ic_person_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_phone_bluetooth_speaker_white_24dp.png b/res/drawable-hdpi/ic_phone_bluetooth_speaker_white_24dp.png
deleted file mode 100644
index 69f28f8a2c..0000000000
Binary files a/res/drawable-hdpi/ic_phone_bluetooth_speaker_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_phone_in_talk_white_24dp.png b/res/drawable-hdpi/ic_phone_in_talk_white_24dp.png
deleted file mode 100644
index f2c89424ef..0000000000
Binary files a/res/drawable-hdpi/ic_phone_in_talk_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_push_registration_reminder.png b/res/drawable-hdpi/ic_push_registration_reminder.png
deleted file mode 100644
index da30f93f84..0000000000
Binary files a/res/drawable-hdpi/ic_push_registration_reminder.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_signal_white_48dp.png b/res/drawable-hdpi/ic_signal_white_48dp.png
deleted file mode 100644
index d418114d36..0000000000
Binary files a/res/drawable-hdpi/ic_signal_white_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_volume_mute_white_24dp.png b/res/drawable-hdpi/ic_volume_mute_white_24dp.png
deleted file mode 100644
index 11ee561323..0000000000
Binary files a/res/drawable-hdpi/ic_volume_mute_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_selector_background_selected.9.png b/res/drawable-hdpi/list_selector_background_selected.9.png
deleted file mode 100644
index 33346f2f03..0000000000
Binary files a/res/drawable-hdpi/list_selector_background_selected.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_dial_background_texture.png b/res/drawable-hdpi/redphone_dial_background_texture.png
deleted file mode 100644
index 95bec9f539..0000000000
Binary files a/res/drawable-hdpi/redphone_dial_background_texture.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_end_call.png b/res/drawable-hdpi/redphone_ic_end_call.png
deleted file mode 100644
index 216fe59ffb..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_end_call.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_mute_holo_dark.png b/res/drawable-hdpi/redphone_ic_mute_holo_dark.png
deleted file mode 100644
index 6382734b76..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_mute_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_sound_bluetooth_holo_dark.png b/res/drawable-hdpi/redphone_ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index a5c0c56d62..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_sound_bluetooth_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_sound_handset_holo_dark.png b/res/drawable-hdpi/redphone_ic_sound_handset_holo_dark.png
deleted file mode 100644
index 0b3eebd0f3..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_sound_handset_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_sound_off_speakerphone_holo_dark.png b/res/drawable-hdpi/redphone_ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 365133774d..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_ic_sound_speakerphone_holo_dark.png b/res/drawable-hdpi/redphone_ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 70141dd9e1..0000000000
Binary files a/res/drawable-hdpi/redphone_ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_list_longpressed.9.png b/res/drawable-hdpi/redphone_list_longpressed.9.png
deleted file mode 100644
index 4ea7afa00e..0000000000
Binary files a/res/drawable-hdpi/redphone_list_longpressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_list_pressed.9.png b/res/drawable-hdpi/redphone_list_pressed.9.png
deleted file mode 100644
index 5654cd6942..0000000000
Binary files a/res/drawable-hdpi/redphone_list_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/redphone_selector_disabled.9.png b/res/drawable-hdpi/redphone_selector_disabled.9.png
deleted file mode 100644
index f6fd30dcdc..0000000000
Binary files a/res/drawable-hdpi/redphone_selector_disabled.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/sms_selection_icon.png b/res/drawable-hdpi/sms_selection_icon.png
deleted file mode 100644
index 4ffdc8c7aa..0000000000
Binary files a/res/drawable-hdpi/sms_selection_icon.png and /dev/null differ
diff --git a/res/drawable-hdpi/sms_system_import_icon.png b/res/drawable-hdpi/sms_system_import_icon.png
deleted file mode 100644
index 17417d1089..0000000000
Binary files a/res/drawable-hdpi/sms_system_import_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_camera_white_36dp.png b/res/drawable-mdpi/ic_camera_white_36dp.png
deleted file mode 100644
index 5f6a9639df..0000000000
Binary files a/res/drawable-mdpi/ic_camera_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_delete_black.png b/res/drawable-mdpi/ic_delete_black.png
deleted file mode 100644
index ba22d333d1..0000000000
Binary files a/res/drawable-mdpi/ic_delete_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_delete_gray.png b/res/drawable-mdpi/ic_delete_gray.png
deleted file mode 100644
index ee112dfc10..0000000000
Binary files a/res/drawable-mdpi/ic_delete_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_delivery_delivered_dark.png b/res/drawable-mdpi/ic_delivery_delivered_dark.png
deleted file mode 100644
index 6d339aeedb..0000000000
Binary files a/res/drawable-mdpi/ic_delivery_delivered_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_devices_black_48dp.png b/res/drawable-mdpi/ic_devices_black_48dp.png
deleted file mode 100644
index 4d47b98396..0000000000
Binary files a/res/drawable-mdpi/ic_devices_black_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_devices_grey600_48dp.png b/res/drawable-mdpi/ic_devices_grey600_48dp.png
deleted file mode 100644
index 8afb363379..0000000000
Binary files a/res/drawable-mdpi/ic_devices_grey600_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_objects_activated_dark.png b/res/drawable-mdpi/ic_emoji_objects_activated_dark.png
deleted file mode 100644
index 241a714c5e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_objects_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_objects_activated_light.png b/res/drawable-mdpi/ic_emoji_objects_activated_light.png
deleted file mode 100644
index d37532a9a3..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_objects_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_objects_normal_dark.png b/res/drawable-mdpi/ic_emoji_objects_normal_dark.png
deleted file mode 100644
index 6ab73d3b2b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_objects_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_objects_normal_light.png b/res/drawable-mdpi/ic_emoji_objects_normal_light.png
deleted file mode 100644
index b53808a9f3..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_objects_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_flag_white_24dp.png b/res/drawable-mdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 0d2c5f65c1..0000000000
Binary files a/res/drawable-mdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_gif_white_36dp.png b/res/drawable-mdpi/ic_gif_white_36dp.png
deleted file mode 100644
index 0978a141a9..0000000000
Binary files a/res/drawable-mdpi/ic_gif_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_group_photo.png b/res/drawable-mdpi/ic_group_photo.png
deleted file mode 100644
index 329969c453..0000000000
Binary files a/res/drawable-mdpi/ic_group_photo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_headset_white_36dp.png b/res/drawable-mdpi/ic_headset_white_36dp.png
deleted file mode 100644
index 6aed6b3985..0000000000
Binary files a/res/drawable-mdpi/ic_headset_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_image_white_36dp.png b/res/drawable-mdpi/ic_image_white_36dp.png
deleted file mode 100644
index 8fbe40d1f9..0000000000
Binary files a/res/drawable-mdpi/ic_image_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_insert_drive_file_white_36dp.png b/res/drawable-mdpi/ic_insert_drive_file_white_36dp.png
deleted file mode 100644
index 84755e4881..0000000000
Binary files a/res/drawable-mdpi/ic_insert_drive_file_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_down_white_36dp.png b/res/drawable-mdpi/ic_keyboard_arrow_down_white_36dp.png
deleted file mode 100644
index 0c31a0a4c3..0000000000
Binary files a/res/drawable-mdpi/ic_keyboard_arrow_down_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png
deleted file mode 100644
index 91702b1d6b..0000000000
Binary files a/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_local_movies_white_36dp.png b/res/drawable-mdpi/ic_local_movies_white_36dp.png
deleted file mode 100644
index d0ad003acf..0000000000
Binary files a/res/drawable-mdpi/ic_local_movies_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_location_on_white_36dp.png b/res/drawable-mdpi/ic_location_on_white_36dp.png
deleted file mode 100644
index 7c281c3f52..0000000000
Binary files a/res/drawable-mdpi/ic_location_on_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_lock_black_18dp.png b/res/drawable-mdpi/ic_lock_black_18dp.png
deleted file mode 100644
index 0f73869c9d..0000000000
Binary files a/res/drawable-mdpi/ic_lock_black_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_barcode.png b/res/drawable-mdpi/ic_menu_barcode.png
deleted file mode 100644
index 5da5c8c96f..0000000000
Binary files a/res/drawable-mdpi/ic_menu_barcode.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_search_holo_dark.png b/res/drawable-mdpi/ic_menu_search_holo_dark.png
deleted file mode 100644
index a982ec6e13..0000000000
Binary files a/res/drawable-mdpi/ic_menu_search_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_message_gray.png b/res/drawable-mdpi/ic_message_gray.png
deleted file mode 100644
index a0627f6d63..0000000000
Binary files a/res/drawable-mdpi/ic_message_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_person_white_36dp.png b/res/drawable-mdpi/ic_person_white_36dp.png
deleted file mode 100644
index 05d4ef6781..0000000000
Binary files a/res/drawable-mdpi/ic_person_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_phone_bluetooth_speaker_white_24dp.png b/res/drawable-mdpi/ic_phone_bluetooth_speaker_white_24dp.png
deleted file mode 100644
index 18068083ae..0000000000
Binary files a/res/drawable-mdpi/ic_phone_bluetooth_speaker_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_phone_in_talk_white_24dp.png b/res/drawable-mdpi/ic_phone_in_talk_white_24dp.png
deleted file mode 100644
index e6f98af95b..0000000000
Binary files a/res/drawable-mdpi/ic_phone_in_talk_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_push_registration_reminder.png b/res/drawable-mdpi/ic_push_registration_reminder.png
deleted file mode 100644
index 7fd4742fa4..0000000000
Binary files a/res/drawable-mdpi/ic_push_registration_reminder.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_signal_white_48dp.png b/res/drawable-mdpi/ic_signal_white_48dp.png
deleted file mode 100644
index 7d6bf19e9b..0000000000
Binary files a/res/drawable-mdpi/ic_signal_white_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_volume_mute_white_24dp.png b/res/drawable-mdpi/ic_volume_mute_white_24dp.png
deleted file mode 100644
index 9685c872cc..0000000000
Binary files a/res/drawable-mdpi/ic_volume_mute_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_selector_background_selected.9.png b/res/drawable-mdpi/list_selector_background_selected.9.png
deleted file mode 100644
index 0a0786ffd2..0000000000
Binary files a/res/drawable-mdpi/list_selector_background_selected.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_dial_background_texture.png b/res/drawable-mdpi/redphone_dial_background_texture.png
deleted file mode 100644
index 90cd07c02d..0000000000
Binary files a/res/drawable-mdpi/redphone_dial_background_texture.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_end_call.png b/res/drawable-mdpi/redphone_ic_end_call.png
deleted file mode 100644
index 42784b8aa2..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_end_call.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_mute_holo_dark.png b/res/drawable-mdpi/redphone_ic_mute_holo_dark.png
deleted file mode 100644
index 076de7fe0b..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_mute_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_sound_bluetooth_holo_dark.png b/res/drawable-mdpi/redphone_ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index e58612ddff..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_sound_bluetooth_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_sound_handset_holo_dark.png b/res/drawable-mdpi/redphone_ic_sound_handset_holo_dark.png
deleted file mode 100644
index 8a10be9898..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_sound_handset_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_sound_off_speakerphone_holo_dark.png b/res/drawable-mdpi/redphone_ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 1a01c3dbca..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_ic_sound_speakerphone_holo_dark.png b/res/drawable-mdpi/redphone_ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index ebd445ed8f..0000000000
Binary files a/res/drawable-mdpi/redphone_ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_list_longpressed.9.png b/res/drawable-mdpi/redphone_list_longpressed.9.png
deleted file mode 100644
index 3bf8e03623..0000000000
Binary files a/res/drawable-mdpi/redphone_list_longpressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_list_pressed.9.png b/res/drawable-mdpi/redphone_list_pressed.9.png
deleted file mode 100644
index 6e77525d2d..0000000000
Binary files a/res/drawable-mdpi/redphone_list_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/redphone_selector_disabled.9.png b/res/drawable-mdpi/redphone_selector_disabled.9.png
deleted file mode 100644
index 92da2f0dd3..0000000000
Binary files a/res/drawable-mdpi/redphone_selector_disabled.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/sms_selection_icon.png b/res/drawable-mdpi/sms_selection_icon.png
deleted file mode 100644
index 645dce6608..0000000000
Binary files a/res/drawable-mdpi/sms_selection_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/sms_system_import_icon.png b/res/drawable-mdpi/sms_system_import_icon.png
deleted file mode 100644
index 48c38a05fa..0000000000
Binary files a/res/drawable-mdpi/sms_system_import_icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_camera_white_36dp.png b/res/drawable-xhdpi/ic_camera_white_36dp.png
deleted file mode 100644
index 9817b7e7e2..0000000000
Binary files a/res/drawable-xhdpi/ic_camera_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_delete_black.png b/res/drawable-xhdpi/ic_delete_black.png
deleted file mode 100644
index 13f3858a3d..0000000000
Binary files a/res/drawable-xhdpi/ic_delete_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_delete_gray.png b/res/drawable-xhdpi/ic_delete_gray.png
deleted file mode 100644
index 6fc64e5ec5..0000000000
Binary files a/res/drawable-xhdpi/ic_delete_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_delivery_delivered_dark.png b/res/drawable-xhdpi/ic_delivery_delivered_dark.png
deleted file mode 100644
index 56342b3a84..0000000000
Binary files a/res/drawable-xhdpi/ic_delivery_delivered_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_devices_black_48dp.png b/res/drawable-xhdpi/ic_devices_black_48dp.png
deleted file mode 100644
index 62946339e1..0000000000
Binary files a/res/drawable-xhdpi/ic_devices_black_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_devices_grey600_48dp.png b/res/drawable-xhdpi/ic_devices_grey600_48dp.png
deleted file mode 100644
index 3beebd2e8c..0000000000
Binary files a/res/drawable-xhdpi/ic_devices_grey600_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png
deleted file mode 100644
index 7e751087a3..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_objects_activated_light.png b/res/drawable-xhdpi/ic_emoji_objects_activated_light.png
deleted file mode 100644
index 691a5d0609..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_objects_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png
deleted file mode 100644
index a2e37c2bde..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_objects_normal_light.png b/res/drawable-xhdpi/ic_emoji_objects_normal_light.png
deleted file mode 100644
index 39553fafb8..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_objects_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_flag_white_24dp.png b/res/drawable-xhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 23c4bb7f0a..0000000000
Binary files a/res/drawable-xhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_gif_white_36dp.png b/res/drawable-xhdpi/ic_gif_white_36dp.png
deleted file mode 100644
index acdb6d0b90..0000000000
Binary files a/res/drawable-xhdpi/ic_gif_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_group_photo.png b/res/drawable-xhdpi/ic_group_photo.png
deleted file mode 100644
index 99b4bf81f2..0000000000
Binary files a/res/drawable-xhdpi/ic_group_photo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_headset_white_36dp.png b/res/drawable-xhdpi/ic_headset_white_36dp.png
deleted file mode 100644
index 4080871fa3..0000000000
Binary files a/res/drawable-xhdpi/ic_headset_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_image_white_36dp.png b/res/drawable-xhdpi/ic_image_white_36dp.png
deleted file mode 100644
index d12002425c..0000000000
Binary files a/res/drawable-xhdpi/ic_image_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_insert_drive_file_white_36dp.png b/res/drawable-xhdpi/ic_insert_drive_file_white_36dp.png
deleted file mode 100644
index f3e153b45e..0000000000
Binary files a/res/drawable-xhdpi/ic_insert_drive_file_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_36dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_down_white_36dp.png
deleted file mode 100644
index 55880b3d66..0000000000
Binary files a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png
deleted file mode 100644
index afc7e537a6..0000000000
Binary files a/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_local_movies_white_36dp.png b/res/drawable-xhdpi/ic_local_movies_white_36dp.png
deleted file mode 100644
index 268a551ff1..0000000000
Binary files a/res/drawable-xhdpi/ic_local_movies_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_location_on_white_36dp.png b/res/drawable-xhdpi/ic_location_on_white_36dp.png
deleted file mode 100644
index 078b10d4fb..0000000000
Binary files a/res/drawable-xhdpi/ic_location_on_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_lock_black_18dp.png b/res/drawable-xhdpi/ic_lock_black_18dp.png
deleted file mode 100644
index 60761381fc..0000000000
Binary files a/res/drawable-xhdpi/ic_lock_black_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_barcode.png b/res/drawable-xhdpi/ic_menu_barcode.png
deleted file mode 100644
index f37d3f2fb4..0000000000
Binary files a/res/drawable-xhdpi/ic_menu_barcode.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_search_holo_dark.png b/res/drawable-xhdpi/ic_menu_search_holo_dark.png
deleted file mode 100644
index 85986e73eb..0000000000
Binary files a/res/drawable-xhdpi/ic_menu_search_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_message_gray.png b/res/drawable-xhdpi/ic_message_gray.png
deleted file mode 100644
index 5eb1a27ae4..0000000000
Binary files a/res/drawable-xhdpi/ic_message_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_person_white_36dp.png b/res/drawable-xhdpi/ic_person_white_36dp.png
deleted file mode 100644
index 7239d88d7f..0000000000
Binary files a/res/drawable-xhdpi/ic_person_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_phone_bluetooth_speaker_white_24dp.png b/res/drawable-xhdpi/ic_phone_bluetooth_speaker_white_24dp.png
deleted file mode 100644
index 20ff3500a3..0000000000
Binary files a/res/drawable-xhdpi/ic_phone_bluetooth_speaker_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_phone_in_talk_white_24dp.png b/res/drawable-xhdpi/ic_phone_in_talk_white_24dp.png
deleted file mode 100644
index a2d78b2217..0000000000
Binary files a/res/drawable-xhdpi/ic_phone_in_talk_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_push_registration_reminder.png b/res/drawable-xhdpi/ic_push_registration_reminder.png
deleted file mode 100644
index b4397059e5..0000000000
Binary files a/res/drawable-xhdpi/ic_push_registration_reminder.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_signal_white_48dp.png b/res/drawable-xhdpi/ic_signal_white_48dp.png
deleted file mode 100644
index 92b3c43d7a..0000000000
Binary files a/res/drawable-xhdpi/ic_signal_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_volume_mute_white_24dp.png b/res/drawable-xhdpi/ic_volume_mute_white_24dp.png
deleted file mode 100644
index 4121c2cb43..0000000000
Binary files a/res/drawable-xhdpi/ic_volume_mute_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/list_selector_background_selected.9.png b/res/drawable-xhdpi/list_selector_background_selected.9.png
deleted file mode 100644
index 2af7360ca2..0000000000
Binary files a/res/drawable-xhdpi/list_selector_background_selected.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_dial_background_texture.png b/res/drawable-xhdpi/redphone_dial_background_texture.png
deleted file mode 100644
index 02aacc87d8..0000000000
Binary files a/res/drawable-xhdpi/redphone_dial_background_texture.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_endcall_background_texture.png b/res/drawable-xhdpi/redphone_endcall_background_texture.png
deleted file mode 100644
index efa65025fe..0000000000
Binary files a/res/drawable-xhdpi/redphone_endcall_background_texture.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_active_state_dialer_holo_dark.png b/res/drawable-xhdpi/redphone_ic_active_state_dialer_holo_dark.png
deleted file mode 100644
index 6ff8e48447..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_active_state_dialer_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_end_call.png b/res/drawable-xhdpi/redphone_ic_end_call.png
deleted file mode 100644
index 87f03df404..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_end_call.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_more_indicator_holo_dark.png b/res/drawable-xhdpi/redphone_ic_more_indicator_holo_dark.png
deleted file mode 100644
index 27b6d33e97..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_more_indicator_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_mute_holo_dark.png b/res/drawable-xhdpi/redphone_ic_mute_holo_dark.png
deleted file mode 100644
index 2699752e57..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_mute_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_sound_bluetooth_holo_dark.png b/res/drawable-xhdpi/redphone_ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index 85cd5420e2..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_sound_bluetooth_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_sound_handset_holo_dark.png b/res/drawable-xhdpi/redphone_ic_sound_handset_holo_dark.png
deleted file mode 100644
index b3a3186c69..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_sound_handset_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png b/res/drawable-xhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 60398caff4..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_ic_sound_speakerphone_holo_dark.png b/res/drawable-xhdpi/redphone_ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index fa8e34f850..0000000000
Binary files a/res/drawable-xhdpi/redphone_ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_list_focused.9.png b/res/drawable-xhdpi/redphone_list_focused.9.png
deleted file mode 100644
index 7c0599e3a6..0000000000
Binary files a/res/drawable-xhdpi/redphone_list_focused.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_list_longpressed.9.png b/res/drawable-xhdpi/redphone_list_longpressed.9.png
deleted file mode 100644
index eda10e6123..0000000000
Binary files a/res/drawable-xhdpi/redphone_list_longpressed.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_list_pressed.9.png b/res/drawable-xhdpi/redphone_list_pressed.9.png
deleted file mode 100644
index e4b33935a3..0000000000
Binary files a/res/drawable-xhdpi/redphone_list_pressed.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_list_pressed_holo_dark.9.png b/res/drawable-xhdpi/redphone_list_pressed_holo_dark.9.png
deleted file mode 100644
index 6e77525d2d..0000000000
Binary files a/res/drawable-xhdpi/redphone_list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/redphone_selector_disabled.9.png b/res/drawable-xhdpi/redphone_selector_disabled.9.png
deleted file mode 100644
index 92da2f0dd3..0000000000
Binary files a/res/drawable-xhdpi/redphone_selector_disabled.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/sms_selection_icon.png b/res/drawable-xhdpi/sms_selection_icon.png
deleted file mode 100644
index 70202b4f56..0000000000
Binary files a/res/drawable-xhdpi/sms_selection_icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi/sms_system_import_icon.png b/res/drawable-xhdpi/sms_system_import_icon.png
deleted file mode 100644
index 83a0572d8d..0000000000
Binary files a/res/drawable-xhdpi/sms_system_import_icon.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_camera_white_36dp.png b/res/drawable-xxhdpi/ic_camera_white_36dp.png
deleted file mode 100644
index 631fa0bf41..0000000000
Binary files a/res/drawable-xxhdpi/ic_camera_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/res/drawable-xxhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index faa409f802..0000000000
Binary files a/res/drawable-xxhdpi/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_delete_black.png b/res/drawable-xxhdpi/ic_delete_black.png
deleted file mode 100644
index 348a93e514..0000000000
Binary files a/res/drawable-xxhdpi/ic_delete_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_delete_gray.png b/res/drawable-xxhdpi/ic_delete_gray.png
deleted file mode 100644
index 5caa4e95a5..0000000000
Binary files a/res/drawable-xxhdpi/ic_delete_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_delivery_delivered_dark.png b/res/drawable-xxhdpi/ic_delivery_delivered_dark.png
deleted file mode 100644
index f5a9ea7b59..0000000000
Binary files a/res/drawable-xxhdpi/ic_delivery_delivered_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_devices_black_48dp.png b/res/drawable-xxhdpi/ic_devices_black_48dp.png
deleted file mode 100644
index 16ed3a0b08..0000000000
Binary files a/res/drawable-xxhdpi/ic_devices_black_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_devices_grey600_48dp.png b/res/drawable-xxhdpi/ic_devices_grey600_48dp.png
deleted file mode 100644
index f7dbe4396a..0000000000
Binary files a/res/drawable-xxhdpi/ic_devices_grey600_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png
deleted file mode 100644
index 720aec5ebd..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png b/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png
deleted file mode 100644
index e3b68bc3cd..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png
deleted file mode 100644
index 7d026ed57f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png b/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png
deleted file mode 100644
index 4e7441bb62..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_flag_white_24dp.png b/res/drawable-xxhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index fb2bc30ceb..0000000000
Binary files a/res/drawable-xxhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_gif_white_36dp.png b/res/drawable-xxhdpi/ic_gif_white_36dp.png
deleted file mode 100644
index ae117123cf..0000000000
Binary files a/res/drawable-xxhdpi/ic_gif_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_group_photo.png b/res/drawable-xxhdpi/ic_group_photo.png
deleted file mode 100644
index 17f480dcdd..0000000000
Binary files a/res/drawable-xxhdpi/ic_group_photo.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_headset_white_36dp.png b/res/drawable-xxhdpi/ic_headset_white_36dp.png
deleted file mode 100644
index d8681c15e6..0000000000
Binary files a/res/drawable-xxhdpi/ic_headset_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_image_white_36dp.png b/res/drawable-xxhdpi/ic_image_white_36dp.png
deleted file mode 100644
index 4f7f2e6a55..0000000000
Binary files a/res/drawable-xxhdpi/ic_image_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_insert_drive_file_white_36dp.png b/res/drawable-xxhdpi/ic_insert_drive_file_white_36dp.png
deleted file mode 100644
index 06886855a2..0000000000
Binary files a/res/drawable-xxhdpi/ic_insert_drive_file_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_36dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_36dp.png
deleted file mode 100644
index b97ab9aa67..0000000000
Binary files a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png
deleted file mode 100644
index 1c1676105c..0000000000
Binary files a/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_local_movies_white_36dp.png b/res/drawable-xxhdpi/ic_local_movies_white_36dp.png
deleted file mode 100644
index d526291117..0000000000
Binary files a/res/drawable-xxhdpi/ic_local_movies_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_location_on_white_36dp.png b/res/drawable-xxhdpi/ic_location_on_white_36dp.png
deleted file mode 100644
index 633bc56957..0000000000
Binary files a/res/drawable-xxhdpi/ic_location_on_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_lock_black_18dp.png b/res/drawable-xxhdpi/ic_lock_black_18dp.png
deleted file mode 100644
index 195c0ff6a1..0000000000
Binary files a/res/drawable-xxhdpi/ic_lock_black_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_menu_search_holo_dark.png b/res/drawable-xxhdpi/ic_menu_search_holo_dark.png
deleted file mode 100644
index da3f436b9c..0000000000
Binary files a/res/drawable-xxhdpi/ic_menu_search_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_message_gray.png b/res/drawable-xxhdpi/ic_message_gray.png
deleted file mode 100644
index 5eb0acf50b..0000000000
Binary files a/res/drawable-xxhdpi/ic_message_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_person_white_36dp.png b/res/drawable-xxhdpi/ic_person_white_36dp.png
deleted file mode 100644
index 58e532c015..0000000000
Binary files a/res/drawable-xxhdpi/ic_person_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_phone_bluetooth_speaker_white_24dp.png b/res/drawable-xxhdpi/ic_phone_bluetooth_speaker_white_24dp.png
deleted file mode 100644
index 61b5bc6df5..0000000000
Binary files a/res/drawable-xxhdpi/ic_phone_bluetooth_speaker_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_phone_in_talk_white_24dp.png b/res/drawable-xxhdpi/ic_phone_in_talk_white_24dp.png
deleted file mode 100644
index 9c002da0aa..0000000000
Binary files a/res/drawable-xxhdpi/ic_phone_in_talk_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_push_registration_reminder.png b/res/drawable-xxhdpi/ic_push_registration_reminder.png
deleted file mode 100644
index 74c4e26af5..0000000000
Binary files a/res/drawable-xxhdpi/ic_push_registration_reminder.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_send_white_24dp.png b/res/drawable-xxhdpi/ic_send_white_24dp.png
deleted file mode 100644
index cbb64e09f4..0000000000
Binary files a/res/drawable-xxhdpi/ic_send_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_signal_white_48dp.png b/res/drawable-xxhdpi/ic_signal_white_48dp.png
deleted file mode 100644
index e52227145c..0000000000
Binary files a/res/drawable-xxhdpi/ic_signal_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_volume_mute_white_24dp.png b/res/drawable-xxhdpi/ic_volume_mute_white_24dp.png
deleted file mode 100644
index 2c539c7ac9..0000000000
Binary files a/res/drawable-xxhdpi/ic_volume_mute_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_end_call.png b/res/drawable-xxhdpi/redphone_ic_end_call.png
deleted file mode 100644
index 094700a423..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_end_call.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_mute_holo_dark.png b/res/drawable-xxhdpi/redphone_ic_mute_holo_dark.png
deleted file mode 100644
index b6add622de..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_mute_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_sound_bluetooth_holo_dark.png b/res/drawable-xxhdpi/redphone_ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index 57f75b37ad..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_sound_bluetooth_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_sound_handset_holo_dark.png b/res/drawable-xxhdpi/redphone_ic_sound_handset_holo_dark.png
deleted file mode 100644
index bc276fa218..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_sound_handset_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png b/res/drawable-xxhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 0bd8462eda..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/redphone_ic_sound_speakerphone_holo_dark.png b/res/drawable-xxhdpi/redphone_ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index dcc16089fb..0000000000
Binary files a/res/drawable-xxhdpi/redphone_ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/sms_selection_icon.png b/res/drawable-xxhdpi/sms_selection_icon.png
deleted file mode 100644
index 5cb1637875..0000000000
Binary files a/res/drawable-xxhdpi/sms_selection_icon.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/sms_system_import_icon.png b/res/drawable-xxhdpi/sms_system_import_icon.png
deleted file mode 100644
index fb0b26f3f7..0000000000
Binary files a/res/drawable-xxhdpi/sms_system_import_icon.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_archive_white_48dp.png b/res/drawable-xxxhdpi/ic_archive_white_48dp.png
deleted file mode 100644
index 6fb64c404b..0000000000
Binary files a/res/drawable-xxxhdpi/ic_archive_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_camera_white_36dp.png b/res/drawable-xxxhdpi/ic_camera_white_36dp.png
deleted file mode 100644
index 4394349386..0000000000
Binary files a/res/drawable-xxxhdpi/ic_camera_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_devices_black_48dp.png b/res/drawable-xxxhdpi/ic_devices_black_48dp.png
deleted file mode 100644
index db31cb6061..0000000000
Binary files a/res/drawable-xxxhdpi/ic_devices_black_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_devices_grey600_48dp.png b/res/drawable-xxxhdpi/ic_devices_grey600_48dp.png
deleted file mode 100644
index 89b42867f8..0000000000
Binary files a/res/drawable-xxxhdpi/ic_devices_grey600_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_flag_white_24dp.png b/res/drawable-xxxhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 41089527ca..0000000000
Binary files a/res/drawable-xxxhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_gif_white_36dp.png b/res/drawable-xxxhdpi/ic_gif_white_36dp.png
deleted file mode 100644
index 0ffbdb3554..0000000000
Binary files a/res/drawable-xxxhdpi/ic_gif_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_headset_white_36dp.png b/res/drawable-xxxhdpi/ic_headset_white_36dp.png
deleted file mode 100644
index 46dc8a2a8a..0000000000
Binary files a/res/drawable-xxxhdpi/ic_headset_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_image_white_36dp.png b/res/drawable-xxxhdpi/ic_image_white_36dp.png
deleted file mode 100644
index 7b75eaf471..0000000000
Binary files a/res/drawable-xxxhdpi/ic_image_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_insert_drive_file_white_36dp.png b/res/drawable-xxxhdpi/ic_insert_drive_file_white_36dp.png
deleted file mode 100644
index 38b2017f09..0000000000
Binary files a/res/drawable-xxxhdpi/ic_insert_drive_file_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_36dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_36dp.png
deleted file mode 100644
index 61c9cf6c7d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png
deleted file mode 100644
index 983a25340c..0000000000
Binary files a/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_local_movies_white_36dp.png b/res/drawable-xxxhdpi/ic_local_movies_white_36dp.png
deleted file mode 100644
index 1c63e32520..0000000000
Binary files a/res/drawable-xxxhdpi/ic_local_movies_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_location_on_white_36dp.png b/res/drawable-xxxhdpi/ic_location_on_white_36dp.png
deleted file mode 100644
index 42ab08cf74..0000000000
Binary files a/res/drawable-xxxhdpi/ic_location_on_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_person_white_36dp.png b/res/drawable-xxxhdpi/ic_person_white_36dp.png
deleted file mode 100644
index 84ab7e6202..0000000000
Binary files a/res/drawable-xxxhdpi/ic_person_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_phone_bluetooth_speaker_white_24dp.png b/res/drawable-xxxhdpi/ic_phone_bluetooth_speaker_white_24dp.png
deleted file mode 100644
index c935d9638e..0000000000
Binary files a/res/drawable-xxxhdpi/ic_phone_bluetooth_speaker_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_phone_in_talk_white_24dp.png b/res/drawable-xxxhdpi/ic_phone_in_talk_white_24dp.png
deleted file mode 100644
index 36be1da995..0000000000
Binary files a/res/drawable-xxxhdpi/ic_phone_in_talk_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_signal_white_48dp.png b/res/drawable-xxxhdpi/ic_signal_white_48dp.png
deleted file mode 100644
index b3cf04a80d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_signal_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_volume_mute_white_24dp.png b/res/drawable-xxxhdpi/ic_volume_mute_white_24dp.png
deleted file mode 100644
index 1379bb4441..0000000000
Binary files a/res/drawable-xxxhdpi/ic_volume_mute_white_24dp.png and /dev/null differ
diff --git a/res/drawable/redphone_black_rectangle.xml b/res/drawable/redphone_black_rectangle.xml
deleted file mode 100644
index 88c970b0de..0000000000
--- a/res/drawable/redphone_black_rectangle.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="@android:color/black"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/redphone_btn_compound_audio.xml b/res/drawable/redphone_btn_compound_audio.xml
deleted file mode 100644
index 84a3daf4c7..0000000000
--- a/res/drawable/redphone_btn_compound_audio.xml
+++ /dev/null
@@ -1,105 +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.
--->
-
-<!-- Layers used to render the in-call "Audio mode" compound button.
-
-     This is a multi-mode button:
-
-     - If no bluetooth headset is connected, it behaves like a simple
-       "compound button" that switches the speaker on and off.  (This is why
-       the button itself is a ToggleButton instance.)
-
-     - But if a bluetooth headset is connected, this becomes a simple
-       action button (with no concept of a "checked" state) that brings
-       up a popup menu offering you a 3-way choice between earpiece /
-       speaker / bluetooth.
-
-     See InCallTouchUi.updateAudioButton() for the corresponding code. -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background, used to distinguish
-         between the "checked" and "unchecked" states when this button is
-         simply an on/off toggle for the speaker.
-         (In states where the audio button *not* a toggle, we explicitly
-         hide this layer.) -->
-    <item android:id="@+id/compoundBackgroundItem"
-          android:drawable="@drawable/redphone_btn_compound_background" />
-
-    <!-- The little triangle that indicates that this isn't a plain
-         button, but will instead pop up a menu.  This layer is *not*
-         shown when the audio button is simply an on/off toggle. -->
-    <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full
-         size of the button. -->
-    <item android:id="@+id/moreIndicatorItem">
-        <bitmap android:src="@drawable/redphone_ic_more_indicator_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Finally, the button icon.
-
-         When the audio button is simply an on/off toggle for the speaker,
-         the icon is a "speakerphone" regardless of whether the speaker is
-         active.  (Instead, the "on/off" indication comes from the
-         redphone_btn_compound_background selector.)
-
-         But when the audio button is connected to the 3-way popup menu,
-         we use the button's icon to indicate the current audio mode
-         (i.e. one of { earpiece (or wired headset) , speaker , bluetooth }).
-
-         Here we have separate layers for each possible foreground icon,
-         and in InCallTouchUi.updateAudioButton() we hide them all
-         *except* the one needed for the current state. -->
-
-    <!-- These all use an explicit <bitmap> to avoid scaling the icon up
-         to the full size of the button. -->
-
-    <!-- Bluetooth is active -->
-    <item android:id="@+id/bluetoothItem">
-        <bitmap android:src="@drawable/redphone_ic_sound_bluetooth_holo_dark"
-                android:gravity="center" />
-    </item>
-
-
-    <!-- Handset earpiece is active -->
-    <item android:id="@+id/handsetItem">
-        <bitmap android:src="@drawable/redphone_ic_sound_handset_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Speakerphone icon showing 'speaker on' state -->
-    <item android:id="@+id/speakerphoneOnItem">
-        <bitmap android:src="@drawable/redphone_ic_sound_speakerphone_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Speakerphone icon showing 'speaker off' state -->
-    <item android:id="@+id/speakerphoneOffItem">
-        <bitmap android:src="@drawable/redphone_ic_sound_off_speakerphone_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Generic "audio mode" icon.  Looks almost identical to
-         ic_sound_speakerphone_holo_dark.png -->
-    <!-- TODO: is this actually needed? -->
-    <!--
-        <item android:id="@+id/soundItem">
-            <bitmap android:src="@drawable/ic_sound_holo_dark"
-                    android:gravity="center" />
-        </item>
-    -->
-
-</layer-list>
diff --git a/res/drawable/redphone_btn_compound_background.xml b/res/drawable/redphone_btn_compound_background.xml
deleted file mode 100644
index efe5550311..0000000000
--- a/res/drawable/redphone_btn_compound_background.xml
+++ /dev/null
@@ -1,34 +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.
--->
-
-<!-- Background resource for "compound buttons" in the in-call UI.
-     These buttons have two states (checked and unchecked), and
-     show a blue bar along the bottom edge when checked. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-          android:drawable="@drawable/redphone_list_pressed_holo_dark" />
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/redphone_list_selector_focused_and_checked" />
-    <item android:state_focused="true"
-          android:drawable="@drawable/list_focused_holo" />
-    <item android:state_checked="true"
-          android:drawable="@drawable/redphone_ic_active_state_dialer_holo_dark" />
-
-    <item
-        android:drawable="@android:color/transparent" />
-
-</selector>
diff --git a/res/drawable/redphone_btn_compound_mute.xml b/res/drawable/redphone_btn_compound_mute.xml
deleted file mode 100644
index 9711559675..0000000000
--- a/res/drawable/redphone_btn_compound_mute.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<!-- Layers used to render the in-call "Mute" compound button. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/redphone_btn_compound_background" />
-
-    <!-- ...and the actual icon on top.  Use an explicit <bitmap> to avoid scaling
-         the icon up to the full size of the button. -->
-    <item>
-        <bitmap android:src="@drawable/redphone_ic_mute_holo_dark"
-                android:gravity="center" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/redphone_dialpad_background.xml b/res/drawable/redphone_dialpad_background.xml
deleted file mode 100644
index 238074231f..0000000000
--- a/res/drawable/redphone_dialpad_background.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/redphone_dial_background_texture"
-    android:tileMode="repeat" />
-
diff --git a/res/drawable/redphone_dialpad_dark_background.xml b/res/drawable/redphone_dialpad_dark_background.xml
deleted file mode 100644
index 47d40344f6..0000000000
--- a/res/drawable/redphone_dialpad_dark_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/redphone_black_rectangle"/>
-    <item android:drawable="@drawable/redphone_dialpad_background"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/redphone_end_call_background.xml b/res/drawable/redphone_end_call_background.xml
deleted file mode 100644
index c3c262bc2f..0000000000
--- a/res/drawable/redphone_end_call_background.xml
+++ /dev/null
@@ -1,19 +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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/redphone_endcall_background_texture"
-    android:tileMode="repeat" />
diff --git a/res/drawable/redphone_list_selector_focused_and_checked.xml b/res/drawable/redphone_list_selector_focused_and_checked.xml
deleted file mode 100644
index 724fda360f..0000000000
--- a/res/drawable/redphone_list_selector_focused_and_checked.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/redphone_ic_active_state_dialer_holo_dark" />
-    <item android:drawable="@drawable/list_focused_holo" />
-</layer-list>
diff --git a/res/drawable/redphone_selector_background_transition.xml b/res/drawable/redphone_selector_background_transition.xml
deleted file mode 100644
index c05542d734..0000000000
--- a/res/drawable/redphone_selector_background_transition.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/redphone_list_pressed"  />
-    <item android:drawable="@drawable/redphone_list_longpressed"  />
-</transition>
diff --git a/res/drawable/selectable_item_background.xml b/res/drawable/selectable_item_background.xml
deleted file mode 100644
index bedb5e59c0..0000000000
--- a/res/drawable/selectable_item_background.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"
-          android:state_enabled="false"
-          android:state_pressed="true"
-          android:drawable="@drawable/redphone_selector_disabled" />
-    <item android:state_focused="true"
-          android:state_enabled="false"
-          android:drawable="@drawable/redphone_selector_disabled" />
-    <item android:state_focused="true"
-          android:state_pressed="true"
-          android:drawable="@drawable/redphone_selector_background_transition" />
-    <item android:state_focused="false"
-          android:state_pressed="true"
-          android:drawable="@drawable/redphone_selector_background_transition" />
-    <item android:state_focused="true"
-          android:drawable="@drawable/redphone_list_focused" />
-    <item android:drawable="@color/transparent" />
-</selector>
diff --git a/res/layout/empty2.xml b/res/layout/empty2.xml
deleted file mode 100644
index 0e384ff840..0000000000
--- a/res/layout/empty2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_menu_search_holo_dark"
-        android:visibility="invisible"/>
-</FrameLayout>
diff --git a/res/layout/redphone.xml b/res/layout/redphone.xml
deleted file mode 100644
index 8ad442e07d..0000000000
--- a/res/layout/redphone.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<!-- In-call state of the Phone UI. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              >
-
-    <org.thoughtcrime.redphone.ui.CallScreen android:id="@+id/callScreen"
-                                             android:layout_width="fill_parent"
-                                             android:layout_height="fill_parent" />
-
-    <!-- Main frame containing all in-call UI elements.
-         This is a FrameLayout with 2 children:
-           (1) inCallPanel: the main set of in-call UI elements
-           (2) manageConferencePanel: the "Manage conference" UI
-         Exactly one of these is visible at any given moment.  -->
-<!--     <FrameLayout android:id="@+id/mainFrame" -->
-<!--         android:layout_width="fill_parent" -->
-<!--         android:layout_height="fill_parent" -->
-<!--         android:layout_weight="1" -->
-<!--         android:paddingTop="10dip" -->
-<!--         android:paddingLeft="6dip" -->
-<!--         android:paddingRight="6dip" -->
-<!--         > -->
-
-        <!-- (1) inCallPanel: the main set of in-call UI elements -->
-<!--         <RelativeLayout android:id="@+id/inCallPanel" -->
-<!--                         android:layout_width="fill_parent" -->
-<!--                         android:layout_height="fill_parent" -->
-<!--                         > -->
-
-<!-- 			<org.thoughtcrime.redphone.ui.CallCard xmlns:android="http://schemas.android.com/apk/res/android" -->
-<!--     											   android:id="@+id/callCard" -->
-<!--     											   android:layout_width="fill_parent" -->
-<!--     											   android:layout_height="fill_parent" /> -->
-
-
- <!--
-            <Button android:id="@+id/answerButton"
-                    android:visibility="gone"
-                    android:layout_width="120px"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_margin="30px"
-                    android:padding="20px"
-                    android:textSize="22px"
-                    android:text="Answer" />
-
-            <Button android:id="@+id/denyButton"
-                    android:visibility="gone"
-                    android:layout_width="120px"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_margin="30px"
-                    android:padding="20px"
-                    android:textSize="22px"
-                    android:text="Deny" />
-
-            <SeekBar android:id="@+id/seek"
-                     android:visibility="gone"
-                     android:layout_width="fill_parent"
-                     android:layout_height="40px"
-                     android:max="100"
-                     android:progress="0"
-                     android:paddingLeft="10px"
-                     android:paddingRight="10px"
-                     android:layout_alignParentBottom="true"
-                     android:layout_margin="30px"
-                     android:thumb="@drawable/slider" />
-
-             <TextView android:id="@+id/seekText"
-                       android:visibility="gone"
-                       android:text="Slide to unlock"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_alignParentBottom="true"
-                       android:layout_centerInParent="true"
-                       android:layout_margin="40px"
-                       />
- -->
-            <!-- The hint about the Menu button, anchored to the bottom of
-                 the screen.  This is used only in landscape mode (see
-                 updateMenuButtonHint()); in portrait mode we use the
-                 menuButtonHint built-in to the CallCard. -->
-<!--             <TextView android:id="@+id/menuButtonHint" -->
-<!--                       android:text="Press Menu for call options  \u2022  Use keyboard to dial" -->
-<!--                       android:textAppearance="?android:attr/textAppearanceMedium" -->
-<!--                       android:textColor="?android:attr/textColorSecondary" -->
-<!--                       android:layout_width="fill_parent" -->
-<!--                       android:layout_height="wrap_content" -->
-<!--                       android:gravity="center" -->
-<!--                       android:visibility="gone" -->
-<!--                       android:layout_alignParentBottom="true" -->
-<!--                       /> -->
-
-<!--         </RelativeLayout>   -->
-<!--     </FrameLayout>   -->
-
-    <!-- The sliding drawer control containing the DTMF dialpad.
-         Note this isn't a child of mainFrame, which ensures that it'll be
-         able to use the full width of the screen.  (And a SlidingDrawer
-         widget needs to be be a direct child of a FrameLayout anyway.)
-         In portrait mode, this is visible; in landscape mode, this is
-         just an empty layout.-->
-
- <!--
-    <include layout="@layout/dtmf_twelve_key_dialer"/>
- -->
-
-    <!-- Finally, the "touch lock" overlay, drawn on top of the DTMF
-         dialpad (after some delay) to prevent false touches from
-         triggering DTMF tones.  (When the overlay is up, you need to
-         double-tap the "lock" icon to unlock the dialpad.) -->
-<!--     <RelativeLayout android:id="@+id/touchLockOverlay" -->
-<!--         android:layout_width="fill_parent" -->
-<!--         android:layout_height="fill_parent" -->
-<!--         android:visibility="gone" -->
-<!--         android:background="#8000" -->
-<!--         > -->
-        <!-- Layout note: we could use android:layout_centerInParent="true"
-             here to center the lock icon exactly in the middle of the screen.
-             But it actually looks better to have the lock roughly in the
-             middle of the dialpad key area, so instead we position it a
-             fixed distance from the bottom of the screen. -->
-<!--         <TextView android:id="@+id/touchLockIcon" -->
-<!--             android:layout_width="wrap_content" -->
-<!--             android:layout_height="wrap_content" -->
-<!--             android:gravity="center" -->
-<!--             android:layout_alignParentBottom="true" -->
-<!--             android:layout_centerHorizontal="true" -->
-<!--             android:layout_marginBottom="70dip" -->
-<!--             android:text="Double-tap\nto unlock" -->
-<!--             android:textAppearance="?android:attr/textAppearanceLarge" -->
-<!--             android:background="@drawable/dialpad_lock" -->
-<!--             /> -->
-<!--     </RelativeLayout> -->
-
-</FrameLayout>
diff --git a/res/layout/redphone_call_card.xml b/res/layout/redphone_call_card.xml
deleted file mode 100644
index eb227f3f91..0000000000
--- a/res/layout/redphone_call_card.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<!-- XML resource file for the *children* of a CallCard used in the Phone app.
-     The CallCard itself is a subclass of FrameLayout, and its (single)
-     child is the LinearLayout found here.  (In the CallCard constructor,
-     we inflate this file and add it as a child.)
-
-     Note that the CallCard is technically the size of the full screen (since
-     our parent container is full-screen, and the layout_width and layout_height
-     here are both "match_parent"), but we manually adjust its bottom margin
-     in CallCard.updateCallInfoLayout() to make sure it doesn't overlap with
-     the onscreen buttons from incall_touch_ui.xml. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/call_info_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <!-- "Call info" block #1, for the foreground call. -->
-    <RelativeLayout android:id="@+id/call_info_1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        >
-
-        <!-- Contact photo for call_info_1 -->
-        <ImageView android:id="@+id/photo"
-                   android:layout_width="match_parent"
-                   android:layout_height="match_parent"
-                   android:layout_below="@+id/call_banner_1"
-                   android:layout_marginBottom="@dimen/in_call_button_height"
-                   android:gravity="top|center_horizontal"
-                   android:background="@android:color/black"
-                   android:scaleType="centerCrop"
-                   />
-
-        <!-- "Call Banner" for call #1, the foregound or ringing call.
-             The "call banner" is a block of info about a single call,
-             including the contact name, phone number, call time counter,
-             and other status info.  This info is shown as a "banner"
-             overlaid across the top of contact photo. -->
-        <RelativeLayout android:id="@+id/call_banner_1"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="80dp"
-            android:paddingLeft="24dp"
-            android:paddingRight="24dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:background="@color/textsecure_primary"
-            >
-
-            <!-- Name (or the phone number, if we don't have a name to display). -->
-            <TextView android:id="@+id/name"
-                      android:layout_alignParentTop="true"
-                      android:layout_alignParentLeft="true"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:paddingRight="50sp"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="#FFFFFF"
-                      android:singleLine="true"
-                      />
-
-            <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-            <LinearLayout android:id="@+id/labelAndNumber"
-                          android:layout_below="@id/name"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:paddingRight="50sp"
-                          android:orientation="horizontal"
-                          >
-                <TextView android:id="@+id/phoneNumber"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:textColor="#FFFFFF"
-                          android:singleLine="true"
-                          />
-                <TextView android:id="@+id/label"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:textColor="#FFFFFF"
-                          android:textAllCaps="true"
-                          android:singleLine="true"
-                          android:layout_marginLeft="6dip"
-                          />
-            </LinearLayout>
-
-            <!-- Elapsed time indication for a call in progress. -->
-            <TextView android:id="@+id/elapsedTime"
-                      android:layout_alignParentRight="true"
-                      android:layout_centerVertical="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="#FFFFFF"
-                      android:singleLine="true"
-                      />
-
-            <!-- Call type indication: a special label and/or branding
-                 for certain kinds of calls (like "Internet call" for a SIP call.) -->
-            <TextView android:id="@+id/callTypeLabel"
-                      android:layout_below="@id/labelAndNumber"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="#FFFFFF"
-                      android:maxLines="1"
-                      android:ellipsize="end"
-                      android:visibility="visible"
-                      android:text="@string/redphone_call_card__signal_call"
-                      />
-
-            <!-- Social status (currently unused) -->
-            <TextView android:id="@+id/socialStatus"
-                      android:layout_below="@id/callTypeLabel"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="#FFFFFF"
-                      android:maxLines="2"
-                      android:ellipsize="end"
-                      />
-
-        </RelativeLayout>  <!-- End of call_banner for call_info #1. -->
-
-        <!-- The "call state label": In some states, this shows a special
-             indication like "Dialing" or "Incoming call" or "Call ended".
-             It's unused for the normal case of an active ongoing call. -->
-        <!-- This is visually part of the call banner, but it's not actually
-             part of the "call_banner_1" RelativeLayout since it needs a
-             different background color. -->
-        <TextView android:id="@+id/callStateLabel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/call_banner_1"
-            android:gravity="right"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:paddingRight="24dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#FFFFFF"
-            android:textAllCaps="true"
-            android:background="#8033b5e5"
-            />
-    </RelativeLayout>
-</LinearLayout>
diff --git a/res/layout/redphone_call_controls.xml b/res/layout/redphone_call_controls.xml
deleted file mode 100644
index 1cba1ac917..0000000000
--- a/res/layout/redphone_call_controls.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<!-- In-call onscreen touch UI elements, used on some platforms.
-
-     This layout is a fullscreen overlay, drawn on top of the
-     non-touch-sensitive parts of the in-call UI (i.e. the call card).
-
-     The top-level View here is a FrameLayout with 2 children:
-       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
-       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
-     Exactly one of these is visible at any given moment.
-     -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!--
-        (1) incomingCallWidget: the UI displayed while an incoming call is ringing.
-            See InCallTouchUi.showIncomingCallWidget().
-
-            Layout notes:
-            - Use an opaque black background since we need to cover up
-              a bit of the bottom of the contact photo
-            - The verticalOffset value gets us a little extra space above
-              the topmost "Respond by SMS" icon
-            - The negative layout_marginBottom shifts us slightly downward;
-              we're already aligned with the bottom of the screen, but we
-              don't have an icon in the downward direction so the whole
-              bottom area of this widget is just wasted space.
-    -->
-    <org.thoughtcrime.securesms.components.multiwaveview.MultiWaveView
-        android:id="@+id/incomingCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="-46dp"
-        android:background="@android:color/black"
-        android:visibility="gone"
-        />
-
-    <TextView android:id="@+id/redphone_banner"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_alignTop="@id/incomingCallWidget"
-              android:gravity="center"
-              android:paddingTop="8dp"
-              android:paddingBottom="8dp"
-              android:textAppearance="?android:attr/textAppearanceLarge"
-              android:textColor="#FFFFFF"
-              android:textAllCaps="true"
-              android:background="@color/textsecure_primary"
-              android:text="@string/redphone_call_controls__signal_call"/>
-
-
-    <!--
-        (2) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <RelativeLayout android:id="@+id/inCallControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
-                    android:visibility="gone"
-                    >
-
-        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-        <LinearLayout android:id="@+id/bottomButtons"
-                      android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true">
-
-            <RelativeLayout android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                <TextView android:id="@+id/sas"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceLarge"
-                          android:textColor="#FFFFFF"
-                          android:background="#a0000000"
-                          android:gravity="center"
-                          android:padding="20dip"
-                          android:singleLine="true"
-                          android:visibility="gone"/>
-
-                <!--<LinearLayout android:id="@+id/confirm_wrapper"-->
-                              <!--android:layout_width="wrap_content"-->
-                              <!--android:layout_height="wrap_content"-->
-                              <!--android:layout_alignParentRight="true"-->
-                              <!--android:layout_alignTop="@id/sas"-->
-                              <!--android:layout_alignBottom="@id/sas"-->
-                              <!--android:background="@drawable/redphone_dialpad_dark_background">-->
-
-                    <!--<ImageButton android:id="@+id/confirm_sas"-->
-                                 <!--android:layout_width="wrap_content"-->
-                                 <!--android:layout_height="fill_parent"-->
-                                 <!--android:gravity="center"-->
-                                 <!--android:layout_gravity="center"-->
-                                 <!--android:paddingRight="10dip"-->
-                                 <!--android:paddingLeft="10dip"-->
-                                 <!--android:contentDescription="verify sas"-->
-                                 <!--android:src="@drawable/ic_check_light"-->
-                                 <!--android:background="@drawable/selectable_item_background"/>-->
-                <!--</LinearLayout>-->
-            </RelativeLayout>
-
-
-            <!-- Row 2: The "End call" button. -->
-            <!-- This is in its own LinearLayout purely so that the whole row
-                 can have a background drawable distinct from the image itself. -->
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/redphone_end_call_background">
-
-                <ImageButton android:id="@+id/endButton"
-                             android:layout_width="match_parent"
-                             android:layout_height="76dp"
-                             android:layout_weight="1"
-                             android:src="@drawable/redphone_ic_end_call"
-                             android:background="@drawable/selectable_item_background"
-                             android:contentDescription="@string/redphone_call_controls__end_call"/>
-            </LinearLayout>
-
-            <!--                              android:background="?android:attr/selectableItemBackground" -->
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/redphone_dialpad_dark_background"
-                android:paddingLeft="@dimen/button_cluster_side_padding"
-                android:paddingRight="@dimen/button_cluster_side_padding"
-                >
-
-                <!-- This row has either 4 or 5 buttons, depending on
-                     whether the device supports "Hold" (i.e. 4 buttons on
-                     CDMA devices, 5 buttons on GSM devices.)  The buttons
-                     are interspersed with 'layout_weight="1"' placeholder
-                     views so that they'll be spaced evenly in both cases.
-
-                     But note there are a couple of *pairs* of buttons that share a
-                     single "slot", namely Hold/Swap and Add/Merge.  For these, the
-                     code in InCallTouchUi is responsible for making sure that at any
-                     point exactly one of the pair is VISIBLE and the other is
-                     GONE. -->
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
-
-                <!-- "Dialpad" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <!--                 <ToggleButton android:id="@+id/dialpadButton" -->
-                <!--                     style="@style/InCallCompoundButton" -->
-                <!--                     android:background="@drawable/btn_compound_dialpad" -->
-                <!--                     android:contentDescription="@string/onscreenShowDialpadText" -->
-                <!--                     /> -->
-
-                <!--                 <View -->
-                <!--                     android:layout_width="0dp" -->
-                <!--                     android:layout_weight="1" -->
-                <!--                     android:layout_height="match_parent" /> -->
-
-
-                <!-- "Audio mode" -->
-                <!-- This is a multi-mode button that can behave either like a
-                     simple "compound button" with two states *or* like an
-                     action button that brings up a popup menu; see
-                     redphone_btn_compound_audio.xmlaudio.xml and InCallTouchUi.updateAudioButton()
-                     for the full details. -->
-                <!--<org.thoughtcrime.redphone.ui.StateListenerView-->
-                    <!--android:id="@+id/menuAttachment"-->
-                    <!--android:layout_width="0dp"-->
-                    <!--android:layout_height="0dp"/>-->
-                <View android:id="@+id/menuAttachment"
-                      android:layout_width="0dp"
-                      android:layout_height="0dp"/>
-
-                <ToggleButton android:id="@+id/audioButton"
-                              style="@style/InCallCompoundButton"
-                              android:background="@drawable/redphone_btn_compound_audio"
-                              android:contentDescription="@string/redphone_call_controls__audio"
-                    />
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
-
-                <!-- "Mute" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton android:id="@+id/muteButton"
-                              style="@style/InCallCompoundButton"
-                              android:background="@drawable/redphone_btn_compound_mute"
-                              android:contentDescription="@string/redphone_call_controls__mute"
-                    />
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
-
-                <!-- This slot is either "Hold" or "Swap", depending on
-                     the state of the call.   One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Hold" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <!--                 <ToggleButton android:id="@+id/holdButton" -->
-                <!--                     style="@style/InCallCompoundButton" -->
-                <!--                     android:background="@drawable/btn_compound_hold" -->
-                <!--                     android:contentDescription="@string/onscreenHoldText" -->
-                <!--                     /> -->
-                <!-- "Swap" (or "Manage calls" in some CDMA states) -->
-                <!--                 <ImageButton android:id="@+id/swapButton" -->
-                <!--                     style="@style/InCallButton" -->
-                <!--                     android:src="@drawable/ic_incall_switch_holo_dark" -->
-                <!--                     android:contentDescription="@string/onscreenSwapCallsText" -->
-                <!--                     /> -->
-
-                <!--                 <View android:id="@+id/holdSwapSpacer" -->
-                <!--                     android:layout_width="0dp" -->
-                <!--                     android:layout_weight="1" -->
-                <!--                     android:layout_height="match_parent" /> -->
-
-                <!-- This slot is either "Add" or "Merge", depending on
-                     the state of the call.  One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Add Call" -->
-                <!--                 <ImageButton android:id="@+id/addButton" -->
-                <!--                     style="@style/InCallButton" -->
-                <!--                     android:src="@drawable/ic_add_contact_holo_dark" -->
-                <!--                     android:contentDescription="@string/onscreenAddCallText" -->
-                <!--                     /> -->
-                <!-- "Merge calls" -->
-                <!-- This button is used only on GSM devices, where we know
-                     that "Add" and "Merge" are never available at the same time.
-                     The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                <!--                 <ImageButton android:id="@+id/mergeButton" -->
-                <!--                     style="@style/InCallButton" -->
-                <!--                     android:src="@drawable/ic_merge_holo_dark" -->
-                <!--                     android:contentDescription="@string/onscreenMergeCallsText" -->
-                <!--                     /> -->
-
-                <!--                 <View -->
-                <!--                     android:layout_width="0dp" -->
-                <!--                     android:layout_weight="1" -->
-                <!--                     android:layout_height="match_parent" /> -->
-
-            </LinearLayout>
-
-
-            <!-- Row 3: The main batch of in-call buttons:
-                    Dialpad / Audio mode / Mute / Hold / Add call
-                 Visible in all states except while an incoming call is
-                 ringing. -->
-
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/res/layout/redphone_call_screen.xml b/res/layout/redphone_call_screen.xml
deleted file mode 100644
index c6e0d04dbc..0000000000
--- a/res/layout/redphone_call_screen.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/incall_screen"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-   <org.thoughtcrime.redphone.ui.CallCard android:id="@+id/callCard"
-                                          android:layout_width="match_parent"
-                                          android:layout_height="match_parent"/>
-
-    <org.thoughtcrime.redphone.ui.CallControls android:id="@+id/callControls"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="match_parent"
-            />
-
-</FrameLayout>
diff --git a/res/menu/conversation_list_empty.xml b/res/menu/conversation_list_empty.xml
deleted file mode 100644
index 47c3dba2c0..0000000000
--- a/res/menu/conversation_list_empty.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:id="@+id/fake_menu_item"
-          app:actionLayout="@layout/empty2"
-          app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/res/menu/key_scanning.xml b/res/menu/key_scanning.xml
deleted file mode 100644
index d54c0e978b..0000000000
--- a/res/menu/key_scanning.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="@string/key_scanning__menu_compare"
-          android:id="@+id/menu_barcode"
-          android:icon="@drawable/ic_menu_barcode"
-          app:showAsAction="ifRoom">
-
-        <menu>
-            <item android:title="@string/key_scanning__menu_scan_contacts_qr_code"
-                  android:id="@+id/menu_scan"/>
-
-            <item android:title="@string/key_scanning__menu_display_your_qr_code"
-                  android:id="@+id/menu_get_scanned"/>
-
-        </menu>
-
-    </item>
-</menu>
\ No newline at end of file