diff --git a/res/drawable-hdpi/actionbar_icon_holo_dark.png b/res/drawable-hdpi/actionbar_icon_holo_dark.png
new file mode 100644
index 0000000000..a75443f72a
Binary files /dev/null and b/res/drawable-hdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-hdpi/alert.png b/res/drawable-hdpi/alert.png
new file mode 100644
index 0000000000..85a40ca75e
Binary files /dev/null and b/res/drawable-hdpi/alert.png differ
diff --git a/res/drawable-hdpi/check_dark.png b/res/drawable-hdpi/check_dark.png
new file mode 100644
index 0000000000..a2153b9eab
Binary files /dev/null and b/res/drawable-hdpi/check_dark.png differ
diff --git a/res/drawable-hdpi/ic_lock_white_32dp.png b/res/drawable-hdpi/ic_lock_white_32dp.png
new file mode 100644
index 0000000000..bf65c7622d
Binary files /dev/null and b/res/drawable-hdpi/ic_lock_white_32dp.png differ
diff --git a/res/drawable-hdpi/ic_save_all_white_24dp.png b/res/drawable-hdpi/ic_save_all_white_24dp.png
new file mode 100644
index 0000000000..93dccddabc
Binary files /dev/null and b/res/drawable-hdpi/ic_save_all_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_text_sms.png b/res/drawable-hdpi/ic_text_sms.png
new file mode 100644
index 0000000000..6a818fab6f
Binary files /dev/null and b/res/drawable-hdpi/ic_text_sms.png differ
diff --git a/res/drawable-hdpi/ic_twilio_shoutout_white.png b/res/drawable-hdpi/ic_twilio_shoutout_white.png
new file mode 100644
index 0000000000..c1eba6dfa1
Binary files /dev/null and b/res/drawable-hdpi/ic_twilio_shoutout_white.png differ
diff --git a/res/drawable-hdpi/list_selected_holo_dark.9.png b/res/drawable-hdpi/list_selected_holo_dark.9.png
new file mode 100644
index 0000000000..40dbd179ff
Binary files /dev/null and b/res/drawable-hdpi/list_selected_holo_dark.9.png differ
diff --git a/res/drawable-hdpi/list_selected_holo_light.9.png b/res/drawable-hdpi/list_selected_holo_light.9.png
new file mode 100644
index 0000000000..40dbd179ff
Binary files /dev/null and b/res/drawable-hdpi/list_selected_holo_light.9.png differ
diff --git a/res/drawable-hdpi/telephone.png b/res/drawable-hdpi/telephone.png
new file mode 100644
index 0000000000..a1098f506e
Binary files /dev/null and b/res/drawable-hdpi/telephone.png differ
diff --git a/res/drawable-ldrtl/actionbar_icon.xml b/res/drawable-ldrtl/actionbar_icon.xml
new file mode 100644
index 0000000000..2a69ed1674
--- /dev/null
+++ b/res/drawable-ldrtl/actionbar_icon.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/actionbar_icon_holo_dark"
+          android:left="8dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable-mdpi/actionbar_icon_holo_dark.png b/res/drawable-mdpi/actionbar_icon_holo_dark.png
new file mode 100644
index 0000000000..f2148b4f8d
Binary files /dev/null and b/res/drawable-mdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-mdpi/alert.png b/res/drawable-mdpi/alert.png
new file mode 100644
index 0000000000..587b378e36
Binary files /dev/null and b/res/drawable-mdpi/alert.png differ
diff --git a/res/drawable-mdpi/check_dark.png b/res/drawable-mdpi/check_dark.png
new file mode 100644
index 0000000000..592974a79c
Binary files /dev/null and b/res/drawable-mdpi/check_dark.png differ
diff --git a/res/drawable-mdpi/ic_lock_white_32dp.png b/res/drawable-mdpi/ic_lock_white_32dp.png
new file mode 100644
index 0000000000..cb391ef1ea
Binary files /dev/null and b/res/drawable-mdpi/ic_lock_white_32dp.png differ
diff --git a/res/drawable-mdpi/ic_save_all_white_24dp.png b/res/drawable-mdpi/ic_save_all_white_24dp.png
new file mode 100644
index 0000000000..67281793a7
Binary files /dev/null and b/res/drawable-mdpi/ic_save_all_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_text_sms.png b/res/drawable-mdpi/ic_text_sms.png
new file mode 100644
index 0000000000..5c5a0f3cea
Binary files /dev/null and b/res/drawable-mdpi/ic_text_sms.png differ
diff --git a/res/drawable-mdpi/ic_twilio_shoutout_white.png b/res/drawable-mdpi/ic_twilio_shoutout_white.png
new file mode 100644
index 0000000000..106977a481
Binary files /dev/null and b/res/drawable-mdpi/ic_twilio_shoutout_white.png differ
diff --git a/res/drawable-mdpi/list_selected_holo_dark.9.png b/res/drawable-mdpi/list_selected_holo_dark.9.png
new file mode 100644
index 0000000000..ee6e9ccd71
Binary files /dev/null and b/res/drawable-mdpi/list_selected_holo_dark.9.png differ
diff --git a/res/drawable-mdpi/list_selected_holo_light.9.png b/res/drawable-mdpi/list_selected_holo_light.9.png
new file mode 100644
index 0000000000..ee6e9ccd71
Binary files /dev/null and b/res/drawable-mdpi/list_selected_holo_light.9.png differ
diff --git a/res/drawable-mdpi/telephone.png b/res/drawable-mdpi/telephone.png
new file mode 100644
index 0000000000..21b26b44b3
Binary files /dev/null and b/res/drawable-mdpi/telephone.png differ
diff --git a/res/drawable-xhdpi/actionbar_icon_holo_dark.png b/res/drawable-xhdpi/actionbar_icon_holo_dark.png
new file mode 100644
index 0000000000..4109717f91
Binary files /dev/null and b/res/drawable-xhdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-xhdpi/alert.png b/res/drawable-xhdpi/alert.png
new file mode 100644
index 0000000000..533421515e
Binary files /dev/null and b/res/drawable-xhdpi/alert.png differ
diff --git a/res/drawable-xhdpi/check_dark.png b/res/drawable-xhdpi/check_dark.png
new file mode 100644
index 0000000000..db23a577dc
Binary files /dev/null and b/res/drawable-xhdpi/check_dark.png differ
diff --git a/res/drawable-xhdpi/ic_lock_white_32dp.png b/res/drawable-xhdpi/ic_lock_white_32dp.png
new file mode 100644
index 0000000000..7189679a76
Binary files /dev/null and b/res/drawable-xhdpi/ic_lock_white_32dp.png differ
diff --git a/res/drawable-xhdpi/ic_save_all_white_24dp.png b/res/drawable-xhdpi/ic_save_all_white_24dp.png
new file mode 100644
index 0000000000..799802dd6b
Binary files /dev/null and b/res/drawable-xhdpi/ic_save_all_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_text_sms.png b/res/drawable-xhdpi/ic_text_sms.png
new file mode 100644
index 0000000000..d95eb93192
Binary files /dev/null and b/res/drawable-xhdpi/ic_text_sms.png differ
diff --git a/res/drawable-xhdpi/ic_twilio_shoutout_white.png b/res/drawable-xhdpi/ic_twilio_shoutout_white.png
new file mode 100644
index 0000000000..a45cc7f974
Binary files /dev/null and b/res/drawable-xhdpi/ic_twilio_shoutout_white.png differ
diff --git a/res/drawable-xhdpi/list_selected_holo_dark.9.png b/res/drawable-xhdpi/list_selected_holo_dark.9.png
new file mode 100644
index 0000000000..a7af9dcf05
Binary files /dev/null and b/res/drawable-xhdpi/list_selected_holo_dark.9.png differ
diff --git a/res/drawable-xhdpi/list_selected_holo_light.9.png b/res/drawable-xhdpi/list_selected_holo_light.9.png
new file mode 100644
index 0000000000..a7af9dcf05
Binary files /dev/null and b/res/drawable-xhdpi/list_selected_holo_light.9.png differ
diff --git a/res/drawable-xhdpi/telephone.png b/res/drawable-xhdpi/telephone.png
new file mode 100644
index 0000000000..1710770efb
Binary files /dev/null and b/res/drawable-xhdpi/telephone.png differ
diff --git a/res/drawable-xxhdpi/actionbar_icon_holo_dark.png b/res/drawable-xxhdpi/actionbar_icon_holo_dark.png
new file mode 100644
index 0000000000..b6702dd25b
Binary files /dev/null and b/res/drawable-xxhdpi/actionbar_icon_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_white_32dp.png b/res/drawable-xxhdpi/ic_lock_white_32dp.png
new file mode 100644
index 0000000000..a45b3e4471
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_white_32dp.png differ
diff --git a/res/drawable-xxhdpi/ic_save_all_white_24dp.png b/res/drawable-xxhdpi/ic_save_all_white_24dp.png
new file mode 100644
index 0000000000..1c6ba846a8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_save_all_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_text_sms.png b/res/drawable-xxhdpi/ic_text_sms.png
new file mode 100644
index 0000000000..1ce7442464
Binary files /dev/null and b/res/drawable-xxhdpi/ic_text_sms.png differ
diff --git a/res/drawable-xxhdpi/ic_twilio_shoutout_white.png b/res/drawable-xxhdpi/ic_twilio_shoutout_white.png
new file mode 100644
index 0000000000..395a507630
Binary files /dev/null and b/res/drawable-xxhdpi/ic_twilio_shoutout_white.png differ
diff --git a/res/drawable-xxxhdpi/ic_save_all_white_24dp.png b/res/drawable-xxxhdpi/ic_save_all_white_24dp.png
new file mode 100644
index 0000000000..94f67c9d37
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_save_all_white_24dp.png differ
diff --git a/res/drawable/background_pane.9.png b/res/drawable/background_pane.9.png
new file mode 100644
index 0000000000..5d598e92f0
Binary files /dev/null and b/res/drawable/background_pane.9.png differ
diff --git a/res/drawable/blocked_indicator_background.xml b/res/drawable/blocked_indicator_background.xml
new file mode 100644
index 0000000000..3fa21373fe
--- /dev/null
+++ b/res/drawable/blocked_indicator_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/compose_background.xml b/res/drawable/compose_background.xml
new file mode 100644
index 0000000000..6e74c4b6fa
--- /dev/null
+++ b/res/drawable/compose_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@null" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/light_touch_highlight_background.xml b/res/drawable/light_touch_highlight_background.xml
new file mode 100644
index 0000000000..805a3ef218
--- /dev/null
+++ b/res/drawable/light_touch_highlight_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/light_button_highlight" />
+    <item android:drawable="@color/light_button" />
+</selector>
diff --git a/res/drawable/pill_button.xml b/res/drawable/pill_button.xml
new file mode 100644
index 0000000000..163c49aeda
--- /dev/null
+++ b/res/drawable/pill_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle" >
+
+    <corners
+            android:bottomLeftRadius="30dp"
+            android:bottomRightRadius="30dp"
+            android:radius="60dp"
+            android:topLeftRadius="30dp"
+            android:topRightRadius="30dp" />
+
+    <solid android:color="#ffffff" />
+
+    <padding
+            android:bottom="0dp"
+            android:left="0dp"
+            android:right="0dp"
+            android:top="0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/progress_background.xml b/res/drawable/progress_background.xml
new file mode 100644
index 0000000000..5f2e8b64c9
--- /dev/null
+++ b/res/drawable/progress_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="#99000000"/>
+</shape>
\ No newline at end of file
diff --git a/res/layout/color_preference_item.xml b/res/layout/color_preference_item.xml
new file mode 100644
index 0000000000..fac3e5b219
--- /dev/null
+++ b/res/layout/color_preference_item.xml
@@ -0,0 +1,24 @@
+<!--
+  Copyright 2013 Google Inc.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="@dimen/color_grid_item_size"
+             android:layout_height="@dimen/color_grid_item_size">
+
+    <ImageView
+            android:id="@+id/color_view"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_gravity="center"
+            android:scaleType="fitXY" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/color_preference_items.xml b/res/layout/color_preference_items.xml
new file mode 100644
index 0000000000..ff7b3b1754
--- /dev/null
+++ b/res/layout/color_preference_items.xml
@@ -0,0 +1,31 @@
+<!--
+  Copyright 2013 Google Inc.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="center"
+             android:gravity="center">
+
+    <android.support.v7.widget.GridLayout
+            android:id="@+id/color_grid"
+            android:padding="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            app:orientation="horizontal"
+            app:columnCount="5"/>
+</FrameLayout>
+
diff --git a/res/layout/contact_selection_list_header.xml b/res/layout/contact_selection_list_header.xml
new file mode 100644
index 0000000000..ca7dbfa97c
--- /dev/null
+++ b/res/layout/contact_selection_list_header.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TextView android:layout_width="match_parent"
+          android:layout_height="32sp"
+          android:singleLine="true"
+          android:ellipsize="marquee"
+          android:layout_centerVertical="true"
+          android:layout_alignParentLeft="true"
+          android:textSize="15sp"
+          android:paddingLeft="10dp"
+          android:paddingRight="25dp"
+          android:textStyle="bold"
+          xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/layout/icon_list_item.xml b/res/layout/icon_list_item.xml
new file mode 100644
index 0000000000..9071aa443f
--- /dev/null
+++ b/res/layout/icon_list_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingTop="1dip"
+    android:paddingBottom="1dip"
+    android:paddingLeft="9dip"
+    android:paddingRight="9dip">
+
+    <ImageView android:id="@+id/icon"
+        android:paddingRight="9dip"
+        android:layout_gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_gravity="center_horizontal|center_vertical" />
+</LinearLayout>
+
diff --git a/res/layout/import_export_activity.xml b/res/layout/import_export_activity.xml
new file mode 100644
index 0000000000..e4f29211d5
--- /dev/null
+++ b/res/layout/import_export_activity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/import_export_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/led_pattern_dialog.xml b/res/layout/led_pattern_dialog.xml
new file mode 100644
index 0000000000..b02d286936
--- /dev/null
+++ b/res/layout/led_pattern_dialog.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:orientation="vertical"
+  android:paddingLeft="5sp"
+  android:paddingRight="5sp"
+  android:id="@+id/CustomLedBlinkLinearLayout">
+  <ScrollView
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:id="@+id/CustomLedBlinkScrollView">
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:id="@+id/ScrollViewLinearLayout"
+        android:paddingLeft="5sp"
+        android:paddingRight="5sp"
+        android:paddingBottom="2sp"
+        android:paddingTop="2sp">
+        <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="left"
+        android:layout_weight="1">
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/SeekBarOnLabel"
+          android:text="@string/preferences__pref_led_blink_custom_pattern_on_for"
+          android:paddingTop="5sp" />
+        <TextView
+          android:id="@+id/SeekBarOnMsLabel"
+          android:layout_width="40dip"
+          android:layout_height="wrap_content"
+          android:text="0"
+          android:gravity="right" />
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="0dip"
+          android:text="ms" />
+      </LinearLayout>
+      <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="left"
+        android:layout_weight="1">
+      <SeekBar
+        android:id="@+id/SeekBarOn"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:max="5000" />
+      </LinearLayout>
+      <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="left"
+        android:layout_weight="1">
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/SeekBarOffLabel"
+        android:text="@string/preferences__pref_led_blink_custom_pattern_off_for"
+        android:paddingTop="5sp" />
+      <TextView
+        android:id="@+id/SeekBarOffMsLabel"
+        android:layout_width="40dip"
+        android:layout_height="wrap_content"
+        android:text="0"
+        android:gravity="right" />
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="0dip"
+        android:text="ms" />
+      </LinearLayout>
+      <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="left"
+        android:layout_weight="1">
+      <SeekBar
+        android:id="@+id/SeekBarOff"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:max="5000" />
+        </LinearLayout>
+    </LinearLayout>
+  </ScrollView>
+</LinearLayout>
diff --git a/res/layout/registration_problems.xml b/res/layout/registration_problems.xml
new file mode 100644
index 0000000000..6529ce3a9f
--- /dev/null
+++ b/res/layout/registration_problems.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:paddingTop="24dp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical">
+
+        <TextView
+                style="@style/Registration.Description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dip"
+                android:text="@string/registration_problems__some_possible_problems_include" />
+
+        <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+            <TableRow>
+
+                <TextView
+                        style="@style/Registration.Description"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="10dip"
+                        android:text="•" />
+
+                <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" >
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/registration_problems__sms_interceptors"
+                            android:textStyle="bold" />
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingRight="10dip"
+                            android:text="@string/registration_problems__some_third_party_text_messaging_clients_such_as_handcent" />
+                </LinearLayout>
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                        style="@style/Registration.Description"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="10dip"
+                        android:text="•" />
+
+                <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" >
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/registration_problems__incorrect_number"
+                            android:textStyle="bold" />
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingRight="10dip"
+                            android:text="@string/registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly" />
+                </LinearLayout>
+            </TableRow>
+        </TableLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/registration_progress_activity.xml b/res/layout/registration_progress_activity.xml
new file mode 100644
index 0000000000..83afe78bbe
--- /dev/null
+++ b/res/layout/registration_progress_activity.xml
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@drawable/background_pattern_repeat"
+            android:fillViewport="true" >
+
+    <FrameLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center" >
+
+        <LinearLayout
+                android:id="@+id/verification_failure_layout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                android:orientation="vertical"
+                android:visibility="gone" >
+
+            <RelativeLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dip"
+                    android:layout_marginTop="10dip"
+                    android:background="@drawable/background_pane" >
+
+                <ImageView
+                        android:id="@+id/alert"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:paddingLeft="4dip"
+                        android:paddingRight="4dip"
+                        android:src="@drawable/alert"
+                        android:contentDescription="@string/registration_progress_activity__alert"/>
+
+                <TextView
+                        style="@style/Registration.Constant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/alert"
+                        android:layout_toRightOf="@id/alert"
+                        android:paddingLeft="4.0dip"
+                        android:paddingRight="8.0dip"
+                        android:text="@string/registration_progress_activity__sms_verification_failed"
+                        android:textColor="#333333"
+                        android:textSize="16.0sp" />
+
+                <TextView
+                        android:id="@+id/sms_failed_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_below="@+id/alert"
+                        android:paddingLeft="4dip"
+                        android:paddingRight="4dip"
+                        android:text="@string/registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message" />
+            </RelativeLayout>
+
+
+            <RelativeLayout android:id="@+id/voice_verification_layout"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dip"
+                            android:background="@drawable/background_pane">
+
+                <ImageView android:id="@+id/telephone"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:paddingLeft="4dip"
+                           android:paddingRight="4dip"
+                           android:src="@drawable/telephone"
+                           android:contentDescription="@string/registration_progress_activity__telephone"/>
+
+                <TextView style="@style/Registration.Constant"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_alignBottom="@id/telephone"
+                          android:layout_toRightOf="@id/telephone"
+                          android:paddingLeft="4dip"
+                          android:paddingRight="8dip"
+                          android:text="@string/registration_progress_activity__voice_verification"
+                          android:textColor="#333333"
+                          android:textSize="16sp"/>
+
+                <TextView android:id="@+id/telephone_text"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_alignParentLeft="true"
+                          android:layout_below="@id/telephone"
+                          android:paddingLeft="4dip"
+                          android:paddingRight="4dip"
+                          android:paddingBottom="10dip"
+                          android:text="@string/registration_progress_activity__signal_can_also_call_you_to_verify_your_number"/>
+
+                <LinearLayout android:id="@+id/code_container"
+                              android:orientation="horizontal"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_centerHorizontal="true"
+                              android:layout_below="@id/telephone_text">
+
+                    <EditText android:id="@+id/telephone_code"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:ems="6"
+                              android:inputType="number"
+                              android:enabled="false"/>
+
+                    <Button android:id="@+id/verify_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/registration_progress_activity__verify"
+                            android:enabled="false"/>
+
+                </LinearLayout>
+
+                <Button android:id="@+id/call_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_below="@id/code_container"
+                        android:paddingLeft="5dip"
+                        android:paddingRight="5dip"
+                        android:layout_marginTop="10dip"
+                        android:text="@string/registration_progress_activity__call_me"/>
+
+                <Button
+                        android:id="@+id/verification_failure_edit_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginBottom="10.0dip"
+                        android:gravity="center"
+                        android:text="@string/registration_progress_activity__edit_number"
+                        android:textStyle="bold"
+                        android:layout_below="@id/call_button"/>
+            </RelativeLayout>
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/connectivity_failure_layout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                android:orientation="vertical"
+                android:visibility="gone" >
+
+            <RelativeLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dip"
+                    android:layout_marginTop="10dip"
+                    android:background="@drawable/background_pane" >
+
+                <ImageView
+                        android:id="@+id/connectivity_alert"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:paddingLeft="4dip"
+                        android:paddingRight="4dip"
+                        android:src="@drawable/alert"
+                        android:contentDescription="@string/registration_progress_activity__alert"/>
+
+                <TextView
+                        style="@style/Registration.Constant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@id/connectivity_alert"
+                        android:layout_toRightOf="@id/connectivity_alert"
+                        android:paddingLeft="4.0dip"
+                        android:paddingRight="8.0dip"
+                        android:text="@string/registration_progress_activity__connectivity_error"
+                        android:textColor="#333333"
+                        android:textSize="16.0sp" />
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_below="@+id/connectivity_alert"
+                        android:paddingLeft="4dip"
+                        android:paddingRight="4dip"
+                        android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_server" />
+            </RelativeLayout>
+
+            <Button
+                    android:id="@+id/connectivity_failure_edit_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="10.0dip"
+                    android:gravity="center"
+                    android:text="@string/registration_progress_activity__edit_number"
+                    android:textStyle="bold" />
+
+            <TextView
+                    style="@style/Registration.Description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dip"
+                    android:text="@string/registration_progress_activity__some_possible_problems_include" />
+
+            <TableLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" >
+
+                <TableRow>
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingRight="10dip"
+                            android:text="•" />
+
+                    <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical" >
+
+                        <TextView
+                                style="@style/Registration.Description"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/registration_progress_activity__no_network_connectivity"
+                                android:textStyle="bold" />
+
+                        <TextView
+                                style="@style/Registration.Description"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingRight="10dip"
+                                android:text="@string/registration_progress_activity__your_device_needs_network_connectivity" />
+                    </LinearLayout>
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                            style="@style/Registration.Description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingRight="10dip"
+                            android:text="•" />
+
+                    <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical" >
+
+                        <TextView
+                                style="@style/Registration.Description"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/registration_progress_activity__restrictive_firewall"
+                                android:textStyle="bold" />
+
+                        <TextView
+                                style="@style/Registration.Description"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingRight="10dip"
+                                android:text="@string/registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall" />
+                    </LinearLayout>
+                </TableRow>
+            </TableLayout>
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/registering_layout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:paddingLeft="16dip"
+                android:paddingRight="16dip" >
+
+            <TextView
+                    style="@style/Registration.Description"
+                    android:gravity="start"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dip"
+                    android:paddingLeft="5dip"
+                    android:text="@string/registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message" />
+
+            <TableLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="10dip"
+                    android:layout_marginTop="10dip"
+                    android:background="@drawable/background_pane"
+                    android:gravity="center" >
+
+                <TableRow>
+                    <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center" >
+
+
+                        <ImageView
+                                android:id="@+id/connecting_complete"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:src="@drawable/check_dark"
+                                android:visibility="invisible"
+                                android:contentDescription="@string/registration_progress_activity__check"/>
+
+                        <ProgressBar
+                                android:id="@+id/connecting_progress"
+                                style="?android:attr/android:progressBarStyleSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:indeterminate="true"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:visibility="invisible" />
+                    </FrameLayout>
+
+                    <TextView
+                            android:id="@+id/connecting_text"
+                            style="@style/Registration.Constant"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="4.0dip"
+                            android:paddingRight="8.0dip"
+                            android:text="@string/registration_progress_activity__connecting"
+                            android:textSize="16.0sp" />
+                </TableRow>
+
+                <TableRow>
+
+                    <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center" >
+
+                        <ImageView
+                                android:id="@+id/verification_complete"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:src="@drawable/check_dark"
+                                android:visibility="invisible"
+                                android:contentDescription="@string/registration_progress_activity__check"/>
+
+                        <ProgressBar
+                                android:id="@+id/verification_progress"
+                                style="?android:attr/android:progressBarStyleSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:indeterminate="true"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:visibility="invisible" />
+                    </FrameLayout>
+
+                    <TextView
+                            android:id="@+id/verification_text"
+                            style="@style/Registration.Constant"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="4.0dip"
+                            android:paddingRight="8.0dip"
+                            android:text="@string/registration_progress_activity__waiting_for_sms_verification"
+                            android:textSize="16.0sp" />
+                </TableRow>
+
+                <TableRow>
+                    <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center" >
+
+
+                        <ImageView
+                                android:id="@+id/generating_keys_complete"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:src="@drawable/check_dark"
+                                android:visibility="invisible"
+                                android:contentDescription="@string/registration_progress_activity__check"/>
+
+                        <ProgressBar
+                                android:id="@+id/generating_keys_progress"
+                                style="?android:attr/android:progressBarStyleSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:indeterminate="true"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:visibility="invisible" />
+                    </FrameLayout>
+
+                    <TextView
+                            android:id="@+id/generating_keys_text"
+                            style="@style/Registration.Constant"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="4.0dip"
+                            android:paddingRight="8.0dip"
+                            android:text="@string/registration_progress_activity__generating_keys"
+                            android:textSize="16.0sp" />
+                </TableRow>
+
+                <TableRow>
+
+                    <FrameLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center" >
+
+                        <ImageView
+                                android:id="@+id/gcm_registering_complete"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:src="@drawable/check_dark"
+                                android:visibility="invisible"
+                                android:contentDescription="@string/registration_progress_activity__check"/>
+
+                        <ProgressBar
+                                android:id="@+id/gcm_registering_progress"
+                                style="?android:attr/android:progressBarStyleSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:indeterminate="true"
+                                android:paddingLeft="4dip"
+                                android:paddingRight="4dip"
+                                android:visibility="invisible" />
+                    </FrameLayout>
+
+                    <TextView
+                            android:id="@+id/gcm_registering_text"
+                            style="@style/Registration.Constant"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingLeft="4.0dip"
+                            android:paddingRight="8.0dip"
+                            android:text="@string/registration_progress_activity__registering_with_server"
+                            android:textSize="16.0sp" />
+                </TableRow>
+
+            </TableLayout>
+
+            <TextView
+                    style="@style/Registration.Description"
+                    android:gravity="start"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="5dip"
+                    android:text="@string/registration_progress_activity__this_couild_take_a_moment_please_be_patient" />
+
+            <RelativeLayout
+                    android:id="@+id/timer_progress_layout"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dip"
+                    android:layout_weight="1.0" >
+
+                <TextView
+                        android:id="@+id/registration_timer"
+                        style="@style/Registration.Constant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
+                        android:text="1:57"
+                        android:textSize="12.0sp" />
+
+                <TextView
+                        style="@style/Registration.Constant"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:text="@string/registration_progress_activity__waiting_for_sms_verification"
+                        android:textAllCaps="true"
+                        android:textSize="12.0sp"
+                        android:textStyle="normal" />
+            </RelativeLayout>
+
+            <ProgressBar
+                    android:id="@+id/registration_progress"
+                    style="@style/Widget.ProgressBar.Horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="14.0dip"
+                    android:layout_marginTop="2.0dip" />
+
+            <Button
+                    android:id="@+id/edit_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="6.0dip"
+                    android:layout_weight="1.0"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    android:text="@string/registration_progress_activity__edit_number"
+                    android:textStyle="bold" />
+        </LinearLayout>
+    </FrameLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/single_recipient_panel.xml b/res/layout/single_recipient_panel.xml
new file mode 100644
index 0000000000..aa939874df
--- /dev/null
+++ b/res/layout/single_recipient_panel.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/recipients_panel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <org.thoughtcrime.securesms.contacts.RecipientsEditor android:id="@+id/recipients_text"
+           android:layout_height="wrap_content"
+            android:capitalize="sentences"
+            android:autoText="true"
+            android:singleLine="true"
+            android:hint="@string/recipients_panel__to"
+            android:paddingRight="45dip"
+            android:paddingLeft="15dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
+            android:textColor="?conversation_editor_text_color"
+            android:background="?conversation_editor_background"
+            android:layout_width="fill_parent"/>
+
+    </RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/contact_selection.xml b/res/menu/contact_selection.xml
new file mode 100644
index 0000000000..5505905cf2
--- /dev/null
+++ b/res/menu/contact_selection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:title="@string/contact_selection__menu_finished"
+          android:id="@+id/menu_selection_finished"
+          android:icon="?menu_accept_icon"
+          app:showAsAction="ifRoom"
+          />
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/local_identity.xml b/res/menu/local_identity.xml
new file mode 100644
index 0000000000..c8a52c453b
--- /dev/null
+++ b/res/menu/local_identity.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--<item android:title="@string/local_identity__regenerate_key"-->
+          <!--android:id="@+id/menu_regenerate_key"-->
+          <!--android:icon="@drawable/refresh"/>-->
+</menu>
\ No newline at end of file
diff --git a/res/menu/media_overview.xml b/res/menu/media_overview.xml
new file mode 100644
index 0000000000..9e99f02add
--- /dev/null
+++ b/res/menu/media_overview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/save"
+          android:title="@string/media_overview__save_all"
+          app:showAsAction="never"/>
+</menu>
diff --git a/res/menu/redphone_audio_popup_menu.xml b/res/menu/redphone_audio_popup_menu.xml
new file mode 100644
index 0000000000..9332cfa4f5
--- /dev/null
+++ b/res/menu/redphone_audio_popup_menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:id="@+id/handset"
+            android:title="@string/redphone_audio_popup_menu__handset"/>
+
+    <item
+            android:id="@+id/headset"
+            android:title="@string/redphone_audio_popup_menu__headset"/>
+
+    <item
+            android:id="@+id/speaker"
+            android:title="@string/redphone_audio_popup_menu__speaker"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/raw/redphone_completed.mp3 b/res/raw/redphone_completed.mp3
new file mode 100644
index 0000000000..50daa99e1c
Binary files /dev/null and b/res/raw/redphone_completed.mp3 differ
diff --git a/res/raw/redphone_failure.mp3 b/res/raw/redphone_failure.mp3
new file mode 100644
index 0000000000..33fc485576
Binary files /dev/null and b/res/raw/redphone_failure.mp3 differ
diff --git a/res/raw/redphone_handshake.mp3 b/res/raw/redphone_handshake.mp3
new file mode 100644
index 0000000000..282ff1063c
Binary files /dev/null and b/res/raw/redphone_handshake.mp3 differ
diff --git a/res/values-small/dimens.xml b/res/values-small/dimens.xml
index 9c568f0b82..1c238c3bc4 100644
--- a/res/values-small/dimens.xml
+++ b/res/values-small/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="onboarding_watermark_size">120dp</dimen>
     <dimen name="onboarding_title_size">32sp</dimen>
     <dimen name="onboarding_subtitle_size">18sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index e5a9a0dffe..e9557fb533 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -4,4 +4,12 @@
     <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
     </style>
 
