diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml
index df2a916d3..4393823e9 100644
--- a/briar-android/AndroidManifest.xml
+++ b/briar-android/AndroidManifest.xml
@@ -277,7 +277,7 @@
 
 		<activity
 			android:name=".android.SettingsActivity"
-			android:label="@string/settings_title"
+			android:label="@string/settings_button"
 			android:parentActivityName=".android.NavDrawerActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
diff --git a/briar-android/res/drawable-hdpi/content_attachment.png b/briar-android/res/drawable-hdpi/content_attachment.png
deleted file mode 100644
index 53b963d54..000000000
Binary files a/briar-android/res/drawable-hdpi/content_attachment.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/device_access_accounts.png b/briar-android/res/drawable-hdpi/device_access_accounts.png
deleted file mode 100644
index 3daaa4967..000000000
Binary files a/briar-android/res/drawable-hdpi/device_access_accounts.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/msg_in_unread.9.png b/briar-android/res/drawable-hdpi/msg_in_unread.9.png
deleted file mode 100644
index c22cc8632..000000000
Binary files a/briar-android/res/drawable-hdpi/msg_in_unread.9.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/navigation_next_item.png b/briar-android/res/drawable-hdpi/navigation_next_item.png
deleted file mode 100644
index e6495b29c..000000000
Binary files a/briar-android/res/drawable-hdpi/navigation_next_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/navigation_previous_item.png b/briar-android/res/drawable-hdpi/navigation_previous_item.png
deleted file mode 100644
index 23778ae9b..000000000
Binary files a/briar-android/res/drawable-hdpi/navigation_previous_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/navigation_refresh.png b/briar-android/res/drawable-hdpi/navigation_refresh.png
deleted file mode 100644
index 479aca465..000000000
Binary files a/briar-android/res/drawable-hdpi/navigation_refresh.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/content_attachment.png b/briar-android/res/drawable-mdpi/content_attachment.png
deleted file mode 100644
index 38ff9f853..000000000
Binary files a/briar-android/res/drawable-mdpi/content_attachment.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/device_access_accounts.png b/briar-android/res/drawable-mdpi/device_access_accounts.png
deleted file mode 100644
index 84296f8e7..000000000
Binary files a/briar-android/res/drawable-mdpi/device_access_accounts.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/msg_in_unread.9.png b/briar-android/res/drawable-mdpi/msg_in_unread.9.png
deleted file mode 100644
index 6e5418856..000000000
Binary files a/briar-android/res/drawable-mdpi/msg_in_unread.9.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/navigation_next_item.png b/briar-android/res/drawable-mdpi/navigation_next_item.png
deleted file mode 100644
index 88029a82d..000000000
Binary files a/briar-android/res/drawable-mdpi/navigation_next_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/navigation_previous_item.png b/briar-android/res/drawable-mdpi/navigation_previous_item.png
deleted file mode 100644
index 8d19e3911..000000000
Binary files a/briar-android/res/drawable-mdpi/navigation_previous_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/navigation_refresh.png b/briar-android/res/drawable-mdpi/navigation_refresh.png
deleted file mode 100644
index 63e70e178..000000000
Binary files a/briar-android/res/drawable-mdpi/navigation_refresh.png and /dev/null differ
diff --git a/briar-android/res/drawable-v21/round_button.xml b/briar-android/res/drawable-v21/round_button.xml
deleted file mode 100644
index 788768ef6..000000000
--- a/briar-android/res/drawable-v21/round_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
-	on lower API levels
--->
-<ripple
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="@color/briar_primary_dark">
-
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/briar_primary"/>
-		</shape>
-	</item>
-
-</ripple>
\ No newline at end of file
diff --git a/briar-android/res/drawable-xhdpi/content_attachment.png b/briar-android/res/drawable-xhdpi/content_attachment.png
deleted file mode 100644
index 1cffb3fbf..000000000
Binary files a/briar-android/res/drawable-xhdpi/content_attachment.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/msg_in_unread.9.png b/briar-android/res/drawable-xhdpi/msg_in_unread.9.png
deleted file mode 100644
index 341ec4f72..000000000
Binary files a/briar-android/res/drawable-xhdpi/msg_in_unread.9.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_next_item.png b/briar-android/res/drawable-xhdpi/navigation_next_item.png
deleted file mode 100644
index c36e050a3..000000000
Binary files a/briar-android/res/drawable-xhdpi/navigation_next_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_previous_item.png b/briar-android/res/drawable-xhdpi/navigation_previous_item.png
deleted file mode 100644
index cf0b485f6..000000000
Binary files a/briar-android/res/drawable-xhdpi/navigation_previous_item.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/navigation_refresh.png b/briar-android/res/drawable-xhdpi/navigation_refresh.png
deleted file mode 100644
index e6212cf67..000000000
Binary files a/briar-android/res/drawable-xhdpi/navigation_refresh.png and /dev/null differ
diff --git a/briar-android/res/drawable-xxhdpi/msg_in_unread.9.png b/briar-android/res/drawable-xxhdpi/msg_in_unread.9.png
deleted file mode 100644
index 3a3bb3e7e..000000000
Binary files a/briar-android/res/drawable-xxhdpi/msg_in_unread.9.png and /dev/null differ
diff --git a/briar-android/res/drawable/ic_warning_black_24dp.xml b/briar-android/res/drawable/ic_warning_black_24dp.xml
deleted file mode 100644
index b3a9e036b..000000000
--- a/briar-android/res/drawable/ic_warning_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>
diff --git a/briar-android/res/drawable/social_send_now.xml b/briar-android/res/drawable/social_send_now.xml
deleted file mode 100644
index 941911ed3..000000000
--- a/briar-android/res/drawable/social_send_now.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:alpha="0.56" android:height="24dp"
-	android:viewportHeight="24.0" android:viewportWidth="24.0"
-	android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-	<path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>
diff --git a/briar-android/res/drawable/social_share.xml b/briar-android/res/drawable/social_share.xml
deleted file mode 100644
index e3fe874d6..000000000
--- a/briar-android/res/drawable/social_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/briar-android/res/layout-land/fragment_keyagreement_id.xml b/briar-android/res/layout-land/fragment_keyagreement_id.xml
index 492c77892..7234c7cef 100644
--- a/briar-android/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout-land/fragment_keyagreement_id.xml
@@ -38,7 +38,6 @@
 			android:paddingTop="@dimen/margin_activity_vertical">
 
 			<TextView
-				android:id="@+id/yourNicknameView"
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -62,7 +61,6 @@
 				android:padding="@dimen/margin_large">
 
 				<ImageView
-					android:id="@+id/explanationView"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:adjustViewBounds="true"
@@ -70,7 +68,6 @@
 					android:src="@drawable/qr_code_explanation"/>
 
 				<TextView
-					android:id="@+id/faceToFaceView"
 					style="@style/BriarTextBody"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
diff --git a/briar-android/res/layout-land/invitation_bluetooth_start.xml b/briar-android/res/layout-land/invitation_bluetooth_start.xml
index 84d0945e6..3eead4f7a 100644
--- a/briar-android/res/layout-land/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout-land/invitation_bluetooth_start.xml
@@ -34,7 +34,6 @@
 			android:orientation="vertical">
 
 			<TextView
-				android:id="@+id/yourNicknameView"
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -51,7 +50,6 @@
 				android:visibility="gone"/>
 
 			<TextView
-				android:id="@+id/faceToFaceView"
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/briar-android/res/layout/activity_nav_drawer.xml b/briar-android/res/layout/activity_nav_drawer.xml
index 7eb1d4e35..ad4465680 100644
--- a/briar-android/res/layout/activity_nav_drawer.xml
+++ b/briar-android/res/layout/activity_nav_drawer.xml
@@ -11,7 +11,6 @@
 
 	<!-- The second child is the menu -->
 	<include
-		android:id="@+id/navigation_menu_drawer"
 		layout="@layout/navigation_menu"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
diff --git a/briar-android/res/layout/activity_startup_failure.xml b/briar-android/res/layout/activity_startup_failure.xml
index 42fa8047c..5b31a755f 100644
--- a/briar-android/res/layout/activity_startup_failure.xml
+++ b/briar-android/res/layout/activity_startup_failure.xml
@@ -7,7 +7,6 @@
 	android:padding="@dimen/margin_activity_horizontal">
 
 	<TextView
