diff --git a/res/drawable-land-xhdpi/conference_default.png b/res/drawable-land-xhdpi/conference_default.png
deleted file mode 100644
index c3f3c62b6..000000000
Binary files a/res/drawable-land-xhdpi/conference_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/conference_over.png b/res/drawable-land-xhdpi/conference_over.png
deleted file mode 100644
index cb6ff9a91..000000000
Binary files a/res/drawable-land-xhdpi/conference_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/dialer_alt_back_default.png b/res/drawable-land-xhdpi/dialer_alt_back_default.png
deleted file mode 100644
index 9adc1d2a5..000000000
Binary files a/res/drawable-land-xhdpi/dialer_alt_back_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/dialer_alt_back_over.png b/res/drawable-land-xhdpi/dialer_alt_back_over.png
deleted file mode 100644
index 73606b5e6..000000000
Binary files a/res/drawable-land-xhdpi/dialer_alt_back_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/dialer_alt_default.png b/res/drawable-land-xhdpi/dialer_alt_default.png
deleted file mode 100644
index f1b2d39cf..000000000
Binary files a/res/drawable-land-xhdpi/dialer_alt_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/dialer_alt_disabled.png b/res/drawable-land-xhdpi/dialer_alt_disabled.png
deleted file mode 100644
index 00a72ac47..000000000
Binary files a/res/drawable-land-xhdpi/dialer_alt_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/dialer_alt_over.png b/res/drawable-land-xhdpi/dialer_alt_over.png
deleted file mode 100644
index d07a14243..000000000
Binary files a/res/drawable-land-xhdpi/dialer_alt_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/hangup_default.png b/res/drawable-land-xhdpi/hangup_default.png
deleted file mode 100644
index e7f49a1c6..000000000
Binary files a/res/drawable-land-xhdpi/hangup_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/hangup_over.png b/res/drawable-land-xhdpi/hangup_over.png
deleted file mode 100644
index ffc1fb469..000000000
Binary files a/res/drawable-land-xhdpi/hangup_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_off_default.png b/res/drawable-land-xhdpi/micro_off_default.png
deleted file mode 100644
index 297071951..000000000
Binary files a/res/drawable-land-xhdpi/micro_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_off_disabled.png b/res/drawable-land-xhdpi/micro_off_disabled.png
deleted file mode 100644
index ef133210a..000000000
Binary files a/res/drawable-land-xhdpi/micro_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_off_over.png b/res/drawable-land-xhdpi/micro_off_over.png
deleted file mode 100644
index 772d734fb..000000000
Binary files a/res/drawable-land-xhdpi/micro_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_on_default.png b/res/drawable-land-xhdpi/micro_on_default.png
deleted file mode 100644
index 0f8be95ea..000000000
Binary files a/res/drawable-land-xhdpi/micro_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_on_disabled.png b/res/drawable-land-xhdpi/micro_on_disabled.png
deleted file mode 100644
index 9165841a8..000000000
Binary files a/res/drawable-land-xhdpi/micro_on_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/micro_on_over.png b/res/drawable-land-xhdpi/micro_on_over.png
deleted file mode 100644
index 8afa26cee..000000000
Binary files a/res/drawable-land-xhdpi/micro_on_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_default.png b/res/drawable-land-xhdpi/options_add_default.png
deleted file mode 100644
index 41606d99d..000000000
Binary files a/res/drawable-land-xhdpi/options_add_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_default_alt.png b/res/drawable-land-xhdpi/options_add_default_alt.png
deleted file mode 100644
index a0cee4151..000000000
Binary files a/res/drawable-land-xhdpi/options_add_default_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_disabled.png b/res/drawable-land-xhdpi/options_add_disabled.png
deleted file mode 100644
index 71b166a62..000000000
Binary files a/res/drawable-land-xhdpi/options_add_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_disabled_alt.png b/res/drawable-land-xhdpi/options_add_disabled_alt.png
deleted file mode 100644
index 8d6dbfb39..000000000
Binary files a/res/drawable-land-xhdpi/options_add_disabled_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_over.png b/res/drawable-land-xhdpi/options_add_over.png
deleted file mode 100644
index e97312e51..000000000
Binary files a/res/drawable-land-xhdpi/options_add_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_add_over_alt.png b/res/drawable-land-xhdpi/options_add_over_alt.png
deleted file mode 100644
index 74338a55c..000000000
Binary files a/res/drawable-land-xhdpi/options_add_over_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_default.png b/res/drawable-land-xhdpi/options_default.png
deleted file mode 100644
index e835f0829..000000000
Binary files a/res/drawable-land-xhdpi/options_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_default_alt.png b/res/drawable-land-xhdpi/options_default_alt.png
deleted file mode 100644
index 251d184e7..000000000
Binary files a/res/drawable-land-xhdpi/options_default_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_disabled.png b/res/drawable-land-xhdpi/options_disabled.png
deleted file mode 100644
index 25bee610a..000000000
Binary files a/res/drawable-land-xhdpi/options_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_disabled_alt.png b/res/drawable-land-xhdpi/options_disabled_alt.png
deleted file mode 100644
index c63a4cddd..000000000
Binary files a/res/drawable-land-xhdpi/options_disabled_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_over.png b/res/drawable-land-xhdpi/options_over.png
deleted file mode 100644
index dc2bb8404..000000000
Binary files a/res/drawable-land-xhdpi/options_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_over_alt.png b/res/drawable-land-xhdpi/options_over_alt.png
deleted file mode 100644
index 487b47905..000000000
Binary files a/res/drawable-land-xhdpi/options_over_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_selected.png b/res/drawable-land-xhdpi/options_selected.png
deleted file mode 100644
index 4de39f880..000000000
Binary files a/res/drawable-land-xhdpi/options_selected.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_selected_alt.png b/res/drawable-land-xhdpi/options_selected_alt.png
deleted file mode 100644
index e03a70dc3..000000000
Binary files a/res/drawable-land-xhdpi/options_selected_alt.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_transfer_default.png b/res/drawable-land-xhdpi/options_transfer_default.png
deleted file mode 100644
index b42022c4f..000000000
Binary files a/res/drawable-land-xhdpi/options_transfer_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_transfer_disabled.png b/res/drawable-land-xhdpi/options_transfer_disabled.png
deleted file mode 100644
index 31462adc6..000000000
Binary files a/res/drawable-land-xhdpi/options_transfer_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/options_transfer_over.png b/res/drawable-land-xhdpi/options_transfer_over.png
deleted file mode 100644
index 6d3ecd1cb..000000000
Binary files a/res/drawable-land-xhdpi/options_transfer_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/pause_off_default.png b/res/drawable-land-xhdpi/pause_off_default.png
deleted file mode 100644
index 4c73470f8..000000000
Binary files a/res/drawable-land-xhdpi/pause_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/pause_off_disabled.png b/res/drawable-land-xhdpi/pause_off_disabled.png
deleted file mode 100644
index 11b619fb3..000000000
Binary files a/res/drawable-land-xhdpi/pause_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/pause_off_over.png b/res/drawable-land-xhdpi/pause_off_over.png
deleted file mode 100644
index 66545c2d4..000000000
Binary files a/res/drawable-land-xhdpi/pause_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/pause_on_default.png b/res/drawable-land-xhdpi/pause_on_default.png
deleted file mode 100644
index 58c98a583..000000000
Binary files a/res/drawable-land-xhdpi/pause_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/pause_on_over.png b/res/drawable-land-xhdpi/pause_on_over.png
deleted file mode 100644
index 37b2875db..000000000
Binary files a/res/drawable-land-xhdpi/pause_on_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_default.png b/res/drawable-land-xhdpi/route_bluetooth_off_default.png
deleted file mode 100644
index 84a001275..000000000
Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png b/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png
deleted file mode 100644
index f523bd6c3..000000000
Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_bluetooth_off_over.png b/res/drawable-land-xhdpi/route_bluetooth_off_over.png
deleted file mode 100644
index ebaffea54..000000000
Binary files a/res/drawable-land-xhdpi/route_bluetooth_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_bluetooth_on_default.png b/res/drawable-land-xhdpi/route_bluetooth_on_default.png
deleted file mode 100644
index 9cbdf574d..000000000
Binary files a/res/drawable-land-xhdpi/route_bluetooth_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_phone_off_default.png b/res/drawable-land-xhdpi/route_phone_off_default.png
deleted file mode 100644
index e9b944cc6..000000000
Binary files a/res/drawable-land-xhdpi/route_phone_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_phone_off_disabled.png b/res/drawable-land-xhdpi/route_phone_off_disabled.png
deleted file mode 100644
index 1d58d39c8..000000000
Binary files a/res/drawable-land-xhdpi/route_phone_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_phone_off_over.png b/res/drawable-land-xhdpi/route_phone_off_over.png
deleted file mode 100644
index f9b8f9734..000000000
Binary files a/res/drawable-land-xhdpi/route_phone_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_phone_on_default.png b/res/drawable-land-xhdpi/route_phone_on_default.png
deleted file mode 100644
index b35b9aa64..000000000
Binary files a/res/drawable-land-xhdpi/route_phone_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_speaker_off_default.png b/res/drawable-land-xhdpi/route_speaker_off_default.png
deleted file mode 100644
index d6c7eacde..000000000
Binary files a/res/drawable-land-xhdpi/route_speaker_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_speaker_off_disabled.png b/res/drawable-land-xhdpi/route_speaker_off_disabled.png
deleted file mode 100644
index f750b1610..000000000
Binary files a/res/drawable-land-xhdpi/route_speaker_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_speaker_off_over.png b/res/drawable-land-xhdpi/route_speaker_off_over.png
deleted file mode 100644
index 74bf86fa1..000000000
Binary files a/res/drawable-land-xhdpi/route_speaker_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/route_speaker_on_default.png b/res/drawable-land-xhdpi/route_speaker_on_default.png
deleted file mode 100644
index 293e675e2..000000000
Binary files a/res/drawable-land-xhdpi/route_speaker_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/routes_default.png b/res/drawable-land-xhdpi/routes_default.png
deleted file mode 100644
index cc68859a8..000000000
Binary files a/res/drawable-land-xhdpi/routes_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/routes_disabled.png b/res/drawable-land-xhdpi/routes_disabled.png
deleted file mode 100644
index 437bdcb35..000000000
Binary files a/res/drawable-land-xhdpi/routes_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/routes_over.png b/res/drawable-land-xhdpi/routes_over.png
deleted file mode 100644
index 958cdc28c..000000000
Binary files a/res/drawable-land-xhdpi/routes_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/routes_selected.png b/res/drawable-land-xhdpi/routes_selected.png
deleted file mode 100644
index 54a0aa48c..000000000
Binary files a/res/drawable-land-xhdpi/routes_selected.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_off_default.png b/res/drawable-land-xhdpi/speaker_off_default.png
deleted file mode 100644
index a8c06fa29..000000000
Binary files a/res/drawable-land-xhdpi/speaker_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_off_disabled.png b/res/drawable-land-xhdpi/speaker_off_disabled.png
deleted file mode 100644
index 71e614e16..000000000
Binary files a/res/drawable-land-xhdpi/speaker_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_off_over.png b/res/drawable-land-xhdpi/speaker_off_over.png
deleted file mode 100644
index 66d3c8992..000000000
Binary files a/res/drawable-land-xhdpi/speaker_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_on_default.png b/res/drawable-land-xhdpi/speaker_on_default.png
deleted file mode 100644
index 5f9ffbbb1..000000000
Binary files a/res/drawable-land-xhdpi/speaker_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_on_disabled.png b/res/drawable-land-xhdpi/speaker_on_disabled.png
deleted file mode 100644
index 7a8c6023a..000000000
Binary files a/res/drawable-land-xhdpi/speaker_on_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/speaker_on_over.png b/res/drawable-land-xhdpi/speaker_on_over.png
deleted file mode 100644
index db44d5a07..000000000
Binary files a/res/drawable-land-xhdpi/speaker_on_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/splashscreen.png b/res/drawable-land-xhdpi/splashscreen.png
deleted file mode 100644
index 6ef7aa0c1..000000000
Binary files a/res/drawable-land-xhdpi/splashscreen.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/statebar_background.png b/res/drawable-land-xhdpi/statebar_background.png
deleted file mode 100644
index 26f042d99..000000000
Binary files a/res/drawable-land-xhdpi/statebar_background.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/transfer_default.png b/res/drawable-land-xhdpi/transfer_default.png
deleted file mode 100644
index dc18399b4..000000000
Binary files a/res/drawable-land-xhdpi/transfer_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/transfer_over.png b/res/drawable-land-xhdpi/transfer_over.png
deleted file mode 100644
index 17740ee06..000000000
Binary files a/res/drawable-land-xhdpi/transfer_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_off_default.png b/res/drawable-land-xhdpi/video_off_default.png
deleted file mode 100644
index bdf806f04..000000000
Binary files a/res/drawable-land-xhdpi/video_off_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_off_disabled.png b/res/drawable-land-xhdpi/video_off_disabled.png
deleted file mode 100644
index bba655b46..000000000
Binary files a/res/drawable-land-xhdpi/video_off_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_off_over.png b/res/drawable-land-xhdpi/video_off_over.png
deleted file mode 100644
index f93047c62..000000000
Binary files a/res/drawable-land-xhdpi/video_off_over.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_on_default.png b/res/drawable-land-xhdpi/video_on_default.png
deleted file mode 100644
index 3ca9fabdf..000000000
Binary files a/res/drawable-land-xhdpi/video_on_default.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_on_disabled.png b/res/drawable-land-xhdpi/video_on_disabled.png
deleted file mode 100644
index f122718f0..000000000
Binary files a/res/drawable-land-xhdpi/video_on_disabled.png and /dev/null differ
diff --git a/res/drawable-land-xhdpi/video_on_over.png b/res/drawable-land-xhdpi/video_on_over.png
deleted file mode 100644
index 252f88441..000000000
Binary files a/res/drawable-land-xhdpi/video_on_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png
deleted file mode 100644
index a3ddce2f2..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png
deleted file mode 100644
index 374aacc0b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png b/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png
deleted file mode 100644
index 24fdabed5..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_call_more_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_default.png b/res/drawable-sw533dp-land-xhdpi/add_contact_default.png
deleted file mode 100644
index 82611c172..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png b/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png
deleted file mode 100644
index ff863911b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/add_contact_over.png b/res/drawable-sw533dp-land-xhdpi/add_contact_over.png
deleted file mode 100644
index 4eb38dddd..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/add_contact_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/back_default.png b/res/drawable-sw533dp-land-xhdpi/back_default.png
deleted file mode 100644
index 3dad47eb4..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/back_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/back_disabled.png b/res/drawable-sw533dp-land-xhdpi/back_disabled.png
deleted file mode 100644
index da4d42006..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/back_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/back_over.png b/res/drawable-sw533dp-land-xhdpi/back_over.png
deleted file mode 100644
index 4dea8f4c8..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/back_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/background_alt.png b/res/drawable-sw533dp-land-xhdpi/background_alt.png
deleted file mode 100644
index 3e178844a..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/background_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/background_logo.png b/res/drawable-sw533dp-land-xhdpi/background_logo.png
deleted file mode 100644
index 749d70f30..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/background_logo.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_default.png b/res/drawable-sw533dp-land-xhdpi/backspace_default.png
deleted file mode 100644
index 274330951..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png b/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png
deleted file mode 100644
index 825232600..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/backspace_over.png b/res/drawable-sw533dp-land-xhdpi/backspace_over.png
deleted file mode 100644
index 95e2137e7..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/backspace_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/bottom.png b/res/drawable-sw533dp-land-xhdpi/bottom.png
deleted file mode 100644
index ba712ad0e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/bottom.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/call_default.png b/res/drawable-sw533dp-land-xhdpi/call_default.png
deleted file mode 100644
index bbfa08f38..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/call_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/call_disabled.png b/res/drawable-sw533dp-land-xhdpi/call_disabled.png
deleted file mode 100644
index f178ee9a2..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/call_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/call_over.png b/res/drawable-sw533dp-land-xhdpi/call_over.png
deleted file mode 100644
index f03e156d6..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/call_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png
deleted file mode 100644
index 3dad47eb4..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png
deleted file mode 100644
index da4d42006..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png b/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png
deleted file mode 100644
index 4dea8f4c8..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/cancel_white_bg_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/chat_default.png b/res/drawable-sw533dp-land-xhdpi/chat_default.png
deleted file mode 100644
index 125d518fe..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/chat_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/chat_over.png b/res/drawable-sw533dp-land-xhdpi/chat_over.png
deleted file mode 100644
index d6c952c2c..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/chat_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/chat_selected.png b/res/drawable-sw533dp-land-xhdpi/chat_selected.png
deleted file mode 100644
index 0d37722c1..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/chat_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/conference_default.png b/res/drawable-sw533dp-land-xhdpi/conference_default.png
deleted file mode 100644
index 12f4072e6..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/conference_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/conference_over.png b/res/drawable-sw533dp-land-xhdpi/conference_over.png
deleted file mode 100644
index edc71a961..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/conference_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_default.png b/res/drawable-sw533dp-land-xhdpi/contacts_default.png
deleted file mode 100644
index 4ce5291c5..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_over.png b/res/drawable-sw533dp-land-xhdpi/contacts_over.png
deleted file mode 100644
index eb6f805fa..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/contacts_selected.png b/res/drawable-sw533dp-land-xhdpi/contacts_selected.png
deleted file mode 100644
index cf49531e0..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/contacts_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png b/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png
deleted file mode 100644
index 21bc36a51..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_address_background.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png
deleted file mode 100644
index 969dec7af..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png
deleted file mode 100644
index a2105442f..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_back_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png
deleted file mode 100644
index 335163e0f..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png
deleted file mode 100644
index 24441f3fe..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png
deleted file mode 100644
index 117a8614a..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_alt_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_default.png b/res/drawable-sw533dp-land-xhdpi/dialer_default.png
deleted file mode 100644
index 643d65dd0..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_over.png b/res/drawable-sw533dp-land-xhdpi/dialer_over.png
deleted file mode 100644
index bd369513e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/dialer_selected.png b/res/drawable-sw533dp-land-xhdpi/dialer_selected.png
deleted file mode 100644
index 7bc91e28b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/dialer_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/hangup_default.png b/res/drawable-sw533dp-land-xhdpi/hangup_default.png
deleted file mode 100644
index 0c88f12d7..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/hangup_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/hangup_over.png b/res/drawable-sw533dp-land-xhdpi/hangup_over.png
deleted file mode 100644
index 00fd688b6..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/hangup_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/history_default.png b/res/drawable-sw533dp-land-xhdpi/history_default.png
deleted file mode 100644
index 0d0af3db1..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/history_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/history_over.png b/res/drawable-sw533dp-land-xhdpi/history_over.png
deleted file mode 100644
index e34562050..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/history_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/history_selected.png b/res/drawable-sw533dp-land-xhdpi/history_selected.png
deleted file mode 100644
index 9c2d82238..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/history_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/mark.png b/res/drawable-sw533dp-land-xhdpi/mark.png
deleted file mode 100644
index 668a3fa9c..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/mark.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_default.png b/res/drawable-sw533dp-land-xhdpi/micro_off_default.png
deleted file mode 100644
index 45a5e3686..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png
deleted file mode 100644
index 1a890b399..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_off_over.png b/res/drawable-sw533dp-land-xhdpi/micro_off_over.png
deleted file mode 100644
index 747f22b75..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_off_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_default.png b/res/drawable-sw533dp-land-xhdpi/micro_on_default.png
deleted file mode 100644
index 29cdd5723..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png
deleted file mode 100644
index 9221d6277..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/micro_on_over.png b/res/drawable-sw533dp-land-xhdpi/micro_on_over.png
deleted file mode 100644
index 1f47f646c..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/micro_on_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_default.png b/res/drawable-sw533dp-land-xhdpi/options_add_default.png
deleted file mode 100644
index 67790d85e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png
deleted file mode 100644
index 67790d85e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_default_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png
deleted file mode 100644
index 14b6acd20..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png
deleted file mode 100644
index 14b6acd20..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_disabled_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_over.png b/res/drawable-sw533dp-land-xhdpi/options_add_over.png
deleted file mode 100644
index c914c077b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png b/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png
deleted file mode 100644
index c914c077b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_add_over_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_default.png b/res/drawable-sw533dp-land-xhdpi/options_default.png
deleted file mode 100644
index 77379da0e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_default_alt.png b/res/drawable-sw533dp-land-xhdpi/options_default_alt.png
deleted file mode 100644
index 77379da0e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_default_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_disabled.png
deleted file mode 100644
index c56fae1ca..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png b/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png
deleted file mode 100644
index c56fae1ca..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_disabled_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_over.png b/res/drawable-sw533dp-land-xhdpi/options_over.png
deleted file mode 100644
index b32bd7274..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_over_alt.png b/res/drawable-sw533dp-land-xhdpi/options_over_alt.png
deleted file mode 100644
index b32bd7274..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_over_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_selected.png b/res/drawable-sw533dp-land-xhdpi/options_selected.png
deleted file mode 100644
index 4dde52145..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png b/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png
deleted file mode 100644
index 4dde52145..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_selected_alt.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png
deleted file mode 100644
index d6f917a49..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png
deleted file mode 100644
index 5cc7423ad..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png b/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png
deleted file mode 100644
index 7ba0428d6..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/options_transfer_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_default.png b/res/drawable-sw533dp-land-xhdpi/pause_off_default.png
deleted file mode 100644
index c7d17c130..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png
deleted file mode 100644
index cd7f9c520..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/pause_off_over.png b/res/drawable-sw533dp-land-xhdpi/pause_off_over.png
deleted file mode 100644
index 72cfef5e2..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/pause_off_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/pause_on_default.png b/res/drawable-sw533dp-land-xhdpi/pause_on_default.png
deleted file mode 100644
index 2aba53412..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/pause_on_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/pause_on_over.png b/res/drawable-sw533dp-land-xhdpi/pause_on_over.png
deleted file mode 100644
index 60eb8a551..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/pause_on_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/settings_default.png b/res/drawable-sw533dp-land-xhdpi/settings_default.png
deleted file mode 100644
index 04bdd29e9..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/settings_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/settings_over.png b/res/drawable-sw533dp-land-xhdpi/settings_over.png
deleted file mode 100644
index ca44f4597..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/settings_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/settings_selected.png b/res/drawable-sw533dp-land-xhdpi/settings_selected.png
deleted file mode 100644
index b2b0f50bd..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/settings_selected.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_default.png b/res/drawable-sw533dp-land-xhdpi/setup_back_default.png
deleted file mode 100644
index 24df95c3b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png
deleted file mode 100644
index a3bf99b0a..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_back_over.png b/res/drawable-sw533dp-land-xhdpi/setup_back_over.png
deleted file mode 100644
index b4b2cc8b7..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_back_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png
deleted file mode 100644
index a0557c5e9..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png
deleted file mode 100644
index e72f7b4d5..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png b/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png
deleted file mode 100644
index edf9a2624..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_cancel_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_default.png b/res/drawable-sw533dp-land-xhdpi/setup_start_default.png
deleted file mode 100644
index 8d1af16b9..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png b/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png
deleted file mode 100644
index 20b0b5b73..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/setup_start_over.png b/res/drawable-sw533dp-land-xhdpi/setup_start_over.png
deleted file mode 100644
index fc030704e..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/setup_start_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png
deleted file mode 100644
index 4b611178c..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png
deleted file mode 100644
index ebd857da7..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png b/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png
deleted file mode 100644
index a68c3eb9b..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_off_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png
deleted file mode 100644
index 75a192643..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png
deleted file mode 100644
index d2447d870..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png b/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png
deleted file mode 100644
index 28483bf59..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/speaker_on_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/splashscreen.png b/res/drawable-sw533dp-land-xhdpi/splashscreen.png
deleted file mode 100644
index 6ef7aa0c1..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/splashscreen.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/statebar_background.png b/res/drawable-sw533dp-land-xhdpi/statebar_background.png
deleted file mode 100644
index 3cef78053..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/statebar_background.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/unknown_small.png b/res/drawable-sw533dp-land-xhdpi/unknown_small.png
deleted file mode 100644
index b4f451da6..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/unknown_small.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_default.png b/res/drawable-sw533dp-land-xhdpi/video_off_default.png
deleted file mode 100644
index c479bf714..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png b/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png
deleted file mode 100644
index 036ec556d..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_off_over.png b/res/drawable-sw533dp-land-xhdpi/video_off_over.png
deleted file mode 100644
index 292042214..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_off_over.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_default.png b/res/drawable-sw533dp-land-xhdpi/video_on_default.png
deleted file mode 100644
index fa3976e72..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_default.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png b/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png
deleted file mode 100644
index 52a3515d3..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_disabled.png and /dev/null differ
diff --git a/res/drawable-sw533dp-land-xhdpi/video_on_over.png b/res/drawable-sw533dp-land-xhdpi/video_on_over.png
deleted file mode 100644
index 23abeffa5..000000000
Binary files a/res/drawable-sw533dp-land-xhdpi/video_on_over.png and /dev/null differ
diff --git a/res/drawable/contacts.xml b/res/drawable/contacts.xml
deleted file mode 100644
index 52818fa7d..000000000
--- a/res/drawable/contacts.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/contacts_over" />
-    <item android:state_selected="true"
-        android:drawable="@drawable/contacts_selected" />
-    <item
-         android:drawable="@drawable/contacts_default" />
-</selector>
diff --git a/res/layout/assistant.xml b/res/layout/assistant.xml
index 81b973b41..c396fb848 100644
--- a/res/layout/assistant.xml
+++ b/res/layout/assistant.xml
@@ -1,31 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:background="@color/colorH"
 	android:layout_width="match_parent"
