diff --git a/res/menu/archived_conversation_list_menu.xml b/res/menu/archived_conversation_list_menu.xml
new file mode 100644
index 0000000..a3a2a19
--- /dev/null
+++ b/res/menu/archived_conversation_list_menu.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+    <item
+        android:id="@+id/action_debug_options"
+        android:orderInCategory="9900"
+        android:title="@string/action_debug_options"
+        android:showAsAction="never"/>
+
+</menu>
diff --git a/res/menu/attachment_chooser_menu.xml b/res/menu/attachment_chooser_menu.xml
new file mode 100644
index 0000000..99345c9
--- /dev/null
+++ b/res/menu/attachment_chooser_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+    <item
+        android:id="@+id/action_confirm_selection"
+        android:icon="@drawable/ic_checkmark_small_light"
+        android:orderInCategory="100"
+        android:title="@string/action_confirm_selection"
+        appcompat:showAsAction="always"/>
+</menu>
diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml
new file mode 100644
index 0000000..a384f57
--- /dev/null
+++ b/res/menu/compose_menu.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    tools:context="com.android.messaging.ConversationActivity" >
+
+    <!-- This must always be the first item so it appears right next to the chip view -->
+    <item
+        android:id="@+id/action_delete_text"
+        android:icon="@drawable/ic_cancel_small_light"
+        android:orderInCategory="0"
+        android:title="@string/chips_text_delete_button_content_description"
+        appcompat:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_ime_dialpad_toggle"
+        android:icon="@drawable/ic_numeric_dialpad"
+        android:orderInCategory="100"
+        android:title="@string/numeric_text_keyboard_toggle_button_content_description"
+        appcompat:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_add_more_participants"
+        android:icon="@drawable/ic_people_add_light"
+        android:orderInCategory="110"
+        android:title="@string/add_more_participants_button_content_description"
+        appcompat:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_confirm_participants"
+        android:icon="@drawable/ic_checkmark_small_light"
+        android:orderInCategory="120"
+        android:title="@string/confrim_participants_button_content_description"
+        appcompat:showAsAction="always"/>
+
+</menu>
diff --git a/res/menu/conversation_fragment_select_menu.xml b/res/menu/conversation_fragment_select_menu.xml
new file mode 100644
index 0000000..7ce0829
--- /dev/null
+++ b/res/menu/conversation_fragment_select_menu.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/share_message_menu"
+        android:title="@string/action_share"
+        android:icon="@drawable/ic_share_dark"
+        appcompat:showAsAction="collapseActionView|always" />
+    <item
+        android:id="@+id/forward_message_menu"
+        android:title="@string/message_context_menu_forward_message"
+        android:icon="@drawable/ic_forward_dark"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/save_attachment"
+        android:title="@string/save"
+        android:icon="@drawable/ic_save_dark"
+        appcompat:showAsAction="collapseActionView|always" />
+    <item
+        android:id="@+id/copy_text"
+        android:title="@string/message_context_menu_copy_text"
+        android:icon="@drawable/ic_content_copy_dark"
+        appcompat:showAsAction="collapseActionView|always"/>
+
+    <item
+        android:id="@+id/details_menu"
+        android:title="@string/message_context_menu_view_details"
+        android:icon="@drawable/ic_info_dark"
+        appcompat:showAsAction="collapseActionView|always"/>
+
+    <item
+        android:id="@+id/action_send"
+        android:icon="@drawable/ic_send_dark"
+        android:title="@string/action_send"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_download"
+        android:icon="@drawable/ic_file_download_dark"
+        android:title="@string/action_download"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_delete_message"
+        android:icon="@drawable/ic_delete_small_dark"
+        android:title="@string/action_delete_message"
+        appcompat:showAsAction="collapseActionView|always"/>
+</menu>
diff --git a/res/menu/conversation_list_fragment_menu.xml b/res/menu/conversation_list_fragment_menu.xml
new file mode 100644
index 0000000..a83a2a5
--- /dev/null
+++ b/res/menu/conversation_list_fragment_menu.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item android:id="@+id/action_start_new_conversation"
+        android:title="@string/start_new_conversation"
+        android:icon="@drawable/ic_add_white"
+        android:visible="false"
+        appcompat:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_show_archived"
+        android:orderInCategory="200"
+        android:title="@string/action_menu_show_archived"
+        android:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_show_blocked_contacts"
+        android:orderInCategory="300"
+        android:title="@string/blocked_contacts_title"
+        appcompat:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="400"
+        android:title="@string/action_settings"
+        appcompat:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_debug_options"
+        android:orderInCategory="9900"
+        android:title="@string/action_debug_options"
+        appcompat:showAsAction="never"/>
+
+</menu>
diff --git a/res/menu/conversation_list_fragment_select_menu.xml b/res/menu/conversation_list_fragment_select_menu.xml
new file mode 100644
index 0000000..8704691
--- /dev/null
+++ b/res/menu/conversation_list_fragment_select_menu.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/action_archive"
+        android:icon="@drawable/ic_archive_small_dark"
+        android:orderInCategory="50"
+        android:title="@string/action_archive"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_unarchive"
+        android:icon="@drawable/ic_archive_undo_small_dark"
+        android:orderInCategory="50"
+        android:title="@string/action_unarchive"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete_small_dark"
+        android:orderInCategory="60"
+        android:title="@string/action_delete"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_notification_off"
+        android:icon="@drawable/ic_notifications_off_dark"
+        android:orderInCategory="70"
+        android:title="@string/action_notification_off"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_notification_on"
+        android:icon="@drawable/ic_notifications_on_dark"
+        android:orderInCategory="80"
+        android:title="@string/action_notification_on"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_add_contact"
+        android:icon="@drawable/ic_person_add_dark"
+        android:orderInCategory="90"
+        android:title="@string/action_add_contact"
+        appcompat:showAsAction="collapseActionView|always"/>
+    <item
+        android:id="@+id/action_block"
+        android:icon="@drawable/ic_dnd_on_dark"
+        android:orderInCategory="100"
+        android:title="@string/action_block"
+        appcompat:showAsAction="collapseActionView|always"/>
+</menu>
diff --git a/res/menu/conversation_menu.xml b/res/menu/conversation_menu.xml
new file mode 100644
index 0000000..57e561b
--- /dev/null
+++ b/res/menu/conversation_menu.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    tools:context="com.android.messaging.ConversationActivity" >
+
+    <item
+        android:id="@+id/action_call"
+        android:icon="@drawable/ic_phone_small_light"
+        android:orderInCategory="80"
+        android:title="@string/action_call"
+        appcompat:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_add_contact"
+        android:icon="@drawable/ic_person_add_light"
+        android:orderInCategory="90"
+        android:title="@string/action_add_contact"
+        android:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_people_and_options"
+        android:orderInCategory="100"
+        android:title="@string/action_people_and_options"
+        appcompat:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_archive"
+        android:orderInCategory="120"
+        android:title="@string/action_archive"
+        android:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unarchive"
+        android:orderInCategory="130"
+        android:title="@string/action_unarchive"
+        android:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_delete"
+        android:orderInCategory="140"
+        android:title="@string/action_delete"
+        android:showAsAction="never"/>
+
+</menu>
diff --git a/res/menu/gallery_picker_menu.xml b/res/menu/gallery_picker_menu.xml
new file mode 100644
index 0000000..428f1e7
--- /dev/null
+++ b/res/menu/gallery_picker_menu.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/action_multiselect"
+        android:icon="@drawable/ic_checkbox_outline_light"
+        android:orderInCategory="100"
+        android:title="@string/action_multiselect"
+        appcompat:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_confirm_multiselect"
+        android:icon="@drawable/ic_checkmark_small_light"
+        android:orderInCategory="101"
+        android:title="@string/action_confirm_multiselect"
+        appcompat:showAsAction="always"/>
+</menu>
diff --git a/res/menu/photo_view_menu.xml b/res/menu/photo_view_menu.xml
new file mode 100644
index 0000000..10a4367
--- /dev/null
+++ b/res/menu/photo_view_menu.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/action_share"
+        android:actionProviderClass="android.widget.ShareActionProvider"
+        android:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/action_save"
+        android:title="@string/save"
+        android:icon="@drawable/ic_save_light"
+        android:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/res/menu/settings_menu.xml b/res/menu/settings_menu.xml
new file mode 100644
index 0000000..3002be8
--- /dev/null
+++ b/res/menu/settings_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/action_license"
+        android:orderInCategory="100"
+        android:title="@string/menu_license"
+        android:showAsAction="never"/>
+
+</menu>
diff --git a/res/menu/vcard_detail_fragment_menu.xml b/res/menu/vcard_detail_fragment_menu.xml
new file mode 100644
index 0000000..ea923cb
--- /dev/null
+++ b/res/menu/vcard_detail_fragment_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto" >
+
+    <item
+        android:id="@+id/action_add_contact"
+        android:icon="@drawable/ic_person_add_light"
+        android:orderInCategory="100"
+        android:title="@string/action_add_contact"
+        appcompat:showAsAction="always"/>
+</menu>