-		android:id="@+id/headlineView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		style="@style/BriarTextTitle"
diff --git a/briar-android/res/layout/fragment_forum_list.xml b/briar-android/res/layout/fragment_forum_list.xml
index 31d90c085..bb4e4ae76 100644
--- a/briar-android/res/layout/fragment_forum_list.xml
+++ b/briar-android/res/layout/fragment_forum_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
-	android:id="@+id/coordinatorLayout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
diff --git a/briar-android/res/layout/fragment_keyagreement_id.xml b/briar-android/res/layout/fragment_keyagreement_id.xml
index 643109dd0..31daffdd4 100644
--- a/briar-android/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout/fragment_keyagreement_id.xml
@@ -16,7 +16,6 @@
 		android:paddingTop="@dimen/margin_activity_vertical">
 
 		<TextView
-			android:id="@+id/yourNicknameView"
 			style="@style/BriarTextBody"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -52,7 +51,6 @@
 			android:padding="@dimen/margin_large">
 
 			<ImageView
-				android:id="@+id/explanationView"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
@@ -60,7 +58,6 @@
 				android:src="@drawable/qr_code_explanation"/>
 
 			<TextView
-				android:id="@+id/faceToFaceView"
 				style="@style/BriarTextBody"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/briar-android/res/layout/introduction_message.xml b/briar-android/res/layout/introduction_message.xml
index cf7e5a27e..3982cbcd3 100644
--- a/briar-android/res/layout/introduction_message.xml
+++ b/briar-android/res/layout/introduction_message.xml
@@ -17,7 +17,6 @@
 			android:layout_height="wrap_content">
 
 			<LinearLayout
-				android:id="@+id/layoutContact1"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_toLeftOf="@+id/introductionIcon"
@@ -56,7 +55,6 @@
 				tools:ignore="ContentDescription"/>
 
 			<LinearLayout
-				android:id="@+id/layoutContact2"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_toEndOf="@+id/introductionIcon"
diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
index 84490caa5..af184c641 100644
--- a/briar-android/res/layout/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -16,7 +16,6 @@
 		android:paddingTop="@dimen/margin_activity_vertical">
 
 		<TextView
-			android:id="@+id/yourNicknameView"
 			style="@style/BriarTextBody"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -42,7 +41,6 @@
 			android:src="@drawable/bluetooth"/>
 
 		<TextView
-			android:id="@+id/faceToFaceView"
 			style="@style/BriarTextBody"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/briar-android/res/layout/list_item_contact.xml b/briar-android/res/layout/list_item_contact.xml
index 9fefd9750..9b00f7643 100644
--- a/briar-android/res/layout/list_item_contact.xml
+++ b/briar-android/res/layout/list_item_contact.xml
@@ -49,7 +49,6 @@
 		</FrameLayout>
 
 		<LinearLayout
-			android:id="@+id/textViews"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
diff --git a/briar-android/res/layout/list_item_introduction_in.xml b/briar-android/res/layout/list_item_introduction_in.xml
index d4b46a2f9..8d197e6eb 100644
--- a/briar-android/res/layout/list_item_introduction_in.xml
+++ b/briar-android/res/layout/list_item_introduction_in.xml
@@ -11,7 +11,6 @@
 		layout="@layout/list_item_msg_in"/>
 
 	<RelativeLayout
-		android:id="@+id/introductionLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left|start"
@@ -50,7 +49,7 @@
 			android:layout_alignEnd="@+id/introductionText"
 			android:layout_alignRight="@+id/introductionText"
 			android:layout_below="@+id/introductionText"
-			android:text="@string/dialog_button_accept"/>
+			android:text="@string/accept"/>
 
 		<Button
 			android:id="@+id/declineButton"
@@ -61,7 +60,7 @@
 			android:layout_below="@+id/introductionText"
 			android:layout_toLeftOf="@+id/acceptButton"
 			android:layout_toStartOf="@+id/acceptButton"
-			android:text="@string/dialog_button_decline"/>
+			android:text="@string/decline"/>
 
 	</RelativeLayout>
 
diff --git a/briar-android/res/layout/list_item_invitations.xml b/briar-android/res/layout/list_item_invitations.xml
index 823fff782..536c8080d 100644
--- a/briar-android/res/layout/list_item_invitations.xml
+++ b/briar-android/res/layout/list_item_invitations.xml
@@ -67,7 +67,7 @@
 		android:layout_alignParentRight="true"
 		android:layout_below="@+id/forumSubscribedView"
 		android:layout_marginTop="-8dp"
-		android:text="@string/dialog_button_accept"/>
+		android:text="@string/accept"/>
 
 	<Button
 		android:id="@+id/declineButton"
@@ -78,7 +78,7 @@
 		android:layout_marginTop="-8dp"
 		android:layout_toLeftOf="@+id/acceptButton"
 		android:layout_toStartOf="@+id/acceptButton"
-		android:text="@string/dialog_button_decline"/>
+		android:text="@string/decline"/>
 
 	<View
 		style="@style/Divider.ForumList"
diff --git a/briar-android/res/layout/list_item_msg_notice_out.xml b/briar-android/res/layout/list_item_msg_notice_out.xml
index 9784a1391..79e006af3 100644
--- a/briar-android/res/layout/list_item_msg_notice_out.xml
+++ b/briar-android/res/layout/list_item_msg_notice_out.xml
@@ -11,7 +11,6 @@
 		layout="@layout/list_item_msg_out"/>
 
 	<RelativeLayout
-		android:id="@+id/introductionLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
diff --git a/briar-android/res/layout/list_item_notice_in.xml b/briar-android/res/layout/list_item_notice_in.xml
index ea63d0a3f..c7caebd52 100644
--- a/briar-android/res/layout/list_item_notice_in.xml
+++ b/briar-android/res/layout/list_item_notice_in.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	android:id="@+id/noticeLayout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
diff --git a/briar-android/res/layout/list_item_notice_out.xml b/briar-android/res/layout/list_item_notice_out.xml
index 9b873d56f..4575f48fe 100644
--- a/briar-android/res/layout/list_item_notice_out.xml
+++ b/briar-android/res/layout/list_item_notice_out.xml
@@ -7,7 +7,6 @@
 	android:orientation="vertical">
 
 	<RelativeLayout
-		android:id="@+id/noticeLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
diff --git a/briar-android/res/layout/list_item_rss_feed.xml b/briar-android/res/layout/list_item_rss_feed.xml
index ffac010d0..809ce8447 100644
--- a/briar-android/res/layout/list_item_rss_feed.xml
+++ b/briar-android/res/layout/list_item_rss_feed.xml
@@ -27,7 +27,7 @@
 		android:layout_alignParentTop="true"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:contentDescription="@string/delete_button"
+		android:contentDescription="@string/delete"
 		android:src="@drawable/action_delete_black"/>
 
 	<TextView
diff --git a/briar-android/res/layout/list_item_shareable_invitation_in.xml b/briar-android/res/layout/list_item_shareable_invitation_in.xml
index 2903e4646..63c628f73 100644
--- a/briar-android/res/layout/list_item_shareable_invitation_in.xml
+++ b/briar-android/res/layout/list_item_shareable_invitation_in.xml
@@ -11,7 +11,6 @@
 		layout="@layout/list_item_msg_in"/>
 
 	<RelativeLayout
-		android:id="@+id/introductionLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="left|start"
diff --git a/briar-android/res/layout/navigation_header.xml b/briar-android/res/layout/navigation_header.xml
index 7f6b9a89b..cc7f80ca8 100644
--- a/briar-android/res/layout/navigation_header.xml
+++ b/briar-android/res/layout/navigation_header.xml
@@ -7,7 +7,6 @@
 	tools:showIn="@layout/navigation_menu">
 
 	<ImageView
-		android:id="@+id/imageView2"
 		android:layout_width="100dp"
 		android:layout_height="100dp"
 		android:layout_gravity="top|center_horizontal"