+    <style name="TextSecureDialogPrimaryText">
+        <item name="android:textColor">?conversation_list_item_contact_color</item>
+    </style>
+
+    <style name="TextSecureDialogSecondaryText">
+        <item name="android:textColor">?conversation_list_item_date_color</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 96ea700c05..4f1695359a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -91,7 +91,12 @@
       <item>vi</item>
   </string-array>
 
-    <string-array name="pref_theme_entries">
+  <string-array name="minutes_hours">
+  	<item>@string/preferences__minutes</item>
+  	<item>@string/preferences__hours</item>
+  </string-array>
+
+  <string-array name="pref_theme_entries">
       <item>@string/preferences__light_theme</item>
       <item>@string/preferences__dark_theme</item>
   </string-array>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 17825a677f..601fb1cfc1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,10 +23,17 @@
     <color name="gray78">#ff383838</color>
     <color name="gray95">#ff111111</color>
 
+    <color name="gray95_transparent50">#7F111111</color>
+
     <color name="conversation_compose_divider">#32000000</color>
 
+    <color name="textsecure_holo_blue_light">#ff33b5e5</color>
+
+    <color name="dark_action_bar">#ff111111</color>
     <color name="action_mode_status_bar">#ff1f1f1f</color>
     <color name="touch_highlight">#400099cc</color>
