diff --git a/res/drawable-sw600dp-xhdpi/add_call_more_default.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_call_more_default.png
rename to res/drawable-sw600dp-land-xhdpi/add_call_more_default.png
diff --git a/res/drawable-sw600dp-xhdpi/add_call_more_disabled.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_call_more_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/add_call_more_over.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_call_more_over.png
rename to res/drawable-sw600dp-land-xhdpi/add_call_more_over.png
diff --git a/res/drawable-sw600dp-xhdpi/add_contact_default.png b/res/drawable-sw600dp-land-xhdpi/add_contact_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_contact_default.png
rename to res/drawable-sw600dp-land-xhdpi/add_contact_default.png
diff --git a/res/drawable-sw600dp-xhdpi/add_contact_disabled.png b/res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_contact_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/add_contact_over.png b/res/drawable-sw600dp-land-xhdpi/add_contact_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/add_contact_over.png
rename to res/drawable-sw600dp-land-xhdpi/add_contact_over.png
diff --git a/res/drawable-sw600dp-xhdpi/back_default.png b/res/drawable-sw600dp-land-xhdpi/back_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/back_default.png
rename to res/drawable-sw600dp-land-xhdpi/back_default.png
diff --git a/res/drawable-sw600dp-xhdpi/back_disabled.png b/res/drawable-sw600dp-land-xhdpi/back_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/back_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/back_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/back_over.png b/res/drawable-sw600dp-land-xhdpi/back_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/back_over.png
rename to res/drawable-sw600dp-land-xhdpi/back_over.png
diff --git a/res/drawable-sw600dp-xhdpi/background_alt.png b/res/drawable-sw600dp-land-xhdpi/background_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/background_alt.png
rename to res/drawable-sw600dp-land-xhdpi/background_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/background_logo.png b/res/drawable-sw600dp-land-xhdpi/background_logo.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/background_logo.png
rename to res/drawable-sw600dp-land-xhdpi/background_logo.png
diff --git a/res/drawable-sw600dp-xhdpi/backspace_default.png b/res/drawable-sw600dp-land-xhdpi/backspace_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/backspace_default.png
rename to res/drawable-sw600dp-land-xhdpi/backspace_default.png
diff --git a/res/drawable-sw600dp-xhdpi/backspace_disabled.png b/res/drawable-sw600dp-land-xhdpi/backspace_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/backspace_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/backspace_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/backspace_over.png b/res/drawable-sw600dp-land-xhdpi/backspace_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/backspace_over.png
rename to res/drawable-sw600dp-land-xhdpi/backspace_over.png
diff --git a/res/drawable-sw600dp-xhdpi/bottom.png b/res/drawable-sw600dp-land-xhdpi/bottom.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/bottom.png
rename to res/drawable-sw600dp-land-xhdpi/bottom.png
diff --git a/res/drawable-sw600dp-xhdpi/call_default.png b/res/drawable-sw600dp-land-xhdpi/call_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/call_default.png
rename to res/drawable-sw600dp-land-xhdpi/call_default.png
diff --git a/res/drawable-sw600dp-xhdpi/call_disabled.png b/res/drawable-sw600dp-land-xhdpi/call_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/call_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/call_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/call_over.png b/res/drawable-sw600dp-land-xhdpi/call_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/call_over.png
rename to res/drawable-sw600dp-land-xhdpi/call_over.png
diff --git a/res/drawable-sw600dp-xhdpi/cancel_white_bg_default.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/cancel_white_bg_default.png
rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png
diff --git a/res/drawable-sw600dp-xhdpi/cancel_white_bg_disabled.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/cancel_white_bg_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/cancel_white_bg_over.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/cancel_white_bg_over.png
rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png
diff --git a/res/drawable-sw600dp-xhdpi/chat_default.png b/res/drawable-sw600dp-land-xhdpi/chat_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/chat_default.png
rename to res/drawable-sw600dp-land-xhdpi/chat_default.png
diff --git a/res/drawable-sw600dp-xhdpi/chat_over.png b/res/drawable-sw600dp-land-xhdpi/chat_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/chat_over.png
rename to res/drawable-sw600dp-land-xhdpi/chat_over.png
diff --git a/res/drawable-sw600dp-xhdpi/chat_selected.png b/res/drawable-sw600dp-land-xhdpi/chat_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/chat_selected.png
rename to res/drawable-sw600dp-land-xhdpi/chat_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/conference_default.png b/res/drawable-sw600dp-land-xhdpi/conference_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/conference_default.png
rename to res/drawable-sw600dp-land-xhdpi/conference_default.png
diff --git a/res/drawable-sw600dp-xhdpi/conference_over.png b/res/drawable-sw600dp-land-xhdpi/conference_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/conference_over.png
rename to res/drawable-sw600dp-land-xhdpi/conference_over.png
diff --git a/res/drawable-sw600dp-xhdpi/contacts_default.png b/res/drawable-sw600dp-land-xhdpi/contacts_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/contacts_default.png
rename to res/drawable-sw600dp-land-xhdpi/contacts_default.png
diff --git a/res/drawable-sw600dp-xhdpi/contacts_over.png b/res/drawable-sw600dp-land-xhdpi/contacts_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/contacts_over.png
rename to res/drawable-sw600dp-land-xhdpi/contacts_over.png
diff --git a/res/drawable-sw600dp-xhdpi/contacts_selected.png b/res/drawable-sw600dp-land-xhdpi/contacts_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/contacts_selected.png
rename to res/drawable-sw600dp-land-xhdpi/contacts_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_address_background.png b/res/drawable-sw600dp-land-xhdpi/dialer_address_background.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_address_background.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_address_background.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_alt_back_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_alt_back_default.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_alt_back_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_alt_back_over.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_alt_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_alt_default.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_alt_disabled.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_alt_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_alt_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_alt_over.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_default.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_default.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_over.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_over.png
diff --git a/res/drawable-sw600dp-xhdpi/dialer_selected.png b/res/drawable-sw600dp-land-xhdpi/dialer_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/dialer_selected.png
rename to res/drawable-sw600dp-land-xhdpi/dialer_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/hangup_default.png b/res/drawable-sw600dp-land-xhdpi/hangup_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/hangup_default.png
rename to res/drawable-sw600dp-land-xhdpi/hangup_default.png
diff --git a/res/drawable-sw600dp-xhdpi/hangup_over.png b/res/drawable-sw600dp-land-xhdpi/hangup_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/hangup_over.png
rename to res/drawable-sw600dp-land-xhdpi/hangup_over.png
diff --git a/res/drawable-sw600dp-xhdpi/history_default.png b/res/drawable-sw600dp-land-xhdpi/history_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/history_default.png
rename to res/drawable-sw600dp-land-xhdpi/history_default.png
diff --git a/res/drawable-sw600dp-xhdpi/history_over.png b/res/drawable-sw600dp-land-xhdpi/history_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/history_over.png
rename to res/drawable-sw600dp-land-xhdpi/history_over.png
diff --git a/res/drawable-sw600dp-xhdpi/history_selected.png b/res/drawable-sw600dp-land-xhdpi/history_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/history_selected.png
rename to res/drawable-sw600dp-land-xhdpi/history_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/mark.png b/res/drawable-sw600dp-land-xhdpi/mark.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/mark.png
rename to res/drawable-sw600dp-land-xhdpi/mark.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_off_default.png b/res/drawable-sw600dp-land-xhdpi/micro_off_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_off_default.png
rename to res/drawable-sw600dp-land-xhdpi/micro_off_default.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_off_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_off_over.png b/res/drawable-sw600dp-land-xhdpi/micro_off_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_off_over.png
rename to res/drawable-sw600dp-land-xhdpi/micro_off_over.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_on_default.png b/res/drawable-sw600dp-land-xhdpi/micro_on_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_on_default.png
rename to res/drawable-sw600dp-land-xhdpi/micro_on_default.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_on_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/micro_on_over.png b/res/drawable-sw600dp-land-xhdpi/micro_on_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/micro_on_over.png
rename to res/drawable-sw600dp-land-xhdpi/micro_on_over.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_default.png b/res/drawable-sw600dp-land-xhdpi/options_add_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_default.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_default.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_default_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_default_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_add_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_disabled_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_disabled_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_over.png b/res/drawable-sw600dp-land-xhdpi/options_add_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_over.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_over.png
diff --git a/res/drawable-sw600dp-xhdpi/options_add_over_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_add_over_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_default.png b/res/drawable-sw600dp-land-xhdpi/options_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_default.png
rename to res/drawable-sw600dp-land-xhdpi/options_default.png
diff --git a/res/drawable-sw600dp-xhdpi/options_default_alt.png b/res/drawable-sw600dp-land-xhdpi/options_default_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_default_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_default_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/options_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/options_disabled_alt.png b/res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_disabled_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_over.png b/res/drawable-sw600dp-land-xhdpi/options_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_over.png
rename to res/drawable-sw600dp-land-xhdpi/options_over.png
diff --git a/res/drawable-sw600dp-xhdpi/options_over_alt.png b/res/drawable-sw600dp-land-xhdpi/options_over_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_over_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_over_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_selected.png b/res/drawable-sw600dp-land-xhdpi/options_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_selected.png
rename to res/drawable-sw600dp-land-xhdpi/options_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/options_selected_alt.png b/res/drawable-sw600dp-land-xhdpi/options_selected_alt.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_selected_alt.png
rename to res/drawable-sw600dp-land-xhdpi/options_selected_alt.png
diff --git a/res/drawable-sw600dp-xhdpi/options_transfer_default.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_transfer_default.png
rename to res/drawable-sw600dp-land-xhdpi/options_transfer_default.png
diff --git a/res/drawable-sw600dp-xhdpi/options_transfer_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_transfer_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/options_transfer_over.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/options_transfer_over.png
rename to res/drawable-sw600dp-land-xhdpi/options_transfer_over.png
diff --git a/res/drawable-sw600dp-xhdpi/pause_off_default.png b/res/drawable-sw600dp-land-xhdpi/pause_off_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/pause_off_default.png
rename to res/drawable-sw600dp-land-xhdpi/pause_off_default.png
diff --git a/res/drawable-sw600dp-xhdpi/pause_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/pause_off_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/pause_off_over.png b/res/drawable-sw600dp-land-xhdpi/pause_off_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/pause_off_over.png
rename to res/drawable-sw600dp-land-xhdpi/pause_off_over.png
diff --git a/res/drawable-sw600dp-xhdpi/pause_on_default.png b/res/drawable-sw600dp-land-xhdpi/pause_on_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/pause_on_default.png
rename to res/drawable-sw600dp-land-xhdpi/pause_on_default.png
diff --git a/res/drawable-sw600dp-xhdpi/pause_on_over.png b/res/drawable-sw600dp-land-xhdpi/pause_on_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/pause_on_over.png
rename to res/drawable-sw600dp-land-xhdpi/pause_on_over.png
diff --git a/res/drawable-sw600dp-xhdpi/settings_default.png b/res/drawable-sw600dp-land-xhdpi/settings_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/settings_default.png
rename to res/drawable-sw600dp-land-xhdpi/settings_default.png
diff --git a/res/drawable-sw600dp-xhdpi/settings_over.png b/res/drawable-sw600dp-land-xhdpi/settings_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/settings_over.png
rename to res/drawable-sw600dp-land-xhdpi/settings_over.png
diff --git a/res/drawable-sw600dp-xhdpi/settings_selected.png b/res/drawable-sw600dp-land-xhdpi/settings_selected.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/settings_selected.png
rename to res/drawable-sw600dp-land-xhdpi/settings_selected.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_back_default.png b/res/drawable-sw600dp-land-xhdpi/setup_back_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_back_default.png
rename to res/drawable-sw600dp-land-xhdpi/setup_back_default.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_back_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_back_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_back_over.png b/res/drawable-sw600dp-land-xhdpi/setup_back_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_back_over.png
rename to res/drawable-sw600dp-land-xhdpi/setup_back_over.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_cancel_default.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_cancel_default.png
rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_cancel_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_cancel_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_cancel_over.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_cancel_over.png
rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_over.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_start_default.png b/res/drawable-sw600dp-land-xhdpi/setup_start_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_start_default.png
rename to res/drawable-sw600dp-land-xhdpi/setup_start_default.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_start_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_start_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/setup_start_over.png b/res/drawable-sw600dp-land-xhdpi/setup_start_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/setup_start_over.png
rename to res/drawable-sw600dp-land-xhdpi/setup_start_over.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_off_default.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_off_default.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_off_default.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_off_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_off_over.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_off_over.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_off_over.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_on_default.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_on_default.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_on_default.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_on_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/speaker_on_over.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/speaker_on_over.png
rename to res/drawable-sw600dp-land-xhdpi/speaker_on_over.png
diff --git a/res/drawable-sw600dp-xhdpi/splashscreen.png b/res/drawable-sw600dp-land-xhdpi/splashscreen.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/splashscreen.png
rename to res/drawable-sw600dp-land-xhdpi/splashscreen.png
diff --git a/res/drawable-sw600dp-xhdpi/statebar_background.png b/res/drawable-sw600dp-land-xhdpi/statebar_background.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/statebar_background.png
rename to res/drawable-sw600dp-land-xhdpi/statebar_background.png
diff --git a/res/drawable-sw600dp-xhdpi/unknown_small.png b/res/drawable-sw600dp-land-xhdpi/unknown_small.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/unknown_small.png
rename to res/drawable-sw600dp-land-xhdpi/unknown_small.png
diff --git a/res/drawable-sw600dp-xhdpi/video_off_default.png b/res/drawable-sw600dp-land-xhdpi/video_off_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_off_default.png
rename to res/drawable-sw600dp-land-xhdpi/video_off_default.png
diff --git a/res/drawable-sw600dp-xhdpi/video_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/video_off_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_off_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/video_off_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/video_off_over.png b/res/drawable-sw600dp-land-xhdpi/video_off_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_off_over.png
rename to res/drawable-sw600dp-land-xhdpi/video_off_over.png
diff --git a/res/drawable-sw600dp-xhdpi/video_on_default.png b/res/drawable-sw600dp-land-xhdpi/video_on_default.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_on_default.png
rename to res/drawable-sw600dp-land-xhdpi/video_on_default.png
diff --git a/res/drawable-sw600dp-xhdpi/video_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/video_on_disabled.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_on_disabled.png
rename to res/drawable-sw600dp-land-xhdpi/video_on_disabled.png
diff --git a/res/drawable-sw600dp-xhdpi/video_on_over.png b/res/drawable-sw600dp-land-xhdpi/video_on_over.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/video_on_over.png
rename to res/drawable-sw600dp-land-xhdpi/video_on_over.png
diff --git a/res/layout-land/incall.xml b/res/layout-land/incall.xml
index 096ed4a78..c9085345f 100644
--- a/res/layout-land/incall.xml
+++ b/res/layout-land/incall.xml
@@ -52,128 +52,40 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:visibility="gone"
+        android:gravity="right"
         android:orientation="vertical" >
 