diff --git a/briar-android/res/menu/blogs_write_blog_post_actions.xml b/briar-android/res/menu/blogs_write_blog_post_actions.xml
deleted file mode 100644
index 11befe036..000000000
--- a/briar-android/res/menu/blogs_write_blog_post_actions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/action_publish_blog_post"
-		android:title="@string/blogs_publish_blog_post"
-		android:icon="@drawable/social_send_now_white"
-		app:showAsAction="always"/>
-
-</menu>
\ No newline at end of file
diff --git a/briar-android/res/values-de/strings.xml b/briar-android/res/values-de/strings.xml
index 1dd58f1f0..ae519cb33 100644
--- a/briar-android/res/values-de/strings.xml
+++ b/briar-android/res/values-de/strings.xml
@@ -10,18 +10,13 @@
   <string name="name_too_long">Name ist zu lang</string>
   <string name="password_too_weak">Passwort ist zu schwach</string>
   <string name="create_account_button">Konto anlegen</string>
-  <string name="password_hint">Passwort</string>
   <string name="forgotten_password">Ich habe mein Passwort vergessen</string>
   <string name="sign_in_button">Anmelden</string>
   <string name="startup_failed_notification_title">Briar konnte nicht gestartet werden</string>
   <string name="startup_failed_activity_title">Fehler beim Starten von Briar</string>
-  <string name="contact_list_button">Kontakte</string>
   <string name="delete_contact">Kontakt löschen</string>
   <string name="contact_deleted_toast">Kontakt gelöscht</string>
-  <string name="forums_button">Foren</string>
-  <string name="settings_button">Einstellungen</string>
   <string name="sign_out_button">Abmelden</string>
-  <string name="contact_list_title">Kontakte</string>
   <string name="no_contacts">Keine Kontakte</string>
   <string name="add_contact_title">Kontakt hinzufügen</string>
   <string name="continue_button">Weiter</string>
@@ -31,34 +26,27 @@
   <string name="codes_do_not_match">Codes stimmen nicht überein</string>
   <string name="contact_added_toast">Kontakt hinzugefügt: %s</string>
   <string name="contact_already_exists">Kontakt %s existiert bereits</string>
-  <string name="scan_qr_code">QR-Code scannen</string>
   <string name="qr_code_invalid">Der QR-Code ist ungültig</string>
   <string name="no_private_messages">Keine Nachrichten</string>
-  <string name="message_sent_toast">Nachricht wurde versendet</string>
-  <string name="show_forums">Anzeigen</string>
+  <string name="show">Anzeigen</string>
   <string name="forum_leave">Forum verlassen</string>
   <string name="forum_left_toast">Forum wurde verlassen</string>
   <string name="create_forum_title">Neues Forum</string>
   <string name="forum_created_toast">Forum wurde erstellt</string>
   <string name="forum_share_button">Forum teilen</string>
   <string name="forum_compose_post">Neuer Forenbeitrag</string>
-  <string name="from">Von:</string>
   <string name="anonymous">Anonym</string>
   <string name="new_identity_item">Neue Identität\u2026</string>
   <string name="new_identity_title">Neue Identität</string>
   <string name="create_identity_button">Identität erstellen</string>
   <string name="identity_created_toast">Identität wurde erstellt</string>
-  <string name="forum_post_hint">Forenbeitrag eingeben</string>
   <string name="forum_declined_toast">Foreneinladung abgelehnt</string>
   <string name="shared_by_format">Geteilt durch %s</string>
   <string name="forum_shared_by">Geteilt durch</string>
   <string name="forum_shared_with">Geteilt mit</string>
   <string name="nobody">Niemand</string>
-  <string name="add_button">Hinzufügen</string>
-  <string name="cancel_button">Abbrechen</string>
-  <string name="done_button">Fertig</string>
-  <string name="delete_button">Löschen</string>
-  <string name="post_sent_toast">Forenbeitrag wurde versendet</string>
+  <string name="cancel">Abbrechen</string>
+  <string name="delete">Löschen</string>
   <plurals name="private_message_notification_text">
     <item quantity="one">Neue private Nachricht.</item>
     <item quantity="other">%d neue private Nachrichten</item>
@@ -68,7 +56,7 @@
     <item quantity="other">%d neue Forenbeiträge</item>
   </plurals>
   <!--Settings-->
-  <string name="settings_title">Einstellungen</string>
+  <string name="settings_button">Einstellungen</string>
   <string name="network_settings_title">Netzwerke</string>
   <string name="bluetooth_setting">Mit Bluetooth verbinden</string>
   <string name="bluetooth_setting_enabled">Sobald Kontakte in der Nähe sind</string>
@@ -115,16 +103,14 @@
   <string name="dialog_title_delete_contact">Löschen des Kontakts bestätigen</string>
   <string name="dialog_title_welcome">Willkommen bei Briar</string>
   <string name="dialog_title_leave_forum">Verlassen des Forums bestätigen</string>
-  <string name="dialog_button_ok">OK</string>
+  <string name="ok">OK</string>
   <string name="dialog_button_leave">Verlassen</string>
-  <string name="dialog_button_accept">Annehmen</string>
-  <string name="dialog_button_decline">Ablehnen</string>
+  <string name="accept">Annehmen</string>
+  <string name="decline">Ablehnen</string>
   <!--Toolbar headers-->
-  <string name="dashboard_toolbar_header">Briar</string>
-  <string name="settings_toolbar_header">Einstellungen</string>
-  <string name="contacts_toolbar_header">Kontakte</string>
-  <string name="forums_toolbar_header">Foren</string>
+  <string name="contact_list_button">Kontakte</string>
+  <string name="forums_button">Foren</string>
   <!--Progress titles-->
-  <string name="progress_title_please_wait">Bitte warten...</string>
+  <string name="progress_title_please_wait">Bitte warten…</string>
   <!--Blogs-->
 </resources>
diff --git a/briar-android/res/values-ms/strings.xml b/briar-android/res/values-ms/strings.xml
index 5675ebc92..da341bab4 100644
--- a/briar-android/res/values-ms/strings.xml
+++ b/briar-android/res/values-ms/strings.xml
@@ -18,9 +18,7 @@
   <string name="delete_contact">Padam kenalan</string>
   <string name="contact_deleted_toast">Kenalan telah dipadam</string>
   <string name="forums_button">Forum</string>
-  <string name="settings_button">Tetapan</string>
   <string name="sign_out_button">Daftar Keluar</string>
-  <string name="contact_list_title">Kenalan</string>
   <string name="no_contacts">Tiada kenalan</string>
   <string name="add_contact_title">Tambah kenalan</string>
   <string name="continue_button">Teruskan</string>
@@ -38,24 +36,19 @@
   <string name="interfering">Ini menunjukkan bahawa seseorang sedang mengganggu sambungan anda</string>
   <string name="contact_added_toast">Kenalan telah ditambah: %s</string>
   <string name="no_private_messages">Tiada mesej</string>
-  <string name="private_message_hint">Taip mesej</string>
-  <string name="message_sent_toast">Mesej telah dihantar</string>
   <string name="create_forum_title">Cipta forum baru</string>
   <string name="choose_forum_name">Pilih nama untuk forum anda:</string>
   <string name="forum_created_toast">Forum telah dicipta</string>
-  <string name="from">Daripada:</string>
   <string name="anonymous">Tidak dikenali</string>
   <string name="new_identity_item">Identiti baru\u2026</string>
   <string name="new_identity_title">Identiti baru</string>
   <string name="identity_created_toast">Identiti telah dicipta</string>
-  <string name="add_button">Tambah</string>
-  <string name="cancel_button">Batal</string>
-  <string name="done_button">Selesai</string>
+  <string name="cancel">Batal</string>
   <plurals name="private_message_notification_text">
     <item quantity="other">%d mesej peribadi baru.</item>
   </plurals>
   <!--Settings-->
-  <string name="settings_title">Tetapan</string>
+  <string name="settings_button">Tetapan</string>
   <string name="bluetooth_setting_disabled">Hanya ketika menambah kenalan</string>
   <string name="notify_private_messages_setting">Papar notifikasi untuk mesej peribadi</string>
   <string name="notify_vibration_setting">Getar</string>
diff --git a/briar-android/res/values-pt-rBR/strings.xml b/briar-android/res/values-pt-rBR/strings.xml
index d616b8fee..8228fdac3 100644
--- a/briar-android/res/values-pt-rBR/strings.xml
+++ b/briar-android/res/values-pt-rBR/strings.xml
@@ -22,7 +22,6 @@
   <string name="passwords_do_not_match">As senhas não conferem</string>
   <string name="create_account_button">Criar conta</string>
   <string name="enter_password">Insira sua senha:</string>