+    <color name="light_button">#33ffffff</color>
+    <color name="light_button_highlight">#66ffffff</color>
 
     <color name="device_link_item_background_light">#ffffffff</color>
     <color name="device_link_item_background_dark">#ff333333</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cc0c00d123..72b4318cdd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,16 +15,25 @@
     <dimen name="transport_selection_popup_yoff">2dp</dimen>
     <dimen name="contact_photo_target_size">64dp</dimen>
     <dimen name="contact_selection_photo_size">50dp</dimen>
+    <dimen name="thumbnail_max_size">230dp</dimen>
+    <dimen name="preference_fragment_padding_side">8dp</dimen>
+    <dimen name="conversation_activity_compose_padding">12dp</dimen>
 
+    <dimen name="message_bubble_end_padding">50dp</dimen>
     <dimen name="message_bubble_corner_radius">4dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="media_bubble_height">210dp</dimen>
+    <dimen name="media_bubble_border_width">3dp</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
 
+    <dimen name="color_grid_extra_padding">32dp</dimen>
+    <dimen name="color_grid_item_size">48dp</dimen>
+
+    <dimen name="quick_media_drawer_default_height">250dp</dimen>
     <dimen name="quick_camera_shutter_ring_size">52dp</dimen>
 
     <dimen name="transfer_controls_expanded_width">150dp</dimen>