-  	android:background="@color/colorH"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
+	<include layout="@layout/assistant_topbar" android:id="@+id/topbar" />
 
 	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:id="@+id/fragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="20dp"
+		android:orientation="horizontal" />
 
-		<fragment
-			android:id="@+id/status"
-			android:name="org.linphone.StatusFragment"
-			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			tools:layout="@layout/status" />
-
-		<include layout="@layout/assistant_toolbar" android:id="@+id/toolbar" />
-
-		<LinearLayout
-			android:id="@+id/fragmentContainer"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:padding="20dp"
-			android:orientation="horizontal" />
-
-	</LinearLayout>
- 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index a112b70f4..edc650767 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -6,13 +6,13 @@
 
 	<TextView
 		android:text="@string/assistant_create_account_title"
-		android:contentDescription="@string/content_description_welcome"
 		style="@style/font6"
 		android:textAllCaps="true"
+		android:contentDescription="@string/content_description_welcome"
 		android:paddingTop="20dp"
-		android:layout_gravity="center"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_gravity="center"
 		android:gravity="center_horizontal"/>
 
 	<TextView
@@ -21,15 +21,15 @@
 		android:layout_gravity="center"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"/>
-    
-   	<TextView
+
+	<TextView
 		android:id="@+id/assistant_error"
 		android:textColor="@color/colorI"