-  <string name="password_hint">senha</string>
   <string name="forgotten_password">Esqueci minha senha</string>
   <string name="try_again">Senha Incorreta, tente novamente</string>
   <string name="sign_in_button">Entrar</string>
@@ -32,14 +31,10 @@
   <string name="startup_failed_db_error">Por alguma razão, seus dados do Briar estão corrompidos e não podem ser reparados. Sua conta, seus dados e todas suas conexões com contatos estão perdidas. Infelizmente você terá que resintalar o Briar e criar uma nova conta.</string>
   <string name="startup_failed_service_error">O Briar não pode iniciar devido a um plugin. Reinstalar o Briar geralmente resolve esse problema. Porém, note que ao fazer isso você perderá sua conta e todos os dados associados a ela,  já que o Briar não usa um servidor central para armazenar seus dados.</string>
   <string name="expiry_warning">Esse programa expirou.\nPor favor instale uma versão mais recente.</string>
-  <string name="contact_list_button">Contatos</string>
   <string name="delete_contact">Apagar contato</string>
   <string name="contact_deleted_toast">Contato apagado</string>
-  <string name="forums_button">Fóruns</string>
-  <string name="settings_button">Configurações</string>
   <string name="sign_out_button">Sair</string>
   <string name="now">agora</string>
-  <string name="contact_list_title">Contatos</string>
   <string name="add_contact_title">Adicionar um contato</string>
   <string name="your_nickname">Escolha a identidade que você quer usar:</string>
   <string name="face_to_face">Você deve estar frente-a-frente com a pessoal que deseja adicionar como contato. Isso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
@@ -61,29 +56,21 @@
   <string name="contact_added_toast">Contato adicionado: %s</string>
   <string name="contact_already_exists">Contato %s já existe</string>
   <string name="contact_exchange_failed">Troca de contatos falhou</string>
-  <string name="scan_qr_code">Escanear QR code</string>
   <string name="qr_code_invalid">O QR code é inválido</string>
   <string name="connecting_to_device">Conectando a device\u2026</string>
   <string name="authenticating_with_device">Autenticando com o dispositivo\u2026</string>
   <string name="connection_aborted_local">Conexão interrompida por nós! Isso pode disgnificar que alguém está tentando interferir na sua conexão</string>
   <string name="connection_aborted_remote">Conexão interrompida pelo seu contato! Isto pode significar que algúem está tentando interferir em sua conexão</string>
   <string name="date_no_private_messages">Sem Mensagens</string>
-  <string name="private_message_hint">Escrever mensagem</string>
-  <string name="message_sent_toast">Mensagem enviada</string>
   <plurals name="forums_shared">
     <item quantity="one">%d fórum compartilhado por contatos</item>
     <item quantity="other">%d fóruns compartilhados por contatos</item>
   </plurals>
   <string name="show">Mostrar</string>
-  <string name="show_forums">Mostrar</string>
   <string name="forum_leave">Sair do fórum</string>
   <string name="forum_left_toast">Saiu do fórum</string>
   <string name="sharing_status">Status de compartilhamento</string>
   <string name="no_posts">Sem Posts</string>
-  <plurals name="unread_posts">
-    <item quantity="one">%d post não lido</item>
-    <item quantity="other">%d posts não lidos</item>
-  </plurals>
   <plurals name="posts">
     <item quantity="one">%d Post</item>
     <item quantity="other">%d Posts</item>
@@ -100,13 +87,11 @@
   <string name="forum_invitation_sent">Você compartilhou o fórum \"%1$s\" com %2$s.</string>
   <string name="forum_show_invitations">Mostrar os convites de Forum</string>
   <string name="forum_compose_post">Nova postagem em fórum</string>
-  <string name="from">De:</string>
   <string name="anonymous">Anônimo</string>
   <string name="new_identity_item">Nova identidade\u2026</string>
   <string name="new_identity_title">Nova identidade</string>
   <string name="create_identity_button">Criar identidade</string>
   <string name="identity_created_toast">Identidade criada</string>
-  <string name="forum_post_hint">Digite sua postagem para o fórum</string>
   <string name="forum_invitations_title">Convites para Foruns</string>
   <string name="forum_joined_toast">Você entrou no fórum</string>
   <string name="forum_declined_toast">Convite do fórum recusado</string>
@@ -114,11 +99,8 @@
   <string name="forum_shared_by">Compartilhado por</string>
   <string name="forum_shared_with">Compartilhado com</string>
   <string name="nobody">Ninguém</string>
-  <string name="add_button">Adicionar</string>
-  <string name="cancel_button">Cancelar</string>
-  <string name="done_button">Pronto</string>
-  <string name="delete_button">Apagar</string>
-  <string name="post_sent_toast">Postagem do fórum enviada</string>
+  <string name="cancel">Cancelar</string>
+  <string name="delete">Apagar</string>
   <plurals name="private_message_notification_text">
     <item quantity="one">Nova mensagem privada.</item>
     <item quantity="other">%d novas mensagens privadas.</item>
@@ -128,7 +110,7 @@
     <item quantity="other">%d novas postagens em fóruns.</item>
   </plurals>
   <!--Settings-->
-  <string name="settings_title">Configurações</string>
+  <string name="settings_button">Configurações</string>
   <string name="network_settings_title">Redes</string>
   <string name="bluetooth_setting">Conectar via Bluetooth</string>
   <string name="bluetooth_setting_enabled">Sempre que estiver perto de contatos</string>
@@ -170,7 +152,6 @@
   <string name="password_changed">Senha alterada com sucesso.</string>
   <string name="feedback_settings_title">Feedback</string>
   <string name="send_feedback">Enviar feedback</string>
-  <string name="step">Passo %1$d/%2$d</string>
   <string name="online">Online</string>
   <string name="offline">Offline</string>
   <string name="send">Enviar</string>
@@ -221,18 +202,16 @@
   <string name="dialog_welcome_message">Adicione um contato para começar uma comunicação segura ou pressione o ícone na parte superior direita da tela para mais opções.</string>
   <string name="dialog_title_leave_forum">Confirmar saída do fórum</string>
   <string name="dialog_message_leave_forum">Você tem certeza que deseja sair deste fórum? Seus contatos com quem você o compartilhou podem deixar de receber notificações dele.</string>
-  <string name="dialog_button_ok">OK</string>
+  <string name="ok">OK</string>
   <string name="dialog_button_leave">Sair</string>
   <string name="dialog_button_introduce">Apresentar</string>
-  <string name="dialog_button_accept">Aceitar</string>
-  <string name="dialog_button_decline">Negar</string>
+  <string name="accept">Aceitar</string>
+  <string name="decline">Negar</string>
   <!--Toolbar headers-->
-  <string name="dashboard_toolbar_header">Briar</string>
-  <string name="settings_toolbar_header">Configurações</string>
-  <string name="contacts_toolbar_header">Contatos</string>
-  <string name="forums_toolbar_header">Fóruns</string>
+  <string name="contact_list_button">Contatos</string>
+  <string name="forums_button">Fóruns</string>
   <!--Progress titles-->
-  <string name="progress_title_logout">Desconectando do Briar...</string>
+  <string name="progress_title_logout">Desconectando do Briar…</string>
   <string name="progress_title_please_wait">Por favor, aguarde</string>
   <!--Blogs-->
   <string name="blogs_button">Micro Blogs</string>
@@ -244,13 +223,12 @@
   <string name="blogs_my_blogs_create_hint_desc">Uma pequena descrição do seu novo Blog</string>
   <string name="blogs_my_blogs_create_hint_desc_explanation">Leitores Potenciais podem se inscrever ou não no seu Blog baseado no conteúdo da descrição. </string>
   <string name="blogs_my_blogs_empty_state">Você não tem nenhum Blog.
-Por que não cria um clicando no simbolo mais no topo direito da tela? </string>
+Por que não cria um clicando no símbolo mais no topo direito da tela? </string>
   <string name="blogs_my_blogs_created">Blog Criado</string>
   <string name="blogs_blog_is_empty">Esse blog está vazio</string>
   <string name="blogs_other_blog_empty_state">Esse Blog atualmente está vazio.