@@ -40,6 +49,7 @@
     <dimen name="incoming_widget_snap_margin">20dip</dimen>
 
     <!-- Height of the main row of in-call buttons. -->
+    <dimen name="in_call_button_height">76dp</dimen>
 
     <!-- Padding at the left and right edges of the incall_touch_ui button
          cluster.  This padding is necessary because we can't allow the
@@ -47,7 +57,11 @@
          risk of false touches (from your finger wrapping around while
          holding the phone, *before* moving it up to your face and having
          the prox sensor kick in.) -->
+    <dimen name="button_cluster_side_padding">20dp</dimen>
 
+    <dimen name="onboarding_margin_vert">35dp</dimen>
+    <dimen name="onboarding_margin_land">20dp</dimen>
+    <dimen name="onboarding_watermark_size">140dp</dimen>
     <dimen name="onboarding_title_size">34sp</dimen>
     <dimen name="onboarding_subtitle_size">20sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42cb502c40..dfd33f171b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -58,6 +58,11 @@
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
 
     <!-- AttachmentTypeSelectorAdapter -->
+    <string name="AttachmentTypeSelectorAdapter_camera">Camera</string>
+    <string name="AttachmentTypeSelectorAdapter_picture">Picture</string>
+    <string name="AttachmentTypeSelectorAdapter_video">Video</string>
+    <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
+    <string name="AttachmentTypeSelectorAdapter_contact">Contact info</string>
 
     <!-- AudioSlidePlayer -->
     <string name="AudioSlidePlayer_error_playing_audio">Error playing audio!</string>
@@ -88,7 +93,12 @@
     <string name="ContactsDatabase_signal_call_s">Signal Call %s</string>
 
     <!-- ConversationItem -->
+    <string name="ConversationItem_message_size_d_kb">Message size: %d KB</string>
+    <string name="ConversationItem_expires_s">Expires: %s</string>
     <string name="ConversationItem_error_not_delivered">Not delivered</string>
+    <string name="ConversationItem_view_secure_media_question">View secure media?</string>
+    <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to storage. Are you sure that you would like to do this?</string>
+    <string name="ConversationItem_error_received_stale_key_exchange_message">Error, received stale key exchange message.</string>
     <string name="ConversationItem_received_key_exchange_message_tap_to_process">Received key exchange message, tap to process.</string>
     <string name="ConversationItem_group_action_left">%1$s has left the group.</string>
     <string name="ConversationItem_click_for_details">Tap for details</string>
@@ -105,14 +115,25 @@
     <string name="ConversationActivity_reset_secure_session_question">Reset secure session?</string>
     <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">This may help if you\'re having encryption problems in this conversation. Your messages will be kept.</string>
     <string name="ConversationActivity_reset">Reset</string>
+    <string name="ConversationActivity_delete_thread_question">Delete conversation?</string>
+    <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">This will permanently delete all messages in this conversation.</string>
     <string name="ConversationActivity_add_attachment">Add attachment</string>
     <string name="ConversationActivity_select_contact_info">Select contact info</string>
     <string name="ConversationActivity_compose_message">Compose message</string>
     <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, there was an error setting your attachment.</string>
+    <string name="ConversationActivity_the_gif_you_selected_was_too_big">The gif you selected was too big!</string>
+    <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sorry, the selected video exceeds message size restrictions (%1$skB).</string>
+    <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sorry, the selected audio exceeds message size restrictions (%1$skB).</string>
     <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
     <string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
     <string name="ConversationActivity_group_members">Group members</string>
+    <string name="ConversationActivity_group_conversation">Group conversation</string>
 
+    <plurals name="ConversationActivity_d_recipients_in_group">
+        <item quantity="one">1 member</item>
+        <item quantity="other">%d members</item>
+    </plurals>
+    <string name="ConversationActivity_saved_draft">Saved draft</string>
     <string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
     <string name="ConversationActivity_calls_not_supported">Calls not supported</string>
     <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">This device does not appear to support dial actions.</string>