-	    android:paddingTop="10dp"
-	    android:gravity="center"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content" />
-    
+		android:paddingTop="10dp"
+		android:gravity="center"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
+
     <LinearLayout 
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
@@ -42,7 +42,6 @@
 			android:text="@string/username"
 			style="@style/font13"
 			android:textAllCaps="true"
-			android:paddingTop="10dp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
@@ -119,25 +118,17 @@
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
 			android:singleLine="true"/>
-        
-        <RelativeLayout
-            android:layout_marginTop="20dp"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content">
 
-			<Button
-				android:id="@+id/assistant_create"
-				android:text="@string/assistant_create"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/content_description_validate"
-				android:layout_width="wrap_content"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:layout_height="wrap_content"
-				android:layout_centerVertical="true"/>
-        
-        </RelativeLayout>
+		<Button
+			android:id="@+id/assistant_create"
+			android:text="@string/assistant_create"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/content_description_validate"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="15dp"
+			android:layout_centerVertical="true"/>
 
 	</LinearLayout>
 
diff --git a/res/layout/assistant_account_creation_confirm.xml b/res/layout/assistant_account_creation_activation.xml
similarity index 57%
rename from res/layout/assistant_account_creation_confirm.xml
rename to res/layout/assistant_account_creation_activation.xml
index 63c458a61..9e2b4a211 100644
--- a/res/layout/assistant_account_creation_confirm.xml
+++ b/res/layout/assistant_account_creation_activation.xml
@@ -22,24 +22,19 @@
 		android:layout_gravity="center"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"/>