-Ou o autor não não postou nada ainda, ou a pessoa que compartilhou esse Blog contigo precisa estar online, assim os Posts serão sincronizados.</string>
+Ou o autor não postou nada ainda, ou a pessoa que compartilhou esse Blog contigo precisa estar online, assim os Posts serão sincronizados.</string>
   <string name="tag_new">Novo</string>
-  <string name="blogs_post_more">mais</string>
   <string name="blogs_write_blog_post">Escrever Post do Blog</string>
   <string name="blogs_write_blog_post_title_hint">Adicione um Título (opcional)</string>
   <string name="blogs_write_blog_post_body_hint">Digite aqui seu post do blog</string>
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index cb1b55840..e7cb49b15 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -4,27 +4,18 @@
 	<color name="briar_blue_dark">#0F1720</color>
 	<color name="briar_gold">#FCCF1C</color>
 	<color name="briar_green_light">#95D220</color>
-	<color name="briar_green_dark">#87C214</color>
-	<color name="briar_red">#C1392B</color>
 
 	<color name="window_background">#eceff1</color>
 	<color name="action_bar_text">#FFFFFF</color>
-	<color name="action_bar_background">@color/briar_blue</color>
 	<color name="button_bar_background">#FFFFFF</color>
-	<color name="dashboard_background">#FFFFFF</color>
 	<color name="private_message_date">#AAAAAA</color>
 	<color name="private_message_date_inverse">#e0e0e0</color>
-	<color name="unread_background">#FFFFFF</color>
-	<color name="horizontal_border">#CCCCCC</color>
-	<color name="forums_available_background">@color/briar_gold</color>
-	<color name="no_private_messages">#AAAAAA</color>
 	<color name="forum_avatar_shadow">#99000000</color>
 
 	<color name="briar_primary">@color/briar_blue</color>
 	<color name="briar_primary_dark">@color/briar_blue_dark</color>
 
 	<color name="briar_accent">@color/briar_blue</color>
-	<color name="briar_accent_dark">@color/briar_blue_dark</color>
 
 	<!-- text colors -->
 	<color name="briar_text_link">#06b9ff</color>
@@ -40,7 +31,6 @@
 	<!-- this is needed as preference_category_material layout uses this color as the text color -->
 	<color name="preference_fallback_accent_color">@color/briar_accent</color>
 	<color name="divider">#c1c1c1</color>
-	<color name="default_separator">#000000</color>
 	<color name="default_separator_inverted">#ffffff</color>
 	<color name="menu_background">#FFFFFF</color>
 
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
index 8b09f7246..de80d0880 100644
--- a/briar-android/res/values/dimens.xml
+++ b/briar-android/res/values/dimens.xml
@@ -21,7 +21,6 @@
 
 	<dimen name="listitem_horizontal_margin">16dp</dimen>
 	<dimen name="listitem_vertical_margin">10dp</dimen>
-	<dimen name="listitem_text_left_margin">72dp</dimen>
 	<dimen name="listitem_height_one_line_avatar">56dp</dimen>
 	<dimen name="listitem_picture_size">48dp</dimen>
 	<dimen name="listitem_picture_size_small">23dp</dimen>
@@ -34,7 +33,6 @@
 	<dimen name="avatar_text_size">30sp</dimen>
 
 	<dimen name="unread_bubble_text_size">12sp</dimen>
-	<dimen name="unread_bubble_border_width">2dp</dimen>
 	<dimen name="unread_bubble_padding_horizontal">6dp</dimen>
 	<dimen name="unread_bubble_size">19dp</dimen>
 
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index bdea4954b..cd77033b9 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="nav_drawer_open_description">Open the navigation drawer</string>
-	<string name="nav_drawer_close_description">Close the navigation drawer</string>
-	<string name="app_name">Briar</string>
+	<string translatable="false" name="app_name">Briar</string>
 
-	<!-- Crash Reporter -->
-	<string name="crash_report_title">Briar Crash Report</string>
-	<string name="briar_crashed">Sorry, Briar has crashed.</string>
-	<string name="not_your_fault">This is not your fault.</string>
-	<string name="please_send_report">Please help us build a better Briar by sending us a crash report.</string>
-	<string name="report_is_encrypted">We promise that the report is encrypted and sent securely.</string>
-	<string name="feedback_title">Feedback</string>
-	<string name="describe_crash">Describe what happened (optional)</string>
-	<string name="enter_feedback">Enter your feedback</string>
-	<string name="optional_contact_email">Your email address (optional)</string>
-	<string name="debug_report">Debug report:</string>
-	<string name="include_debug_report_crash">Include anonymous data about the crash</string>
-	<string name="include_debug_report_feedback">Include anonymous data about this device</string>
-	<string name="could_not_load_report_data">Could not load report data.</string>
-	<string name="send_report">Send report</string>
-	<string name="close">Close</string>
-	<string name="dev_report_saved">Report saved. It will be sent the next time you log into Briar.</string>
-
-	<string name="ongoing_notification_title">Signed into Briar</string>
-	<string name="ongoing_notification_text">Touch to open Briar.</string>
+	<!-- Setup -->
 	<string name="setup_title">Briar Setup</string>
 	<string name="setup_explanation">Your Briar account is stored encrypted on your device, not in the cloud. If you uninstall Briar or forget your password, there\'s no way to recover your account and your data.</string>
 	<string name="choose_nickname">Choose your nickname</string>
@@ -33,27 +12,78 @@
 	<string name="password_too_weak">Password is too weak</string>
 	<string name="passwords_do_not_match">Passwords do not match</string>
 	<string name="create_account_button">Create Account</string>
+	<string name="progress_title_please_wait">Please wait..</string>
+
+	<!-- Login -->
 	<string name="enter_password">Enter your password:</string>
-	<string name="password_hint">Password</string>
-	<string name="forgotten_password">I have forgotten my password</string>
 	<string name="try_again">Wrong password, try again</string>
 	<string name="sign_in_button">Sign In</string>
+	<string name="forgotten_password">I have forgotten my password</string>
+	<string name="dialog_title_lost_password">Lost Password</string>
+	<string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
 	<string name="startup_failed_notification_title">Briar could not start</string>
 	<string name="startup_failed_notification_text">You may need to reinstall Briar.</string>
 	<string name="startup_failed_activity_title">Briar Startup Failure</string>
 	<string name="startup_failed_db_error">For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contact connections are lost. Unfortunately, you need to reinstall Briar und set up a new account.</string>
 	<string name="startup_failed_service_error">Briar was unable to start a required plugin. Reinstalling Briar usually solves this problem. However, please note that you will then lose your account and all data associated with it since Briar is not using central servers to store your data on.</string>
 	<string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
+	<string name="dialog_title_welcome">Welcome to Briar</string>
+	<string name="dialog_welcome_message">Add a contact to start communicating securely or press the icon in the upper left corner of the screen for more options.</string>
+
+	<!-- Navigation Drawer -->
+	<string name="nav_drawer_open_description">Open the navigation drawer</string>
+	<string name="nav_drawer_close_description">Close the navigation drawer</string>
 	<string name="contact_list_button">Contacts</string>
-	<string name="delete_contact">Delete contact</string>
-	<string name="contact_deleted_toast">Contact deleted</string>
 	<string name="forums_button">Forums</string>
+	<string name="blogs_button">Micro Blogs</string>
 	<string name="settings_button">Settings</string>
 	<string name="sign_out_button">Sign Out</string>
+
+	<!-- Transports -->
+	<string name="transport_tor">Internet</string>
+	<string name="transport_bt">Bluetooth</string>
+	<string name="transport_lan">Wi-Fi</string>
+
+	<!-- Notifications -->
+	<string name="ongoing_notification_title">Signed into Briar</string>
+	<string name="ongoing_notification_text">Touch to open Briar.</string>
+	<plurals name="private_message_notification_text">
+		<item quantity="one">New private message.</item>
+		<item quantity="other">%d new private messages.</item>
+	</plurals>
+	<plurals name="forum_post_notification_text">
+		<item quantity="one">New forum post.</item>
+		<item quantity="other">%d new forum posts.</item>
+	</plurals>
+	<plurals name="blog_post_notification_text">
+		<item quantity="one">New blog post.</item>
+		<item quantity="other">%d new blog posts.</item>
+	</plurals>
+
+	<!-- Misc -->
 	<string name="now">now</string>