@@ -124,6 +145,8 @@
     <string name="ConversationActivity_lets_switch_to_signal">Let\'s switch to Signal %1$s</string>
     <string name="ConversationActivity_lets_use_this_to_chat">Let\'s use this to chat: %1$s</string>
     <string name="ConversationActivity_error_leaving_group">Error leaving group</string>
+    <string name="ConversationActivity_mms_not_supported_title">MMS not supported</string>
+    <string name="ConversationActivity_mms_not_supported_message">This message cannot be sent since your carrier doesn\'t support MMS.</string>
     <string name="ConversationActivity_specify_recipient">Please choose a contact</string>
     <string name="ConversationActivity_unblock_this_contact_question">Unblock this contact?</string>
     <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">You will once again be able to receive messages and calls from this contact.</string>
@@ -141,6 +164,9 @@
     </plurals>
 
     <!-- ConversationFragment -->
+    <string name="ConversationFragment_message_details">Message details</string>
+    <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSent/Received: %2$s</string>
+    <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s</string>
     <plurals name="ConversationFragment_delete_selected_messages">
         <item quantity="one">Delete selected message?</item>
         <item quantity="other">Delete selected messages?</item>
@@ -171,12 +197,16 @@
         <item quantity="one">Saving attachment to storage...</item>
         <item quantity="other">Saving %1$d attachments to storage...</item>
     </plurals>
+    <string name="ConversationFragment_collecting_attahments">Collecting attachments...</string>
     <string name="ConversationFragment_pending">Pending...</string>
     <string name="ConversationFragment_push">Data (Signal)</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
+    <string name="ConversationFragment_deleting">Deleting</string>
+    <string name="ConversationFragment_deleting_messages">Deleting messages...</string>
 
     <!-- ConversationListActivity -->
+    <string name="ConversationListActivity_search">Search</string>
     <string name="ConversationListActivity_there_is_no_browser_installed_on_your_device">There is no browser installed on your device.</string>
 
     <!-- ConversationListFragment -->
@@ -194,6 +224,7 @@
         <item quantity="one">Conversation archived</item>
         <item quantity="other">%d conversations archived</item>
     </plurals>
+    <string name="ConversationListFragment_undo">UNDO</string>
     <plurals name="ConversationListFragment_moved_conversations_to_inbox">
         <item quantity="one">Moved conversation to inbox</item>
         <item quantity="other">Moved %d conversations to inbox</item>
@@ -209,8 +240,11 @@
     <string name="CreateProfileActivity_your_profile_info">Your profile info</string>
     <string name="CreateProfileActivity_error_setting_profile_photo">Error setting profile photo</string>
     <string name="CreateProfileActivity_problem_setting_profile">Problem setting profile</string>
+    <string name="CreateProfileActivity_updating_profile">Updating profile</string>
+    <string name="CreateProfileActivity_updating_and_encrypting_profile">Updating and encrypting profile</string>
     <string name="CreateProfileActivity_profile_photo">Profile photo</string>
     <string name="CreateProfileActivity_too_long">Too long</string>
+    <string name="CreateProfileActivity_error_capturing_photo_camera_did_not_return_image">Error capturing photo, camera did not return image</string>
 
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
@@ -228,6 +262,8 @@
     <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">By unlinking this device, it will no longer be able to send or receive messages.</string>
     <string name="DeviceListActivity_network_connection_failed">Network connection failed</string>
     <string name="DeviceListActivity_try_again">Try again</string>
+    <string name="DeviceListActivity_unlinking_device">Unlinking device...</string>
+    <string name="DeviceListActivity_unlinking_device_no_ellipsis">Unlinking device</string>
     <string name="DeviceListActivity_network_failed">Network failed!</string>
 
     <!-- DeviceListItem -->
@@ -292,6 +328,7 @@
     <string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string>
     <string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support Signal groups, so this group will be MMS.</string>
     <string name="GroupCreateActivity_youre_not_registered_for_signal">You\'re not registered for Signal messages and calls, so Signal groups are disabled. Please try registering in Settings &gt; Advanced.</string>
+    <string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
     <string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
     <string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
     <string name="GroupCreateActivity_avatar_content_description">Group avatar</string>
@@ -322,6 +359,13 @@
     </string>
     <string name="ImportFragment_import">Import</string>
     <string name="ImportFragment_cancel">Cancel</string>
+    <string name="ImportFragment_restore_encrypted_backup">Restore encrypted backup?</string>
+    <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+        Restoring an encrypted backup will completely replace your existing keys, preferences, and
+        messages. You will lose any information that\'s in your current Signal install but not
+        in the backup.
+    </string>
+    <string name="ImportFragment_restore">Restore</string>
     <string name="ImportFragment_import_plaintext_backup">Import plaintext backup?</string>
     <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">This will import
         messages from a plaintext backup. If you\'ve previously imported this backup,
@@ -332,6 +376,10 @@
     <string name="ImportFragment_no_plaintext_backup_found">No plaintext backup found!</string>
     <string name="ImportFragment_error_importing_backup">Error importing backup!</string>
     <string name="ImportFragment_import_complete">Import complete!</string>
+    <string name="ImportFragment_restoring">Restoring</string>
+    <string name="ImportFragment_restoring_encrypted_backup">Restoring encrypted backup...</string>
+    <string name="ImportFragment_no_encrypted_backup_found">No encrypted backup found!</string>
+    <string name="ImportFragment_restore_complete">Restore complete!</string>
 
     <!-- InputPanel -->
     <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tap and hold to record a voice message, release to send</string>
@@ -357,6 +405,9 @@
     <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Friends don\'t let friends chat unencrypted.</string>
 
     <!-- KeyScanningActivity -->
+    <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No scanned key found!</string>
+    <string name="KeyScanningActivity_install_barcode_Scanner">Install Barcode Scanner?</string>
+    <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Signal needs Barcode Scanner for QR codes.</string>
 
     <!-- MessageDetailsRecipient -->
     <string name="MessageDetailsRecipient_failed_to_send">Failed to send</string>
@@ -367,6 +418,8 @@
     <string name="MessageRetrievalService_background_connection_enabled">Background connection enabled</string>
 
     <!-- MmsDownloader -->
+    <string name="MmsDownloader_error_storing_mms">Error storing MMS!</string>
+    <string name="MmsDownloader_error_connecting_to_mms_provider">Error connecting to MMS provider</string>
     <string name="MmsDownloader_error_reading_mms_settings">Error reading wireless provider MMS settings</string>
 
     <!-- MediaOverviewActivity -->
@@ -375,6 +428,8 @@
 
     <!--- NotificationBarManager -->
     <string name="NotificationBarManager_signal_call_in_progress">Signal call in progress</string>
+    <string name="NotificationBarManager_missed_call_from_s">Missed call from %s</string>
+    <string name="NotificationBarManager_missed_signal_call">Missed Signal call</string>
     <string name="NotificationBarManager__establishing_signal_call">Establishing Signal call</string>
     <string name="NotificationBarManager__incoming_signal_call">Incoming Signal call</string>
     <string name="NotificationBarManager__deny_call">Deny call</string>
@@ -414,11 +469,14 @@
     <string name="DeviceProvisioningActivity_link_this_device">Link this device?</string>
     <string name="DeviceProvisioningActivity_cancel">CANCEL</string>
     <string name="DeviceProvisioningActivity_continue">CONTINUE</string>
+    <string name="DeviceProvisioningActivity_title">Link this device?</string>
     <string name="DeviceProvisioningActivity_content_intro">It will be able to</string>
     <string name="DeviceProvisioningActivity_content_bullets">
         • Read all your messages
         \n• Send messages in your name
     </string>
+    <string name="DeviceProvisioningActivity_content_progress_title">Linking device</string>
+    <string name="DeviceProvisioningActivity_content_progress_content">Linking new device...</string>
     <string name="DeviceProvisioningActivity_content_progress_success">Device approved!</string>
     <string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string>
     <string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string>
@@ -468,16 +526,26 @@
     <string name="RedPhone_answering">Answering</string>
     <string name="RedPhone_ending_call">Ending call</string>
     <string name="RedPhone_dialing">Dialing</string>
+    <string name="RedPhone_canceling_call">Canceling call</string>
+    <string name="RedPhone_call_rejected">Call rejected</string>
     <string name="RedPhone_ringing">Ringing</string>
     <string name="RedPhone_busy">Busy</string>
     <string name="RedPhone_connected">Connected</string>
+    <string name="RedPhone_connecting">Connecting</string>
+    <string name="RedPhone_handshake_failed">Handshake failed!</string>
     <string name="RedPhone_recipient_unavailable">Recipient unavailable</string>
+    <string name="RedPhone_performing_handshake">Performing handshake</string>
     <string name="RedPhone_network_failed">Network failed!</string>
+    <string name="RedPhone_client_failed">Client failed</string>
+    <string name="RedPhone_fatal_error">Fatal Error</string>
+    <string name="RedPhone_login_failed">Login failed!</string>
+    <string name="RedPhone_message_from_the_server">Message from the server</string>
     <string name="RedPhone_number_not_registered">Number not registered!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">The number you dialed does not support secure voice!</string>
     <string name="RedPhone_got_it">Got it</string>
 
     <!-- RegistrationActivity -->