-    
-    <RelativeLayout
-    	android:layout_marginTop="20dp"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content">
 
-		<Button
-			android:id="@+id/assistant_check"
-			android:text="@string/assistant_create"
-			android:background="@drawable/assistant_button"
-			style="@style/font8"
-			android:contentDescription="@string/content_description_validate"
-			android:layout_width="wrap_content"
-			android:paddingLeft="10dp"
-			android:paddingRight="10dp"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"/>
-       
-       </RelativeLayout>
+
+	<Button
+		android:id="@+id/assistant_check"
+		android:text="@string/assistant_create"
+		android:background="@drawable/assistant_button"
+		style="@style/font8"
+		android:contentDescription="@string/content_description_validate"
+		android:layout_width="wrap_content"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		android:layout_marginTop="20dp"
+		android:layout_height="wrap_content"
+		android:layout_centerVertical="true"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index ecbd8ef89..bbe5d2c3b 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -19,7 +19,6 @@
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
 		android:orientation="vertical"
-	    android:paddingTop="20dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
 	    android:gravity="center">
@@ -83,25 +82,20 @@
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
 			android:singleLine="true"/>
-        
-        <RelativeLayout
-            android:layout_marginTop="20dp"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content">
 
-			<Button
-				android:id="@+id/assistant_apply"
-				android:text="@string/assistant_apply"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/content_description_validate"
-				android:layout_width="wrap_content"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:layout_centerInParent="true"
-				android:layout_height="wrap_content"
-				android:layout_centerVertical="true"/>
+		<Button
+			android:id="@+id/assistant_apply"
+			android:text="@string/assistant_apply"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/content_description_validate"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
 