-	<string name="contact_list_title">Contacts</string>
+	<string name="show">Show</string>
+	<string name="hide">Hide</string>
+	<string name="ok">OK</string>
+	<string name="cancel">Cancel</string>
+	<string name="delete">Delete</string>
+	<string name="accept">Accept</string>
+	<string name="decline">Decline</string>
+	<string name="online">Online</string>
+	<string name="offline">Offline</string>
+	<string name="send">Send</string>
+	<string name="no_data">No data</string>
+
+	<!-- Contacts and Private Conversations-->
 	<string name="no_contacts">It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.</string>
-	<string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
+	<string name="date_no_private_messages">No messages.</string>
+	<string name="no_private_messages">This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.</string>
+	<string name="delete_contact">Delete contact</string>
+	<string name="dialog_title_delete_contact">Confirm Contact Deletion</string>
+	<string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string>
+	<string name="contact_deleted_toast">Contact deleted</string>
+
+	<!-- Adding Contacts -->
 	<string name="add_contact_title">Add a Contact</string>
 	<string name="your_nickname">Choose the identity you want to use:</string>
 	<string name="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</string>
@@ -75,138 +105,13 @@
 	<string name="contact_added_toast">Contact added: %s</string>
 	<string name="contact_already_exists">Contact %s already exists</string>
 	<string name="contact_exchange_failed">Contact exchange failed</string>
-	<string name="scan_qr_code">Scan QR code</string>
 	<string name="qr_code_invalid">The QR code is invalid</string>
 	<string name="connecting_to_device">Connecting to device\u2026</string>
 	<string name="authenticating_with_device">Authenticating with device\u2026</string>
 	<string name="connection_aborted_local">Connection aborted by us! This could mean that someone is trying to interfere with your connection</string>
 	<string name="connection_aborted_remote">Connection aborted by your contact! This could mean that someone is trying to interfere with your connection</string>
-	<string name="date_no_private_messages">No messages.</string>
-	<string name="no_private_messages">This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.</string>
-	<string name="private_message_hint">Type message</string>
-	<string name="message_sent_toast">Message sent</string>
-	<string name="no_forums">You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.</string>
-	<string name="no_forum_posts">This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!</string>
-	<plurals name="forums_shared">
-		<item quantity="one">%d forum shared by contacts</item>
-		<item quantity="other">%d forums shared by contacts</item>
-	</plurals>
-	<string name="show">Show</string>
-	<string name="hide">Hide</string>
-	<string name="show_forums">Show</string>
-	<string name="forum_leave">Leave Forum</string>
-	<string name="forum_left_toast">Left Forum</string>
-	<string name="sharing_status">Sharing Status</string>
-	<string name="no_posts">No posts</string>
-	<plurals name="unread_posts">
-		<item quantity="one">%d unread post</item>
-		<item quantity="other">%d unread posts</item>
-	</plurals>
-	<plurals name="posts">
-		<item quantity="one">%d post</item>
-		<item quantity="other">%d posts</item>
-	</plurals>
-	<string name="create_forum_title">New Forum</string>
-	<string name="choose_forum_name">Choose a name for your forum:</string>
-	<string name="create_forum_button">Create Forum</string>
-	<string name="forum_created_toast">Forum created</string>
-	<string name="forum_share_action">Share this forum with chosen contacts</string>
-	<string name="forum_share_button">Share Forum</string>
-	<string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
-	<string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
-	<string name="forum_share_error">There was an error sharing this forum.</string>
-	<string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
-	<string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
-	<string name="forum_show_invitations">Show Forum Invitations</string>
-	<string name="forum_compose_post">New Forum Post</string>
-	<string name="from">From:</string>
-	<string name="anonymous">Anonymous</string>
-	<string name="new_identity_item">New identity\u2026</string>
-	<string name="new_identity_title">New Identity</string>
-	<string name="create_identity_button">Create Identity</string>
-	<string name="identity_created_toast">Identity created</string>
-	<string name="forum_post_hint">Type forum post</string>
-	<string name="forum_invitations_title">Forum Invitations</string>
-	<string name="forum_invitation_exists">You accepted an invitation to this forum already. Accepting more invitations will grow and strengthen the communication in the forum.</string>
-	<string name="forum_joined_toast">Joined Forum</string>
-	<string name="forum_declined_toast">Forum Invitation Declined</string>
-	<string name="shared_by_format">Shared by %s</string>
-	<string name="forum_shared_by">Shared by</string>
-	<string name="forum_shared_with">Shared with</string>
-	<string name="nobody">Nobody</string>
-	<string name="add_button">Add</string>
-	<string name="cancel_button">Cancel</string>
-	<string name="done_button">Done</string>
-	<string name="delete_button">Delete</string>
-	<string name="post_sent_toast">Forum post sent</string>
-	<plurals name="private_message_notification_text">
-		<item quantity="one">New private message.</item>
-		<item quantity="other">%d new private messages.</item>
-	</plurals>
-	<plurals name="forum_post_notification_text">
-		<item quantity="one">New forum post.</item>
-		<item quantity="other">%d new forum posts.</item>
-	</plurals>
-	<plurals name="blog_post_notification_text">
-		<item quantity="one">New blog post.</item>
-		<item quantity="other">%d new blog posts.</item>
-	</plurals>
 
-	<!-- Settings -->
-	<string name="settings_title">Settings</string>
-	<string name="network_settings_title">Networks</string>
-	<string name="bluetooth_setting">Connect via Bluetooth</string>
-	<string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
-	<string name="bluetooth_setting_disabled">Only when adding contacts</string>
-	<string name="tor_mobile_setting">Connect via Tor</string>
-	<string name="tor_mobile_setting_enabled">When using Wi-Fi or mobile data</string>
-	<string name="tor_mobile_setting_disabled">Only when using Wi-Fi</string>
-	<string name="security_settings_title">Security</string>
-	<string name="change_password">Change password</string>
-	<string name="panic_setting">Panic button setup</string>
-	<string name="panic_setting_title">Panic button</string>
-	<string name="panic_setting_hint">Configure how Briar will react when you use a panic button app</string>
-	<string name="notification_settings_title">Notifications</string>
-	<string name="notify_private_messages_setting">Show alerts for private messages</string>
-	<string name="notify_forum_posts_setting">Show alerts for forum posts</string>
-	<string name="notify_blog_posts_setting">Show alerts for blog posts</string>
-	<string name="notify_vibration_setting">Vibrate</string>
-	<string name="notify_sound_setting">Sound</string>
-	<string name="notify_sound_setting_default">Default ringtone</string>
-	<string name="notify_sound_setting_disabled">None</string>
-	<string name="choose_ringtone_title">Choose ringtone</string>
-	<string name="crash_report_settings_title">Crash reports</string>
-	<string name="enable_acra_setting">Enable crash reporter</string>
-	<string name="acra_syslog_setting">Send system logs</string>
-	<string name="acra_user_email_setting">Optional contact email</string>
-	<string name="acra_alwaysaccept_setting">Always send reports</string>
-	<string name="panic_app_setting_title">Panic Button App</string>
-	<string name="unknown_app">an unknown app</string>
-	<string name="panic_app_setting_summary">No app has been set</string>
-	<string name="panic_app_setting_none">None</string>
-	<string name="lock_setting_title">Sign Out</string>
-	<string name="lock_setting_summary">Sign out of Briar if a panic button is pressed</string>
-	<string name="purge_setting_title">Delete Account</string>
-	<string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
-	<string name="uninstall_setting_title">Uninstall Briar</string>
-	<string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string>
-	<string name="current_password">Enter your current password:</string>
-	<string name="choose_new_password">Choose your new password:</string>
-	<string name="confirm_new_password">Confirm your new password:</string>
-	<string name="password_changed">Password has been changed.</string>
-	<string name="feedback_settings_title">Feedback</string>
-	<string name="send_feedback">Send feedback</string>
-
-	<string name="step">Step %1$d/%2$d</string>
-	<string name="online">Online</string>
-	<string name="offline">Offline</string>
-	<string name="send">Send</string>
-	<string name="transport_tor">Internet</string>
-	<string name="transport_bt">Bluetooth</string>
-	<string name="transport_lan">Wi-Fi</string>
-	<string name="no_data">No data</string>
-
-	<!-- Introduction Client -->
+	<!-- Introductions -->
 	<string name="introduction_activity_title">Select Contact</string>
 	<string name="introduction_message_title">Introduce Contacts</string>
 	<string name="introduction_message_text">You can compose a message that will be sent to %1$s and %2$s along with your introduction:</string>