+    <string name="RegistrationActivity_connect_with_signal">Connect with Signal</string>
     <string name="RegistrationActivity_select_your_country">Select your country</string>
     <string name="RegistrationActivity_you_must_specify_your_country_code">You must specify your
         country code
@@ -489,6 +557,11 @@
     <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">The number you
         specified (%s) is invalid.
     </string>
+    <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+        Double-check that this is your number! We\'re about to verify it with an SMS.
+    </string>
+    <string name="RegistrationActivity_continue">Continue</string>
+    <string name="RegistrationActivity_edit">Edit</string>
     <string name="RegistrationActivity_missing_google_play_services">Missing Google Play Services</string>
     <string name="RegistrationActivity_this_device_is_missing_google_play_services">This device is missing Google Play Services. You can still use Signal, but this configuration may result in reduced reliability or performance.\n\nIf you are not an advanced user, are not running an aftermarket Android ROM, or believe that you are seeing this in error, please contact support@whispersystems.org for help trouble shooting.</string>
     <string name="RegistrationActivity_i_understand">I understand</string>
@@ -498,8 +571,29 @@
     <string name="RegistrationActivity_less_information">Less information</string>
 
     <!-- RegistrationProblemsActivity -->
+    <string name="RegistrationProblemsActivity_possible_problems">Possible problems</string>
 
     <!-- RegistrationProgressActivity -->
+    <string name="RegistrationProgressActivity_verifying_number">Verifying number</string>
+    <string name="RegistrationProgressActivity_edit_s">Edit %s</string>
+    <string name="RegistrationProgressActivity_registration_complete">Registration complete!</string>
+    <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">You must enter the code you received first</string>
+    <string name="RegistrationProgressActivity_connecting">Connecting</string>
+    <string name="RegistrationProgressActivity_connecting_for_verification">Connecting for verification...</string>
+    <string name="RegistrationProgressActivity_network_error">Network error!</string>
+    <string name="RegistrationProgressActivity_unable_to_connect">Unable to connect. Please check your network connection and try again.</string>
+    <string name="RegistrationProgressActivity_verification_failed">Verification failed!</string>
+    <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">The verification code you submitted is incorrect. Please try again.</string>
+    <string name="RegistrationProgressActivity_too_many_attempts">Too many attempts</string>
+    <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">You\'ve submitted an incorrect verification code too many times. Please wait a minute before trying again.</string>
+    <string name="RegistrationProgressActivity_requesting_call">Requesting call</string>
+    <string name="RegistrationProgressActivity_requesting_incoming_call">Requesting incoming verification call...</string>
+    <string name="RegistrationProgressActivity_server_error">Server error</string>
+    <string name="RegistrationProgressActivity_the_server_encountered_an_error">The server encountered an error. Please try again.</string>
+    <string name="RegistrationProgressActivity_too_many_requests">Too many requests!</string>
+    <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">You\'ve already recently requested a voice call. You can request another in 20 minutes.</string>
+    <string name="RegistrationProgressActivity_registration_conflict">Registration conflict</string>
+    <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">This number is already registered on a different Signal server. You must unregister there before registering here.</string>
 
     <!-- RegistrationService -->
     <string name="RegistrationService_registration_complete">Registration complete</string>
@@ -510,6 +604,7 @@
     <!-- RingtonePreference -->
     <string name="RingtonePreference_ringtone_default">Default ringtone</string>
     <string name="RingtonePreference_ringtone_silent">None</string>
+    <string name="RingtonePreference_ringtone_picker_title">Ringtones</string>
     <string name="RingtonePreference_notification_sound_default">Default notification sound</string>
     <string name="RingtonePreference_alarm_sound_default">Default alarm sound</string>
     <string name="RingtonePreference_add_ringtone_text">Add ringtone</string>
@@ -578,6 +673,8 @@
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">No safety number to compare was found in the clipboard</string>
 
     <!-- KeyExchangeInitiator -->
+    <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initiate despite existing request?</string>
+    <string name="KeyExchangeInitiator_send">Send</string>
 
     <!-- MessageDisplayHelper -->
     <string name="MessageDisplayHelper_bad_encrypted_message">Bad encrypted message</string>
@@ -591,6 +688,11 @@
     <string name="ThreadDatabase_error_decrypting_message">Error decrypting message.</string>
 
     <!-- MmsDatabase -->
+    <string name="MmsDatabase_connecting_to_mms_server">Connecting to MMS server...</string>
+    <string name="MmsDatabase_downloading_mms">Downloading MMS...</string>
+    <string name="MmsDatabase_mms_download_failed">MMS download failed!</string>
+    <string name="MmsDatabase_downloading">Downloading...</string>
+    <string name="MmsDatabase_mms_pending_download">Tap and configure MMS settings to continue download.</string>
     <string name="MmsDatabase_error_decrypting_message">Error decrypting message.</string>
 
     <!-- MmsMessageRecord -->
@@ -615,6 +717,7 @@
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">You</string>
+    <string name="MediaPreviewActivity_cant_display">Failed to preview this image</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</string>
     <string name="MediaPreviewActivity_draft">Draft</string>
 
@@ -623,6 +726,7 @@
     <string name="MessageNotifier_most_recent_from_s">Most recent from: %1$s</string>
     <string name="MessageNotifier_locked_message">Locked message</string>
     <string name="MessageNotifier_media_message_with_text">Media message: %s</string>
+    <string name="MessageNotifier_no_subject">(No subject)</string>
     <string name="MessageNotifier_message_delivery_failed">Message delivery failed.</string>
     <string name="MessageNotifier_failed_to_deliver_message">Failed to deliver message.</string>
     <string name="MessageNotifier_error_delivering_message">Error delivering message.</string>
@@ -634,6 +738,12 @@
     <string name="MessageNotifier_you_have_pending_signal_messages">You have pending Signal messages, tap to open and retrieve</string>
 
     <!-- MmsPreferencesFragment -->
+    <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Manual MMS settings are required for your phone.</string>
+    <string name="MmsPreferencesFragment__enabled">Enabled</string>
+    <string name="MmsPreferencesFragment__disabled">Disabled</string>
+    <string name="MmsPreferencesFragment__not_set">Not set</string>
+    <string name="MmsPreferencesFragment__invalid_uri">The text entered was not a valid URI</string>
+    <string name="MmsPreferencesFragment__invalid_host">The text entered was not a valid host</string>
 
     <!-- QuickResponseService -->
     <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Signal is locked!</string>
@@ -692,13 +802,16 @@
     <string name="SingleContactSelectionActivity_contact_photo">Contact Photo</string>
 
     <!-- ContactSelectionListFragment-->
+    <string name="ContactSelectionlistFragment_select_for">Select for</string>
 
     <!-- blocked_contacts_fragment -->
     <string name="blocked_contacts_fragment__no_blocked_contacts">No blocked contacts</string>
 
     <!-- contact_selection_recent_activity -->
+    <string name="contact_selection_recent_activity__no_recent_calls">No recent calls.</string>
 
     <!-- conversation_title_view -->
+    <string name="conversation_title_view__conversation_muted">Conversation muted</string>
 
     <!-- conversation_activity -->
     <string name="conversation_activity__type_message_push">Signal message</string>
@@ -706,6 +819,8 @@
     <string name="conversation_activity__type_message_mms_insecure">Unsecured MMS</string>
     <string name="conversation_activity__from_sim_name">From %1$s</string>
     <string name="conversation_activity__send">Send</string>
+    <string name="conversation_activity__remove">Remove</string>
+    <string name="conversation_activity__window_description">Conversation with %1$s</string>
     <string name="conversation_activity__compose_description">Message composition</string>
     <string name="conversation_activity__emoji_toggle_description">Toggle emoji keyboard</string>
     <string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
@@ -717,16 +832,21 @@
     <string name="conversation_input_panel__slide_to_cancel">SLIDE TO CANCEL</string>
 
     <!-- conversation_item -->
+    <string name="conversation_item__mms_downloading_description">Media message downloading</string>
     <string name="conversation_item__mms_image_description">Media message</string>
     <string name="conversation_item__secure_message_description">Secure message</string>
 
     <!-- conversation_item_sent -->
+    <string name="conversation_item_sent__download">Download</string>
+    <string name="conversation_item_sent__downloading">Downloading</string>
     <string name="conversation_item_sent__send_failed_indicator_description">Send Failed</string>
     <string name="conversation_item_sent__pending_approval_description">Pending Approval</string>
     <string name="conversation_item_sent__delivered_description">Delivered</string>
 
     <!-- conversation_item_received -->
+    <string name="conversation_item_received__download">Download</string>
     <string name="conversation_item_received__contact_photo_description">Contact photo</string>
+    <string name="conversation_item_received__downloading">Downloading</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_accessibility_description">Play</string>
@@ -821,11 +941,14 @@
     <string name="giphy_fragment__nothing_found">Nothing found</string>
 
     <!-- import_export_fragment -->
+    <string name="import_export_fragment__export">Export</string>
+    <string name="import_export_fragment__import">Import</string>
 
     <!-- log_submit_activity -->
     <string name="log_submit_activity__log_fetch_failed">Could not read the log on your device. You can still use ADB to get a debug log instead.</string>
     <string name="log_submit_activity__thanks">Thanks for your help!</string>
     <string name="log_submit_activity__submitting">Submitting</string>
+    <string name="log_submit_activity__posting_logs">Posting logs to gist&#8230;</string>
     <string name="log_submit_activity__no_browser_installed">No browser installed</string>
 
     <!-- database_migration_activity -->