-        </RelativeLayout>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_generic_login.xml b/res/layout/assistant_login.xml
similarity index 83%
rename from res/layout/assistant_generic_login.xml
rename to res/layout/assistant_login.xml
index d732c66a1..ed1283cb1 100644
--- a/res/layout/assistant_generic_login.xml
+++ b/res/layout/assistant_login.xml
@@ -18,7 +18,6 @@
     <LinearLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:paddingTop="20dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
 	    android:gravity="center"
@@ -106,25 +105,21 @@
 			android:paddingRight="10dp"
 			android:singleLine="true"/>
 
-		<RelativeLayout
+
+
+		<Button
+			android:id="@+id/assistant_apply"
+			android:text="@string/assistant_apply"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/content_description_validate"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
 			android:layout_marginTop="20dp"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
 
-			<Button
-				android:id="@+id/assistant_apply"
-				android:text="@string/assistant_apply"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/content_description_validate"
-				android:layout_width="wrap_content"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:layout_centerInParent="true"
-				android:layout_height="wrap_content"
-				android:layout_centerVertical="true"/>
-
-		</RelativeLayout>
 	</LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_menu.xml b/res/layout/assistant_menu.xml
deleted file mode 100644
index 35bd183a0..000000000
--- a/res/layout/assistant_menu.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    
-    <TextView
-		android:text="@string/assistant_welcome"
-		style="@style/font6"
-		android:textAllCaps="true"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-	    android:paddingTop="20dp"
-		android:layout_gravity="center"/>
-    
-    <LinearLayout 
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-		android:orientation="vertical"
-	    android:gravity="center"
-		android:layout_margin="20dp"
-		android:layout_gravity="center">
-
-        <RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-            android:padding="10dp">
-
-			<Button
-				android:id="@+id/create_account"
-				android:text="@string/assistant_create_account"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/assistant_create_account"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-            android:padding="10dp">
-
-			<Button
-				android:id="@+id/login_linphone"
-				android:text="@string/assistant_login_linphone"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/assistant_login_linphone"
-				android:layout_centerInParent="true"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
-
-        </RelativeLayout>
-        
-        <RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-            android:padding="10dp">
-
-			<Button
-				android:id="@+id/login_generic"
-				android:text="@string/assistant_login_generic"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/assistant_login_generic"
-				android:layout_centerInParent="true"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
-        
-        </RelativeLayout>
-        
-        <RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-            android:padding="10dp">
-
-			<Button
-				android:id="@+id/remote_provisioning"
-				android:text="@string/assistant_remote_provisioning"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/assistant_remote_provisioning"
-				android:layout_centerInParent="true"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
-        
-        </RelativeLayout>
-
-	</LinearLayout>
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_remote_provisioning.xml b/res/layout/assistant_remote_provisioning.xml
index 5fe507b2d..460697bde 100644
--- a/res/layout/assistant_remote_provisioning.xml
+++ b/res/layout/assistant_remote_provisioning.xml
@@ -18,7 +18,6 @@
     <LinearLayout 
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    android:paddingTop="20dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
 	    android:gravity="center"