+        <TextView
+        	android:id="@+id/transfer"
+            android:background="@drawable/options_transfer"
+         	android:text="@string/button_transfer"
+         	android:gravity="center"
+         	android:paddingTop="50dp"
+         	android:textColor="@drawable/text_incall_button_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible" />
+
+        <TextView
+            android:id="@+id/addCall"
+            android:background="@drawable/options_add_call_alt"
+         	android:text="@string/button_add_call"
+         	android:gravity="center"
+         	android:paddingTop="50dp"
+         	android:textColor="@drawable/text_incall_button_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible" />
+            
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_weight="1"
-            android:orientation="horizontal" >
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <TextView
-                android:id="@+id/transfer"
-                android:background="@drawable/options_transfer"
-	            android:text="@string/button_transfer"
-	            android:gravity="center"
-	            android:paddingTop="50dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_weight="1"
-            android:orientation="horizontal" >
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <TextView
-                android:id="@+id/addCall"
-                android:background="@drawable/options_add_call_alt"
-	            android:text="@string/button_add_call"
-	            android:gravity="center"
-	            android:paddingTop="50dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
             android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/pause"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_pause"
@@ -184,7 +96,7 @@
                 android:id="@+id/conference"
                 android:visibility="gone"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_conference"
@@ -196,10 +108,10 @@
                 android:background="@drawable/video_off"
 	            android:text="@string/button_video"
 	            android:gravity="center"