@@ -843,6 +966,8 @@
     <string name="export_fragment__export_a_plaintext_backup_compatible_with">Export a plaintext backup compatible with \'SMS Backup &amp; Restore\' to storage</string>
     <string name="import_fragment__import_system_sms_database">Import system SMS database</string>
     <string name="import_fragment__import_the_database_from_the_default_system">Import the database from the default system messenger app</string>
+    <string name="import_fragment__restore_encrypted_backup">Restore encrypted backup</string>
+    <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Restore a previously exported encrypted Signal backup</string>
     <string name="import_fragment__import_plaintext_backup">Import plaintext backup</string>
     <string name="import_fragment__import_a_plaintext_backup_file">Import a plaintext backup file. Compatible with \'SMS Backup &amp; Restore.\'</string>
 
@@ -881,29 +1006,109 @@
     <string name="profile_create_activity__your_name">Your name</string>
 
     <!-- recipient_preferences_activity -->
+    <string name="recipient_preference_activity__blocked">BLOCKED</string>
 
     <!-- recipient_preferences -->
     <string name="recipient_preferences__mute_conversation">Mute conversation</string>
+    <string name="recipient_preferences__disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
     <string name="recipient_preferences__notification_sound">Notification sound</string>
     <string name="recipient_preferences__vibrate">Vibrate</string>
     <string name="recipient_preferences__block">Block</string>
     <string name="recipient_preferences__color">Color</string>
+    <string name="recipient_preferences__color_for_this_contact">Color for this contact</string>
     <string name="recipient_preferences__view_safety_number">View safety number</string>
     <string name="recipient_preferences__chat_settings">Chat settings</string>
     <string name="recipient_preferences__privacy">Privacy</string>
 
     <!--- redphone_call_controls -->
     <string name="redphone_call_card__signal_call">Signal Call</string>
+    <string name="redphone_call_controls__end_call">end call</string>
+    <string name="redphone_call_controls__audio">Audio</string>
     <string name="redphone_call_controls__mute">Mute</string>
     <string name="redphone_call_controls__signal_call">Signal Call</string>
 
     <!-- registration_activity -->
+    <string name="registration_activity__verify_your_number_to_connect_with_signal">
+        Verify your phone number to connect with Signal.
+    </string>
+    <string name="registration_activity__your_country">YOUR COUNTRY</string>
+    <string name="registration_activity__your_country_code_and_phone_number">YOUR COUNTRY CODE AND
+        PHONE NUMBER
+    </string>
     <string name="registration_activity__phone_number">PHONE NUMBER</string>
+    <string name="registration_activity__register">Register</string>
     <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal makes it easy to communicate by using your existing phone number and address book. Friends and contacts who already know how to contact you by phone will be able to easily get in touch by Signal.\n\nRegistration transmits some contact information to the server. It is not stored.</string>
+    <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
 
     <!-- registration_problems -->
+    <string name="registration_problems__some_possible_problems_include">Some possible problems
+        include:
+    </string>
+    <string name="registration_problems__sms_interceptors">SMS interceptors.</string>
+    <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+        Some third party text messaging clients, such as Handcent or GoSMS, behave poorly and
+        intercept all incoming SMS messages. Check to see if you received a text message that starts
+        with \'Your Signal verification code:\', in which case you\'ll need to configure your
+        third party text messaging app to let text messages through.
+    </string>
+    <string name="registration_problems__incorrect_number">Incorrect number.</string>
+    <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+        Please check to make sure you entered your number correctly, and that it is formatted correctly for
+        your region.
+    </string>
+    <string name="registration_problems__google_voice">Google Voice.</string>
+    <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
+        Signal will not work with Google Voice numbers.
+    </string>
 
     <!-- registration_progress_activity -->
+    <string name="registration_progress_activity__voice_verification">Voice verification</string>
+    <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+        Signal can also call you to verify your number. Tap \'Call Me\' and enter the six digit
+        code that you hear below.
+    </string>
+    <string name="registration_progress_activity__verify">Verify</string>
+    <string name="registration_progress_activity__call_me">Call me</string>
+    <string name="registration_progress_activity__edit_number">Edit number</string>
+    <string name="registration_progress_activity__connectivity_error">Connectivity error.</string>
+    <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal was unable to connect to the server.</string>
+    <string name="registration_progress_activity__some_possible_problems_include">Some possible
+        problems include:
+    </string>
+    <string name="registration_progress_activity__no_network_connectivity">No network
+        connectivity.
+    </string>
+    <string name="registration_progress_activity__your_device_needs_network_connectivity">Your
+        device needs network connectivity in order to use this Signal feature. Check to ensure
+        that it is connected to mobile data or Wi-Fi.
+    </string>
+    <string name="registration_progress_activity__restrictive_firewall">Restrictive firewall.
+    </string>
+    <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+        If you are connected via Wi-Fi, it\'s possible that there is a firewall blocking access to
+        the Signal server. Try another network or mobile data.
+    </string>
+    <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+        Signal will now automatically verify your number with a confirmation SMS message.
+    </string>
+    <string name="registration_progress_activity__connecting">Connecting...</string>
+    <string name="registration_progress_activity__waiting_for_sms_verification">Waiting for SMS
+        verification...
+    </string>
+    <string name="registration_progress_activity__registering_with_server">Registering with server...</string>
+    <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">This
+        could take a moment. Please be patient, we\'ll notify you when verification is complete.
+    </string>
+    <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
+        Signal timed out while waiting for a verification SMS message.
+    </string>
+    <string name="registration_progress_activity__sms_verification_failed">SMS verification
+        failed.
+    </string>
+    <string name="registration_progress_activity__generating_keys">Generating keys...</string>
+    <string name="registration_progress_activity__alert">Alert</string>
+    <string name="registration_progress_activity__telephone">Telephone</string>
+    <string name="registration_progress_activity__check">Check</string>
 
     <!-- recipients_panel -->
     <string name="recipients_panel__to"><small>Enter a name or number</small></string>
@@ -938,10 +1143,13 @@
     <string name="AndroidManifest__create_passphrase">Create passphrase</string>
     <string name="AndroidManifest__enter_passphrase">Enter passphrase</string>
     <string name="AndroidManifest__select_contacts">Select contacts</string>
+    <string name="AndroidManifest__signal_detected">Signal detected</string>
     <string name="AndroidManifest__change_passphrase">Change passphrase</string>
     <string name="AndroidManifest__verify_safety_number">Verify safety number</string>
     <string name="AndroidManifest__log_submit">Submit debug log</string>
     <string name="AndroidManifest__media_preview">Media preview</string>
+    <string name="AndroidManifest__all_media">All media</string>
+    <string name="AndroidManifest__all_media_named">All media with %1$s</string>
     <string name="AndroidManifest__message_details">Message details</string>
     <string name="AndroidManifest__linked_devices">Linked devices</string>
     <string name="AndroidManifest__invite_friends">Invite friends</string>
@@ -988,13 +1196,18 @@
     </plurals>
 
     <!-- preferences.xml -->
+    <string name="preferences__general">General</string>
     <string name="preferences__sms_mms">SMS and MMS</string>
     <string name="preferences__pref_all_sms_title">Receive all SMS</string>
     <string name="preferences__pref_all_mms_title">Receive all MMS</string>
     <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">Use Signal for all incoming text messages</string>
     <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages">Use Signal for all incoming multimedia messages</string>
+    <string name="preferences__input_settings">Input Settings</string>
+    <string name="preferences__enable_enter_key_title">Enable Enter key</string>
+    <string name="preferences__replace_smiley_with_enter_key">Replace the smiley key with an Enter key</string>
     <string name="preferences__pref_enter_sends_title">Enter key sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the Enter key will send text messages</string>
+    <string name="preferences__display_settings">Display settings</string>
     <string name="preferences__choose_identity">Choose identity</string>
     <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Choose your contact entry from the contacts list.</string>
     <string name="preferences__change_passphrase">Change passphrase</string>
@@ -1007,11 +1220,20 @@
     <string name="preferences__inactivity_timeout_passphrase">Inactivity timeout passphrase</string>
     <string name="preferences__inactivity_timeout_interval">Inactivity timeout interval</string>
     <string name="preferences__notifications">Notifications</string>
+    <string name="preferences__enable_message_notifications">Enable message notifications</string>
+    <string name="preferences__new_contacts_notifications">New contacts notifications</string>
+    <string name="preferences__show_a_notification_for_new_signal_contacts">Show a notification for new Signal contacts</string>
     <string name="preferences__led_color">LED color</string>
     <string name="preferences__led_color_unknown">Unknown</string>
     <string name="preferences__pref_led_blink_title">LED blink pattern</string>
+    <string name="preferences__pref_led_blink_custom_pattern_title">Set custom LED blink pattern</string>
+    <string name="preferences__pref_led_blink_custom_pattern_on_for">On for:</string>
+    <string name="preferences__pref_led_blink_custom_pattern_off_for">Off for:</string>
+    <string name="preferences__pref_led_blink_custom_pattern_set">Custom LED blink pattern set!</string>
     <string name="preferences__sound">Sound</string>
     <string name="preferences__silent">Silent</string>
+    <string name="preferences__in_conversation_notifications">In-conversation notifications</string>
+    <string name="preferences__play_inthread_notifications">Play notification sound when viewing an active conversation</string>
     <string name="preferences__repeat_alerts">Repeat alerts</string>
     <string name="preferences__never">Never</string>
     <string name="preferences__one_time">One time</string>
@@ -1020,6 +1242,9 @@
     <string name="preferences__five_times">Five times</string>
     <string name="preferences__ten_times">Ten times</string>
     <string name="preferences__vibrate">Vibrate</string>