@@ -44,25 +43,19 @@
 			android:paddingRight="10dp"
 			android:singleLine="true"/>
 
-		<RelativeLayout
+		<Button
+			android:id="@+id/assistant_apply"
+			android:text="@string/assistant_apply"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/content_description_validate"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
 			android:layout_marginTop="20dp"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<Button
-				android:id="@+id/assistant_apply"
-				android:text="@string/assistant_apply"
-				android:background="@drawable/assistant_button"
-				style="@style/font8"
-				android:contentDescription="@string/content_description_validate"
-				android:layout_width="wrap_content"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:layout_centerInParent="true"
-				android:layout_height="wrap_content"
-				android:layout_centerVertical="true"/>
-
-		</RelativeLayout>
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
 	</LinearLayout>
     
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_toolbar.xml b/res/layout/assistant_toolbar.xml
deleted file mode 100644
index 1e39f4933..000000000
--- a/res/layout/assistant_toolbar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/toolbar"
-	android:background="@color/colorF"
-	android:layout_width="match_parent"
-	android:layout_height="70dp">
-
-	<RelativeLayout
-		android:id="@+id/assistant_back"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:layout_alignParentLeft="true">
-
-		<ImageView
-			android:src="@drawable/back"
-			android:contentDescription="@string/content_description_back"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="10dp"
-			android:layout_centerInParent="true"/>
-	</RelativeLayout>
-
-	<TextView
-		android:id="@+id/toolbar_text"
-		android:text="@string/assistant_title"
-		style="@style/font1"
-		android:layout_centerInParent="true"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:gravity="center_vertical"/>
-
-	<RelativeLayout
-		android:id="@+id/assistant_cancel"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:layout_alignParentRight="true">
-
-		<ImageView
-			android:src="@drawable/dialer_back"
-			android:contentDescription="@string/content_description_dialer"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="10dp"
-			android:layout_centerInParent="true"/>
-	</RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_topbar.xml b/res/layout/assistant_topbar.xml
new file mode 100644
index 000000000..d2c73418c
--- /dev/null
+++ b/res/layout/assistant_topbar.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/topbar"
+	android:background="@color/colorF"
+	android:layout_width="match_parent"
+	android:layout_height="70dp">
+
+	<ImageView
+		android:id="@+id/back"
+		android:src="@drawable/back"
+		android:contentDescription="@string/content_description_back"
+		android:layout_width="30dp"
+		android:layout_height="match_parent"
+		android:layout_margin="20dp"
+		android:layout_alignParentLeft="true"
+		android:layout_centerInParent="true"/>
+
+	<TextView
+		android:text="@string/assistant_title"
+		style="@style/font1"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_centerInParent="true"
+		android:gravity="center_vertical"/>
+
+	<ImageView
+		android:id="@+id/cancel"
+		android:src="@drawable/dialer_back"
+		android:contentDescription="@string/content_description_dialer"
+		android:layout_width="30dp"
+		android:layout_height="match_parent"
+		android:layout_margin="20dp"
+		android:layout_centerInParent="true"
+		android:layout_alignParentRight="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_welcome.xml b/res/layout/assistant_welcome.xml
new file mode 100644
index 000000000..a78fbb332
--- /dev/null
+++ b/res/layout/assistant_welcome.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    
+    <TextView
+		android:text="@string/assistant_welcome"
+		style="@style/font6"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+	    android:paddingTop="20dp"
+		android:layout_gravity="center"/>
+    
+    <LinearLayout 
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+		android:orientation="vertical"
+	    android:gravity="center"
+		android:layout_margin="20dp"
+		android:layout_gravity="center">
+
+		<Button
+			android:id="@+id/create_account"
+			android:text="@string/assistant_create_account"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/assistant_create_account"
+			android:layout_marginTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerInParent="true"/>
+
+
+		<Button
+			android:id="@+id/login_linphone"
+			android:text="@string/assistant_login_linphone"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/assistant_login_linphone"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"/>
+
+		<Button
+			android:id="@+id/login_generic"
+			android:text="@string/assistant_login_generic"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/assistant_login_generic"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"/>
+
+		<Button
+			android:id="@+id/remote_provisioning"
+			android:text="@string/assistant_remote_provisioning"
+			android:background="@drawable/assistant_button"
+			style="@style/font8"
+			android:contentDescription="@string/assistant_remote_provisioning"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"/>
+
+	</LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conference.xml b/res/layout/conference.xml
deleted file mode 100644
index 8a0db70c0..000000000
--- a/res/layout/conference.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/top_layout"
-	android:background="@color/colorH" >
-
-	<LinearLayout
-		android:id="@+id/conferenceHeader"
-		android:layout_width="match_parent"
-		android:layout_height="75dp"
-		android:orientation="horizontal"
-		android:gravity="center_vertical"
-		android:background="@color/colorF">
-
-		<TextView
-			android:layout_width="0dip"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:gravity="center_vertical|left"
-			android:paddingLeft="20dp"
-			android:paddingRight="10dp"
-			android:textStyle="bold"
-			android:textColor="@color/text_header"
-			android:text="@string/conference"
-			android:textSize="26dp" />
-
-		<ImageView
-			android:contentDescription="@string/content_description_pause"
-			android:id="@+id/conferenceStatus"
-			android:layout_width="30dp"
-			android:layout_height="30dp"
-			android:scaleType="fitCenter"
-			android:adjustViewBounds="true"
-			android:src="@drawable/pause" />
-
-		<Chronometer
-			android:visibility="invisible"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingLeft="10dp"
-			android:paddingRight="20dp"
-			android:gravity="center_vertical|right"
-			android:textColor="@android:color/white"
-			android:textSize="22dp" />
-		</LinearLayout>
-
-	<TableLayout
-		android:id="@+id/calls"
-		android:layout_below="@id/conferenceHeader"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/launcher.xml b/res/layout/launch_screen.xml
similarity index 71%
rename from res/layout/launcher.xml
rename to res/layout/launch_screen.xml
index e7de99d5f..f946c5c53 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launch_screen.xml
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorC"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@color/colorC">
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_gravity="center">
+		android:layout_gravity="center"
+		android:orientation="vertical">
 
 		<ImageView