-	            android:paddingTop="35dp"
+	            android:paddingTop="30dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <TextView
@@ -207,17 +119,17 @@
                 android:background="@drawable/micro_on"
 	            android:text="@string/button_micro"
 	            android:gravity="center"
-	            android:paddingTop="35dp"
+	            android:paddingTop="30dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <ImageView
                 android:id="@+id/hangUp"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.94"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_hang_up"
                 android:scaleType="fitXY"
@@ -228,10 +140,10 @@
                 android:background="@drawable/speaker_off"
 	            android:text="@string/button_speaker"
 	            android:gravity="center"
-	            android:paddingTop="35dp"
+	            android:paddingTop="30dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <TextView
@@ -239,22 +151,24 @@
                 android:background="@drawable/options"
 	            android:text="@string/button_options"
 	            android:gravity="center"
-	            android:paddingTop="35dp"
+	            android:paddingTop="30dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <ImageView
                 android:id="@+id/dialer"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_numpad"
                 android:scaleType="fitXY"
                 android:src="@drawable/dialer_alt" />
+            
         </LinearLayout>
+        
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/incall.xml b/res/layout-sw600dp-land/incall.xml
index 27a40f8ca..2b19b8470 100644
--- a/res/layout-sw600dp-land/incall.xml
+++ b/res/layout-sw600dp-land/incall.xml
@@ -47,6 +47,7 @@
 
     <RelativeLayout 
         android:id="@+id/menu"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         
diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index 91f5e28e9..f1c8a9a24 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -52,87 +52,34 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:visibility="gone"
+        android:gravity="right"
         android:orientation="vertical" >
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal" >
+        <TextView
+           	android:id="@+id/transfer"
+           	android:background="@drawable/options_transfer"
+        	android:text="@string/button_transfer"
+        	android:gravity="center"
+        	android:paddingTop="50dp"
+        	android:textColor="@drawable/text_incall_button_color"
+           	android:layout_width="wrap_content"
+           	android:layout_height="wrap_content"
+           	android:visibility="invisible" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <TextView
-                android:id="@+id/transfer"
-                android:background="@drawable/options_transfer"
-	            android:text="@string/button_transfer"
-	            android:gravity="center"
-	            android:paddingTop="50dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-        </LinearLayout>
+       <TextView
+			android:id="@+id/addCall"
+       		android:background="@drawable/options_add_call_alt"
+        	android:text="@string/button_add_call"
+        	android:gravity="center"
+        	android:paddingTop="50dp"
+        	android:textColor="@drawable/text_incall_button_color"
+           	android:layout_width="wrap_content"
+           	android:layout_height="wrap_content"
+           	android:visibility="invisible" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal" >
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-
-            <TextView
-                android:id="@+id/addCall"
-                android:background="@drawable/options_add_call_alt"
-	            android:text="@string/button_add_call"
-	            android:gravity="center"
-	            android:paddingTop="50dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="75dp"
-                android:layout_weight="1"
-                android:visibility="invisible" />
-            
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
             android:orientation="horizontal" >
 
             <TextView