+    <string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string>
+    <string name="preferences__minutes">minutes</string>
+    <string name="preferences__hours">hours</string>
     <string name="preferences__green">Green</string>
     <string name="preferences__red">Red</string>
     <string name="preferences__blue">Blue</string>
@@ -1031,10 +1256,13 @@
     <string name="preferences__fast">Fast</string>
     <string name="preferences__normal">Normal</string>
     <string name="preferences__slow">Slow</string>
+    <string name="preferences__custom">Custom</string>
     <string name="preferences__advanced">Advanced</string>
     <string name="preferences__privacy">Privacy</string>
     <string name="preferences__mms_user_agent">MMS User Agent</string>
     <string name="preferences__advanced_mms_access_point_names">Manual MMS settings</string>
+    <string name="preferences__enable_manual_mms">Use manual MMS settings</string>
+    <string name="preferences__override_system_mms_settings">Override system MMS settings with the information below.</string>
     <string name="preferences__mmsc_url">MMSC URL</string>
     <string name="preferences__mms_proxy_host">MMS Proxy Host</string>
     <string name="preferences__mms_proxy_port">MMS Proxy Port</string>
@@ -1065,6 +1293,9 @@
     <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">If read receipts are disabled, you won\'t be able to see read receipts from others.</string>
     <string name="preferences__request_keyboard_to_disable_personalized_learning">Request keyboard to disable personalized learning</string>
     <string name="preferences_app_protection__blocked_contacts">Blocked contacts</string>
+    <string name="preferences_app_protection__safety_numbers_approval">Safety numbers approval</string>
+    <string name="preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change">Require approval of new safety numbers when they change</string>
+    <string name="preferences_notifications__display_in_notifications">Display in notifications</string>
     <string name="preferences_chats__when_using_mobile_data">When using mobile data</string>
     <string name="preferences_chats__when_using_wifi">When using Wi-Fi</string>
     <string name="preferences_chats__when_roaming">When roaming</string>
@@ -1072,6 +1303,8 @@
     <string name="preferences_chats__message_trimming">Message trimming</string>
     <string name="preferences_advanced__use_system_emoji">Use system emoji</string>
     <string name="preferences_advanced__disable_signal_built_in_emoji_support">Disable Signal\'s built-in emoji support</string>
+    <string name="preferences_advanced__video_calling_beta">Video calling beta</string>
+    <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Support for next-generation video and voice calls when enabled by both parties. This feature is in beta.</string>
     <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Relay all calls through the Signal server to avoid revealing your IP address to your contact. Enabling will reduce call quality.</string>
     <string name="preferences_advanced__always_relay_calls">Always relay calls</string>
     <string name="preferences_app_protection__app_access">App access</string>
@@ -1092,11 +1325,17 @@
     <!-- **************************************** -->
 
     <!-- contact_selection_list -->
+    <string name="contact_selection_list__menu_select_all">Select all</string>
+    <string name="contact_selection_list__menu_unselect_all">Unselect all</string>
+    <string name="contact_selection_list__header_signal_users">SIGNAL USERS</string>
+    <string name="contact_selection_list__header_other">ALL CONTACTS</string>
     <string name="contact_selection_list__unknown_contact">New message to...</string>
 
     <!-- contact_selection -->
+    <string name="contact_selection__menu_finished">Finished</string>
 
     <!-- refreshing push directory from menu -->
+    <string name="push_directory__menu_refresh">Refresh contact list</string>
 
     <!-- conversation_callable_insecure -->
     <string name="conversation_callable_insecure__menu_call">Call</string>
@@ -1124,6 +1363,7 @@
     <string name="conversation_insecure__invite">Invite</string>
 
     <!-- conversation_insecure_no_push -->
+    <string name="conversation_insecure__security">Security</string>
 
     <!-- conversation_list_batch -->
     <string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
@@ -1132,9 +1372,11 @@
     <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Unarchive selected</string>
 
     <!-- conversation_list -->
+    <string name="conversation_list__menu_search">Search</string>
 
     <!-- conversation_list_item_view -->
     <string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>
+    <string name="conversation_list_item_view__error_alert">Error alert</string>
     <string name="conversation_list_item_view__archived">Archived</string>
 
     <!-- conversation_list_fragment -->
@@ -1153,6 +1395,7 @@
     <string name="conversation__menu_add_attachment">Add attachment</string>
     <string name="conversation__menu_edit_group">Edit group</string>
     <string name="conversation__menu_leave_group">Leave group</string>
+    <string name="conversation__menu_delete_thread">Delete conversation</string>
     <string name="conversation__menu_view_all_media">All media</string>
     <string name="conversation__menu_conversation_settings">Conversation settings</string>
 
@@ -1169,6 +1412,9 @@
     <string name="conversation_group_options__broadcast">Broadcast</string>
 
     <!-- key_scanning -->
+    <string name="key_scanning__menu_compare">Compare</string>
+    <string name="key_scanning__menu_display_your_qr_code">Display your QR code</string>
+    <string name="key_scanning__menu_scan_contacts_qr_code">Scan contact\'s QR code</string>
 
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_message">New message</string>
@@ -1192,16 +1438,23 @@
     <string name="reminder_header_outdated_build_details_today">Your version of Signal will expire today. Tap to update to the most recent version.</string>
     <string name="reminder_header_expired_build">Your version of Signal has expired!</string>
     <string name="reminder_header_expired_build_details">Messages will no longer send successfully. Tap to update to the most recent version.</string>
+    <string name="reminder_header_expired_build_button">UPDATE</string>
     <string name="reminder_header_sms_default_title">Use as default SMS app</string>
     <string name="reminder_header_sms_default_text">Tap to make Signal your default SMS app.</string>
+    <string name="reminder_header_sms_default_button">SET</string>
     <string name="reminder_header_sms_import_title">Import system SMS</string>
     <string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into Signal\'s encrypted database.</string>
+    <string name="reminder_header_sms_import_button">IMPORT</string>
     <string name="reminder_header_push_title">Enable Signal messages and calls</string>
     <string name="reminder_header_push_text">Upgrade your communication experience.</string>
+    <string name="reminder_header_push_button">ENABLE</string>
     <string name="reminder_header_invite_title">Invite to Signal</string>
     <string name="reminder_header_invite_text">Take your conversation with %1$s to the next level.</string>
+    <string name="reminder_header_invite_button">INVITE</string>
     <string name="reminder_header_share_title">Invite your friends!</string>
     <string name="reminder_header_share_text">The more friends use Signal, the better it gets.</string>
+    <string name="reminder_header_share_button">SHARE</string>
+    <string name="reminder_header_close_button">CLOSE</string>
 
     <!-- media_preview -->
     <string name="media_preview__save_title">Save</string>
@@ -1209,6 +1462,7 @@
     <string name="media_preview__all_media_title">All media</string>
 
     <!-- media_overview -->
+    <string name="media_overview__save_all">Save all</string>
 
     <!-- media_preview_activity -->
     <string name="media_preview_activity__media_content_description">Media preview</string>
@@ -1216,6 +1470,9 @@
     <!-- new_conversation_activity -->
     <string name="new_conversation_activity__refresh">Refresh</string>
     <!-- redphone_audio_popup_menu -->
+    <string name="redphone_audio_popup_menu__handset">Handset</string>
+    <string name="redphone_audio_popup_menu__headset">Headset</string>
+    <string name="redphone_audio_popup_menu__speaker">Speaker</string>
 
     <!-- Trimmer -->
     <string name="trimmer__deleting">Deleting</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c956700093..07d056a5c9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -91,6 +91,18 @@
         <item name="colorButtonNormal">@color/textsecure_primary</item>
     </style>
 
+    <style name="transparent_progress">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowTitleStyle">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
     <style name="NotificationText">
       <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
@@ -144,10 +156,32 @@
     </style>
 
     <!-- For Holo Light Dialog Activity Styling Emulation -->
+    <style name="TextSecureDialogWindowTitle">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">@color/textsecure_holo_blue_light</item>
+    </style>
+
+    <style name="TextSecureDialogButtonBar"
+           tools:ignore="NewApi">
+        <item name="android:background">@null</item>
+        <item name="android:dividerPadding">0dp</item>
+    </style>
+
+    <style name="TextSecureBorderlessButtonSmall">
+        <item name="android:textSize">14sp</item>
+    </style>
 
     <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
     </style>
 
+    <style name="TextSecureDialogPrimaryText">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="TextSecureDialogSecondaryText">
+        <item name="android:textColor">#ff999999</item>
+    </style>
+
     <style name="MaterialButton">
         <item name="android:elevation">1dp</item>
         <item name="android:translationZ">1dp</item>
@@ -185,12 +219,22 @@
     <!-- RedPhone -->
 
     <!-- Buttons in the main "button row" of the in-call onscreen touch UI. -->
+    <style name="InCallButton">
+        <item name="android:layout_width">0px</item>
+        <item name="android:layout_height">@dimen/in_call_button_height</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+    </style>
 
     <!-- "Compound button" variation of InCallButton.
            These buttons have the concept of two states: checked and unchecked.
            (This style is just like "InCallButton" except that we also
            clear out android:textOn and android:textOff, to avoid the default
            text label behavior of the ToggleButton class.) -->
+    <style name="InCallCompoundButton" parent="InCallButton">
+        <item name="android:textOn">@null</item>
+        <item name="android:textOff">@null</item>
+    </style>
 
     <style name="WebRtcCallCompoundButton">
         <item name="android:layout_height">31dp</item>