+			android:src="@drawable/splashscreen"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:src="@drawable/splashscreen"/>
+			android:layout_height="wrap_content"/>
 
 		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="10dp"
-			android:textSize="50sp"
-			android:textAllCaps="true"
-			android:textColor="@color/colorH"
 			android:text="@string/app_name"
+			style="@style/font21"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="20dp"
 			android:layout_gravity="center"/>
 
 		<TextView
+			android:text="@string/app_description"
+			android:textSize="28sp"
+			android:textColor="@color/colorA"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textSize="30sp"
-			android:textColor="@color/colorA"
-			android:text="@string/app_description"
 			android:layout_gravity="center"/>
 
-		</LinearLayout>
+	</LinearLayout>
 
     <ProgressBar 
         android:layout_height="wrap_content" 
@@ -41,10 +39,10 @@
 		android:layout_marginBottom="20dp"
         android:layout_gravity="center_horizontal|bottom" />
 
-	<ImageView
+	<View
+		android:background="@color/colorA"
 		android:layout_height="10dp"
 		android:layout_width="100dp"
-		android:background="@color/colorA"
 		android:layout_gravity="center_horizontal|bottom" />
-    
+
 </FrameLayout>
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java
index 0bb5a5848..378ee9372 100644
--- a/src/org/linphone/LinphoneLauncherActivity.java
+++ b/src/org/linphone/LinphoneLauncherActivity.java
@@ -55,7 +55,7 @@ public class LinphoneLauncherActivity extends Activity {
         } else {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
-		setContentView(R.layout.launcher);
+		setContentView(R.layout.launch_screen);
         
 		mHandler = new Handler();
 		
@@ -99,7 +99,6 @@ public class LinphoneLauncherActivity extends Activity {
 					throw new RuntimeException("waiting thread sleep() has been interrupted");
 				}
 			}