@@ -217,6 +122,7 @@
 	<string name="introduction_response_error">Error when responding to introduction</string>
 	<string name="introduction_warn_different_identities_title">Warning: Different Identities</string>
 	<string name="introduction_warn_different_identities_text">You are trying to introduce two contacts that you have added with different identities. This might reveal that both identities are yours.</string>
+	<string name="dialog_button_introduce">Introduce</string>
 	<string name="introduction_request_sent">You have asked to introduce %1$s to %2$s.</string>
 	<string name="introduction_request_received">%1$s has asked to introduce you to %2$s. Do you want to add %2$s to your contact list?</string>
 	<string name="introduction_request_exists_received">%1$s has asked to introduce you to %2$s, but %2$s is already in your contact list. Since %1$s might not know that, you can still respond:</string>
@@ -230,52 +136,67 @@
 	<string name="introduction_success_title">Introduced contact was added</string>
 	<string name="introduction_success_text">You have been introduced to %1$s.</string>
 
-	<!-- Forum -->
+	<!-- Forums -->
+	<string name="no_forums">You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.</string>
+	<string name="create_forum_title">New Forum</string>
+	<string name="choose_forum_name">Choose a name for your forum:</string>
+	<string name="create_forum_button">Create Forum</string>
+	<string name="forum_created_toast">Forum created</string>
+	<string name="no_forum_posts">This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!</string>
+	<string name="no_posts">No posts</string>
+	<plurals name="posts">
+		<item quantity="one">%d post</item>
+		<item quantity="other">%d posts</item>
+	</plurals>
+	<string name="forum_compose_post">New Forum Post</string>
+	<string name="forum_new_entry_posted">Forum entry posted</string>
+	<string name="forum_new_entry_received">New forum entry</string>
+	<string name="forum_new_message_hint">New Entry</string>
+	<string name="forum_message_reply_hint">New Reply</string>
 	<string name="btn_reply">REPLY</string>
 	<plurals name="message_replies">
 		<item quantity="one">%1$d reply</item>
 		<item quantity="other">%1$d replies</item>
 	</plurals>
-	<string name="forum_new_entry_posted">Forum entry posted</string>
-	<string name="forum_new_entry_received">New forum entry</string>
-	<string name="forum_new_message_hint">New Entry</string>
-	<string name="forum_message_reply_hint">New Reply</string>
+	<string name="forum_leave">Leave Forum</string>
+	<string name="dialog_title_leave_forum">Confirm Leaving Forum</string>
+	<string name="dialog_message_leave_forum">Are you sure that you want to leave this forum? Contacts you have shared this forum with might get cut off from receiving updates for this forum.</string>
+	<string name="dialog_button_leave">Leave</string>
+	<string name="forum_left_toast">Left Forum</string>
+
+	<!-- Forum Sharing -->
+	<string name="forum_share_button">Share Forum</string>
+	<string name="forum_share_action">Share this forum with chosen contacts</string>
+	<string name="activity_share_toolbar_header">Choose Contacts</string>
+	<string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
+	<string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
+	<string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
+	<string name="forum_share_error">There was an error sharing this forum.</string>
+	<string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
+	<string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
+	<string name="forum_show_invitations">Show Forum Invitations</string>
+	<string name="forum_invitations_title">Forum Invitations</string>
+	<string name="forum_invitation_exists">You accepted an invitation to this forum already. Accepting more invitations will grow and strengthen the communication in the forum.</string>
+	<string name="forum_joined_toast">Joined Forum</string>
+	<string name="forum_declined_toast">Forum Invitation Declined</string>
+	<string name="shared_by_format">Shared by %s</string>
 	<string name="forum_invitation_already_sharing">Already sharing</string>
 	<string name="forum_invitation_response_accepted_sent">You accepted the forum invitation from %s.</string>
 	<string name="forum_invitation_response_declined_sent">You declined the forum invitation from %s.</string>
 	<string name="forum_invitation_response_accepted_received">%s accepted the forum invitation.</string>
 	<string name="forum_invitation_response_declined_received">%s declined the forum invitation.</string>
 
-	<!-- Dialogs -->
-	<string name="dialog_title_lost_password">Lost Password</string>
-	<string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
-	<string name="dialog_title_delete_contact">Confirm Contact Deletion</string>
-	<string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string>
-	<string name="dialog_title_connect_panic_app">Confirm Panic App</string>
-	<string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
-	<string name="dialog_title_welcome">Welcome to Briar</string>
-	<string name="dialog_welcome_message">Add a contact to start communicating securely or press the icon in the upper left corner of the screen for more options.</string>
-	<string name="dialog_title_leave_forum">Confirm Leaving Forum</string>
-	<string name="dialog_message_leave_forum">Are you sure that you want to leave this forum? Contacts you have shared this forum with might get cut off from receiving updates for this forum.</string>
-	<string name="dialog_button_ok">OK</string>
-	<string name="dialog_button_leave">Leave</string>
-	<string name="dialog_button_introduce">Introduce</string>
-	<string name="dialog_button_accept">Accept</string>
-	<string name="dialog_button_decline">Decline</string>
-	<!-- Toolbar headers -->
-	<string name="dashboard_toolbar_header">Briar</string>
-	<string name="settings_toolbar_header">Settings</string>
-	<string name="contacts_toolbar_header">Contacts</string>
-	<string name="forums_toolbar_header">Forums</string>
-	<string name="activity_share_toolbar_header">Choose Contacts</string>
-	<!-- Progress titles -->
-	<string name="progress_title_logout">Signing out of Briar..</string>
-	<string name="progress_title_please_wait">Please wait..</string>
+	<string name="sharing_status">Sharing Status</string>
+	<plurals name="forums_shared">
+		<item quantity="one">%d forum shared by contacts</item>
+		<item quantity="other">%d forums shared by contacts</item>
+	</plurals>
+	<string name="forum_shared_by">Shared by</string>
+	<string name="forum_shared_with">Shared with</string>
+	<string name="nobody">Nobody</string>
 
 	<!-- Blogs -->
-	<string name="blogs_button">Micro Blogs</string>
 	<string name="blogs_feed">Feed</string>
-
 	<string name="blogs_my_blogs">My Blogs</string>
 	<string name="blogs_my_blogs_create">Create Blog</string>
 	<string name="blogs_my_blogs_label">Add new Blog</string>
@@ -288,7 +209,6 @@
 	<string name="blogs_blog_is_empty">This blog is empty</string>
 	<string name="blogs_other_blog_empty_state">This blog is currently empty.\n\nEither the author hasn\'t written anything yet, or the person who shared this blog with you needs to come online, so posts can be synchronized.</string>
 	<string name="tag_new">NEW</string>
-	<string name="blogs_post_more">more</string>
 	<string name="blogs_write_blog_post">Write Blog Post</string>
 	<string name="blogs_write_blog_post_title_hint">Add a title (optional)</string>
 	<string name="blogs_write_blog_post_body_hint">Type your blog post here</string>
@@ -304,6 +224,12 @@
 	<string name="blogs_remove_blog_dialog_message">Are you sure that you want to remove this blog and all posts?\nNote that this will not remove the blog from other people\'s devices.</string>
 	<string name="blogs_remove_blog_ok">Remove Blog</string>
 	<string name="blogs_blog_removed">Blog Removed</string>
+
+	<string name="blogs_blog_list">Blog List</string>
+	<string name="blogs_available_blogs">Available Blogs</string>
+	<string name="blogs_drafts">Drafts</string>
+
+	<!-- Blog Sharing -->
 	<string name="blogs_sharing_share">Share Blog</string>
 	<string name="blogs_sharing_error">There was an error sharing this blog.</string>
 	<string name="blogs_sharing_button">Share Blog</string>
@@ -320,10 +246,6 @@
 	<string name="blogs_sharing_joined_toast">Subscribed to Blog</string>
 	<string name="blogs_sharing_declined_toast">Blog Invitation Declined</string>
 