@@ -143,7 +90,7 @@
 	            android:paddingTop="45dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="75dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <TextView
@@ -154,7 +101,7 @@
 	            android:paddingTop="45dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="75dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <TextView
@@ -165,7 +112,7 @@
 	            android:paddingTop="45dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="75dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
             <TextView
@@ -176,20 +123,19 @@
 	            android:paddingTop="45dp"
 	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
-                android:layout_height="75dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="75dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
             android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/pause"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_pause"
@@ -200,7 +146,7 @@
                 android:id="@+id/conference"
                 android:visibility="gone"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_conference"
@@ -210,8 +156,8 @@
             <ImageView
                 android:id="@+id/hangUp"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.97"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_hang_up"
                 android:scaleType="fitXY"
@@ -220,12 +166,13 @@
             <ImageView
                 android:id="@+id/dialer"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_numpad"
                 android:scaleType="fitXY"
                 android:src="@drawable/dialer_alt" />
+            
         </LinearLayout>
         
     </LinearLayout>
diff --git a/res/values-FR-small/strings.xml b/res/values-FR-small/strings.xml
deleted file mode 100644
index 175824f9f..000000000
--- a/res/values-FR-small/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="button_speaker">HP</string>
-</resources>
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 72525932f..400e46e35 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -50,7 +50,7 @@
 	<string name="state_outgoing_progress">sortant</string>
 	
 	<string name="mutemic_button_txt">Silence</string>
-	<string name="speaker_button_txt">Haut parleur</string>
+	<string name="speaker_button_txt">HP</string>
 	<string name="bluetooth_button_txt">Bluetooth</string>
 
 	<string name="CancelButtonText">Annuler</string>
@@ -310,7 +310,7 @@
 	<string name="button_add_call">+ Appel</string>
 	<string name="button_video">Vidéo</string>
 	<string name="button_micro">Micro</string>
-	<string name="button_speaker">Haut parleur</string>
+	<string name="button_speaker">HP</string>
 	<string name="button_options">Options</string>
 	
 	<string name="button_send_message">Envoyer</string>