-
 			mHandler.post(new Runnable() {
 				@Override
 				public void run() {
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 05b1ec7ae..6cf2893d4 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -42,6 +42,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 /**
@@ -49,7 +50,7 @@ import android.widget.Toast;
  */
 public class AssistantActivity extends Activity implements OnClickListener {
 	private static AssistantActivity instance;
-	private RelativeLayout back, cancel;
+	private ImageView back, cancel;
 	private AssistantFragmentsEnum currentFragment;
 	private AssistantFragmentsEnum firstFragment;
 	private Fragment fragment;
@@ -134,9 +135,9 @@ public class AssistantActivity extends Activity implements OnClickListener {
 	}
 
 	private void initUI() {
-		back = (RelativeLayout) findViewById(R.id.assistant_back);
+		back = (ImageView) findViewById(R.id.back);
 		back.setOnClickListener(this);
-		cancel = (RelativeLayout) findViewById(R.id.assistant_cancel);
+		cancel = (ImageView) findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
 		status.enableLeftMenu(false);
 	}
@@ -151,7 +152,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
 	public void onClick(View v) {
 		int id = v.getId();
 		
-		if (id == R.id.assistant_cancel) {
+		if (id == R.id.cancel) {
 			LinphonePreferences.instance().firstLaunchSuccessful();
 			if (getResources().getBoolean(R.bool.setup_cancel_move_to_back)) {
 				moveTaskToBack(true);
@@ -159,7 +160,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
 				setResult(Activity.RESULT_CANCELED);
 				finish();
 			}
-		} else if (id == R.id.assistant_back) {
+		} else if (id == R.id.back) {
 			onBackPressed();
 		}
 	}
@@ -178,7 +179,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
 				|| currentFragment == AssistantFragmentsEnum.LINPHONE_LOGIN
 				|| currentFragment == AssistantFragmentsEnum.CREATE_ACCOUNT
 				|| currentFragment == AssistantFragmentsEnum.REMOTE_PROVISIONING) {
-			MenuFragment fragment = new MenuFragment();
+			WelcomeFragment fragment = new WelcomeFragment();
 			changeFragment(fragment);
 			currentFragment = AssistantFragmentsEnum.MENU;
 			back.setVisibility(View.GONE);
@@ -245,14 +246,14 @@ public class AssistantActivity extends Activity implements OnClickListener {
 	}
 
 	public void displayMenu() {
-		fragment = new MenuFragment();
+		fragment = new WelcomeFragment();
 		changeFragment(fragment);
 		currentFragment = AssistantFragmentsEnum.MENU;
 		back.setVisibility(View.GONE);
 	}
 
 	public void displayLoginGeneric() {
-		fragment = new GenericLoginFragment();
+		fragment = new LoginFragment();
 		changeFragment(fragment);
 		currentFragment = AssistantFragmentsEnum.GENERIC_LOGIN;
 		back.setVisibility(View.VISIBLE);
@@ -368,7 +369,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
 	}
 
 	public void displayWizardConfirm(String username) {
-		CreateAccountConfirmFragment fragment = new CreateAccountConfirmFragment();
+		CreateAccountActivationFragment fragment = new CreateAccountActivationFragment();
 		
 		Bundle extras = new Bundle();
 		extras.putString("Username", username);
diff --git a/src/org/linphone/assistant/CreateAccountConfirmFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java
similarity index 97%
rename from src/org/linphone/assistant/CreateAccountConfirmFragment.java
rename to src/org/linphone/assistant/CreateAccountActivationFragment.java
index 0696e6e35..9ff6d3295 100644
--- a/src/org/linphone/assistant/CreateAccountConfirmFragment.java
+++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java
@@ -37,14 +37,14 @@ import de.timroes.axmlrpc.XMLRPCServerException;
 /**
  * @author Sylvain Berfini
  */
-public class CreateAccountConfirmFragment extends Fragment {
+public class CreateAccountActivationFragment extends Fragment {
 	private String username;
 	private Handler mHandler = new Handler();
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.assistant_account_creation_confirm, container, false);
+		View view = inflater.inflate(R.layout.assistant_account_creation_activation, container, false);
 		
 		username = getArguments().getString("Username");
 		
diff --git a/src/org/linphone/assistant/GenericLoginFragment.java b/src/org/linphone/assistant/LoginFragment.java
similarity index 93%
rename from src/org/linphone/assistant/GenericLoginFragment.java
rename to src/org/linphone/assistant/LoginFragment.java
index b864d39a8..d8b24f030 100644
--- a/src/org/linphone/assistant/GenericLoginFragment.java
+++ b/src/org/linphone/assistant/LoginFragment.java
@@ -31,14 +31,14 @@ import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
-public class GenericLoginFragment extends Fragment implements OnClickListener {
+public class LoginFragment extends Fragment implements OnClickListener {
 	private EditText login, password, displayName, domain;
 	private Button apply;
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.assistant_generic_login, container, false);
+		View view = inflater.inflate(R.layout.assistant_login, container, false);
 		
 		login = (EditText) view.findViewById(R.id.assistant_username);
 		password = (EditText) view.findViewById(R.id.assistant_password);
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index 8a1e44e43..f0448a5dd 100644
--- a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 /**
@@ -39,7 +40,7 @@ import android.widget.RelativeLayout;
  */
 public class RemoteProvisioningLoginActivity extends Activity implements OnClickListener {
 	private EditText login, password, domain;
-	private RelativeLayout  cancel;
+	private ImageView  cancel;
 	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -50,7 +51,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
 		password = (EditText) findViewById(R.id.setup_password);
 		domain = (EditText) findViewById(R.id.setup_domain);
 
-		cancel = (RelativeLayout) findViewById(R.id.assistant_cancel);
+		cancel = (ImageView) findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
 		
 		String defaultDomain = getIntent().getStringExtra("Domain");
@@ -94,7 +95,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
 	public void onClick(View v) {
 		int id = v.getId();
 		
-		if (id == R.id.assistant_cancel) {
+		if (id == R.id.cancel) {
 			cancelWizard(false);
 		}
 	}
diff --git a/src/org/linphone/assistant/MenuFragment.java b/src/org/linphone/assistant/WelcomeFragment.java
similarity index 94%
rename from src/org/linphone/assistant/MenuFragment.java
rename to src/org/linphone/assistant/WelcomeFragment.java
index 704ef7bf4..9761ac242 100644
--- a/src/org/linphone/assistant/MenuFragment.java
+++ b/src/org/linphone/assistant/WelcomeFragment.java
@@ -30,13 +30,13 @@ import android.widget.Button;
 /**
  * @author Sylvain Berfini
  */
-public class MenuFragment extends Fragment implements OnClickListener {
+public class WelcomeFragment extends Fragment implements OnClickListener {
 	private Button createAccount, logLinphoneAccount, logGenericAccount, remoteProvisioning;
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.assistant_menu, container, false);
+		View view = inflater.inflate(R.layout.assistant_welcome, container, false);
 		
 		createAccount = (Button) view.findViewById(R.id.create_account);
 		createAccount.setOnClickListener(this);