-	<string name="blogs_blog_list">Blog List</string>
-	<string name="blogs_available_blogs">Available Blogs</string>
-	<string name="blogs_drafts">Drafts</string>
-
 	<!-- RSS Feeds -->
 	<string name="blogs_rss_feeds_import">Import RSS Feed</string>
 	<string name="blogs_rss_feeds_import_button">Import</string>
@@ -337,4 +259,83 @@
 	<string name="blogs_rss_feeds_manage_empty_state">You haven\'t imported any RSS feeds.\n\nWhy don\'t you click the plus in the top right screen corner to add your first?</string>
 	<string name="blogs_rss_feeds_manage_error">There was a problem loading your feeds. Please try again later.</string>
 
+	<!-- Settings Network -->
+	<string name="network_settings_title">Networks</string>
+	<string name="bluetooth_setting">Connect via Bluetooth</string>
+	<string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
+	<string name="bluetooth_setting_disabled">Only when adding contacts</string>
+	<string name="tor_mobile_setting">Connect via Tor</string>
+	<string name="tor_mobile_setting_enabled">When using Wi-Fi or mobile data</string>
+	<string name="tor_mobile_setting_disabled">Only when using Wi-Fi</string>
+
+	<!-- Settings Security and Panic -->
+	<string name="security_settings_title">Security</string>
+	<string name="change_password">Change password</string>
+	<string name="current_password">Enter your current password:</string>
+	<string name="choose_new_password">Choose your new password:</string>
+	<string name="confirm_new_password">Confirm your new password:</string>
+	<string name="password_changed">Password has been changed.</string>
+	<string name="panic_setting">Panic button setup</string>
+	<string name="panic_setting_title">Panic button</string>
+	<string name="panic_setting_hint">Configure how Briar will react when you use a panic button app</string>
+	<string name="panic_app_setting_title">Panic Button App</string>
+	<string name="unknown_app">an unknown app</string>
+	<string name="panic_app_setting_summary">No app has been set</string>
+	<string name="panic_app_setting_none">None</string>
+	<string name="dialog_title_connect_panic_app">Confirm Panic App</string>
+	<string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
+	<string name="lock_setting_title">Sign Out</string>
+	<string name="lock_setting_summary">Sign out of Briar if a panic button is pressed</string>
+	<string name="purge_setting_title">Delete Account</string>
+	<string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
+	<string name="uninstall_setting_title">Uninstall Briar</string>
+	<string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string>
+
+	<!-- Settings Notifications -->
+	<string name="notification_settings_title">Notifications</string>
+	<string name="notify_private_messages_setting">Show alerts for private messages</string>
+	<string name="notify_forum_posts_setting">Show alerts for forum posts</string>
+	<string name="notify_blog_posts_setting">Show alerts for blog posts</string>
+	<string name="notify_vibration_setting">Vibrate</string>
+	<string name="notify_sound_setting">Sound</string>
+	<string name="notify_sound_setting_default">Default ringtone</string>
+	<string name="notify_sound_setting_disabled">None</string>
+	<string name="choose_ringtone_title">Choose ringtone</string>
+
+	<!-- Settings Crash reports and feedback -->
+	<string name="crash_report_settings_title">Crash reports</string>
+	<string name="enable_acra_setting">Enable crash reporter</string>
+	<string name="acra_syslog_setting">Send system logs</string>
+	<string name="acra_user_email_setting">Optional contact email</string>
+	<string name="acra_alwaysaccept_setting">Always send reports</string>
+	<string name="feedback_settings_title">Feedback</string>
+	<string name="send_feedback">Send feedback</string>
+
+	<!-- Multiple Identities -->
+	<string name="anonymous">Anonymous</string>
+	<string name="new_identity_item">New identity\u2026</string>
+	<string name="new_identity_title">New Identity</string>
+	<string name="create_identity_button">Create Identity</string>
+	<string name="identity_created_toast">Identity created</string>
+
+	<!-- Crash Reporter -->
+	<string name="crash_report_title">Briar Crash Report</string>
+	<string name="briar_crashed">Sorry, Briar has crashed.</string>
+	<string name="not_your_fault">This is not your fault.</string>
+	<string name="please_send_report">Please help us build a better Briar by sending us a crash report.</string>
+	<string name="report_is_encrypted">We promise that the report is encrypted and sent securely.</string>
+	<string name="feedback_title">Feedback</string>
+	<string name="describe_crash">Describe what happened (optional)</string>
+	<string name="enter_feedback">Enter your feedback</string>
+	<string name="optional_contact_email">Your email address (optional)</string>
+	<string name="include_debug_report_crash">Include anonymous data about the crash</string>
+	<string name="include_debug_report_feedback">Include anonymous data about this device</string>
+	<string name="could_not_load_report_data">Could not load report data.</string>
+	<string name="send_report">Send report</string>
+	<string name="close">Close</string>
+	<string name="dev_report_saved">Report saved. It will be sent the next time you log into Briar.</string>
+
+	<!-- Sign Out -->
+	<string name="progress_title_logout">Signing out of Briar…</string>
+
 </resources>
diff --git a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
index e6082e07f..e797dd800 100644
--- a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
@@ -24,9 +24,9 @@ public abstract class BriarFragmentActivity extends BriarActivity {
 			return;
 
 		if (fragmentTag.equals(ContactListFragment.TAG)) {
-			actionBar.setTitle(R.string.contacts_toolbar_header);
+			actionBar.setTitle(R.string.contact_list_button);
 		} else if (fragmentTag.equals(ForumListFragment.TAG)) {
-			actionBar.setTitle(R.string.forums_toolbar_header);
+			actionBar.setTitle(R.string.forums_button);
 		} else if (fragmentTag.equals(BlogsFragment.TAG)) {
 			actionBar.setTitle(R.string.blogs_button);
 		}
@@ -75,7 +75,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
 				R.style.BriarDialogTheme);
 		builder.setTitle(titleStringId);
 		builder.setMessage(msgStringId);
-		builder.setPositiveButton(R.string.dialog_button_ok, null);
+		builder.setPositiveButton(R.string.ok, null);
 		AlertDialog dialog = builder.create();
 		dialog.show();
 	}
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 321f6c4a1..751b6adcd 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -109,8 +109,8 @@ public class PasswordActivity extends BaseActivity {
 				R.style.BriarDialogTheme);
 		builder.setTitle(R.string.dialog_title_lost_password);
 		builder.setMessage(R.string.dialog_message_lost_password);
-		builder.setPositiveButton(R.string.cancel_button, null);
-		builder.setNegativeButton(R.string.delete_button,
+		builder.setPositiveButton(R.string.cancel, null);
+		builder.setNegativeButton(R.string.delete,
 				new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
diff --git a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
index 9629d0426..0bd866284 100644
--- a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
+++ b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
@@ -283,7 +283,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
 		builder.setTitle(getString(R.string.blogs_remove_blog));
 		builder.setMessage(
 				getString(R.string.blogs_remove_blog_dialog_message));
-		builder.setPositiveButton(R.string.cancel_button, null);
+		builder.setPositiveButton(R.string.cancel, null);
 		builder.setNegativeButton(R.string.blogs_remove_blog_ok, okListener);
 		builder.show();
 	}
diff --git a/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java b/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
index c7d772cba..62f6c4f42 100644
--- a/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
+++ b/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
@@ -160,7 +160,7 @@ public class RssFeedImportActivity extends BriarActivity {
 						new AlertDialog.Builder(RssFeedImportActivity.this,
 								R.style.BriarDialogTheme);
 				builder.setMessage(R.string.blogs_rss_feeds_import_error);
-				builder.setNegativeButton(R.string.cancel_button, null);
+				builder.setNegativeButton(R.string.cancel, null);
 				builder.setPositiveButton(R.string.try_again_button,
 						new DialogInterface.OnClickListener() {
 							@Override
diff --git a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
index 0b1486b84..0f3378852 100644
--- a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
+++ b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
@@ -88,7 +88,7 @@ public class ForumListFragment extends BaseEventFragment implements
 
 		snackbar = Snackbar.make(list, "", LENGTH_INDEFINITE);
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
-		snackbar.setAction(R.string.show_forums, this);
+		snackbar.setAction(R.string.show, this);
 		snackbar.setActionTextColor(ContextCompat
 				.getColor(getContext(), R.color.briar_button_positive));